commontator 4.0.1 → 4.0.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commontator
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Dante Soares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -87,13 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/controllers/commontator/application_controller.rb~
 - app/controllers/commontator/threads_controller.rb
-- app/controllers/commontator/threads_controller.rb~
 - app/controllers/commontator/application_controller.rb
 - app/controllers/commontator/subscriptions_controller.rb
-- app/controllers/commontator/comments_controller.rb~
-- app/controllers/commontator/subscriptions_controller.rb~
 - app/controllers/commontator/comments_controller.rb
 - app/assets/stylesheets/commontator/application.css
 - app/assets/stylesheets/commontator/comments.css
@@ -102,96 +98,58 @@ files:
 - app/assets/images/commontator/upvote_hover.png
 - app/assets/images/commontator/downvote_hover.png
 - app/assets/images/commontator/upvote.png
-- app/models/commontator/thread.rb~
 - app/models/commontator/subscription.rb
-- app/models/commontator/tree.rb~
-- app/models/commontator/subscription.rb~
 - app/models/commontator/thread.rb
 - app/models/commontator/comment.rb
-- app/models/commontator/comment.rb~
 - app/helpers/commontator/threads_helper.rb
 - app/helpers/commontator/application_helper.rb
-- app/views/commontator/subscriptions/_link.html.erb~
 - app/views/commontator/subscriptions/subscribe.js.erb
 - app/views/commontator/subscriptions/_link.html.erb
 - app/views/commontator/subscriptions_mailer/comment_created.html.erb
 - app/views/commontator/threads/_show.html.erb
 - app/views/commontator/threads/show.js.erb
-- app/views/commontator/threads/_show.html.erb~
-- app/views/commontator/shared/_thread.html.erb~
 - app/views/commontator/shared/_thread.html.erb
 - app/views/commontator/comments/_votes.html.erb
-- app/views/commontator/comments/_body.html.erb~
 - app/views/commontator/comments/create.js.erb
 - app/views/commontator/comments/_show.html.erb
 - app/views/commontator/comments/_actions.html.erb
-- app/views/commontator/comments/_show.html.erb~
 - app/views/commontator/comments/update.js.erb
 - app/views/commontator/comments/delete.js.erb
 - app/views/commontator/comments/new.js.erb
 - app/views/commontator/comments/_body.html.erb
 - app/views/commontator/comments/edit.js.erb
-- app/views/commontator/comments/_votes.html.erb~
 - app/views/commontator/comments/vote.js.erb
 - app/views/commontator/comments/_form.html.erb
-- app/views/commontator/comments/_actions.html.erb~
-- app/views/commontator/comments/_form.html.erb~
-- app/views/commontator/comments/delete.js.erb~
 - app/mailers/commontator/subscriptions_mailer.rb
-- app/mailers/commontator/subscriptions_mailer.rb~
 - config/routes.rb
-- config/initializers/commontator.rb~
 - config/initializers/commontator.rb
-- config/routes.rb~
 - db/migrate/0_install_commontator.rb
-- db/migrate/0_install.rb~
-- lib/commontator.rb~
-- lib/commontator/version.rb~
 - lib/commontator/commontable_config.rb
 - lib/commontator/acts_as_commontator.rb
-- lib/commontator/acts_as_commontator.rb~
 - lib/commontator/commontator_config.rb
 - lib/commontator/acts_as_commontable.rb
-- lib/commontator/shared_helper.rb~
 - lib/commontator/controller_includes.rb
 - lib/commontator/engine.rb
-- lib/commontator/acts_as_commontable.rb~
 - lib/commontator/shared_helper.rb
 - lib/commontator/version.rb
-- lib/commontator/security_transgression.rb~
-- lib/commontator/controller_includes.rb~
 - lib/commontator/security_transgression.rb
 - lib/commontator.rb
-- lib/tasks/commontator_tasks.rake~
 - lib/tasks/commontator_tasks.rake
 - MIT-LICENSE
 - Rakefile
 - README.md
-- spec/app/controllers/commontator/comments_controller_spec.rb~
-- spec/app/controllers/commontator/threads_controller_spec.rb~
 - spec/app/controllers/commontator/threads_controller_spec.rb
