commontator 2.0.2 → 4.0.0

data/db/migrate/0_install.rb~

@@ -16,7 +16,7 @@ class Install < ActiveRecord::Migration
       t.timestamps
     end
 
-    add_index :commontator_comments, [:creator_type, :creator_id, :thread_id], :name => "index_c_c_on_c_type_and_c_id_and_t_id"
+    add_index :commontator_comments, [:creator_type, :creator_id, :thread_id], :name => 'index_c_c_on_c_type_and_c_id_and_t_id'
     add_index :commontator_comments, :thread_id
 
     add_index :commontator_comments, :cached_votes_total
@@ -32,7 +32,7 @@ class Install < ActiveRecord::Migration
       t.timestamps
     end
 
-    add_index :commontator_subscriptions, [:subscriber_type, :subscriber_id, :thread_id], :unique => true, :name => "index_c_s_on_s_type_and_s_id_and_t_id"
+    add_index :commontator_subscriptions, [:subscriber_type, :subscriber_id, :thread_id], :unique => true, :name => 'index_c_s_on_s_type_and_s_id_and_t_id'
     add_index :commontator_subscriptions, :thread_id
 
     create_table "commontator_threads" do |t|
@@ -45,6 +45,6 @@ class Install < ActiveRecord::Migration
       t.timestamps
     end
 
-    add_index :commontator_threads, [:commontable_type, :commontable_id], :unique => true
+    add_index :commontator_threads, [:commontable_type, :commontable_id], :unique => true, :name => 'index_c_t_on_c_type_and_c_id'
   end
 end

data/lib/commontator/shared_helper.rb

@@ -1,7 +1,7 @@
 module Commontator
   module SharedHelper
     def commontator_thread(commontable)
-      user = self.send Commontator.current_user_method
+      user = send(Commontator.current_user_method)
       
       render(:partial => 'commontator/shared/thread',
              :locals => {:thread => commontable.thread,

data/lib/commontator/version.rb

@@ -1,3 +1,3 @@
 module Commontator
-  VERSION = "2.0.2"
+  VERSION = "4.0.0"
 end

data/lib/commontator/version.rb~

@@ -1,3 +1,3 @@
 module Commontator
-  VERSION = "2.0.1"
+  VERSION = "2.1.0"
 end

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

@@ -1,4 +1,4 @@
-require 'minitest_helper'
+require 'test_helper'
 require 'acts_as_votable'
 
 module Commontator
@@ -178,13 +178,13 @@ module Commontator
       attributes = Hash.new
       attributes[:body] = 'Something else'
       
-      put :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
+      patch :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
       assert_response 403
       assigns(:comment).body.must_equal 'Something'
       assigns(:comment).editor.must_be_nil
       
       sign_in @user
-      put :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
+      patch :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
       assert_response 403
       assigns(:comment).body.must_equal 'Something'
       assigns(:comment).editor.must_be_nil
@@ -194,7 +194,7 @@ module Commontator
       user2.can_edit = true
       user2.is_admin = true
       sign_in user2
-      put :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
+      patch :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
       assert_response 403
       assigns(:comment).body.must_equal 'Something'
       assigns(:comment).editor.must_be_nil
@@ -208,7 +208,7 @@ module Commontator
       comment2.creator = @user
       comment2.body = 'Something else'
       comment2.save!
-      put :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
+      patch :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
       assert_response 403
       assigns(:comment).body.must_equal 'Something'
       assigns(:comment).editor.must_be_nil
@@ -220,40 +220,40 @@ module Commontator
       attributes[:body] = 'Something else'
       
       @user.can_read = true
-      put :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
+      patch :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:comment).errors.must_be_empty
       assigns(:comment).editor.must_equal @user
       
       @user.can_read = false
       @user.can_edit = true
-      put :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
+      patch :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:comment).errors.must_be_empty
       assigns(:comment).editor.must_equal @user
       
       @user.can_edit = false
       @user.is_admin = true
-      put :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
+      patch :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:comment).errors.must_be_empty
       assigns(:comment).editor.must_equal @user
     end
     
     it 'wont delete unless authorized and not deleted' do
