acts_as_commentable2 7.1.0.1 → 7.2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cba4e2158759d8b64431532ea6549f553098890ee51d31d10c6395699c34d3b4
-  data.tar.gz: b0422fd7970df076c0fdf8435c3f0eb331945d17b915261ba5db31a751df894f
+  metadata.gz: 1025e16458f3cbd4cf626aa47ac5bc333d91d171af2bc7927cede9a77a4b6635
+  data.tar.gz: 35b6beb57cdbce25fe90c5224c5c107cd81290e34ca21269b51b6ce071a44611
 SHA512:
-  metadata.gz: b6a93a595c46937d7f3fd1dc3fd8e50e857bdcd34382eb0ae3c034dd64c589b0bcdbd8eae3e2545648c18fef4f77947245f5925aa32374f6578ed91a1c7a108f
-  data.tar.gz: e7dd1cc9f91a6ed2b4031f4be45a7b5d50941443f98df5e73dda31def652051f426592e1bc2a4b7336c492e4d00eeb0100e2f28cd7eb768444719dc5eec48fe6
+  metadata.gz: 673c8bd078e3446afe30687c0215f6d4bde83966b0a8c39538c1677977cc8de26c941b5c7bb6e54d88d4639a0ca6e3ecfd5df8d97134815c378a709ec5e6c5fc
+  data.tar.gz: 2a432e27973ec295786736f4049ad4352b7f07ff4e943652e584b04d46e4212830d4ff2b5eb6a5237e3523f2bcfcf6979b2bf7d233ef6dcb31b0aba5eec202fa

data/README.rdoc

@@ -13,6 +13,7 @@ Add the following line to your Gemfile
 
   gem 'acts_as_commentable', git: 'git@github.com:fatfreecrm/acts_as_commentable.git'
 
+Choose the appropriate tag for your rails version.
  
 == Generator
 

data/lib/comment_methods.rb

@@ -29,7 +29,8 @@ module ActsAsCommentable
       # Helper class method to look up all comments for
       # commentable class name and commentable id.
       def find_comments_for_commentable(commentable_str, commentable_id, role = 'comments')
-        where(['commentable_type = ? and commentable_id = ? and role = ?', commentable_str, commentable_id, role]).order('created_at DESC')
+        where(['commentable_type = ? and commentable_id = ? and role = ?', commentable_str, commentable_id,
+               role]).order('created_at DESC')
       end
 
       # Helper class method to look up a commentable object

data/lib/commentable_methods.rb

@@ -2,8 +2,8 @@ require 'active_record'
 
 # ActsAsCommentable
 module Juixe
-  module Acts #:nodoc:
-    module Commentable #:nodoc:
+  module Acts # :nodoc:
+    module Commentable # :nodoc:
       def self.included(base)
         base.extend ClassMethods
       end
@@ -12,9 +12,9 @@ module Juixe
         private
 
         def define_role_based_inflection(role)
-          return if method_defined?("#{role}_comments".to_sym)
+          return if method_defined?(:"#{role}_comments")
 
-          has_many "#{role}_comments".to_sym,
+          has_many :"#{role}_comments",
                    -> { where(role: role.to_s) },
                    **has_many_options(role)
         end
@@ -44,13 +44,13 @@ module Juixe
           class_attribute :comment_types
           self.comment_types = (comment_roles.blank? ? [:comments] : comment_roles)
 
-          if !comment_roles.blank?
+          if comment_roles.blank?
+            has_many :comments, as: :commentable, dependent: :destroy, **join_options
+          else
             comment_roles.each do |role|
               define_role_based_inflection(role)
             end
-            has_many :all_comments, **{ as: :commentable, dependent: :destroy, class_name: 'Comment' }.merge(join_options)
-          else
-            has_many :comments, **{ as: :commentable, dependent: :destroy }.merge(join_options)
+            has_many :all_comments, as: :commentable, dependent: :destroy, class_name: 'Comment', **join_options
           end
 
           comment_types.each do |role|
@@ -64,7 +64,9 @@ module Juixe
 
               def self.find_#{method_name}_by_user(user)
                 commentable = self.base_class.name
-                Comment.where(["user_id = ? and commentable_type = ? and role = ?", user.id, commentable, "#{role}"]).order("created_at DESC")
+                Comment.where([
+                  "user_id = ? and commentable_type = ? and role = ?", user.id, commentable, "#{role}"
+                ]).order("created_at DESC")
               end
 
               def #{method_name}_ordered_by_submitted
@@ -75,7 +77,7 @@ module Juixe
                 comment.role = "#{role}"
                 #{method_name} << comment
               end
-            }
+            }, __FILE__, __LINE__ - 21
           end
         end
       end
@@ -83,4 +85,4 @@ module Juixe
   end
 end
 
-ActiveRecord::Base.send(:include, Juixe::Acts::Commentable)
+ActiveRecord::Base.include Juixe::Acts::Commentable

data/lib/generators/comment/comment_generator.rb

@@ -4,7 +4,7 @@ class CommentGenerator < Rails::Generators::Base
   include Rails::Generators::Migration
 
   def self.source_root
-    @_acts_as_commentable_source_root ||= File.expand_path('templates', __dir__)
+    @source_root ||= File.expand_path('templates', __dir__)
   end
 
   def self.next_migration_number(_path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_commentable2
 version: !ruby/object:Gem::Version
-  version: 7.1.0.1
+  version: 7.2.0.1
 platform: ruby
 authors:
 - Cosmin Radoi, Jack Dempsey, Xelipe, Chris Eppstein
@@ -16,16 +16,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
 description: Plugin/gem that provides comment functionality
-email: unknown@juixe.com
+email: daniel.oconnor@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -46,7 +46,8 @@ files:
 homepage: http://www.juixe.com/techknow/index.php/2006/06/18/acts-as-commentable-plugin/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -54,7 +55,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -62,6 +63,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.6.2
-specification_version: 3
+specification_version: 4
 summary: Plugin/gem that provides comment functionality
 test_files: []