-- spec/app/controllers/commontator/subscriptions_controller_spec.rb~
 - spec/app/controllers/commontator/comments_controller_spec.rb
 - spec/app/controllers/commontator/subscriptions_controller_spec.rb
-- spec/app/models/commontator/comment_observer_spec.rb~
-- spec/app/models/commontator/thread_spec.rb~
 - spec/app/models/commontator/comment_spec.rb
 - spec/app/models/commontator/subscription_spec.rb
 - spec/app/models/commontator/thread_spec.rb
-- spec/app/models/commontator/comment_spec.rb~
-- spec/app/models/commontator/subscription_spec.rb~
-- spec/app/helpers/commontator/application_helper_spec.rb~
-- spec/app/helpers/commontator/threads_helper_spec.rb~
 - spec/app/helpers/commontator/threads_helper_spec.rb
 - spec/app/helpers/commontator/application_helper_spec.rb
 - spec/app/mailers/commontator/subscriptions_mailer_spec.rb
-- spec/app/mailers/commontator/subscriptions_mailer_spec.rb~
 - spec/test_helper.rb
-- spec/minitest_helper.rb~
 - spec/dummy/script/rails
 - spec/dummy/Rakefile
-- spec/dummy/Rakefile~
-- spec/dummy/config.ru~
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/dummy_models_controller.rb
 - spec/dummy/app/assets/stylesheets/application.css
@@ -212,12 +170,8 @@ files:
 - spec/dummy/config/environment.rb
 - spec/dummy/config/routes.rb
 - spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/production.rb~
-- spec/dummy/config/environments/test.rb~
-- spec/dummy/config/environments/development.rb~
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/environments/development.rb
-- spec/dummy/config/initializers/secret_token.rb~
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
@@ -227,11 +181,8 @@ files:
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/boot.rb
-- spec/dummy/config/environment.rb~
 - spec/dummy/config/application.rb
 - spec/dummy/config/database.yml
-- spec/dummy/config/application.rb~
-- spec/dummy/README.md~
 - spec/dummy/README.md
 - spec/dummy/public/500.html
 - spec/dummy/public/422.html
@@ -246,21 +197,12 @@ files:
 - spec/dummy/db/migrate/1_create_dummy_models.rb
 - spec/dummy/db/migrate/3_acts_as_votable_migration.rb
 - spec/dummy/db/test.sqlite3
-- spec/test_helper.rb~
-- spec/spec_helper.rb~
 - spec/lib/commontator_spec.rb
-- spec/lib/commontator_spec.rb~
-- spec/lib/commontator/commontator_config_spec.rb~
-- spec/lib/commontator/acts_as_commontator_spec.rb~
-- spec/lib/commontator/commontable_config_spec.rb~
 - spec/lib/commontator/acts_as_commontator_spec.rb
 - spec/lib/commontator/controller_includes_spec.rb
 - spec/lib/commontator/shared_helper_spec.rb
-- spec/lib/commontator/controller_includes_spec.rb~
 - spec/lib/commontator/commontable_config_spec.rb
-- spec/lib/commontator/acts_as_commontable_spec.rb~
 - spec/lib/commontator/commontator_config_spec.rb
-- spec/lib/commontator/shared_helper_spec.rb~
 - spec/lib/commontator/acts_as_commontable_spec.rb
 homepage: http://github.com/lml/commontator
 licenses:
@@ -287,31 +229,18 @@ signing_key:
 specification_version: 4
 summary: Allows users to comment on any model in your application.
 test_files:
-- spec/app/controllers/commontator/comments_controller_spec.rb~
-- spec/app/controllers/commontator/threads_controller_spec.rb~
 - spec/app/controllers/commontator/threads_controller_spec.rb
-- spec/app/controllers/commontator/subscriptions_controller_spec.rb~
 - spec/app/controllers/commontator/comments_controller_spec.rb
 - spec/app/controllers/commontator/subscriptions_controller_spec.rb
-- spec/app/models/commontator/comment_observer_spec.rb~
-- spec/app/models/commontator/thread_spec.rb~
 - spec/app/models/commontator/comment_spec.rb
 - spec/app/models/commontator/subscription_spec.rb
 - spec/app/models/commontator/thread_spec.rb