-      put :delete, :id => @comment.id, :use_route => :commontator
+      patch :delete, :id => @comment.id, :use_route => :commontator
       assert_response 403
       assigns(:comment).is_deleted?.must_equal false
       
       sign_in @user
       
-      put :delete, :id => @comment.id, :use_route => :commontator
+      patch :delete, :id => @comment.id, :use_route => :commontator
       assert_response 403
       assigns(:comment).is_deleted?.must_equal false
       
       @user.can_read = true
       @comment.delete_by(@user).must_equal true
-      put :delete, :id => @comment.id, :use_route => :commontator
+      patch :delete, :id => @comment.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:comment).errors.wont_be_empty
       
@@ -263,7 +263,7 @@ module Commontator
       comment2.body = 'Something else'
       comment2.save!
       @comment.undelete_by(@user).must_equal true
-      put :delete, :id => @comment.id, :use_route => :commontator
+      patch :delete, :id => @comment.id, :use_route => :commontator
       assert_response 403
       assigns(:comment).is_deleted?.must_equal false
     end
@@ -272,7 +272,7 @@ module Commontator
       sign_in @user
       
       @user.can_read = true
-      put :delete, :id => @comment.id, :use_route => :commontator
+      patch :delete, :id => @comment.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:comment).errors.must_be_empty
       assigns(:comment).is_deleted?.must_equal true
@@ -288,7 +288,7 @@ module Commontator
       
       assigns(:comment).undelete_by(@user).must_equal true
       user2.can_edit = true
-      put :delete, :id => @comment.id, :use_route => :commontator
+      patch :delete, :id => @comment.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:comment).errors.must_be_empty
       assigns(:comment).is_deleted?.must_equal true
@@ -297,7 +297,7 @@ module Commontator
       assigns(:comment).undelete_by(@user).must_equal true
       user2.can_edit = false
       user2.is_admin = true
-      put :delete, :id => @comment.id, :use_route => :commontator
+      patch :delete, :id => @comment.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:comment).errors.must_be_empty
       assigns(:comment).is_deleted?.must_equal true
@@ -306,19 +306,19 @@ module Commontator
     
     it 'wont undelete unless authorized and deleted' do
       @comment.delete_by(@user).must_equal true
-      put :undelete, :id => @comment.id, :use_route => :commontator
+      patch :undelete, :id => @comment.id, :use_route => :commontator
       assert_response 403
       assigns(:comment).is_deleted?.must_equal true
       
       sign_in @user
       
-      put :undelete, :id => @comment.id, :use_route => :commontator
+      patch :undelete, :id => @comment.id, :use_route => :commontator
       assert_response 403
       assigns(:comment).is_deleted?.must_equal true
       
       @user.can_read = true
       @comment.undelete_by(@user).must_equal true
-      put :undelete, :id => @comment.id, :use_route => :commontator
+      patch :undelete, :id => @comment.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:comment).errors.wont_be_empty
       
@@ -327,7 +327,7 @@ module Commontator
       user2.can_edit = true
       user2.is_admin = true
       @comment.delete_by(user2).must_equal true
-      put :undelete, :id => @comment.id, :use_route => :commontator
+      patch :undelete, :id => @comment.id, :use_route => :commontator
       assert_response 403
       assigns(:comment).is_deleted?.must_equal true
       
@@ -338,7 +338,7 @@ module Commontator
       comment2.save!
       @comment.undelete_by(@user).must_equal true
       @comment.delete_by(@user).must_equal true
-      put :undelete, :id => @comment.id, :use_route => :commontator
+      patch :undelete, :id => @comment.id, :use_route => :commontator
       assert_response 403
       assigns(:comment).is_deleted?.must_equal true
     end
@@ -348,7 +348,7 @@ module Commontator
       
       @comment.delete_by(@user).must_equal true
       @user.can_read = true
-      put :undelete, :id => @comment.id, :use_route => :commontator
+      patch :undelete, :id => @comment.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:comment).errors.must_be_empty
       assigns(:comment).is_deleted?.must_equal false
