0
@@ -56,8 +56,9 @@ class TopicsController < ApplicationController
0
   end
0
 
0
   def update
0
+    current_user.revise @topic, params[:topic]
0
     respond_to do |format|
0
-      if @topic.update_attributes(params[:topic])
0
+      if @topic.errors.empty?
0
         flash[:notice] = 'Topic was successfully updated.'
0
         format.html { redirect_to(forum_topic_path(@forum, @topic)) }
0
         format.xml  { head :ok }

0
@@ -65,4 +65,8 @@ module ApplicationHelper
0
   def jstime(time, format = nil)
0
     content_tag 'span', time.strftime(format || @@default_jstime_format), :class => 'time'
0
   end
0
+
0
+  def for_moderators_of(record, &block)
0
+    moderator_of?(record) && concat(capture(&block), block.binding)
0
+  end
0
 end

0
@@ -31,7 +31,7 @@ class User < ActiveRecord::Base
0
   end
0
 
0
   def moderator_of?(forum)
0
-    Moderatorship.exists?(:user_id => id, :forum_id => forum.id)
0
+    admin? || Moderatorship.exists?(:user_id => id, :forum_id => forum.id)
0
   end
0
 
0
   def display_name

0
@@ -1,5 +1,5 @@
0
 module User::Editable
0
   def editable_by?(user)
0
-    user && (user.id == user_id || user.admin? || user.moderator_of?(forum_id))
0
+    user && (user.id == user_id || user.moderator_of?(forum_id))
0
   end
0
 end
0
\ No newline at end of file

0
@@ -6,13 +6,10 @@ class User
0
   #
0
   def post(forum, attributes)
0
     attributes.symbolize_keys!
0
-    returning Topic.new(attributes) do |topic|
0
-      if admin? || moderator_of?(forum)
0
-        topic.sticky, topic.locked = attributes[:sticky], attributes[:locked]
0
-      end
0
+    Topic.new(attributes) do |topic|
0
       topic.forum = forum
0
       topic.user  = self
0
-      topic.save
0
+      revise_topic topic, attributes
0
     end
0
   end
0
 
0
@@ -24,4 +21,19 @@ class User
0
       post.save
0
     end
0
   end
0
+  
0
+  def revise(record, attributes)
0
+    case record
0
+      when Topic then revise_topic(record, attributes)
0
+      when Post  then post.save
0
+      else raise "Invalid record to revise: #{record.class.name.inspect}"
0
+    end
0
+    record
0
+  end
0
+
0
+protected
0
+  def revise_topic(topic, attributes)
0
+    topic.sticky, topic.locked = attributes[:sticky], attributes[:locked] if moderator_of?(topic.forum)
0
+    topic.save
0
+  end
0
 end
0
\ No newline at end of file

0
@@ -2,7 +2,7 @@
0
 <label for="topic_title"><%= 'Title'[:title_title] %></label><br />
0
 <%= form.text_field :title, :onchange => "/*TopicForm.editNewTitle(this);*/", :class => "primary", :tabindex => 10 %>
0
 
0
-<% if admin? || current_user.moderator_of?(@topic.forum) -%>
0
+<% for_moderators_of @topic do -%>
0
 <label style="margin-left:1em;">
0
 <%= form.check_box :sticky %> <%= 'Sticky'[:sticky_title] %>
0
 </label>
0
@@ -10,7 +10,6 @@
0
 <label style="margin-left:1em;">
0
 <%= form.check_box :locked %> <%= 'Locked'[:locked_title] %>
0
 </label>
0
-
0
 <% end -%>
0
 
0
 </p>

0
@@ -26,6 +26,13 @@ module AuthenticatedSystem
0
       logged_in? && current_user.admin?
0
     end
0
     
0
+    def moderator_of?(record)
0
+      return true  if admin?
0
+      return false unless logged_in?
0
+      forum = record.respond_to?(:forum) ? record.forum : record
0
+      current_user.moderator_of? forum
0
+    end
0
+    
0
     # Check if the user is authorized
0
     #
0
     # Override this method in your controllers if you want to restrict access
0
@@ -104,7 +111,7 @@ module AuthenticatedSystem
0
     # Inclusion hook to make #current_user and #logged_in?
0
     # available as ActionView helper methods.
0
     def self.included(base)
0
-      base.send :helper_method, :current_user, :logged_in?, :current_site, :admin?
0
+      base.send :helper_method, :current_user, :logged_in?, :current_site, :admin?, :moderator_of?
0
     end
0
 
0
     # Called from #current_user.  First attempt to login by the user id stored in the session.

0
@@ -204,12 +204,14 @@ end
0
 
0
 describe TopicsController, "PUT #update" do
0
   before do
0
+    login_as :default
0
     @forum  = forums(:default)
0
     Forum.stub!(:find_by_permalink).with('1').and_return(@forum)
0
     @attributes = {}
0
     @topic = topics(:default)
0
     @forum.stub!(:topics).and_return([])
0
     @forum.topics.stub!(:find_by_permalink).with('1').and_return(@topic)
0
+    @user.stub!(:revise).with(@topic, @attributes)
0
   end
0
   
0
   describe TopicsController, "(successful save)" do
0
@@ -217,7 +219,7 @@ describe TopicsController, "PUT #update" do
0
     act! { put :update, :forum_id => 1, :id => 1, :topic => @attributes }
0
 
0
     before do
0
-      @topic.stub!(:save).and_return(true)
0
+      @topic.stub!(:errors).and_return([])
0
     end
0
     
0
     it_assigns :topic, :flash => { :notice => :not_nil }
0
@@ -229,7 +231,7 @@ describe TopicsController, "PUT #update" do
0
     act! { put :update, :forum_id => 1, :id => 1, :topic => @attributes }
0
 
0
     before do
0
-      @topic.stub!(:save).and_return(false)
0
+      @topic.stub!(:errors).and_return([1])
0
     end
0
     
0
     it_assigns :topic
0
@@ -241,7 +243,7 @@ describe TopicsController, "PUT #update" do
0
     act! { put :update, :forum_id => 1, :id => 1, :topic => @attributes, :format => 'xml' }
0
 
0
     before do
0
-      @topic.stub!(:save).and_return(true)
0
+      @topic.stub!(:errors).and_return([])
0
     end
0
     
0
     it_assigns :topic
0
@@ -253,7 +255,7 @@ describe TopicsController, "PUT #update" do
0
     act! { put :update, :forum_id => 1, :id => 1, :topic => @attributes, :format => 'xml' }
0
 
0
     before do
0
-      @topic.stub!(:save).and_return(false)
0
+      @topic.stub!(:errors).and_return([@topic])
0
     end
0
     
0
     it_assigns :topic

0
@@ -79,7 +79,6 @@ describe Post, "#editable_by?" do
0
   end
0
 
0
   it "restricts user for other post" do
0
-    @user.should_receive(:admin?).and_return(false)
0
     @user.should_receive(:moderator_of?).and_return(false)
0
     @post.should_not be_editable_by(@user)
0
   end
0
@@ -90,19 +89,17 @@ describe Post, "#editable_by?" do
0
   end
0
   
0
   it "allows admin" do
0
-    @user.should_receive(:admin?).and_return(true)
0
+    @user.should_receive(:moderator_of?).and_return(true)
0
     @post.should be_editable_by(@user)
0
   end
0
   
0
   it "restricts moderator for other forum" do
0
-    @user.should_receive(:admin?).and_return(false)
0
     @user.should_receive(:moderator_of?).with(1).and_return(false)
0
     @post.forum_id = 1
0
     @post.should_not be_editable_by(@user)
0
   end
0
   
0
   it "allows moderator" do
0
-    @user.should_receive(:admin?).and_return(false)
0
     @user.should_receive(:moderator_of?).with(2).and_return(true)
0
     @post.forum_id = 2
0
     @post.should     be_editable_by(@user)

0
@@ -156,7 +156,6 @@ describe Topic, "#editable_by?" do
0
   end
0
 
0
   it "restricts user for other topic" do
0
-    @user.should_receive(:admin?).and_return(false)
0
     @user.should_receive(:moderator_of?).and_return(false)
0
     @topic.should_not be_editable_by(@user)
0
   end
0
@@ -166,20 +165,7 @@ describe Topic, "#editable_by?" do
0
     @topic.should be_editable_by(@user)
0
   end
0
   
0
-  it "allows admin" do
0
-    @user.should_receive(:admin?).and_return(true)
0
-    @topic.should be_editable_by(@user)
0
-  end
0
-  
0
-  it "restricts moderator for other forum" do
0
-    @user.should_receive(:admin?).and_return(false)
0
-    @user.should_receive(:moderator_of?).with(1).and_return(false)
0
-    @topic.forum_id = 1
0
-    @topic.should_not be_editable_by(@user)
0
-  end
0
-  
0
   it "allows moderator" do
0
-    @user.should_receive(:admin?).and_return(false)
0
     @user.should_receive(:moderator_of?).with(2).and_return(true)
0
     @topic.forum_id = 2
0
     @topic.should be_editable_by(@user)

0
@@ -114,6 +114,78 @@ describe User, "#post for admins" do
0
   end
0
 end
0
 
0
+module TopicUpdatePostHelper
0
+  def self.included(base)
0
+    base.define_models
0
+    
0
+    base.before do
0
+      @user  = users(:default)
0
+      @topic = topics(:default)
0
+      @attributes = {:body => 'booya'}
0
+    end
0
+  end
0
+  
0
+  def revise!
0
+    @user.revise @topic, @attributes
0
+  end
0
+end
0
+
0
+describe User, "#revise(topic) for users" do  
0
+  include TopicUpdatePostHelper
0
+  
0
+  it "ignores sticky bit" do
0
+    @attributes[:sticky] = 1
0
+    revise!
0
+    @topic.should_not be_sticky
0
+  end
0
+  
0
+  it "ignores locked bit" do
0
+    @attributes[:locked] = true
0
+    revise!
0
+    @topic.should_not be_locked
0
+  end
0
+end
0
+
0
+describe User, "#revise(topic) for moderators" do
0
+  include TopicUpdatePostHelper
0
+  
0
+  before do
0
+    @user.stub!(:moderator_of?).and_return(true)
0
+  end
0
+  
0
+  it "sets sticky bit" do
0
+    @attributes[:sticky] = 1
0
+    revise!
0
+    @topic.should be_sticky
0
+  end
0
+  
0
+  it "sets locked bit" do
0
+    @attributes[:locked] = true
0
+    revise!
0
+    @topic.should be_locked
0
+  end
0
+end
0
+
0
+describe User, "#revise(topic) for admins" do
0
+  include TopicUpdatePostHelper
0
+  
0
+  before do
0
+    @user.admin = true
0
+  end
0
+  
0
+  it "sets sticky bit" do
0
+    @attributes[:sticky] = 1
0
+    revise!
0
+    @topic.should be_sticky
0
+  end
0
+  
0
+  it "sets locked bit" do
0
+    @attributes[:locked] = true
0
+    revise!
0
+    @topic.should be_locked
0
+  end
0
+end
0
+
0
 describe User, "#reply" do
0
   define_models
0