acts_as_commentable_more 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82fb9899d8883d3beafdbf2f8ca5c56d9432a888
-  data.tar.gz: 370116730009818699aa006177784dfb05d8903b
+  metadata.gz: 672806220d9adb336f161186d27b0efa7712f0c9
+  data.tar.gz: 10235ad9b411cfd878c26c7c75bfaabc47efc911
 SHA512:
-  metadata.gz: db7145766eda6390af0469b2f7c8a21c07e744c0a7adf13955546f1a7ea5d0581f3af25ce62fc459b642f1e5e270860a661bef5a119b960d5e7d448a8d1b3e4b
-  data.tar.gz: 177574f64e96bb3c54ee28b9333cea523cc02ff6a6133a400977814c826b34d9293f4fe64b40d4958c203187017661800df2142d993266935b5578293344543e
+  metadata.gz: b38325194551c42e0b1f47e38fe4c64f76294dd9b16852fa6e02d847a83fde4de6757b0462e9a82c934674062fea509c935ad7dc8e3fed7714eb49b2d6e9c5a3
+  data.tar.gz: 4ebb78f27f14789e26d5fcec562c15651dad5281895efa4968ad9504d8405c75fadad88d644f94d298e9276daef54ec8112c89a1f1657d54dad9506c883296b9

data/lib/acts_as_commentable_more/commentable_methods.rb

@@ -10,53 +10,59 @@ module ActsAsCommentableMore
     include Helpers::Comment::CacheCounterHelper
     include Helpers::Comment::InstanceMethodsHelper
 
-    def acts_as_commentable(types: [], options: {}, as: nil, counter_cache: true)
-      mattr_accessor :comment_model
-      mattr_accessor :comment_roles
+    def acts_as_commentable(association_comment_name, *args)#types: [], options: {}, as: nil, counter_cache: true)
+      mattr_accessor :aacm_commentable_options
+      mattr_accessor :aacm_association_options
 
-      default_options = {as: :commentable, dependent: :destroy, class_name: 'Comment'}
+      default_commentable_options = { types: [], options: {}, as: nil, counter_cache: true }
+      default_association_options = { as: :commentable, dependent: :destroy, class_name: 'Comment' }
 
-      types = types.flatten.compact.map(&:to_sym)
+      self.aacm_commentable_options = default_commentable_options.merge(args.extract_options!)
+      self.aacm_association_options = default_association_options.merge(aacm_commentable_options[:options].compact)
 
-      association_options = default_options.merge(options.compact)
-      association_comment_name = (as || association_options[:class_name].demodulize.underscore.to_sym).to_s.pluralize
-      self.comment_roles = types.present? ? types : [association_comment_name.singularize.to_sym]
-      self.comment_model = association_options[:class_name].classify.constantize
-      enable_counter_cache = counter_cache
+      self.aacm_commentable_options[:association_comment_name] = association_comment_name.to_s
+      self.aacm_commentable_options[:types] = aacm_commentable_options[:types].flatten.compact
+      self.aacm_commentable_options[:comment_model] = aacm_association_options[:class_name].classify.constantize
+      self.aacm_commentable_options[:comment_roles] = if aacm_commentable_options[:types].present?
+                                                        aacm_commentable_options[:types]
+                                                      else
+                                                        [aacm_commentable_options[:association_comment_name].singularize]
+                                                      end.map(&:to_s)
 
-      if comment_roles.size == 1
+      if aacm_commentable_options[:comment_roles].size == 1
         ###########################
         ###    basic comment    ###
         ###########################
-        post_define_role_based_inflection(comment_roles.first, association_comment_name, association_options)
-        post_define_create_role(association_comment_name)
+        post_define_role_based_inflection(aacm_commentable_options[:comment_roles].first, aacm_commentable_options[:association_comment_name])
+        post_define_create_role(aacm_commentable_options[:association_comment_name])
       else
         ###########################
         ### many roles comment  ###
         ###########################
         # scope method for post model
