Capfile @@ -11,4 +11,4 @@ test coverage coverage/* config/*.sphinx.conf - +config/deploy.rb .gitignore @@ -2,19 +2,19 @@ class PostsController < ApplicationController before_filter :login_required def new - @topic = Topic.find(params[:topic_id], :include => :posts) - #is there an easier way to do this? - @posts = @topic.last_10_posts - @post = @topic.posts.build(:user => current_user) - if params[:quote] - @quoting_post = Post.find(params[:quote]) - @post.text = "[quote=\"" + @quoting_post.user.login + "\"]" + @quoting_post.text + "[/quote]" - end - end + @topic = Topic.find(params[:topic_id], :include => :posts) + #is there an easier way to do this? + @posts = @topic.last_10_posts + @post = @topic.posts.build(:user => current_user) + if params[:quote] + @quoting_post = Post.find(params[:quote]) + @post.text = "[quote=\"" + @quoting_post.user.login + "\"]" + @quoting_post.text + "[/quote]" + end + end def create @topic = Topic.find(params[:topic_id], :include => :posts) - @posts = is_admin? ? @topic.posts : @topic.user_posts + @posts = @topic.posts @posts = @posts.find(:all, :order => "id DESC", :limit => 10) @post = @posts.build(params[:post].merge!(:user => current_user)) if @post.save @@ -55,14 +55,13 @@ class PostsController < ApplicationController def destroy @post = Post.find(params[:id]) @post.destroy - flash[:notice] = "Post was deleted." - if @post.topic.posts.size.zero? - @post.topic.destroy - 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 + flash[:notice] = "Post was deleted." + if @post.topic.posts.size.zero? + @post.topic.destroy + 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 app/controllers/posts_controller.rb @@ -20,6 +20,8 @@ class TopicsController < ApplicationController end def new + check_ownership + puts "I SHOULD NEVER APPEAR" @topic = Topic.new @post = @topic.posts.build end @@ -118,6 +120,10 @@ class TopicsController < ApplicationController end end + def check_ownership + redirect_to root_path and return false + end + def find_forum @forum = Forum.find(params[:forum_id]) if params[:forum_id] end app/controllers/topics_controller.rb @@ -62,6 +62,11 @@ class Forum < ActiveRecord::Base list.compact end + def self.woot + callback :after_woot + end + + def sub? !parent_id.nil? end app/models/forum.rb @@ -24,9 +24,16 @@ class Topic < ActiveRecord::Base new_forum = Forum.find(new_forum_id) update_attribute("forum_id", new_forum_id) 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(new_forum) if was_old_last_post + if is_new_last_post + puts "UPDATING LAST POST FOR #{new_forum}" + new_forum.update_last_post(new_forum, posts.last) + end + + if was_old_last_post + old_forum.reload + puts "UPDATING LAST POST FOR #{old_forum}" + old_forum.update_last_post(new_forum) + end end def lock! app/models/topic.rb @@ -16,7 +16,7 @@ require File.join(File.dirname(__FILE__), 'boot') Rails::Initializer.run do |config| # Settings in config/environments/* take precedence over those specified here - + config.gem 'chronic' # Skip frameworks you're not going to use (only works if using vendor/rails) # config.frameworks -= [ :action_web_service, :action_mailer ] config.action_controller.session = { :session_key => "rboard_secret", :secret => "this is a super secret passphrase that protects rboard" } @@ -40,7 +40,7 @@ config.action_controller.session = { :session_key => "rboard_secret", :secret => # config.active_record.schema_format = :sql # Activate observers that should always be running - # config.active_record.observers = :cacher, :garbage_collector + #config.active_record.observers = :forum_observer # Make Active Record use UTC-base instead of local time # config.active_record.default_timezone = :utc config/environment.rb @@ -13,11 +13,9 @@ ActionController::Routing::Routes.draw do |map| admin.resources :accounts, :collection => { :ban_ip => :any }, :member => { :ban => :any, :ban_ip => :any } admin.resources :themes, :member => { :make_default => :put } admin.resources :forums, :member => { :move_up => :put, :move_down => :put, :move_to_top => :put, :move_to_bottom => :put } + admin.chronic 'chronic', :controller => 'chronic' end - #FIXME - map.connect '/admin/chronic', :controller => "/admin/chronic" - map.resources :forums, :collection => { :list => :get } do |forum| forum.resources :topics, :collection => { :moderate => :post }, :member => { :lock => :put, :unlock => :put } end config/routes.rb @@ -23,6 +23,7 @@ user_3: subject: Fifth topic! user: plebian forum: sub_of_everybody + last_post: user_3 invalid: id: 4 spec/fixtures/topics.yml @@ -1,12 +1,13 @@ require File.dirname(__FILE__) + '/../spec_helper' -describe Topic, "creation" do +describe Topic, "in general" do fixtures :topics, :forums before do @topic = mock("topic") @forum = mock("forum") @invalid_topic = topics(:invalid) - @valid_topic = topics(:user) + @valid_topic = topics(:user_3) @everybody = forums(:everybody) + @sub_of_everybody = forums(:sub_of_everybody) @admins_only = forums(:admins_only) # Remove the call to reverse for an interesting failing test @posts = @valid_topic.posts.reverse @@ -43,7 +44,7 @@ describe Topic, "creation" do end it "should be able to show the string version" do - @valid_topic.to_s.should eql("Third topic!") + @valid_topic.to_s.should eql("Fifth topic!") end it "should be able to lock a topic" do @@ -72,4 +73,17 @@ describe Topic, "creation" do @valid_topic.should_not be_sticky end + it "should be able to move a topic from a sub-forum to a top-level forum" do + @everybody.last_post.should eql(@valid_topic.last_post) + @valid_topic.forum.should eql(@sub_of_everybody) + @valid_topic.move!(@admins_only.id) + @valid_topic.forum_id.should eql(@admins_only.id) + @sub_of_everybody.last_post_id.should be_nil + @everybody.last_post.should_not eql(@valid_topic.last_post) + @admins_only.reload + @admins_only.last_post.should eql(@valid_topic.last_post) + end + + + end spec/models/topic_spec.rb 570c4a9a61e12c4fbf49c4f88c66b3e26ec2dfae Ryan Bigg radarlistener@gmail.com http://github.com/radar/rboard/commit/0d63219efc21fa6515f29acf632370bb76d4b7b2 0d63219efc21fa6515f29acf632370bb76d4b7b2 2008-09-03T04:22:16-07:00 2008-09-03T04:22:16-07:00 Added new stuff. 1875f17c953071fc8e4c33a6f1059f869c33ee78 Ryan Bigg radarlistener@gmail.com