commontator 4.3.0 → 4.4.1

data/spec/lib/commontator/acts_as_commontable_spec.rb

@@ -20,6 +20,7 @@ module Commontator
       dummy.must_respond_to :comments
       dummy.must_respond_to :subscriptions
       dummy.must_respond_to :commontable_config
+      dummy.must_respond_to :commontable_name
       dummy.commontable_config.must_be_instance_of CommontableConfig
     end
   end

data/spec/lib/commontator/acts_as_commontator_spec.rb

@@ -19,6 +19,10 @@ module Commontator
       user.must_respond_to :comments
       user.must_respond_to :subscriptions
       user.must_respond_to :commontator_config
+      user.must_respond_to :commontator_name
+      user.must_respond_to :commontator_email
+      user.must_respond_to :commontator_link
+      user.must_respond_to :commontator_avatar
       user.commontator_config.must_be_instance_of CommontatorConfig
     end
   end

data/spec/lib/commontator/commontator_config_spec.rb

@@ -17,10 +17,12 @@ module Commontator
     end
     
     it 'must be configurable' do
-      config = CommontatorConfig.new(:user_name_clickable => true)
-      config.user_name_clickable.must_equal true
-      config = CommontatorConfig.new(:user_name_clickable => false)
-      config.user_name_clickable.must_equal false
+      proc = lambda { |user| 'Some name' }
+      proc2 = lambda { |user| 'Another name' }
+      config = CommontatorConfig.new(:user_name_proc => proc)
+      (config.user_name_proc == proc).must_equal true
+      config = CommontatorConfig.new(:user_name_proc => proc2)
+      (config.user_name_proc == proc2).must_equal true
     end
   end
 end

data/spec/test_helper.rb

@@ -29,12 +29,6 @@ def setup_controller_spec
 end
 
 def setup_helper_spec
-  setup_model_spec
-  @comment = Commontator::Comment.new
-  @comment.body = 'Some comment'
-  @comment.thread = @thread
-  @comment.creator = @user
-  @comment.save!
 end
 
 def setup_mailer_spec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commontator
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.1
 platform: ruby
 authors:
 - Dante Soares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -102,8 +102,6 @@ files:
 - app/controllers/commontator/subscriptions_controller.rb
 - app/controllers/commontator/threads_controller.rb
 - app/helpers/commontator/application_helper.rb
-- app/helpers/commontator/comments_helper.rb
-- app/helpers/commontator/threads_helper.rb
 - app/mailers/commontator/subscriptions_mailer.rb
 - app/models/commontator/comment.rb
 - app/models/commontator/subscription.rb
@@ -128,7 +126,7 @@ files:
 - app/views/commontator/threads/_show.html.erb
 - app/views/commontator/threads/show.js.erb
 - config/initializers/commontator.rb
-- config/locales/en.yml
+- config/locales/commontator/en.yml
 - config/routes.rb
 - db/migrate/0_install_commontator.rb
 - lib/commontator.rb
@@ -146,8 +144,6 @@ files:
 - spec/app/controllers/commontator/subscriptions_controller_spec.rb
 - spec/app/controllers/commontator/threads_controller_spec.rb
 - spec/app/helpers/commontator/application_helper_spec.rb
-- spec/app/helpers/commontator/comments_helper_spec.rb
-- spec/app/helpers/commontator/threads_helper_spec.rb
 - spec/app/mailers/commontator/subscriptions_mailer_spec.rb
 - spec/app/models/commontator/comment_spec.rb
 - spec/app/models/commontator/subscription_spec.rb
@@ -237,8 +233,6 @@ test_files:
 - spec/app/controllers/commontator/subscriptions_controller_spec.rb
 - spec/app/controllers/commontator/threads_controller_spec.rb
 - spec/app/helpers/commontator/application_helper_spec.rb
-- spec/app/helpers/commontator/comments_helper_spec.rb
-- spec/app/helpers/commontator/threads_helper_spec.rb
 - spec/app/mailers/commontator/subscriptions_mailer_spec.rb
 - spec/app/models/commontator/comment_spec.rb
 - spec/app/models/commontator/subscription_spec.rb

data/app/helpers/commontator/comments_helper.rb

@@ -1,17 +0,0 @@
-module Commontator
-  module CommentsHelper
-    def created_timestamp(comment)
-      t 'commontator.comment.status.created_at',
-      :created_at => l(comment.created_at, :format => :commontator)
-    end
-
-    def updated_timestamp(comment)
-      editor = comment.editor
-      return '' if editor.nil?
-
-      t 'commontator.comment.status.updated_at',
-        :editor_name => editor.commontator_config.user_name_proc.call(editor),
-        :updated_at => l(comment.updated_at, :format => :commontator)
-    end
-  end
-end

data/app/helpers/commontator/threads_helper.rb

@@ -1,7 +0,0 @@
-module Commontator
-  module ThreadsHelper
-    def commontable_name(thread)
-      thread.config.commontable_name_proc.call(thread.commontable)
-    end
-  end
-end

data/spec/app/helpers/commontator/comments_helper_spec.rb

@@ -1,29 +0,0 @@
-require 'test_helper'
-
-module Commontator
-  describe CommentsHelper do
-    before do
-      setup_helper_spec
-    end
-    
-    it 'must make proper timestamps' do
-      editor_name = @user.commontator_config.user_name_proc.call(@user)
-      created_timestamp(@comment).must_equal t('commontator.comment.status.created_at',
-                                               :created_at => l(@comment.created_at,
-                                                                :format => :commontator))
-      updated_timestamp(@comment).must_equal ''
-
-      @comment.body = 'Something else'
-      @comment.editor = @user
-      @comment.save!
-
-      created_timestamp(@comment).must_equal t('commontator.comment.status.created_at',
-                                               :created_at => l(@comment.created_at,
-                                                                :format => :commontator))
-      updated_timestamp(@comment).must_equal t('commontator.comment.status.updated_at',
-                                               :editor_name => editor_name,
-                                               :updated_at => l(@comment.updated_at,
-                                                                :format => :commontator))
-    end
-  end
-end

data/spec/app/helpers/commontator/threads_helper_spec.rb

@@ -1,13 +0,0 @@
-require 'test_helper'
-
-module Commontator
-  describe ThreadsHelper do
-    before do
-      setup_helper_spec
-    end
-    
-    it 'must print commontable name' do
-      commontable_name(@thread).must_equal 'DummyModel #2'
-    end
-  end
-end