-        post_define_all_scope(association_comment_name, association_options[:as])
+        post_define_all_scope
         
-        comment_roles.each do |role|
+        aacm_commentable_options[:comment_roles].each do |role|
           # association for post model
-          association_name = "#{role.to_s}_#{association_comment_name.to_s}"
-          post_define_role_based_inflection(role, association_name, association_options)
+          association_name = "#{role}_#{aacm_commentable_options[:association_comment_name]}"
+          post_define_role_based_inflection(role, association_name)
           # support method for comment model
           post_define_create_role(association_name)
-          comment_define_is_role?(role)
-          comment_define_to_role(role)
-          comment_define_to_role!(role)
+          comment_define_is_role?(aacm_commentable_options[:comment_model], role)
+          comment_define_to_role(aacm_commentable_options[:comment_model], role)
+          comment_define_to_role!(aacm_commentable_options[:comment_model], role)
         end
         # helpper method for comment model
-        comment_define_can_change_role_of(association_options[:as])
+        comment_define_can_change_role_of(aacm_commentable_options[:comment_model], aacm_association_options[:as])
       end
 
-       # counter cache for comment model
-      comment_define_counter_cache_role(association_comment_name, association_options[:as]) if enable_counter_cache
-
+      # counter cache for comment model
+      if aacm_commentable_options[:counter_cache]
+        comment_define_counter_cache_role(aacm_commentable_options[:comment_model], aacm_commentable_options[:association_comment_name], aacm_association_options[:as])
+      end
       # instance method for comment
-      comment_define_instance_method
-      comment_define_class_method
+      comment_define_instance_method(aacm_commentable_options[:comment_model])
+      comment_define_class_method(aacm_commentable_options[:comment_model])
     end
 
   end

data/lib/acts_as_commentable_more/helpers/comment/cache_counter_helper.rb

@@ -5,7 +5,7 @@ module ActsAsCommentableMore
 
         private
 
-        def comment_define_counter_cache_role association_comment_name, commentable_name
+        def comment_define_counter_cache_role(comment_model, association_comment_name, commentable_name)
           never_has_counter_cache = !comment_model._create_callbacks.select {|cb| cb.kind == :after }.collect(&:filter).include?(:acts_as_commentable_more_increment!)
 
           if never_has_counter_cache
@@ -17,7 +17,7 @@ module ActsAsCommentableMore
 
             comment_model.redefine_method("acts_as_commentable_more_increment!") do
               all_counter_field = "#{association_comment_name}_count"
-              role_counter_field = "#{self.role.to_s}_#{all_counter_field}"
+              role_counter_field = "#{self.role}_#{all_counter_field}"
               post_model = self.send("#{commentable_name}_type").classify.constantize
               attributes_post = post_model.column_names
 
@@ -32,7 +32,7 @@ module ActsAsCommentableMore
 
             comment_model.redefine_method("acts_as_commentable_more_decrement!") do
               all_counter_field = "#{association_comment_name}_count"
-              role_counter_field = "#{self.role.to_s}_#{all_counter_field}"
+              role_counter_field = "#{self.role}_#{all_counter_field}"
               post_model = self.send("#{commentable_name}_type").classify.constantize
               attributes_post = post_model.column_names
 
@@ -64,10 +64,10 @@ module ActsAsCommentableMore
 
           # setting attributes for read only
           post_model = self
-          counter_fields = ["#{association_comment_name.to_s}_count"]
-          if post_model.comment_roles.size > 1
-            post_model.comment_roles.each do |role|
-              counter_fields << "#{role.to_s}_#{association_comment_name.to_s}_count"
+          counter_fields = ["#{association_comment_name}_count"]
+          if post_model.aacm_commentable_options[:comment_roles].size > 1
+            post_model.aacm_commentable_options[:comment_roles].each do |role|
+              counter_fields << "#{role}_#{association_comment_name}_count"
             end
           end
           post_model.attr_readonly(*counter_fields)