-- spec/app/models/commontator/comment_spec.rb~
-- spec/app/models/commontator/subscription_spec.rb~
-- spec/app/helpers/commontator/application_helper_spec.rb~
-- spec/app/helpers/commontator/threads_helper_spec.rb~
 - spec/app/helpers/commontator/threads_helper_spec.rb
 - spec/app/helpers/commontator/application_helper_spec.rb
 - spec/app/mailers/commontator/subscriptions_mailer_spec.rb
-- spec/app/mailers/commontator/subscriptions_mailer_spec.rb~
 - spec/test_helper.rb
-- spec/minitest_helper.rb~
 - spec/dummy/script/rails
 - spec/dummy/Rakefile
-- spec/dummy/Rakefile~
-- spec/dummy/config.ru~
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/dummy_models_controller.rb
 - spec/dummy/app/assets/stylesheets/application.css
@@ -332,12 +261,8 @@ test_files:
 - spec/dummy/config/environment.rb
 - spec/dummy/config/routes.rb
 - spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/production.rb~
-- spec/dummy/config/environments/test.rb~
-- spec/dummy/config/environments/development.rb~
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/environments/development.rb
-- spec/dummy/config/initializers/secret_token.rb~
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
@@ -347,11 +272,8 @@ test_files:
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/boot.rb
-- spec/dummy/config/environment.rb~
 - spec/dummy/config/application.rb
 - spec/dummy/config/database.yml
-- spec/dummy/config/application.rb~
-- spec/dummy/README.md~
 - spec/dummy/README.md
 - spec/dummy/public/500.html
 - spec/dummy/public/422.html
@@ -366,19 +288,10 @@ test_files:
 - spec/dummy/db/migrate/1_create_dummy_models.rb
 - spec/dummy/db/migrate/3_acts_as_votable_migration.rb
 - spec/dummy/db/test.sqlite3
-- spec/test_helper.rb~
-- spec/spec_helper.rb~
 - spec/lib/commontator_spec.rb
-- spec/lib/commontator_spec.rb~
-- spec/lib/commontator/commontator_config_spec.rb~
-- spec/lib/commontator/acts_as_commontator_spec.rb~
-- spec/lib/commontator/commontable_config_spec.rb~
 - spec/lib/commontator/acts_as_commontator_spec.rb
 - spec/lib/commontator/controller_includes_spec.rb
 - spec/lib/commontator/shared_helper_spec.rb
-- spec/lib/commontator/controller_includes_spec.rb~
 - spec/lib/commontator/commontable_config_spec.rb
-- spec/lib/commontator/acts_as_commontable_spec.rb~
 - spec/lib/commontator/commontator_config_spec.rb
-- spec/lib/commontator/shared_helper_spec.rb~
 - spec/lib/commontator/acts_as_commontable_spec.rb

data/app/controllers/commontator/application_controller.rb~

@@ -1,27 +0,0 @@
-module Commontator
-  class CommontatorController < ActionController::Base
-    before_filter :get_user
-    
-    cattr_accessor :commontable_url
-    
-    rescue_from SecurityTransgression, :with => lambda { head(:forbidden) }
-    
-    protected
-    
-    def get_user
-      @user = self.send Commontator.current_user_method	
-      raise SecurityTransgression unless (@user.nil? || @user.is_commontator)
-    end
-    
-    def get_thread
-      @thread = params[:thread_id].blank? ? \
-        Commontator::Thread.find(params[:id]) : \
-        Commontator::Thread.find(params[:thread_id])
-      raise SecurityTransgression if @thread.commontable.nil?
-    end
-    
-    def set_commontable_url
-      self.commontable_url = @thread.config.commontable_url_proc.call(main_app, @thread.commontable)
-    end
-  end
-end

data/app/controllers/commontator/comments_controller.rb~

