acts_as_commentable_more 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 037f9f38c5c7fd1a25f744df3f3a0c49e78f2e69
-  data.tar.gz: e061ee04950bd58ac4eda48e24d6514a51ab1c36
+  metadata.gz: 765add18f643c88f9c310c82fbe8a4a147759bfb
+  data.tar.gz: c9e2e38774735fd8563836a5bb9bd8fc60e54e39
 SHA512:
-  metadata.gz: a0563be11b18e542f091c016c10797d378f675677cb18128fd7b086f33c6863e80af39b03cbfa473da6524660529247d421215af1ef1728555b66c7139a4a28d
-  data.tar.gz: 258925f06bee0b39f901e1b5db50fad0c4ffa670e517124143363221c550084aaf05f9ea979c4982f7e3a2b6da5f8277e44b99c5d2f555d8192bfde1aeb10aa0
+  metadata.gz: 9b0b142c6e0e69ea986d08c06d127cf50429229cfa5092e16e319e3f07f8d4a8d55726ed943c2440e3a163b8423efdcb63130924ddc0c2329386347e9380e8d2
+  data.tar.gz: 7f8a5dc85e78b00e3fd418c148452437b20020255750707f96087a327f6a25da3bd042f283e7a6719af145c38d39de86777eba7be2612dec8ac9ea2b2fea1ce6

data/lib/acts_as_commentable_more/commentable_methods.rb

@@ -1,4 +1,4 @@
-Dir[File.dirname(__FILE__) + "/helpers/**/*.rb"].each {|file| require file }
+Dir[File.dirname(__FILE__) + "/helpers/**/*.rb"].each {|file| require_relative file }
 
 module ActsAsCommentableMore
   extend ActiveSupport::Concern
@@ -8,7 +8,7 @@ module ActsAsCommentableMore
     include Helpers::Post::MethodsHelper
     include Helpers::Post::ScopesHelper
     include Helpers::Comment::CacheCounterHelper
-    include Helpers::Comment::MethodsHelper
+    include Helpers::Comment::InstanceMethodsHelper
 
     def acts_as_commentable(types: [], options: {}, as: nil, counter_cache: true)
       mattr_accessor :comment_model
@@ -28,32 +28,35 @@ module ActsAsCommentableMore
         ###########################
         ###    basic comment    ###
         ###########################
-        define_role_based_inflection(comment_roles.first, association_comment_name, association_options)
-        define_create_role_comments(association_comment_name)
+        post_define_role_based_inflection(comment_roles.first, association_comment_name, association_options)
+        post_define_create_role(association_comment_name)
       else
         ###########################
         ### many roles comment  ###
         ###########################
         # scope method for post model
-        define_all_comments_scope(association_comment_name, association_options[:as])
+        post_define_all_scope(association_comment_name, association_options[:as])
         
         comment_roles.each do |role|
           # association for post model
           association_name = "#{role.to_s}_#{association_comment_name.to_s}"
-          define_role_based_inflection(role, association_name, association_options)
+          post_define_role_based_inflection(role, association_name, association_options)
           # support method for comment model
-          define_create_role_comments(association_name)
-          define_is_role?(role)
-          define_to_role(role)
-          define_to_role!(role)
+          post_define_create_role(association_name)
+          comment_define_is_role?(role)
+          comment_define_to_role(role)
+          comment_define_to_role!(role)
         end
         # helpper method for comment model
-        define_can_change_role_of(association_options[:as])
+        comment_define_can_change_role_of(association_options[:as])
       end
 
        # counter cache for comment model
-      define_counter_cache_role_comment_callback(association_comment_name, association_options[:as]) if enable_counter_cache
+      comment_define_counter_cache_role(association_comment_name, association_options[:as]) if enable_counter_cache
 
+      # instance method for comment
+      comment_define_instance_method
+      comment_define_class_method
     end
 
   end

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

@@ -5,7 +5,7 @@ module ActsAsCommentableMore
 
         private
 
-        def define_counter_cache_role_comment_callback association_comment_name, commentable_name
+        def comment_define_counter_cache_role 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

data/lib/acts_as_commentable_more/helpers/comment/{methods_helper.rb → instance_methods_helper.rb}

@@ -1,11 +1,38 @@
 module ActsAsCommentableMore
   module Helpers
     module Comment
-      module MethodsHelper
+      module InstanceMethodsHelper
 
         private
 
-        def define_can_change_role_of(commentable_name)
+        def comment_define_instance_method
+
+          comment_model.class_eval do
+            def related_attributes
+              read_attribute(:related_attributes).symbolize_keys
+            end
+          end
+
+        end
+
+        def comment_define_class_method
+          
+          comment_model.class_eval do
+
+            class << self
+
+              def find_comments_by_user(user, role = nil)
+                attr_finder = { user: user }
+                attr_finder.merge!(role: role.to_s) if role.present?
+                where(attr_finder).order(created_at: :desc)
+              end
+
+            end
+          end
+
+        end
+
+        def comment_define_can_change_role_of(commentable_name)
           comment_model.redefine_method("can_change_role?") do |role|
             commentable_class = send(commentable_name).class
             limit_role = commentable_class.comment_roles
@@ -14,14 +41,14 @@ module ActsAsCommentableMore
           comment_model.send(:private, "can_change_role?".to_sym)
         end
 
-        def define_is_role?(role)
+        def comment_define_is_role?(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
           end
         end
 
-        def define_to_role(role)
+        def comment_define_to_role(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
@@ -29,7 +56,7 @@ module ActsAsCommentableMore
           end
         end
 
-        def define_to_role!(role)
+        def comment_define_to_role!(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)

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

@@ -5,7 +5,7 @@ module ActsAsCommentableMore
 
         private
 
-        def define_role_based_inflection(role, association_comment_name, join_options)
+        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)
         end
 

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

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

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

@@ -3,7 +3,7 @@ module ActsAsCommentableMore
     module Post
       module ScopesHelper
 
-        def define_all_comments_scope comment_name, commentable
+        def post_define_all_scope comment_name, commentable
           redefine_method("all_#{comment_name.to_s}") do
             comment_model
             .includes(commentable.to_sym, :user)

data/lib/acts_as_commentable_more/version.rb

@@ -1,3 +1,3 @@
 module ActsAsCommentableMore
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 end

data/lib/acts_as_commentable_more.rb

@@ -1,7 +1,4 @@
 module ActsAsCommentableMore
-  require 'acts_as_commentable_more/commentable_methods'
-  require 'acts_as_commentable_more/comment_methods'
-
+  require_relative 'acts_as_commentable_more/commentable_methods'
   ActiveRecord::Base.send(:include, ActsAsCommentableMore)
-
 end

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

@@ -8,8 +8,6 @@ class <%= class_name %> < ActiveRecord::Base
   ### for example if you have public and private comment
   ### your types would be [:public, :private]
 
-  include ActsAsCommentableMore::Finders
-
   belongs_to :<%= class_name.demodulize.underscore + "able" %>, :polymorphic => true
   belongs_to :user, polymorphic: true
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_commentable_more
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - piya23300
 autorequire: acts_as_commentable_more
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -76,10 +76,9 @@ files:
 - MIT-LICENSE
 - Rakefile
 - lib/acts_as_commentable_more.rb
-- lib/acts_as_commentable_more/comment_methods.rb
 - lib/acts_as_commentable_more/commentable_methods.rb
 - lib/acts_as_commentable_more/helpers/comment/cache_counter_helper.rb
-- lib/acts_as_commentable_more/helpers/comment/methods_helper.rb
+- lib/acts_as_commentable_more/helpers/comment/instance_methods_helper.rb
 - lib/acts_as_commentable_more/helpers/post/associations_helper.rb
 - lib/acts_as_commentable_more/helpers/post/methods_helper.rb
 - lib/acts_as_commentable_more/helpers/post/scopes_helper.rb
@@ -121,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: gem that provides comment functionality.

data/lib/acts_as_commentable_more/comment_methods.rb

@@ -1,18 +0,0 @@
-module ActsAsCommentableMore::Finders
-  extend ActiveSupport::Concern
-
-  def related_attributes
-    read_attribute(:related_attributes).symbolize_keys
-  end
-  
-  module ClassMethods
-
-    def find_comments_by_user(user, role = nil)
-      attr_finder = { user: user }
-      attr_finder.merge!(role: role.to_s) if role.present?
-      where(attr_finder).order("created_at DESC")
-    end
-    
-  end
-
-end