commontator 1.1.0 → 1.1.1

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

@@ -2,7 +2,7 @@ module Commontator
   class CommentsController < ApplicationController
     before_filter :get_thread, :only => [:new, :create]
     before_filter :get_comment_and_thread, :except => [:new, :create]
-    before_filter :set_commontable_url, :only => :show
+    before_filter :set_commontable_url, :only => :create
 
     # GET /1/comments/new
     def new
@@ -21,11 +21,10 @@ module Commontator
 
     # POST /1/comments
     def create
-      set_commontable_url
       @comment = Comment.new(params[:comment])
       @comment.thread = @thread
       @comment.creator = @user
-      
+      CommentObserver.instance
       raise SecurityTransgression unless @comment.can_be_created_by?(@user)
       
       respond_to do |format|

data/app/models/commontator/comment.rb

@@ -86,4 +86,6 @@ module Commontator
         thread.can_be_read_by?(user) && user != creator
     end
   end
+  
+  CommentObserver.instance
 end

data/app/models/commontator/comment.rb~

@@ -78,7 +78,7 @@ module Commontator
     end
     
     def can_be_voted_on?
-      is_votable? && !is_deleted? && thread.config.comments_can_be_voted_on
+      is_votable? && !is_deleted? && thread.config.can_vote_on_comments
     end
 
     def can_be_voted_on_by?(user)

data/config/initializers/commontator.rb

@@ -11,9 +11,10 @@ Commontator.configure do |config|
   # Proc that is called after any javascript runs (e.g. to display/clear flash messages)
   # It is passed the view_context object (self from the view template), so you should be able to
   # access anything you normally could in a view template (by using, e.g. view.flash)
+  # However, be aware that it does not have access to the main application's helpers
   # Should return a string containing JS to be appended to all Commontator JS responses
-  # Default: lambda { |view| '$("#error_explanation").hide();' }
-  config.javascript_proc = lambda { |view| '$("#error_explanation").hide();' }
+  # Default: lambda { |view| '$("#error_explanation").remove();' }
+  config.javascript_proc = lambda { |view| '$("#error_explanation").remove();' }
 
 
   # User (acts_as_commontator) Configuration

data/config/initializers/commontator.rb~

@@ -11,6 +11,7 @@ Commontator.configure do |config|
   # Proc that is called after any javascript runs (e.g. to display/clear flash messages)
   # It is passed the view_context object (self from the view template), so you should be able to
   # access anything you normally could in a view template (by using, e.g. view.flash)
+  # However, be aware that it does not have access to the main application's helpers
   # Should return a string containing JS to be appended to all Commontator JS responses
   # Default: lambda { |view| '$("#error_explanation").remove();' }
   config.javascript_proc = lambda { |view| '$("#error_explanation").hide();' }

data/lib/commontator/engine.rb~

@@ -1,6 +1,7 @@
 module Commontator
   class Engine < ::Rails::Engine
     isolate_namespace Commontator
-    pp main_app
+    
+    config.active_record.observers = :comment_observer
   end
 end

data/lib/commontator/version.rb

@@ -1,3 +1,3 @@
 module Commontator
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/commontator/version.rb~

@@ -1,3 +1,3 @@
 module Commontator
-  VERSION = "1.0.6"
+  VERSION = "1.1.0"
 end

data/spec/app/models/commontator/comment_observer_spec.rb

@@ -4,7 +4,7 @@ module Commontator
   describe CommentObserver do
     before do
       setup_model_spec
-      @comment_observer = CommentObserver.send :new
+      @comment_observer = CommentObserver.instance
       @thread.subscribe(@user)
       @comment = Comment.new
       @comment.thread = @thread

data/spec/app/models/commontator/comment_observer_spec.rb~

@@ -20,7 +20,7 @@ module Commontator
     it 'must send mail if recipients not empty' do
       @user2 = DummyUser.create
       @thread.subscribe(@user2)
-      pp @thread.active_subscribers
+      @comment.reload
       @comment_observer.after_create(@comment).must_be_instance_of Mail::Message
     end
   end

data/spec/dummy/config/initializers/commontator.rb

@@ -11,9 +11,10 @@ Commontator.configure do |config|
   # Proc that is called after any javascript runs (e.g. to display/clear flash messages)
   # It is passed the view_context object (self from the view template), so you should be able to
   # access anything you normally could in a view template (by using, e.g. view.flash)
+  # However, be aware that it does not have access to the main application's helpers
   # Should return a string containing JS to be appended to all Commontator JS responses
-  # Default: lambda { |view| '$("#error_explanation").hide();' }
-  config.javascript_proc = lambda { |view| '' }
+  # Default: lambda { |view| '$("#error_explanation").remove();' }
+  config.javascript_proc = lambda { |view| '$("#error_explanation").remove();' }
 
 
   # User (acts_as_commontator) Configuration

data/spec/dummy/config/initializers/commontator.rb~

@@ -11,9 +11,10 @@ Commontator.configure do |config|
   # Proc that is called after any javascript runs (e.g. to display/clear flash messages)
   # It is passed the view_context object (self from the view template), so you should be able to
   # access anything you normally could in a view template (by using, e.g. view.flash)
+  # However, be aware that it does not have access to the main application's helpers
   # Should return a string containing JS to be appended to all Commontator JS responses
-  # Default: lambda { |view| '$("#error_explanation").hide();' }
-  config.javascript_proc = lambda { |view| 'Dummy Javascript' }
+  # Default: lambda { |view| '$("#error_explanation").remove();' }
+  config.javascript_proc = lambda { |view| '' }
 
 
   # User (acts_as_commontator) Configuration

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commontator
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors: