commontator 4.0.2 → 4.1.1

data/lib/commontator.rb

@@ -6,16 +6,15 @@ module Commontator
 
   # Can be set in initializer only
   ENGINE_ATTRIBUTES = [
-    :current_user_method,
+    :current_user_proc,
     :javascript_proc
   ]
 
   # Can be set in initializer or passed as an option to acts_as_commontator
   COMMONTATOR_ATTRIBUTES = [
-    :user_missing_name,
     :user_name_clickable,
-    :user_email_method,
-    :user_name_method,
+    :user_name_proc,
+    :user_email_proc,
     :user_admin_proc,
     :subscription_email_enable_proc
   ]
@@ -27,7 +26,6 @@ module Commontator
     :comment_create_verb_past,
     :comment_edit_verb_present,
     :comment_edit_verb_past,
-    :commontable_name,
     :timestamp_format,
     :admin_can_edit_comments,
     :auto_subscribe_on_comment,
@@ -37,12 +35,13 @@ module Commontator
     :can_delete_old_comments,
     :can_subscribe_to_thread,
     :can_vote_on_comments,
+    :combine_upvotes_and_downvotes,
     :comments_ordered_by_votes,
     :closed_threads_are_readable,
     :deleted_comments_are_visible,
-    :commontable_id_method,
-    :can_edit_thread_proc,
     :can_read_thread_proc,
+    :can_edit_thread_proc,
+    :commontable_name_proc,
     :commontable_url_proc,
     :subscription_email_from_proc,
     :subscription_email_subject_proc

data/lib/commontator.rb~

@@ -0,0 +1,61 @@
+require 'commontator/engine'
+require 'commontator/controller_includes'
+
+module Commontator
+  # Attributes
+
+  # Can be set in initializer only
+  ENGINE_ATTRIBUTES = [
+    :current_user_method,
+    :javascript_proc
+  ]
+
+  # Can be set in initializer or passed as an option to acts_as_commontator
+  COMMONTATOR_ATTRIBUTES = [
+    :user_name_clickable,
+    :user_name_proc,
+    :user_email_proc,
+    :user_admin_proc,
+    :subscription_email_enable_proc
+  ]
+  
+  # Can be set in initializer or passed as an option to acts_as_commontable
+  COMMONTABLE_ATTRIBUTES = [
+    :comment_name,
+    :comment_create_verb_present,
+    :comment_create_verb_past,
+    :comment_edit_verb_present,
+    :comment_edit_verb_past,
+    :timestamp_format,
+    :admin_can_edit_comments,
+    :auto_subscribe_on_comment,
+    :can_edit_own_comments,
+    :can_edit_old_comments,
+    :can_delete_own_comments,
+    :can_delete_old_comments,
+    :can_subscribe_to_thread,
+    :can_vote_on_comments,
+    :combine_upvotes_and_downvotes,
+    :comments_ordered_by_votes,
+    :closed_threads_are_readable,
+    :deleted_comments_are_visible,
+    :can_read_thread_proc,
+    :can_edit_thread_proc,
+    :commontable_name_proc,
+    :commontable_url_proc,
+    :subscription_email_from_proc,
+    :subscription_email_subject_proc
+  ]
+  
+  (ENGINE_ATTRIBUTES + COMMONTATOR_ATTRIBUTES + \
+    COMMONTABLE_ATTRIBUTES).each do |attribute|
+    mattr_accessor attribute
+  end
+  
+  def self.configure
+    yield self
+  end
+end
+
+require 'commontator/acts_as_commontator'
+require 'commontator/acts_as_commontable'

data/lib/commontator/controller_includes.rb

@@ -10,9 +10,7 @@ module Commontator
     protected
     
     def commontator_thread_show(commontable)
-      user = send Commontator.current_user_method	
-      raise SecurityTransgression unless (user.nil? || user.is_commontator)
-      
+      user = Commontator.current_user_proc.call(self)	
       thread = commontable.thread
       raise SecurityTransgression unless thread.can_be_read_by?(user)
       thread.mark_as_read_for(user)

data/lib/commontator/controller_includes.rb~