data/lib/acts_as_commentable_more/helpers/comment/instance_methods_helper.rb

@@ -5,7 +5,7 @@ module ActsAsCommentableMore
 
         private
 
-        def comment_define_instance_method
+        def comment_define_instance_method(comment_model)
 
           comment_model.class_eval do
           
@@ -23,7 +23,7 @@ module ActsAsCommentableMore
 
         end
 
-        def comment_define_class_method
+        def comment_define_class_method(comment_model)
           
           comment_model.class_eval do
 
@@ -31,7 +31,7 @@ module ActsAsCommentableMore
 
               def find_comments_by_user(user, role = nil)
                 attr_finder = { user: user }
-                attr_finder.merge!(role: role.to_s) if role.present?
+                attr_finder.merge!(role: role) if role.present?
                 where(attr_finder).order(created_at: :desc)
               end
 
@@ -40,34 +40,34 @@ module ActsAsCommentableMore
 
         end
 
-        def comment_define_can_change_role_of(commentable_name)
+        def comment_define_can_change_role_of(comment_model, commentable_name)
           comment_model.redefine_method("can_change_role?") do |role|
             commentable_class = send(commentable_name).class
-            limit_role = commentable_class.comment_roles
-            limit_role.include?(role.to_sym)
+            limit_role = commentable_class.aacm_commentable_options[:comment_roles]
+            limit_role.include?(role)
           end
           comment_model.send(:private, "can_change_role?".to_sym)
         end
 
-        def comment_define_is_role?(role)
+        def comment_define_is_role?(comment_model, role)
           comment_model.redefine_method("is_#{role}?") do
-            raise(NoMethodError, "undefined method 'is_" + role.to_s + "?'") unless can_change_role?(role.to_s)
-            self.role == role.to_s
+            raise(NoMethodError, "undefined method 'is_" + role + "?'") unless can_change_role?(role)
+            self.role == role
           end
         end
 
-        def comment_define_to_role(role)
+        def comment_define_to_role(comment_model, role)
           comment_model.redefine_method("to_#{role}") do
-            raise(NoMethodError, "undefined method 'is_" + role.to_s + "?'") unless can_change_role?(role.to_s)
-            self.role = role.to_s
+            raise(NoMethodError, "undefined method 'is_" + role + "?'") unless can_change_role?(role)
+            self.role = role
             self
           end
         end
 
-        def comment_define_to_role!(role)
+        def comment_define_to_role!(comment_model, role)
           comment_model.redefine_method("to_#{role}!") do
-            raise(NoMethodError, "undefined method 'is_" + role.to_s + "?'") unless can_change_role?(role.to_s)
-            self.update(role: role.to_s)
+            raise(NoMethodError, "undefined method 'is_" + role + "?'") unless can_change_role?(role)
+            self.update(role: role)
             self
           end
         end

data/lib/acts_as_commentable_more/helpers/post/associations_helper.rb

@@ -5,23 +5,24 @@ module ActsAsCommentableMore
 
         private
 
-        def post_define_role_based_inflection(role, association_comment_name, join_options)
-          send("define_role_based_inflection_#{Rails.version.first}", role, association_comment_name,join_options)
+        def post_define_role_based_inflection(role, association_comment_name)
+          commantable_name = aacm_association_options[:as].to_sym
+          send("define_role_based_inflection_#{Rails.version.first}", role, commantable_name, association_comment_name)
         end
 
-        def define_role_based_inflection_3(role, association_comment_name, join_options)
-          has_many "#{association_comment_name.to_s}".to_sym,
-                   has_many_options(role, join_options).merge(:conditions => { role: role.to_s })
+        def define_role_based_inflection_3(role, commantable_name, association_comment_name)
+          has_many "#{association_comment_name}".to_sym,
+                   has_many_options(role).merge(:conditions => { role: role })
         end
 
