acts_as_commentable_more 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d51dd167465cc7e7cfa7292a1d5ab6fe668a0b51
-  data.tar.gz: 1dca0c84401a50288562fa380416f2b6f6d886a4
+  metadata.gz: a700a1c603c1dff97419b559c0f72a3fcfbe0c70
+  data.tar.gz: cdab54377ee4ab193bc2db96b63860f8ff96db03
 SHA512:
-  metadata.gz: c30f803e905e088b4454d5721d8b86477c93375d48d77e405a6f3958855c20dcb0c4761dea630a7d58b0aeeb0ba9e91b676471e77e282a074bd4f35e2442d9ce
-  data.tar.gz: c1b027f827e48377e7aeee58e3c62e8ae43ee4d8e08aad6e3ff4874bfc3c4cfe68edc49b1646f45b492d1c66ec10ad3c1c629c8032891b84f0d8c0beaee78969
+  metadata.gz: 493e49085a113635c59a4fa3e5d48816840eb792d88c2edb9605209036a259ff811d5fe1fb89ec4fa6d49e24c05b480fb5c68f3b5841578f763fd94febaa0fb6
+  data.tar.gz: 77c8f29135dc326f76564dc61ee3f6f729d33f2ef3b5317e070955cf663c61001c7a0cae24d4a604a7ba5c2399d89511d3fbc3b2bab913c51e0111e2d8532789

data/lib/acts_as_commentable_more/commentable_methods.rb

@@ -15,14 +15,12 @@ module ActsAsCommentableMore
       mattr_accessor :comment_roles
 
       default_options = {as: :commentable, dependent: :destroy, class_name: 'Comment'}
-      default_as = :comments
-      default_roles = [default_as.to_s.singularize.to_sym]
 
       types = types.flatten.compact.map(&:to_sym)
 
       association_options = default_options.merge(options.compact)
-      association_comment_name = (as || default_as).to_s.pluralize
-      self.comment_roles = types.present? ? types : [association_comment_name.to_s.singularize.to_sym]
+      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
 
@@ -54,7 +52,7 @@ module ActsAsCommentableMore
       end
 
        # counter cache for comment model
-      define_counter_cache_role_comment_callback(association_options[:as]) if enable_counter_cache
+      define_counter_cache_role_comment_callback(association_comment_name, association_options[:as]) if enable_counter_cache
 
     end
 

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

@@ -5,7 +5,7 @@ module ActsAsCommentableMore
 
         private
 
-        def define_counter_cache_role_comment_callback commentable_name
+        def define_counter_cache_role_comment_callback 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
@@ -15,8 +15,7 @@ module ActsAsCommentableMore
             end
 
             comment_model.redefine_method("acts_as_commentable_more_increment!") do
-              comment_table_name = self.class.table_name
-              all_counter_field = "#{comment_table_name}_count"
+              all_counter_field = "#{association_comment_name}_count"
               role_counter_field = "#{self.role.to_s}_#{all_counter_field}"
               post_model = self.send("#{commentable_name}_type").classify.constantize
               attributes_post = post_model.column_names
@@ -31,8 +30,7 @@ module ActsAsCommentableMore
             comment_model.send(:private, "acts_as_commentable_more_increment!".to_sym)
 
             comment_model.redefine_method("acts_as_commentable_more_decrement!") do
-              comment_table_name = self.class.table_name
-              all_counter_field = "#{comment_table_name}_count"
+              all_counter_field = "#{association_comment_name}_count"
               role_counter_field = "#{self.role.to_s}_#{all_counter_field}"
               post_model = self.send("#{commentable_name}_type").classify.constantize
               attributes_post = post_model.column_names

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

@@ -5,17 +5,17 @@ module ActsAsCommentableMore
 
         private
 
-        def define_role_based_inflection(role, association_name, join_options)
-          send("define_role_based_inflection_#{Rails.version.first}", role, association_name,join_options)
+        def define_role_based_inflection(role, association_comment_name, join_options)
+          send("define_role_based_inflection_#{Rails.version.first}", role, association_comment_name,join_options)
         end
 
-        def define_role_based_inflection_3(role, association_name, join_options)
-          has_many "#{association_name.to_s}".to_sym,
+        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 })
         end
 
-        def define_role_based_inflection_4(role, association_name, join_options)
-          has_many "#{association_name.to_s}".to_sym,
+        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)
         end

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

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

data/lib/acts_as_commentable_more/version.rb

@@ -1,3 +1,3 @@
 module ActsAsCommentableMore
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/test/dummy/spec/models/letter_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
 RSpec.describe Letter, :type => :model do
-  it { should have_many(:hide_comments).dependent(:destroy).class_name('CustomComment').conditions(role: 'hide') }
-  it { should have_many(:show_comments).dependent(:destroy).class_name('CustomComment').conditions(role: 'show') }
+  it { should have_many(:hide_custom_comments).dependent(:destroy).class_name('CustomComment').conditions(role: 'hide') }
+  it { should have_many(:show_custom_comments).dependent(:destroy).class_name('CustomComment').conditions(role: 'show') }
 end

data/test/dummy/spec/models/topic_spec.rb

@@ -1,5 +1,5 @@
 require 'rails_helper'
 
 RSpec.describe Topic, :type => :model do
-  it { should have_many(:comments).dependent(:destroy).class_name('CustomComment').conditions(role: 'comment') }
+  it { should have_many(:custom_comments).dependent(:destroy).class_name('CustomComment').conditions(role: 'custom_comment') }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_commentable_more
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - piya23300