@@ -0,0 +1,22 @@
+require 'commontator/shared_helper'
+require 'commontator/security_transgression'
+
+module Commontator
+  module ControllerIncludes
+    def self.included(base)
+      base.helper Commontator::SharedHelper
+    end
+    
+    protected
+    
+    def commontator_thread_show(commontable)
+      user = send Commontator.current_user_proc.call(self)	
+      thread = commontable.thread
+      raise SecurityTransgression unless thread.can_be_read_by?(user)
+      thread.mark_as_read_for(user)
+      @commontator_thread_show = true
+    end
+  end
+end
+
+ActionController::Base.send :include, Commontator::ControllerIncludes

data/lib/commontator/shared_helper.rb

@@ -1,7 +1,7 @@
 module Commontator
   module SharedHelper
     def commontator_thread(commontable)
-      user = send(Commontator.current_user_method)
+      user = Commontator.current_user_proc.call(self)
       
       render(:partial => 'commontator/shared/thread',
              :locals => {:thread => commontable.thread,
@@ -9,16 +9,11 @@ module Commontator
     end
     
     def commontator_name(user)
-      return Commontator.user_missing_name if user.nil?
-      config = user.commontator_config
-      config.user_name_method.blank? ? config.user_missing_name : \
-        user.send(config.user_name_method)
+      user.commontator_config.user_name_proc.call(user)
     end
     
     def commontator_email(user)
-      return '' if user.nil?
-      config = user.commontator_config
-      config.user_email_method.blank? ? '' : user.send(config.user_email_method)
+      user.commontator_config.user_email_proc.call(user)
     end
     
     def commontator_gravatar_url(user, options = {})

data/lib/commontator/shared_helper.rb~

@@ -0,0 +1,37 @@
+module Commontator
+  module SharedHelper
+    def commontator_thread(commontable)
+      user = send(Commontator.current_user_method)
+      
+      render(:partial => 'commontator/shared/thread',
+             :locals => {:thread => commontable.thread,
+                         :user => user}).html_safe
+    end
+    
+    def commontator_name(user)
+      user.commontator_config.user_name_proc.call(user)
+    end
+    
+    def commontator_email(user)
+      user.commontator_config.user_email_proc.call(user)
+    end
+    
+    def commontator_gravatar_url(user, options = {})
+      options[:secure] ||= request.ssl?
+      options[:size] ||= 50
+    
+      hash = Digest::MD5.hexdigest(commontator_email(user))
+      base = options[:secure] ? "s://secure" : "://www"
+      
+      "http#{base}.gravatar.com/avatar/#{hash}?s=#{options[:size]}"
+    end
+  
+    def commontator_gravatar_image(user, options = {})
+      name = commontator_name(user)
+      image_tag(commontator_gravatar_url(user, options), 
+                { :alt => name, 
+                  :title => name,
+                  :border => 1 })
+    end
+  end
+end

data/lib/commontator/version.rb

@@ -1,3 +1,3 @@
 module Commontator
-  VERSION = "4.0.2"
+  VERSION = "4.1.1"
 end

data/lib/commontator/version.rb~

@@ -0,0 +1,3 @@
+module Commontator
+  VERSION = "4.1.0"
+end

data/spec/app/controllers/commontator/comments_controller_spec.rb

@@ -13,7 +13,7 @@ module Commontator
       @comment.is_votable?.must_equal true
     end
     
-    it 'wont get new unless authorized' do
+    it "won't get new unless authorized" do
       get :new, :thread_id => @thread.id, :use_route => :commontator
       assert_response 403
       
@@ -43,7 +43,7 @@ module Commontator
       assigns(:comment).errors.must_be_empty
     end
     
-    it 'wont create unless authorized' do
+    it "won't create unless authorized" do
       attributes = Hash.new
       attributes[:body] = 'Something else'
       
@@ -99,7 +99,7 @@ module Commontator
       assigns(:comment).thread.must_equal @thread
     end
     
-    it 'wont create if double posting' do
+    it "won't create if double posting" do
       sign_in @user
       @user.can_read = true
       attributes = Hash.new
@@ -124,7 +124,7 @@ module Commontator
       assigns(:comment).errors.wont_be_empty
     end
     
-    it 'wont edit unless authorized' do
+    it "won't edit unless authorized" do
       get :edit, :id => @comment.id, :use_route => :commontator
       assert_response 403
       
@@ -174,20 +174,22 @@ module Commontator
       assigns(:comment).errors.must_be_empty
     end
     
-    it 'wont update unless authorized' do
+    it "won't update unless authorized" do
       attributes = Hash.new
       attributes[:body] = 'Something else'
       
       put :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
       assert_response 403
-      assigns(:comment).body.must_equal 'Something'
-      assigns(:comment).editor.must_be_nil
+      @comment.reload
+      @comment.body.must_equal 'Something'
+      @comment.editor.must_be_nil
       
       sign_in @user
       put :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
       assert_response 403
-      assigns(:comment).body.must_equal 'Something'
-      assigns(:comment).editor.must_be_nil
+      @comment.reload
+      @comment.body.must_equal 'Something'
+      @comment.editor.must_be_nil
       
       user2 = DummyUser.create
       user2.can_read = true
@@ -196,8 +198,9 @@ module Commontator
       sign_in user2
       put :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
       assert_response 403
-      assigns(:comment).body.must_equal 'Something'
-      assigns(:comment).editor.must_be_nil
+      @comment.reload
+      @comment.body.must_equal 'Something'
+      @comment.editor.must_be_nil
       
       @user.can_read = true
       @user.can_edit = true
@@ -209,9 +212,9 @@ module Commontator
       comment2.body = 'Something else'
       comment2.save!
       put :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
-      assert_response 403
-      assigns(:comment).body.must_equal 'Something'
-      assigns(:comment).editor.must_be_nil
+      @comment.reload
+      @comment.body.must_equal 'Something'
+      @comment.editor.must_be_nil
     end
     
     it 'must update if authorized' do
@@ -240,16 +243,18 @@ module Commontator
       assigns(:comment).editor.must_equal @user
     end
     
-    it 'wont delete unless authorized and not deleted' do
+    it "won't delete unless authorized and not deleted" do
       put :delete, :id => @comment.id, :use_route => :commontator
       assert_response 403
-      assigns(:comment).is_deleted?.must_equal false
+      @comment.reload
+      @comment.is_deleted?.must_equal false
       
       sign_in @user
       
       put :delete, :id => @comment.id, :use_route => :commontator
       assert_response 403
-      assigns(:comment).is_deleted?.must_equal false
+      @comment.reload
+      @comment.is_deleted?.must_equal false
       
       @user.can_read = true
       @comment.delete_by(@user).must_equal true
@@ -265,7 +270,8 @@ module Commontator
       @comment.undelete_by(@user).must_equal true
       put :delete, :id => @comment.id, :use_route => :commontator
       assert_response 403
-      assigns(:comment).is_deleted?.must_equal false
+      @comment.reload
+      @comment.is_deleted?.must_equal false
     end
     
     it 'must delete if authorized and not deleted' do
@@ -304,17 +310,19 @@ module Commontator
       assigns(:comment).editor.must_equal user2
     end
     
-    it 'wont undelete unless authorized and deleted' do
+    it "won't undelete unless authorized and deleted" do
       @comment.delete_by(@user).must_equal true
       put :undelete, :id => @comment.id, :use_route => :commontator
       assert_response 403
-      assigns(:comment).is_deleted?.must_equal true
+      @comment.reload
+      @comment.is_deleted?.must_equal true
       
       sign_in @user
       
       put :undelete, :id => @comment.id, :use_route => :commontator
       assert_response 403
-      assigns(:comment).is_deleted?.must_equal true
+      @comment.reload
+      @comment.is_deleted?.must_equal true
       
       @user.can_read = true
       @comment.undelete_by(@user).must_equal true
@@ -329,7 +337,8 @@ module Commontator
       @comment.delete_by(user2).must_equal true
       put :undelete, :id => @comment.id, :use_route => :commontator
       assert_response 403
-      assigns(:comment).is_deleted?.must_equal true
+      @comment.reload
+      @comment.is_deleted?.must_equal true
       
       comment2 = Comment.new
       comment2.thread = @thread
@@ -340,7 +349,8 @@ module Commontator
       @comment.delete_by(@user).must_equal true
       put :undelete, :id => @comment.id, :use_route => :commontator
       assert_response 403
-      assigns(:comment).is_deleted?.must_equal true
+      @comment.reload
+      @comment.is_deleted?.must_equal true
     end
     
     it 'must undelete if authorized and deleted' do
@@ -377,25 +387,28 @@ module Commontator
       assigns(:comment).is_deleted?.must_equal false
     end
     
-    it 'wont upvote if not authorized' do
+    it "won't upvote unless authorized" do
       put :upvote, :id => @comment.id, :use_route => :commontator
       assert_response 403
-      assigns(:comment).upvotes.must_be_empty
-      assigns(:comment).downvotes.must_be_empty
+      @comment.reload
+      @comment.upvotes.must_be_empty
+      @comment.downvotes.must_be_empty
       
       sign_in @user
       @user.can_read = true
       put :upvote, :id => @comment.id, :use_route => :commontator
       assert_response 403
-      assigns(:comment).upvotes.must_be_empty
-      assigns(:comment).downvotes.must_be_empty
+      @comment.reload
+      @comment.upvotes.must_be_empty
+      @comment.downvotes.must_be_empty
       
       user2 = DummyUser.create
       sign_in user2
       put :upvote, :id => @comment.id, :use_route => :commontator
       assert_response 403
-      assigns(:comment).upvotes.must_be_empty
-      assigns(:comment).downvotes.must_be_empty
+      @comment.reload
+      @comment.upvotes.must_be_empty
+      @comment.downvotes.must_be_empty
     end
     
     it 'must upvote if authorized' do
@@ -421,25 +434,28 @@ module Commontator
       assigns(:comment).downvotes.must_be_empty
     end
     
-    it 'wont downvote if not authorized' do
+    it "won't downvote unless authorized" do
       put :downvote, :id => @comment.id, :use_route => :commontator
       assert_response 403
-      assigns(:comment).upvotes.must_be_empty
-      assigns(:comment).downvotes.must_be_empty
+      @comment.reload
+      @comment.upvotes.must_be_empty
+      @comment.downvotes.must_be_empty
       
       sign_in @user
       @user.can_read = true
       put :downvote, :id => @comment.id, :use_route => :commontator
       assert_response 403
-      assigns(:comment).upvotes.must_be_empty
-      assigns(:comment).downvotes.must_be_empty
+      @comment.reload
+      @comment.upvotes.must_be_empty
+      @comment.downvotes.must_be_empty
       
       user2 = DummyUser.create
       sign_in user2
       put :downvote, :id => @comment.id, :use_route => :commontator
       assert_response 403
-      assigns(:comment).upvotes.must_be_empty
-      assigns(:comment).downvotes.must_be_empty
+      @comment.reload
+      @comment.upvotes.must_be_empty
+      @comment.downvotes.must_be_empty
     end
     
     it 'must downvote if authorized' do
@@ -465,27 +481,30 @@ module Commontator
       assigns(:comment).downvotes.count.must_equal 1
     end
     
-    it 'wont unvote if not authorized' do
+    it "won't unvote unless authorized" do
       @comment.upvote_from(@user).must_equal true
       
       put :unvote, :id => @comment.id, :use_route => :commontator
       assert_response 403
-      assigns(:comment).upvotes.count.must_equal 1
-      assigns(:comment).downvotes.must_be_empty
+      @comment.reload
+      @comment.upvotes.count.must_equal 1
+      @comment.downvotes.must_be_empty
       
       sign_in @user
       @user.can_read = true
       put :unvote, :id => @comment.id, :use_route => :commontator
       assert_response 403
-      assigns(:comment).upvotes.count.must_equal 1
-      assigns(:comment).downvotes.must_be_empty
+      @comment.reload
+      @comment.upvotes.count.must_equal 1
+      @comment.downvotes.must_be_empty
       
       user2 = DummyUser.create
       sign_in user2
       put :unvote, :id => @comment.id, :use_route => :commontator
       assert_response 403
-      assigns(:comment).upvotes.count.must_equal 1
-      assigns(:comment).downvotes.must_be_empty
+      @comment.reload
+      @comment.upvotes.count.must_equal 1
+      @comment.downvotes.must_be_empty
     end
     
     it 'must unvote if authorized' do
@@ -511,7 +530,7 @@ module Commontator
       assigns(:comment).downvotes.must_be_empty
     end
 
-    it 'wont send mail if recipients empty' do
+    it "won't send mail if recipients empty" do
       if defined?(CommentsController::SubscriptionsMailer)
         CommentsController::SubscriptionsMailer.__send__(:initialize)
       else