commontator 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfe1cd4d8b6e17df4c8cb7bb38c2d95e70f02e75
-  data.tar.gz: 0ac6f1da9de7e7f74100357ca553eb57f0286de4
+  metadata.gz: f96ed4a2b92b92ce20a0ab78422775c3a5ada743
+  data.tar.gz: 1ef5a31ee4e7abd7bf27a873d6827b38203a9fd7
 SHA512:
-  metadata.gz: fd2e34719d1715cf575024c58bc40f61c7778fcf64f80b8462b575cd4d8ed60be003ae5cb7ffb98621c879f3112592f743dc6ba51b6c2a4bbb027e979a11c11b
-  data.tar.gz: d743b7dcbda343981f71e26a492cb7de74938d14f0b98f7b56728b8a91c6028b063aa08d595b72e4b984a35f9ba8aff5da201d6c37940e72b6fd791479ce71f8
+  metadata.gz: 239ae6a054aaa4f051648a4e9946b903b8d9fa5bca8d7c287edaeee5a34eccfa7bcfe705a844c2ad68ddc0c5e2dc6b9cebb9e9ac13248c34919d3b9c939a6b6e
+  data.tar.gz: f0317ca260ea97798c6d479d3d524f3ee8e859dce1950a4b56d7aad26630a0aaf6c1ae162dcba0d3c569b7548c4183005a305e340542cb46dc3c3670b6fc8435

data/README.md

@@ -1,6 +1,6 @@
 # Commontator
 
-Commontator is a Rails engine for comments.
+Commontator is a Rails engine for comments. It is compatible with Rails 3.1+ and Rails 4.
 Being an engine means it is fully functional as soon as you install and configure its gem, providing models, views and controllers of its own.
 At the same time, almost anything about it can be configured or customized to suit your needs.
 
@@ -10,14 +10,12 @@ There are 4 steps you must follow to install commontator:
 
 1. Gem
 
-  Add this line to your application's Gemfile (for Rails 4+):
+  Add this line to your application's Gemfile:
 
   ```ruby
-  gem 'commontator', '~> 4.0.0'
+  gem 'commontator', '~> 4.0.2'
   ```
 