-        def define_role_based_inflection_4(role, association_comment_name, join_options)
-          has_many "#{association_comment_name.to_s}".to_sym,
-                   -> { includes(join_options[:as].to_sym, :user).where(role: role.to_s) },
-                   has_many_options(role, join_options)
+        def define_role_based_inflection_4(role, commantable_name, association_comment_name)
+          has_many "#{association_comment_name}".to_sym,
+                   -> { includes(commantable_name, :user).where(role: role) },
+                   has_many_options(role)
         end
 
-        def has_many_options(role, join_options)
-          { before_add: Proc.new { |post, comment| comment.role = role.to_s } }.merge(join_options)
+        def has_many_options(role)
+          { before_add: Proc.new { |post, comment| comment.role = role } }.merge(aacm_association_options)
         end
 
       end

data/lib/acts_as_commentable_more/helpers/post/methods_helper.rb

@@ -6,7 +6,7 @@ module ActsAsCommentableMore
         private
 
         def post_define_create_role(association_comment_name)
-          redefine_method("creates_#{association_comment_name.to_s.pluralize}") do |attributes = nil|
+          redefine_method("creates_#{association_comment_name.pluralize}") do |attributes = nil|
             send(association_comment_name).create(attributes)
           end
         end

data/lib/acts_as_commentable_more/helpers/post/scopes_helper.rb

@@ -3,11 +3,11 @@ module ActsAsCommentableMore
     module Post
       module ScopesHelper
 
-        def post_define_all_scope comment_name, commentable
-          redefine_method("all_#{comment_name.to_s}") do
-            comment_model
-            .includes(commentable.to_sym, :user)
-            .where(commentable.to_sym => self)
+        def post_define_all_scope
+          redefine_method("all_#{aacm_commentable_options[:association_comment_name]}") do
+            aacm_commentable_options[:comment_model]
+            .includes(aacm_association_options[:as].to_sym, :user)
+            .where(aacm_association_options[:as].to_sym => self)
             .order(created_at: :desc)
           end
         end

data/lib/acts_as_commentable_more/version.rb

@@ -1,3 +1,3 @@
 module ActsAsCommentableMore
-  VERSION = "1.2.8"
+  VERSION = "1.2.9"
 end

data/lib/generators/commentable/templates/comment.rb

@@ -2,13 +2,13 @@
 class <%= class_name %> < ActiveRecord::Base
   ###################################################################
   ### To implement commentable add the following line to your model
-  ### acts_as_commentable types: [:hide, :show], options: { class_name: '<%= class_name %>', as: :<%= class_name.demodulize.underscore + "able" %> }, as: :<%= class_name.demodulize.downcase.pluralize %> , counter_cache: true
+  ### acts_as_commentable :<%= class_name.demodulize.downcase.pluralize %>, types: [:hide, :show], options: { class_name: '<%= class_name %>', as: :<%= class_name.demodulize.underscore %>able }, counter_cache: true
   
   ### types is an array of possible comment type
   ### for example if you have public and private comment
   ### your types would be [:public, :private]
 
-  belongs_to :<%= class_name.demodulize.underscore + "able" %>, :polymorphic => true
+  belongs_to :<%= class_name.demodulize.underscore %>able, polymorphic: true
   belongs_to :user, polymorphic: true
 
   ###################################################################

data/lib/generators/commentable/templates/create_comments.rb

@@ -8,7 +8,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration
       t.references :<%= class_name.demodulize.underscore + "able" %>, polymorphic: true
       t.references :user, polymorphic: true, index: true
       t.string :role, default: nil
-      t.hstore :related_attributes
+      t.hstore :related_attributes, default: ''
       t.timestamps
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_commentable_more
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - piya23300
 autorequire: acts_as_commentable_more
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: gem that provides comment functionality.