@@ -363,7 +363,7 @@ module Commontator
       
       assigns(:comment).delete_by(@user).must_equal true
       user2.can_edit = true
-      put :undelete, :id => @comment.id, :use_route => :commontator
+      patch :undelete, :id => @comment.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:comment).errors.must_be_empty
       assigns(:comment).is_deleted?.must_equal false
@@ -371,28 +371,28 @@ module Commontator
       assigns(:comment).delete_by(@user).must_equal true
       user2.can_edit = false
       user2.is_admin = true
-      put :undelete, :id => @comment.id, :use_route => :commontator
+      patch :undelete, :id => @comment.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:comment).errors.must_be_empty
       assigns(:comment).is_deleted?.must_equal false
     end
     
     it 'wont upvote if not authorized' do
-      put :upvote, :id => @comment.id, :use_route => :commontator
+      patch :upvote, :id => @comment.id, :use_route => :commontator
       assert_response 403
       assigns(:comment).upvotes.must_be_empty
       assigns(:comment).downvotes.must_be_empty
       
       sign_in @user
       @user.can_read = true
-      put :upvote, :id => @comment.id, :use_route => :commontator
+      patch :upvote, :id => @comment.id, :use_route => :commontator
       assert_response 403
       assigns(:comment).upvotes.must_be_empty
       assigns(:comment).downvotes.must_be_empty
       
       user2 = DummyUser.create
       sign_in user2
-      put :upvote, :id => @comment.id, :use_route => :commontator
+      patch :upvote, :id => @comment.id, :use_route => :commontator
       assert_response 403
       assigns(:comment).upvotes.must_be_empty
       assigns(:comment).downvotes.must_be_empty
@@ -403,40 +403,40 @@ module Commontator
       user2.can_read = true
       sign_in user2
       
-      put :upvote, :id => @comment.id, :use_route => :commontator
+      patch :upvote, :id => @comment.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:comment).upvotes.count.must_equal 1
       assigns(:comment).downvotes.must_be_empty
       
-      put :upvote, :id => @comment.id, :use_route => :commontator
+      patch :upvote, :id => @comment.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:comment).upvotes.count.must_equal 1
       assigns(:comment).downvotes.must_be_empty
       
       @comment.downvote_from(user2).must_equal true
       
-      put :upvote, :id => @comment.id, :use_route => :commontator
+      patch :upvote, :id => @comment.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:comment).upvotes.count.must_equal 1
       assigns(:comment).downvotes.must_be_empty
     end
     
     it 'wont downvote if not authorized' do
-      put :downvote, :id => @comment.id, :use_route => :commontator
+      patch :downvote, :id => @comment.id, :use_route => :commontator
       assert_response 403
       assigns(:comment).upvotes.must_be_empty
       assigns(:comment).downvotes.must_be_empty
       
       sign_in @user
       @user.can_read = true
-      put :downvote, :id => @comment.id, :use_route => :commontator
+      patch :downvote, :id => @comment.id, :use_route => :commontator
       assert_response 403
       assigns(:comment).upvotes.must_be_empty
       assigns(:comment).downvotes.must_be_empty
       
       user2 = DummyUser.create
       sign_in user2
-      put :downvote, :id => @comment.id, :use_route => :commontator
+      patch :downvote, :id => @comment.id, :use_route => :commontator
       assert_response 403
       assigns(:comment).upvotes.must_be_empty
       assigns(:comment).downvotes.must_be_empty
@@ -447,19 +447,19 @@ module Commontator
       user2.can_read = true
       sign_in user2
       
-      put :downvote, :id => @comment.id, :use_route => :commontator
+      patch :downvote, :id => @comment.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:comment).upvotes.must_be_empty
       assigns(:comment).downvotes.count.must_equal 1
       
-      put :downvote, :id => @comment.id, :use_route => :commontator
+      patch :downvote, :id => @comment.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:comment).upvotes.must_be_empty
       assigns(:comment).downvotes.count.must_equal 1
       
       @comment.upvote_from(user2).must_equal true
       
