work on forum post controller

app/controllers/forum_posts_controller.rb

@@ -1,37 +1,52 @@
 class ForumPostsController < ApplicationController
+  respond_to :html, :xml, :json
+  before_filter :member_only, :except => [:index, :show]
+  rescue_from User::PrivilegeError, :with => "static/access_denied"
+
   def new
     @forum_post = ForumPost.new(:topic_id => params[:topic_id])
+    respond_with(@forum_post)
   end
   
   def edit
     @forum_post = ForumPost.find(params[:id])
+    check_privilege(@forum_post)
+    respond_with(@forum_post)
+  end
+  
+  def index
+    @forum_posts = ForumPost.search(params[:search])
+    respond_with(@forum_posts)
   end
 
   def show
     @forum_post = ForumPost.find(params[:id])
+    respond_with(@forum_post)
   end
   
   def create
     @forum_post = ForumPost.new(params[:forum_post])
-    if @forum_post.save
+    respond_with(@forum_post)
-      redirect_to forum_post_path(@forum_post)
-    else
-      render :action => "new"
-    end
   end
   
   def update
     @forum_post = ForumPost.find(params[:id])
-    if @forum_post.update_attributes(params[:forum_post])
+    check_privilege(@forum_post)
-      redirect_to forum_post_path(@forum_post)
+    @forum_post.update_attributes(params[:forum_post])
-    else
+    respond_with(@forum_post)
-      render :action => "edit"
-    end
   end
   
   def destroy
     @forum_post = ForumPost.find(params[:id])
+    check_privilege(@forum_post)
     @forum_post.destroy
-    redirect_to forum_topic_path(@forum_post.topic_id)
+    respond_with(@forum_post)
+  end
+
+private
+  def check_privilege(forum_post)
+    if !forum_post.editable_by?(CurrentUser.user)
+      raise User::PrivilegeError
+    end
   end
 end

app/controllers/forum_topics_controller.rb

@@ -43,11 +43,11 @@ class ForumTopicsController < ApplicationController
     @forum_topic.destroy
     respond_with(@forum_topic)
   end
-  
+
-  private
+private
-    def check_privilege(forum_topic)
+  def check_privilege(forum_topic)
-      if !forum_topic.editable_by?(CurrentUser.user)
+    if !forum_topic.editable_by?(CurrentUser.user)
-        raise User::PrivilegeError
+      raise User::PrivilegeError
-      end
     end
+  end
 end

app/controllers/uploads_controller.rb

@@ -7,6 +7,7 @@ class UploadsController < ApplicationController
     if params[:url]
       @post = Post.find_by_source(params[:url])
     end
+    respond_with(@upload)
   end
   
   def index
@@ -16,6 +17,7 @@ class UploadsController < ApplicationController
   
   def show
     @upload = Upload.find(params[:id])
+    respond_with(@upload)
   end
 
   def create
@@ -26,8 +28,6 @@ class UploadsController < ApplicationController
   def update
     @upload = Upload.find(params[:id])
     @upload.process!
-    render :update do |page|
+    respond_with(@upload)
-      page.reload
-    end
   end
 end

app/models/forum_post.rb

@@ -8,6 +8,10 @@ class ForumPost < ActiveRecord::Base
   validates_presence_of :body, :creator_id
   scope :body_matches, lambda {|body| where(["text_index @@ plainto_tsquery(?)", body])}
   search_methods :body_matches
+
+  def editable_by?(user)
+    creator_id == user.id || user.is_moderator?
+  end
   
   def update_topic_updated_at
     topic.update_attributes(:updater_id => CurrentUser.id)

app/views/uploads/update.js.rjs

@@ -0,0 +1 @@
+page.reload

test/functional/forum_posts_controller_test.rb

@@ -1,8 +1,86 @@
 require 'test_helper'
 
 class ForumPostsControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
+  context "The forum posts controller" do
-  test "the truth" do
+    setup do
-    assert true
+      @user = Factory.create(:user)
+      CurrentUser.user = @user
+      CurrentUser.ip_addr = "127.0.0.1"
+      @other_user = Factory.create(:user)
+      @mod = Factory.create(:moderator_user)
+      @forum_topic = Factory.create(:forum_topic, :title => "my forum topic", :creator => @user)
+      @forum_post = Factory.create(:forum_post, :topic_id => @forum_topic.id, :body => "xxx")
+    end
+    
+    teardown do
+      CurrentUser.user = nil
+      CurrentUser.ip_addr = nil
+    end
+    
+    context "index action" do
+      should "list all forum posts" do
+        get :index
+        assert_response :success
+      end
+      
+      context "with search conditions" do
+        should "list all matching forum posts" do
+          get :index, {:search => {:body_matches => "xxx"}}
+          assert_response :success
+          assert_equal(1, assigns(:forum_posts).size)
+        end
+        
+        should "list nothing for when the search matches nothing" do
+          get :index, {:search => {:body_matches => "bababa"}}
+          assert_response :success
+          assert_equal(0, assigns(:forum_posts).size)
+        end
+      end
+    end
+    
+    context "edit action" do
+      should "render if the editor is the creator of the topic" do
+        get :edit, {:id => @forum_post.id}, {:user_id => @user.id}
+        assert_response :success
+      end
+    
+      should "render if the editor is a moderator" do
+        get :edit, {:id => @forum_post.id}, {:user_id => @mod.id}
+        assert_response :success
+      end
+      
+      should "fail if the editor is not the creator of the topic and is not a moderator" do
+        assert_raises(User::PrivilegeError) do
+          get :edit, {:id => @forum_post.id}, {:user_id => @other_user.id}
+        end
+      end
+    end
+    
+    context "new action" do
+      should "render" do
+        get :new, {}, {:user_id => @user.id}
+        assert_response :success
+      end
+    end
+    
+    context "create action" do
+      should "create a new forum post" do
+        assert_difference("ForumPost.count", 1) do
+          post :create, {:forum_post => {:body => "xaxaxa"}}, {:user_id => @user.id}
+        end
+
+        forum_post = ForumPost.last
+        assert_redirected_to(forum_post_path(forum_post))
+      end
+    end
+    
+    context "destroy action" do
+      should "destroy the posts" do
+        assert_difference("ForumPost.count", -1) do
+          post :destroy, {:id => @forum_post.id}, {:user_id => @user.id}
+        end
+        assert_redirected_to(forum_posts_path)
+      end
+    end
   end
 end