Added even more tests, an .autotest file for growl notifications, fixed up a few more places where it was needlessly calling #id on objects for route helpers.

Fixed up the relationships between forums and the last post and the sub forum they were posted in.

Changed the #belongs_to_user method for messages to just #belongs_to?

The post model now will correctly define which forum it was last posted in.

Removed the rcov file, use rake spec:rcov SHOW_ONLY="app" now.

Author: radar

.autotest

@@ -0,0 +1,18 @@
+module Autotest::Growl
+
+   def self.growl title, msg, img, pri=0, sticky=""
+     system "growlnotify -n autotest --image #{img} -p #{pri} -m #{msg.inspect} #{title} #{sticky}"
+   end
+
+  Autotest.add_hook :ran_command do |at|
+    results = [at.results].flatten.join("\n")
+    output = results.slice(/(\d+)\s+examples?,\s*(\d+)\s+failures?(,\s*(\d+)\s+not implemented)?/) 
+      if output
+        if $~[2].to_i > 0
+          growl "FAIL", "#{output}", "~/.autotest_images/fail.png", 2
+       else
+         growl "Pass", "#{output}", "~/.autotest_images/pass.png" 
+       end
+     end
+   end 
+ end 

.gitignore

@@ -5,7 +5,6 @@ db/*.sqlite3
 config/database.yml
 nbproject/**/*
 nbproject/project.*
