@@ -10,5 +10,5 @@ nbproject/project.* test coverage coverage/* - +config/*.sphinx.conf .gitignore @@ -17,6 +17,7 @@ class PostsController < ApplicationController @posts = @topic.posts.find(:all, :order => "id DESC", :limit => 10) @post = @topic.posts.build(params[:post].merge!(:user => current_user)) if @post.save + @topic.update_attribute("last_post_id", @post.id) page = (@topic.posts.size.to_f / 30).ceil flash[:notice] = "Post has been created." redirect_to forum_topic_path(@post.forum,@topic, :page => page) app/controllers/posts_controller.rb @@ -24,6 +24,7 @@ class TopicsController < ApplicationController @post = @topic.posts.build(params[:post].merge(:user_id => current_user.id)) @topic.sticky = true if params[:topic][:sticky] == 1 && current_user.admin? if @topic.save + @topic.update_attribute("last_post_id", @post.id) flash[:notice] = "Topic has been created." redirect_to forum_topic_path(@topic.forum, @topic) else app/controllers/topics_controller.rb @@ -17,17 +17,23 @@ class Forum < ActiveRecord::Base #There's no easy way to do it alias_method :old_topics, :topics - #NOT TESTED - #POTENTIALLY UNSTABLE - def update_last_post - if posts.first.nil? - self.last_post = nil - self.last_post_forum = nil - else - self.last_post = posts.first - self.last_post_forum = posts.first.forum if posts.first.forum != self + def update_last_post(new_forum, post=nil) + post ||= posts.last + self.last_post = post + self.last_post_forum = nil + self.save! + for ancestor in (ancestors - [new_forum]) + if !post.nil? + if ancestor.last_post.nil? || (ancestor.last_post.created_at < post.created_at) + ancestor.last_post = post + ancestor.last_post_forum = self + end + else + ancestor.last_post = nil + ancestor.last_post_forum = nil + end + ancestor.save end - save end def topics app/models/forum.rb @@ -3,6 +3,7 @@ class Topic < ActiveRecord::Base belongs_to :forum has_many :posts, :dependent => :destroy, :order => "created_at asc" has_many :users, :through => :posts + belongs_to :last_post, :class_name => "Post" #makes error_messages_for return the wrong number of errors. validates_associated :posts, :message => nil @@ -19,11 +20,13 @@ class Topic < ActiveRecord::Base def move!(new_forum_id) old_forum = Forum.find(forum_id) + was_old_last_post = old_forum.last_post == self.last_post new_forum = Forum.find(new_forum_id) update_attribute("forum_id", new_forum_id) - posts.last.update_forum if posts.last != new_forum.posts.last + is_new_last_post = new_forum.last_post.nil? || (new_forum.last_post.created_at <= posts.last.created_at) + new_forum.update_last_post(new_forum, posts.last) if is_new_last_post old_forum.reload - old_forum.update_last_post + old_forum.update_last_post(new_forum) if was_old_last_post end def lock! app/models/topic.rb @@ -45,7 +45,7 @@ describe ForumsController do it "should show the admin forum to the administrator" do login_as(:administrator) - Forum.should_receive(:find).twice.and_return(@forum) + Forum.should_receive(:find).twice.and_return(@forum, @forums) @forum.should_receive(:viewable?).and_return(true) @forum.should_receive(:topics).and_return(@topics) @topics.should_receive(:paginate).and_return(@topics) spec/controllers/forums_controller_spec.rb @@ -68,6 +68,7 @@ describe PostsController, "as plebian" do @post.should_receive(:save).and_return(true) @post.should_receive(:forum).twice.and_return(@forum) @post.should_receive(:topic).and_return(@topic) + @topic.should_receive(:update_attribute).with("last_post_id", @post.id).and_return(true) post 'create', {:post => { :text => "This is a new post" }, :topic_id => topics(:user).id } flash[:notice].should eql("Post has been created.") response.should redirect_to(forum_topic_path(@post.forum, @post.topic, :page => 1)) spec/controllers/posts_controller_spec.rb @@ -105,6 +105,7 @@ describe TopicsController do @posts.should_receive(:build).and_return(@post) @topic.should_receive(:forum).and_return(@forum) @topic.should_receive(:save).and_return(true) + @topic.should_receive(:update_attribute).with("last_post_id", @post.id).and_return(true) post 'create', { :topic => { :subject => "Subject"}, :post => { :text => "New text!"}, :forum_id => forums(:admins_only).id } flash[:notice].should eql("Topic has been created.") #TODO: Test for redirect spec/controllers/topics_controller_spec.rb 3a0e632e9f224edb8198557c25f820539eacafd8 Ryan Bigg radarlistener@gmail.com http://github.com/radar/rboard/commit/8872174c29284cfdab1b4eea1a88aa2d0cbdaf6b 8872174c29284cfdab1b4eea1a88aa2d0cbdaf6b 2008-08-13T20:44:53-07:00 2008-08-13T20:44:53-07:00 Topic moving now correctly works, for real! 13f875ac1e1142831438eeac75a8d46ef8d6b457 Ryan Bigg radarlistener@gmail.com