@@ -1,144 +0,0 @@
-module Commontator
-  class CommentsController < Commontator::ApplicationController
-    before_filter :get_thread, :only => [:new, :create]
-    before_filter :get_comment_and_thread, :except => [:new, :create]
-    before_filter :set_commontable_url, :only => :create
-
-    # GET /threads/1/comments/new
-    def new
-      @comment = Comment.new
-      @comment.thread = @thread
-      @comment.creator = @user
-
-      raise SecurityTransgression unless @comment.can_be_created_by?(@user)
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js
-      end
-     
-    end
-
-    # POST /threads/1/comments
-    def create
-      @comment = Comment.new
-      @comment.body = params[:comment][:body] unless params[:comment].nil?
-      @comment.thread = @thread
-      @comment.creator = @user
-      
-      raise SecurityTransgression unless @comment.can_be_created_by?(@user)
-      
-      respond_to do |format|
-        if @comment.save
-          @thread.subscribe(@user) if @thread.config.auto_subscribe_on_comment
-          @thread.add_unread_except_for(@user)
-          recipients = @thread.active_subscribers.reject{|s| s == @user}
-          SubscriptionsMailer.comment_created(@comment, recipients).deliver \
-            unless recipients.empty?
-
-          format.html { redirect_to @thread }
-          format.js
-        else
-          format.html { redirect_to @thread }
-          format.js { render :new }
-        end
-      end
-    end
-
-    # GET /comments/1/edit
-    def edit
-      raise SecurityTransgression unless @comment.can_be_edited_by?(@user)
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js
-      end
-    end
-
-    # PATCH /comments/1
-    def update
-      raise SecurityTransgression unless @comment.can_be_edited_by?(@user)
-      @comment.body = params[:comment][:body] unless params[:comment].nil?
-      @comment.editor = @user
-
-      respond_to do |format|
-        if @comment.save
-          format.html { redirect_to @thread }
-          format.js
-        else
-          format.html { redirect_to @thread }
-          format.js { render :edit }
-        end
-      end
-    end
-
-    # PATCH /comments/1/delete
-    def delete
-      raise SecurityTransgression unless @comment.can_be_deleted_by?(@user)
-
-      @comment.errors.add(:base, 'This comment has already been deleted.') \
-        unless @comment.delete_by(@user)
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js { render :delete }
-      end
-    end
-    
-    # PATCH /comments/1/undelete
-    def undelete
-      raise SecurityTransgression unless @comment.can_be_deleted_by?(@user)
-
-      @comment.errors.add(:base, 'This comment is not deleted.') \
-        unless @comment.undelete_by(@user)
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js { render :delete }
-      end
-    end
-    
-    # PATCH /comments/1/upvote
-    def upvote
-      raise SecurityTransgression unless @comment.can_be_voted_on_by?(@user)
-      
-      @comment.upvote_from @user
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js { render :vote }
-      end
-    end
-    
-    # PATCH /comments/1/downvote
-    def downvote
-      raise SecurityTransgression unless @comment.can_be_voted_on_by?(@user)
-      
-      @comment.downvote_from @user
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js { render :vote }
-      end
-    end
-    
-    # PATCH /comments/1/unvote
-    def unvote
-      raise SecurityTransgression unless @comment.can_be_voted_on_by?(@user)
-      
-      @comment.unvote :voter => @user
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js { render :vote }
-      end
-    end
-    
-    protected
-    
-    def get_comment_and_thread
-      @comment = Comment.find(params[:id])
-      @thread = @comment.thread
-    end
-  end
-end

data/app/controllers/commontator/subscriptions_controller.rb~

@@ -1,32 +0,0 @@
-module Commontator
-  class SubscriptionsController < Commontator::ApplicationController
-    before_filter :get_thread
-
-    # PATCH threads/1/subscribe
-    def subscribe
-      raise SecurityTransgression unless @thread.can_subscribe?(@user)
-
-      @thread.errors.add(:subscription, "You are already subscribed to this thread") \
-        unless @thread.subscribe(@user)
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js { render :subscribe }
-      end
-
-    end
-
-    # PATCH threads/1/unsubscribe
-    def unsubscribe
-      raise SecurityTransgression unless @thread.can_subscribe?(@user)
-
-      @thread.errors.add(:subscription, "You are not subscribed to this thread") \
-        unless @thread.unsubscribe(@user)
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js { render :subscribe }
-      end
-    end
-  end
-end