-commit
 test
 coverage
 coverage/*

app/controllers/admin/accounts_controller.rb

@@ -16,7 +16,6 @@ def ban_ip
     else
       @banned_ip = BannedIp.new(params[:banned_ip])
     end
-
     @banned = BannedIp.find(:all, :conditions => ["ban_time > ?",Time.now])
   end
 

app/controllers/messages_controller.rb

@@ -7,7 +7,7 @@ def index
   end
 
   def new
-    @message = Message.new
+    @message = current_user.outbox_messages.new
     @users = User.find(:all, :order => "login ASC") - [current_user]
     if @users.empty?
       flash[:notice] = "There's nobody else to send a message to!"
@@ -16,8 +16,7 @@ def new
   end
 
   def create
-    params[:message][:from_id] = session[:user]
-    @message = Message.new(params[:message])
+    @message = current_user.outbox_messages.new(params[:message])
     if @message.save
       flash[:notice] = "The message has been sent."
       redirect_back_or_default(messages_path)
@@ -28,14 +27,9 @@ def create
   end
 
   def destroy
-    #refactor! if if else end if end else end... this can be done so much better.
-    @message = Message.find(params[:id])
-    if @message.belongs_to_user(current_user.id)
-      if @message.from_id == current_user.id
-        @message.update_attribute("from_deleted",true)
-      else
-        @message.update_attribute("to_deleted",true)
-      end
+    @message = Message.find(params[:id]) 
+    if @message.belongs_to?(current_user.id)
+      @message.update_attribute("#{@message.from_id == current_user.id ? "from" : "to"}_deleted",true) 
       @message.destroy if @message.from_deleted == @message.to_deleted
       flash[:notice] = "This message has been deleted."
     else
@@ -46,7 +40,7 @@ def destroy
 
   def show
     @message = Message.find(params[:id])
-    if !@message.belongs_to_user(current_user.id)
+    if !@message.belongs_to?(current_user.id)
       flash[:notice] = "That message does not belong to you."
       redirect_back_or_default(messages_path) and return
     else

app/controllers/posts_controller.rb

@@ -1,5 +1,4 @@
 class PostsController < ApplicationController
-  #TODO: Rescue on error where needed.
   before_filter :login_required
   def edit
     @post = Post.find(params[:id])
@@ -9,7 +8,8 @@ def edit
     else
       render :layout => false
     end
-    
+  rescue ActiveRecord::RecordNotFound
+    not_found
   end
 
   def update
@@ -19,17 +19,18 @@ def update
     else
       flash[:notice] = "This post could not be updated."
     end
+  rescue ActiveRecord::RecordNotFound
+    not_found
   end
 
   def create
-    @topic = Topic.find(params[:topic_id])
-    @posts = @topic.posts
+    @topic = Topic.find(params[:topic_id], :include => :posts)
+    @posts = @topic.posts.find(:all, :order => "id DESC", :limit => 10)
     @post = @topic.posts.build(params[:post])
     if @post.save
       flash[:notice] = "Post has been created."
-      redirect_to forum_topic_path(@post.forum.id,@post.topic.id)
+      redirect_to forum_topic_path(@post.forum,@topic)
     else
-      @posts = @topic.posts.find(:all, :order => "id DESC", :limit => 10)
       @quoting_post = Post.find(params[:quote]) unless params[:quote].blank?
       flash[:notice] = "This post could not be created."
       render :action => "../topics/reply"
@@ -41,8 +42,19 @@ def destroy
     flash[:notice] = "Post was deleted."
     if @post.topic.posts.size.zero?
       @post.topic.destroy
-      flash[:notice] = "Post was deleted. This was the only post in the topic, so topic was deleted also."
+      flash[:notice] += " This was the only post in the topic, so topic was deleted also."
+      redirect_to forum_path(@post.forum)
+    else
+      redirect_to forum_topic_path(@post.forum, @post.topic)
     end
+  rescue ActiveRecord::RecordNotFound
+    not_found
   end
 
+  private
+    def not_found
+      flash[:notice] = "The post you were looking for could not be found."
+      redirect_back_or_default(forums_path)
+    end
+  
 end

app/controllers/topics_controller.rb

@@ -13,19 +13,19 @@ def create
     Topic.transaction do
       @topic = current_user.topics.create!(params[:topic].merge(:forum_id => params[:forum_id]))
       @post = @topic.posts.create!(params[:post].merge(:user_id => current_user.id ))
-      @topic.sticky = true if params[:topic][:sticky] == 1
+      @topic.sticky = true if params[:topic][:sticky] == 1 && is_admin?
     end
     flash[:notice] = "Topic has been created."
-    redirect_to forum_topic_path(@topic.forum.id,@topic.id)
+    redirect_to forum_topic_path(@topic.forum, @topic)
   rescue ActiveRecord::RecordNotSaved, ActiveRecord::RecordInvalid => @e
     flash[:notice] = "Topic was not created."
     #So it doesn't forget the post text
-    @post = Post.create(params[:post].merge(:user_id => current_user.id ))
+    @post = current_user.posts.new(params[:post])
     render :template => "topics/new"
   end
 
   def show
-    @topic = Topic.find(params[:id])
+    @topic ||= Topic.find(params[:id], :include => [:forum])
     @topic.increment!("views")
   end
 
@@ -62,14 +62,14 @@ def lock
     topic = Topic.find(params[:id])
     topic.update_attribute("locked",true)
     flash[:notice] = "This topic has been locked."
-    redirect_to topic_path(topic.id)
+    redirect_to topic_path(topic)
   end
 
   def unlock
     topic = Topic.find(params[:id])
     topic.update_attribute("locked",false)
     flash[:notice] = "This topic has been unlocked."
-    redirect_to topic_path(topic.id)
+    redirect_to topic_path(topic)
   end
 
   private
@@ -79,8 +79,9 @@ def can_reply?
   end
 
   def is_viewable?
-    @topic = Topic.find(params[:id])
-    unless (logged_in? && @topic.forum.is_visible_to < current_user.user_level_id) || @topic.forum.is_visible_to == 1
+    @topic = Topic.find(params[:id], :include => [:forum])
+    @forum = @topic.forum
+    unless (logged_in? && @forum.is_visible_to < current_user.user_level_id) || @forum.is_visible_to == 1
       flash[:notice] = "You do not have the permissions to access that topic."
       redirect_back_or_default(forums_path)
     end

app/models/forum.rb

@@ -6,7 +6,8 @@ class Forum < ActiveRecord::Base
   validates_presence_of :title, :description
   belongs_to :visible_to, :class_name => "UserLevel", :foreign_key => "is_visible_to"
   belongs_to :creator_of_topics, :class_name => "UserLevel", :foreign_key => "topics_created_by"
-  #has_one :last_post, :class_name => "Post"
+  belongs_to :last_post, :class_name => "Post", :foreign_key => "last_post_id"
+  belongs_to :last_post_forum, :class_name => "Forum", :foreign_key => "last_post_forum_id"
 
   def to_s
     title
@@ -19,14 +20,6 @@ def topics
     old_topics.sort_by { |t| t.posts.last.created_at }.reverse
   end
 
-  def last_post
-    Post.find_by_id(last_post_id)
-  end
-  
-  def last_post_forum
-    Forum.find_by_id(last_post_forum_id)
-  end
-  
   def descendants
     children.map { |f| !f.children.empty? ? f.children + [f]: f }.flatten
   end

app/models/message.rb

@@ -2,7 +2,7 @@ class Message < ActiveRecord::Base
   belongs_to :to, :class_name => "User", :foreign_key => :to_id
   belongs_to :from, :class_name => "User", :foreign_key => :from_id
 
-  def belongs_to_user(user_id)
+  def belongs_to?(user_id)
 	   to_id == user_id || from_id == user_id
   end
 end

app/models/post.rb

@@ -9,21 +9,21 @@ class Post < ActiveRecord::Base
   after_destroy :find_latest_post
 
   def update_forum
-    forum.last_post_id = id
+    forum.last_post = self
     Post.update_latest_post(self)
   end
 
   def self.update_latest_post(post)
-    post.forum.last_post_id = post.id
+    post.forum.last_post = post
     if post.forum.sub? 
       for ancestor in post.forum.ancestors
-        ancestor.last_post_id = post.id
-        ancestor.last_post_forum_id = post.forum.id
+        ancestor.last_post = post
+        ancestor.last_post_forum = post.forum
         ancestor.save
       end
     end
-    post.forum.last_post_id = post.id
-    post.forum.last_post_forum_id = nil
+    post.forum.last_post = post
+    post.forum.last_post_forum = nil
     post.forum.save
   end
 
@@ -32,8 +32,8 @@ def find_latest_post
     if !last.nil?
       update_latest_post(last)
     else
-      forum.last_post_id = nil
-      forum.last_post_forum_id = nil
+      forum.last_post = nil
+      forum.last_post_forum = nil
       forum.save
     end
 

app/views/admin/forums/_forum.html.erb

@@ -1,14 +1,14 @@
 <tr>
-  <td class='icon'><%= link_to theme_image_tag("edit.jpg"), edit_admin_forum_path(forum.id) %>
-  <%= link_to theme_image_tag("delete.jpg"), admin_forum_path(forum.id), :method => "delete", :confirm => "Are you sure you want to delete '#{forum.title}'" %></td>
+  <td class='icon'><%= link_to theme_image_tag("edit.jpg"), edit_admin_forum_path(forum) %>
+  <%= link_to theme_image_tag("delete.jpg"), admin_forum_path(forum), :method => "delete", :confirm => "Are you sure you want to delete '#{forum.title}'" %></td>
   <td style='text-align:left !important'> <%= theme_image_tag("extender.jpg", :style => "padding-left:#{depth*20}") if extender %>
 <%= link_to forum.title, forum_path(forum) %></td>
   <td><%= forum.visible_to %></td>
   <td><%= forum.creator_of_topics %></td>
   <td><%= forum.topics.size %></td>
   <td><%= forum.posts.size %></td>
   <td>
-<%= link_to theme_image_tag("top.jpg"), move_to_top_admin_forum_path(forum), :method => :put%>
+<%= link_to theme_image_tag("top.jpg"), move_to_top_admin_forum_path(forum), :method => :put %>
 <%= link_to theme_image_tag("up.jpg"), move_up_admin_forum_path(forum), :method => :put %>
     <%= forum.position %>
     <%= link_to theme_image_tag("down.jpg"), move_down_admin_forum_path(forum), :method => :put %>

app/views/forums/_forum.html.erb

@@ -1,14 +1,14 @@
-<tr><td align='left'><h1><%= link_to(forum.title, forum_path(forum.id)) %></h1><%= forum.description %></td>
-  <td align='center'><%= forum.topics.size %></td>
-  <td align='center'><%= forum.posts.size %></td>
-  <td align='right'><% if !forum.last_post.nil? %>
-      <%= time_ago_in_words(forum.last_post.created_at) %> ago
-      by <%= link_to(forum.last_post.user.login, :controller => "accounts", :action => "user", :id => forum.last_post.user.login)  %>
-      in <%= link_to(forum.last_post.topic.subject, forum_topic_path(forum,forum.last_post.topic)) %>
-      <% if !forum.last_post_forum.nil? %>
-        in <%= link_to(forum.last_post_forum, forum_path(forum.last_post_forum)) %>
-        <% end %>
-      <% else %>
-        None
-      <% end %>
-  </td></tr>
+<tr><td align='left'><h1><%= link_to(forum.title, forum_path(forum)) %></h1><%= forum.description %></td>
+  <td align='center'><%= forum.topics.size %></td>
+  <td align='center'><%= forum.posts.size %></td>
+  <td align='right'><% if !forum.last_post.nil? %>
+      <%= time_ago_in_words(forum.last_post.created_at) %> ago
+      by <%= link_to(forum.last_post.user.login, :controller => "accounts", :action => "user", :id => forum.last_post.user.login)  %>
+      in <%= link_to(forum.last_post.topic.subject, forum_topic_path(forum,forum.last_post.topic)) %>
+      <% if !forum.last_post_forum.nil? %>
+        in <%= link_to(forum.last_post_forum, forum_path(forum.last_post_forum)) %>
+        <% end %>
+      <% else %>
+        None
+      <% end %>
+  </td></tr>

app/views/messages/_message.html.erb

@@ -1,6 +1,6 @@
 		<tr>
-			<td align='center'><%= link_to(message.to_read? ?  style_image_tag("old.jpg") : style_image_tag("new.jpg"), message_path(message.id))%></td>
-			<td align='center'><%= link_to(style_image_tag("delete.jpg"), message_path(message.id), :method => "delete", :confirm => "Are you sure you want to delete this message?") %></td>
+			<td align='center'><%= link_to(message.to_read? ?  theme_image_tag("old.jpg") : theme_image_tag("new.jpg"), message_path(message))%></td>
+			<td align='center'><%= link_to(theme_image_tag("delete.jpg"), message_path(message), :method => "delete", :confirm => "Are you sure you want to delete this message?") %></td>
 			<td align='center'><%= message.from.login %></td>
 			<td align='center'><%= time_ago_in_words(message.created_at) %> ago</td>
 		</tr>

app/views/topics/show.html.erb

@@ -1,24 +1,24 @@
-
 <%= link_to("rBoard", forums_path) %> <%= breadcrumb(@topic.forum) %> -> <%= @topic.subject %>
 <h2><%= @topic.subject %></h2>
 <% if logged_in? %>
-<% if can_create_topics? %>
-<%= link_to "New Topic", new_forum_topic_path(@topic.forum) %> |
-<% end %>
-<% if can_reply? && !@topic.locked? %>
-
-   <%= link_to "New Reply", reply_topic_path(@topic) %> |
-   <% end %>
-  
-  <% if is_admin? %>
-    <% if @topic.locked? %> 
-      <%= link_to "Unlock this topic", unlock_topic_path(@topic), :method => :put %>
-    <% else %>
-      <%= link_to "Lock this topic", lock_topic_path(@topic), :method => :put %>
-    <% end %>
+  <% if can_create_topics? %>
+    <%= link_to "New Topic", new_forum_topic_path(@topic.forum) %> |
+	<% end %>
+	
+	<% if can_reply? && !@topic.locked? %>
+   		<%= link_to "New Reply", reply_topic_path(@topic) %>
   <% end %>
+  
+  	<% if is_admin? %>
+      |
+    	<% if @topic.locked? %> 
+        <%= link_to "Unlock this topic", unlock_topic_path(@topic), :method => :put %>
+    	<% else %>
+      	<%= link_to "Lock this topic", lock_topic_path(@topic), :method => :put %>
+    	<% end %>
+  	<% end %>
 <% else %>
-  Locked!
+ | Locked!
 <% end %>
 <br />
 <%= render :partial => @topic.posts %>