-      put :downvote, :id => @comment.id, :use_route => :commontator
+      patch :downvote, :id => @comment.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:comment).upvotes.must_be_empty
       assigns(:comment).downvotes.count.must_equal 1
@@ -468,21 +468,21 @@ module Commontator
     it 'wont unvote if not authorized' do
       @comment.upvote_from(@user).must_equal true
       
-      put :unvote, :id => @comment.id, :use_route => :commontator
+      patch :unvote, :id => @comment.id, :use_route => :commontator
       assert_response 403
       assigns(:comment).upvotes.count.must_equal 1
       assigns(:comment).downvotes.must_be_empty
       
       sign_in @user
       @user.can_read = true
-      put :unvote, :id => @comment.id, :use_route => :commontator
+      patch :unvote, :id => @comment.id, :use_route => :commontator
       assert_response 403
       assigns(:comment).upvotes.count.must_equal 1
       assigns(:comment).downvotes.must_be_empty
       
       user2 = DummyUser.create
       sign_in user2
-      put :unvote, :id => @comment.id, :use_route => :commontator
+      patch :unvote, :id => @comment.id, :use_route => :commontator
       assert_response 403
       assigns(:comment).upvotes.count.must_equal 1
       assigns(:comment).downvotes.must_be_empty
@@ -494,21 +494,70 @@ module Commontator
       sign_in user2
       
       @comment.upvote_from(user2).must_equal true
-      put :unvote, :id => @comment.id, :use_route => :commontator
+      patch :unvote, :id => @comment.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:comment).upvotes.must_be_empty
       assigns(:comment).downvotes.must_be_empty
       
-      put :unvote, :id => @comment.id, :use_route => :commontator
+      patch :unvote, :id => @comment.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:comment).upvotes.must_be_empty
       assigns(:comment).downvotes.must_be_empty
       
       @comment.downvote_from(user2).must_equal true
-      put :unvote, :id => @comment.id, :use_route => :commontator
+      patch :unvote, :id => @comment.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:comment).upvotes.must_be_empty
       assigns(:comment).downvotes.must_be_empty
     end
+
+    it 'wont send mail if recipients empty' do
+      if defined?(CommentsController::SubscriptionsMailer)
+        CommentsController::SubscriptionsMailer.__send__(:initialize)
+      else
+        CommentsController::SubscriptionsMailer = MiniTest::Mock.new
+      end
+
+      user2 = DummyUser.create
+      user2.can_read = true
+
+      email = MiniTest::Mock.new.expect(:deliver, nil)
+      CommentsController::SubscriptionsMailer.expect(:comment_created, email, [Comment, [user2]])
+
+      @user.can_read = true
+      sign_in @user
+
+      attributes = {:body => 'Something else'}
+      post :create, :thread_id => @thread.id, :comment => attributes, :use_route => :commontator
+      assigns(:comment).errors.must_be_empty
+
+      proc { CommentsController::SubscriptionsMailer.verify }.must_raise(MockExpectationError)
+      proc { email.verify }.must_raise(MockExpectationError)
+    end
+    
+    it 'must send mail if recipients not empty' do
+      if defined?(CommentsController::SubscriptionsMailer)
+        CommentsController::SubscriptionsMailer.__send__(:initialize)
+      else
+        CommentsController::SubscriptionsMailer = MiniTest::Mock.new
+      end
+
+      user2 = DummyUser.create
+      user2.can_read = true
+      @thread.subscribe(user2)
+
+      email = MiniTest::Mock.new.expect(:deliver, nil)
+      CommentsController::SubscriptionsMailer.expect(:comment_created, email, [Comment, [user2]])
+
+      @user.can_read = true
+      sign_in @user
+
+      attributes = {:body => 'Something else'}
+      post :create, :thread_id => @thread.id, :comment => attributes, :use_route => :commontator
+      assigns(:comment).errors.must_be_empty
+
+      CommentsController::SubscriptionsMailer.verify
+      email.verify
+    end
   end
 end

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

@@ -1,4 +1,4 @@
-require 'minitest_helper'
+require 'test_helper'
 
 module Commontator
   describe SubscriptionsController do