-  If you are still using rails 3, use Commontator version 2.0.1 instead.
-
   And then execute:
 
   ```sh

data/app/controllers/commontator/comments_controller.rb

@@ -55,7 +55,7 @@ module Commontator
       end
     end
 
-    # PATCH /comments/1
+    # PUT /comments/1
     def update
       raise SecurityTransgression unless @comment.can_be_edited_by?(@user)
       @comment.body = params[:comment].nil? ? nil : params[:comment][:body]
@@ -72,7 +72,7 @@ module Commontator
       end
     end
 
-    # PATCH /comments/1/delete
+    # PUT /comments/1/delete
     def delete
       raise SecurityTransgression unless @comment.can_be_deleted_by?(@user)
 
@@ -85,7 +85,7 @@ module Commontator
       end
     end
     
-    # PATCH /comments/1/undelete
+    # PUT /comments/1/undelete
     def undelete
       raise SecurityTransgression unless @comment.can_be_deleted_by?(@user)
 
@@ -98,7 +98,7 @@ module Commontator
       end
     end
     
-    # PATCH /comments/1/upvote
+    # PUT /comments/1/upvote
     def upvote
       raise SecurityTransgression unless @comment.can_be_voted_on_by?(@user)
       
@@ -110,7 +110,7 @@ module Commontator
       end
     end
     
-    # PATCH /comments/1/downvote
+    # PUT /comments/1/downvote
     def downvote
       raise SecurityTransgression unless @comment.can_be_voted_on_by?(@user)
       
@@ -122,7 +122,7 @@ module Commontator
       end
     end
     
-    # PATCH /comments/1/unvote
+    # PUT /comments/1/unvote
     def unvote
       raise SecurityTransgression unless @comment.can_be_voted_on_by?(@user)
       

data/app/controllers/commontator/subscriptions_controller.rb

@@ -2,7 +2,7 @@ module Commontator
   class SubscriptionsController < Commontator::ApplicationController
     before_filter :get_thread
 
-    # PATCH /threads/1/subscribe
+    # PUT /threads/1/subscribe
     def subscribe
       raise SecurityTransgression unless @thread.can_subscribe?(@user)
 
@@ -16,7 +16,7 @@ module Commontator
 
     end
 
-    # PATCH /threads/1/unsubscribe
+    # PUT /threads/1/unsubscribe
     def unsubscribe
       raise SecurityTransgression unless @thread.can_subscribe?(@user)
 

data/app/controllers/commontator/threads_controller.rb

@@ -13,7 +13,7 @@ module Commontator
       end
     end
     
-    # PATCH /threads/1/close
+    # PUT /threads/1/close
     def close
       raise SecurityTransgression unless @thread.can_be_edited_by?(@user)
 
@@ -26,7 +26,7 @@ module Commontator
       end
     end
     
-    # PATCH /threads/1/reopen
+    # PUT /threads/1/reopen
     def reopen
       raise SecurityTransgression unless @thread.can_be_edited_by?(@user)
 

data/app/views/commontator/comments/_actions.html.erb

@@ -23,7 +23,7 @@
               :confirm => (!is_deleted ? \
                             "Are you sure you want to delete this " + \
                             "#{comment.thread.config.comment_name}?" : nil),
-              :method => :patch,
+              :method => :put,
               :id => "comment_#{comment.id.to_s}_#{del_string}_link",
               :class => "comment_#{del_string}_link",
               :remote => true %>

data/app/views/commontator/comments/_votes.html.erb

@@ -10,7 +10,7 @@
   <span id="comment_<%= comment.id %>_upvote_span" class="comment_upvote">
     <% if can_vote && (vote.blank? || !vote.vote_flag) %>
       <%= form_tag commontator.upvote_comment_path(comment),
-            :method => :patch,
+            :method => :put,
             :remote => true do %>
         <%= image_submit_tag "commontator/upvote.png",
               :onmouseover => "this.src='/assets/commontator/upvote_hover.png'",
@@ -18,7 +18,7 @@
       <% end %>
     <% elsif can_vote %>
       <%= form_tag commontator.unvote_comment_path(comment),
-            :method => :patch,
+            :method => :put,
             :remote => true do %>
         <%= image_submit_tag "commontator/upvote_hover.png",
               :onmouseover => "this.src='/assets/commontator/upvote.png'",
@@ -36,7 +36,7 @@
   <span id="comment_<%= comment.id %>_downvote_span" class="comment_downvote">
     <% if can_vote && (vote.blank? || vote.vote_flag) %>
       <%= form_tag commontator.downvote_comment_path(comment),
-            :method => :patch,
+            :method => :put,
             :remote => true do %>
         <%= image_submit_tag "commontator/downvote.png",
               :onmouseover => "this.src='/assets/commontator/downvote_hover.png'",
@@ -44,7 +44,7 @@
       <% end %>
     <% elsif can_vote %>
       <%= form_tag commontator.unvote_comment_path(comment),
-            :method => :patch,
+            :method => :put,
             :remote => true do %>
         <%= image_submit_tag "commontator/downvote_hover.png",
               :onmouseover => "this.src='/assets/commontator/downvote.png'",

data/app/views/commontator/shared/_thread.html.erb

@@ -13,7 +13,7 @@
       <%= render :partial => 'commontator/threads/show', :locals => {:thread => thread,
                                                                      :user => user} %>
     <% else %>
-      <%= link_to "Show #{thread.config.comment_name.pluralize} (#{subscription ? subscription.unread + '/' + thread.comments.count : thread.comments.count})", \
+      <%= link_to "Show #{thread.config.comment_name.pluralize} (#{subscription ? (subscription.unread.to_s + '/' + thread.comments.count.to_s) : thread.comments.count.to_s})", \
                   commontator.thread_path(thread), :remote => true %>
     <% end %>
   </div>

data/app/views/commontator/subscriptions/_link.html.erb

@@ -10,7 +10,7 @@
             :confirm => (is_subscribed ? \
                           "Are you sure you want to unsubscribe from this thread?" : \
                           nil),
-            :method => :patch,
+            :method => :put,
             :id => "thread_#{thread.id.to_s}_#{sub_string}_link",
             :class => "thread_#{sub_string}_link",
             :remote => true %>

data/app/views/commontator/threads/_show.html.erb

@@ -28,7 +28,7 @@
                 commontator.polymorphic_path([close_string, thread]),
                 :confirm => (!is_closed ? \
                               'Are you sure you want to close this thread?' : nil),
-                :method => :patch,
+                :method => :put,
                 :id => "thread_#{thread.id.to_s}_#{close_string}_link",
                 :class => "thread_#{close_string}_link",
                 :remote => true %>

data/config/routes.rb

@@ -2,21 +2,21 @@ Commontator::Engine.routes.draw do
   resources :threads, :only => [:show] do
     resources :comments, :except => [:index, :destroy], :shallow => true do
       member do
-        patch 'delete'
-        patch 'undelete'
+        put 'delete'
+        put 'undelete'
         
-        patch 'upvote'
-        patch 'downvote'
-        patch 'unvote'
+        put 'upvote'
+        put 'downvote'
+        put 'unvote'
       end
     end
     
     member do
-      patch 'close'
-      patch 'reopen'
+      put 'close'
+      put 'reopen'
       
-      patch 'subscribe', :to => 'subscriptions#subscribe'
-      patch 'unsubscribe', :to => 'subscriptions#unsubscribe'
+      put 'subscribe', :to => 'subscriptions#subscribe'
+      put 'unsubscribe', :to => 'subscriptions#unsubscribe'
     end
   end
 end

data/lib/commontator/version.rb

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

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

@@ -178,13 +178,13 @@ module Commontator
       attributes = Hash.new
       attributes[:body] = 'Something else'
       
-      patch :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
+      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
       
       sign_in @user
-      patch :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
+      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
@@ -194,7 +194,7 @@ module Commontator
       user2.can_edit = true
       user2.is_admin = true
       sign_in user2
-      patch :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
+      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
@@ -208,7 +208,7 @@ module Commontator
       comment2.creator = @user
       comment2.body = 'Something else'
       comment2.save!
-      patch :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
+      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
@@ -220,40 +220,40 @@ module Commontator
       attributes[:body] = 'Something else'
       
       @user.can_read = true
-      patch :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
+      put :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
-      patch :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
+      put :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
-      patch :update, :id => @comment.id, :comment => attributes, :use_route => :commontator
+      put :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
-      patch :delete, :id => @comment.id, :use_route => :commontator
+      put :delete, :id => @comment.id, :use_route => :commontator
       assert_response 403
       assigns(:comment).is_deleted?.must_equal false
       
       sign_in @user
       
-      patch :delete, :id => @comment.id, :use_route => :commontator
+      put :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
-      patch :delete, :id => @comment.id, :use_route => :commontator
+      put :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
-      patch :delete, :id => @comment.id, :use_route => :commontator
+      put :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
-      patch :delete, :id => @comment.id, :use_route => :commontator
+      put :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
-      patch :delete, :id => @comment.id, :use_route => :commontator
+      put :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
-      patch :delete, :id => @comment.id, :use_route => :commontator
+      put :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
-      patch :undelete, :id => @comment.id, :use_route => :commontator
+      put :undelete, :id => @comment.id, :use_route => :commontator
       assert_response 403
       assigns(:comment).is_deleted?.must_equal true
       
       sign_in @user
       
-      patch :undelete, :id => @comment.id, :use_route => :commontator
+      put :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
-      patch :undelete, :id => @comment.id, :use_route => :commontator
+      put :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
-      patch :undelete, :id => @comment.id, :use_route => :commontator
+      put :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
-      patch :undelete, :id => @comment.id, :use_route => :commontator
+      put :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
-      patch :undelete, :id => @comment.id, :use_route => :commontator
+      put :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
-      patch :undelete, :id => @comment.id, :use_route => :commontator
+      put :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
-      patch :undelete, :id => @comment.id, :use_route => :commontator
+      put :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
-      patch :upvote, :id => @comment.id, :use_route => :commontator
+      put :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
-      patch :upvote, :id => @comment.id, :use_route => :commontator
+      put :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
-      patch :upvote, :id => @comment.id, :use_route => :commontator
+      put :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
       
-      patch :upvote, :id => @comment.id, :use_route => :commontator
+      put :upvote, :id => @comment.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:comment).upvotes.count.must_equal 1
       assigns(:comment).downvotes.must_be_empty
       
-      patch :upvote, :id => @comment.id, :use_route => :commontator
+      put :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
       
-      patch :upvote, :id => @comment.id, :use_route => :commontator
+      put :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
-      patch :downvote, :id => @comment.id, :use_route => :commontator
+      put :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
-      patch :downvote, :id => @comment.id, :use_route => :commontator
+      put :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
-      patch :downvote, :id => @comment.id, :use_route => :commontator
+      put :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
       
-      patch :downvote, :id => @comment.id, :use_route => :commontator
+      put :downvote, :id => @comment.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:comment).upvotes.must_be_empty
       assigns(:comment).downvotes.count.must_equal 1
       
-      patch :downvote, :id => @comment.id, :use_route => :commontator
+      put :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
       
-      patch :downvote, :id => @comment.id, :use_route => :commontator
+      put :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
       
-      patch :unvote, :id => @comment.id, :use_route => :commontator
+      put :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
-      patch :unvote, :id => @comment.id, :use_route => :commontator
+      put :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
-      patch :unvote, :id => @comment.id, :use_route => :commontator
+      put :unvote, :id => @comment.id, :use_route => :commontator
       assert_response 403
       assigns(:comment).upvotes.count.must_equal 1
       assigns(:comment).downvotes.must_be_empty
@@ -494,18 +494,18 @@ module Commontator
       sign_in user2
       
       @comment.upvote_from(user2).must_equal true
-      patch :unvote, :id => @comment.id, :use_route => :commontator
+      put :unvote, :id => @comment.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:comment).upvotes.must_be_empty
       assigns(:comment).downvotes.must_be_empty
       
-      patch :unvote, :id => @comment.id, :use_route => :commontator
+      put :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
-      patch :unvote, :id => @comment.id, :use_route => :commontator
+      put :unvote, :id => @comment.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:comment).upvotes.must_be_empty
       assigns(:comment).downvotes.must_be_empty