@@ -6,29 +6,29 @@ module Commontator
       setup_controller_spec
     end
     
-    it 'wont create unless authorized' do
-      post :create, :thread_id => @thread.id, :use_route => :commontator
+    it 'wont subscribe unless authorized' do
+      patch :subscribe, :thread_id => @thread.id, :use_route => :commontator
       assert_response 403
       @thread.subscription_for(nil).must_be_nil
       @thread.subscription_for(@user).must_be_nil
       
       sign_in @user
-      post :create, :thread_id => @thread.id, :use_route => :commontator
+      patch :subscribe, :thread_id => @thread.id, :use_route => :commontator
       assert_response 403
       @thread.subscription_for(@user).must_be_nil
       
       @thread.subscribe(@user)
       @user.can_read = true
-      post :create, :thread_id => @thread.id, :use_route => :commontator
+      patch :subscribe, :thread_id => @thread.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:thread).errors.wont_be_empty
     end
     
-    it 'must create if authorized' do
+    it 'must subscribe if authorized' do
       sign_in @user
       
       @user.can_read = true
-      post :create, :thread_id => @thread.id, :use_route => :commontator
+      patch :subscribe, :thread_id => @thread.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:thread).errors.must_be_empty
       @thread.subscription_for(@user).wont_be_nil
@@ -36,7 +36,7 @@ module Commontator
       @thread.unsubscribe(@user)
       @user.can_read = false
       @user.can_edit = true
-      post :create, :thread_id => @thread.id, :use_route => :commontator
+      patch :subscribe, :thread_id => @thread.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:thread).errors.must_be_empty
       @thread.subscription_for(@user).wont_be_nil
@@ -44,27 +44,27 @@ module Commontator
       @thread.unsubscribe(@user)
       @user.can_edit = false
       @user.is_admin = true
-      post :create, :thread_id => @thread.id, :use_route => :commontator
+      patch :subscribe, :thread_id => @thread.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:thread).errors.must_be_empty
       @thread.subscription_for(@user).wont_be_nil
     end
     
-    it 'wont destroy unless authorized' do
+    it 'wont unsubscribe unless authorized' do
       @thread.subscribe(@user)
-      delete :destroy, :thread_id => @thread.id, :use_route => :commontator
+      patch :unsubscribe, :thread_id => @thread.id, :use_route => :commontator
       assert_response 403
       @thread.subscription_for(nil).must_be_nil
       @thread.subscription_for(@user).wont_be_nil
       
       sign_in @user
-      delete :destroy, :thread_id => @thread.id, :use_route => :commontator
+      patch :unsubscribe, :thread_id => @thread.id, :use_route => :commontator
       assert_response 403
       @thread.subscription_for(@user).wont_be_nil
       
       @thread.unsubscribe(@user)
       @user.can_read = true
-      delete :destroy, :thread_id => @thread.id, :use_route => :commontator
+      patch :unsubscribe, :thread_id => @thread.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:thread).errors.wont_be_empty
     end
@@ -74,7 +74,7 @@ module Commontator
       
       @thread.subscribe(@user)
       @user.can_read = true
-      delete :destroy, :thread_id => @thread.id, :use_route => :commontator
+      patch :unsubscribe, :thread_id => @thread.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:thread).errors.must_be_empty
       @thread.subscription_for(@user).must_be_nil
@@ -82,7 +82,7 @@ module Commontator
       @thread.subscribe(@user)
       @user.can_read = false
       @user.can_edit = true
-      delete :destroy, :thread_id => @thread.id, :use_route => :commontator
+      patch :unsubscribe, :thread_id => @thread.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:thread).errors.must_be_empty
       @thread.subscription_for(@user).must_be_nil
@@ -90,7 +90,7 @@ module Commontator
       @thread.subscribe(@user)
       @user.can_edit = false
       @user.is_admin = true
-      delete :destroy, :thread_id => @thread.id, :use_route => :commontator
+      patch :unsubscribe, :thread_id => @thread.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:thread).errors.must_be_empty
       @thread.subscription_for(@user).must_be_nil