acts-as-taggable-on-mongoid 6.0.1.2 → 6.0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d93a7c1beb5fbe71abb708118e35b734203691f
-  data.tar.gz: 6ae2ad0b0060b5265c879338aa26d4684d551a26
+  metadata.gz: c13fda8fcc653c6f63e06b5cede43f5981330550
+  data.tar.gz: 0e29ec9543e00254f4b495b40ff6f2499c8cb0cd
 SHA512:
-  metadata.gz: e5ac3c342c801316fb57ace4fc70f143db77c1204ace3cc3ee7a192de608e64dd5d2737afa9bd6284a355719dda04d34d474105410ee3b07947df895d61de2cb
-  data.tar.gz: 13f2f14dd4cda732d427f4e0c71f3eaf8efacbaa9a8bc74417fbf7ad68edb1a0b9e72523ee9d3e26552682d9ed7c1045f63548e0b790384c658e03d9c8267658
+  metadata.gz: eb149028e0ba4adc52119f84059fbb8afd5090f14d1812895b69b01697df8603c93b392982dd1c766adc34da443059820c22ce34ef392e3b04906f21242d5fbf
+  data.tar.gz: 2e07b06e928dacc5d88a409f5fb8985b3a5f032a5422ba2ec4e30930baf2bfb03ee6bffedce2f6625edd4281f2811ffb71cb9af7b204cd4c9f35aef9c52f8cf2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    acts-as-taggable-on-mongoid (6.0.1.2)
+    acts-as-taggable-on-mongoid (6.0.1.3)
       activesupport (~> 4.2)
       mongoid (~> 5.2)
 
@@ -38,7 +38,7 @@ GEM
       descendants_tracker (~> 0.0.1)
     colorize (0.8.1)
     concurrent-ruby (1.0.5)
-    cornucopia (0.1.53)
+    cornucopia (0.1.55)
       activesupport (< 5.0)
     database_cleaner (1.7.0)
     descendants_tracker (0.0.4)
@@ -74,7 +74,7 @@ GEM
       tzinfo (>= 0.3.37)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    octokit (4.11.0)
+    octokit (4.12.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     origin (2.3.1)
     parallel (1.12.1)
@@ -138,7 +138,7 @@ GEM
     rspec-support (3.8.0)
     rspec_junit_formatter (0.3.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.59.0)
+    rubocop (0.59.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)

data/lib/acts-as-taggable-on-mongoid.rb

@@ -48,6 +48,22 @@ module ActsAsTaggableOnMongoid
 
     autoload :Taggable
 
+    autoload_under "models/concerns" do
+      autoload :TagFields
+      autoload :TagAssociations
+      autoload :TagValidations
+      autoload :TagScopes
+      autoload :TagMethods
+      autoload :TagModel
+
+      autoload :TaggingFields
+      autoload :TaggingAssociations
+      autoload :TaggingValidations
+      autoload :TaggingScopes
+      autoload :TaggingMethods
+      autoload :TaggingModel
+    end
+
     autoload_under :Models do
       autoload :Tag
       autoload :Tagging

data/lib/acts_as_taggable_on_mongoid/models/concerns/tag_associations.rb

@@ -0,0 +1,15 @@
+module ActsAsTaggableOnMongoid
+  module Models
+    module Concerns
+      module TagAssociations
+        extend ActiveSupport::Concern
+
+        included do
+          ### ASSOCIATIONS:
+
+          has_many :taggings, dependent: :destroy, class_name: "ActsAsTaggableOnMongoid::Models::Tagging"
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_taggable_on_mongoid/models/concerns/tag_fields.rb

@@ -0,0 +1,23 @@
+module ActsAsTaggableOnMongoid
+  module Models
+    module Concerns
+      module TagFields
+        extend ActiveSupport::Concern
+
+        included do
+          include Mongoid::Document
+          include Mongoid::Timestamps
+
+          field :name, type: String
+          field :taggings_count, type: Integer, default: 0
+          field :context, type: String
+          field :taggable_type, type: String
+
+          # field :type, type: String
+
+          index({ name: 1, taggable_type: 1, context: 1 }, unique: true)
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_taggable_on_mongoid/models/concerns/tag_methods.rb

@@ -0,0 +1,67 @@
+module ActsAsTaggableOnMongoid
+  module Models
+    module Concerns
+      module TagMethods
+        extend ActiveSupport::Concern
+
+        ### CLASS METHODS:
+
+        class_methods do
+          def find_or_create_all_with_like_by_name(tag_definition, *list)
+            list = ActsAsTaggableOnMongoid::TagList.new(tag_definition, *Array.wrap(list).flatten)
+
+            return [] if list.empty?
+
+            list.map do |tag_name|
+              begin
+                tries ||= 3
+
+                existing_tag = tag_definition.tags_table.for_tag(tag_definition).named(tag_name).first
+
+                existing_tag || create_tag(tag_definition, tag_name)
+              rescue Mongoid::Errors::Validations
+                # :nocov:
+                if (tries -= 1).positive?
+                  retry
+                end
+
+                raise ActsAsTaggableOnMongoid::Errors::DuplicateTagError.new, "'#{tag_name}' has already been taken"
+                # :nocov:
+              end
+            end
+          end
+
+          def create_tag(tag_definition, name)
+            tag_definition.tags_table.create(name:          name,
+                                             context:       tag_definition.tag_type,
+                                             taggable_type: tag_definition.owner.name)
+          end
+
+          def as_8bit_ascii(string)
+            string = string.to_s
+            if defined?(Encoding)
+              string.dup.force_encoding("BINARY")
+            else
+              # :nocov:
+              string.mb_chars
+              # :nocov:
+            end
+          end
+        end
+
+        ### INSTANCE METHODS:
+
+        def ==(other)
+          super || (other.class == self.class &&
+              name == other.name &&
+              context == other.context &&
+              taggable_type == other.taggable_type)
+        end
+
+        def to_s
+          name
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_taggable_on_mongoid/models/concerns/tag_model.rb

@@ -0,0 +1,17 @@
+module ActsAsTaggableOnMongoid
+  module Models
+    module Concerns
+      module TagModel
+        extend ActiveSupport::Concern
+
+        included do
+          include ActsAsTaggableOnMongoid::Models::Concerns::TagFields
+          include ActsAsTaggableOnMongoid::Models::Concerns::TagMethods
+          include ActsAsTaggableOnMongoid::Models::Concerns::TagAssociations
+          include ActsAsTaggableOnMongoid::Models::Concerns::TagValidations
+          include ActsAsTaggableOnMongoid::Models::Concerns::TagScopes
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_taggable_on_mongoid/models/concerns/tag_scopes.rb

@@ -0,0 +1,23 @@
+module ActsAsTaggableOnMongoid
+  module Models
+    module Concerns
+      module TagScopes
+        extend ActiveSupport::Concern
+
+        included do
+          ### SCOPES:
+          scope :most_used, ->(limit = 20) { order("taggings_count desc").limit(limit) }
+          scope :least_used, ->(limit = 20) { order("taggings_count asc").limit(limit) }
+
+          scope :named, ->(name) { where(name: as_8bit_ascii(name)) }
+          scope :named_any, ->(*names) { where(:name.in => names.map { |name| as_8bit_ascii(name) }) }
+          scope :named_like, ->(name) { where(name: /#{as_8bit_ascii(name)}/i) }
+          scope :named_like_any, ->(*names) { where(:name.in => names.map { |name| /#{as_8bit_ascii(name)}/i }) }
+          scope :for_context, ->(context) { where(context: context) }
+          scope :for_taggable_class, ->(taggable_type) { where(taggable_type: taggable_type.name) }
+          scope :for_tag, ->(tag_definition) { for_taggable_class(tag_definition.owner).for_context(tag_definition.tag_type) }
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_taggable_on_mongoid/models/concerns/tag_validations.rb

@@ -0,0 +1,18 @@
+module ActsAsTaggableOnMongoid
+  module Models
+    module Concerns
+      module TagValidations
+        extend ActiveSupport::Concern
+
+        included do
+          ### VALIDATIONS:
+
+          validates :name, presence: true
+          validates :context, presence: true
+          validates :taggable_type, presence: true
+          validates :name, uniqueness: { scope: %i[context taggable_type] }
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_taggable_on_mongoid/models/concerns/tagging_associations.rb

@@ -0,0 +1,15 @@
+module ActsAsTaggableOnMongoid
+  module Models
+    module Concerns
+      module TaggingAssociations
+        extend ActiveSupport::Concern
+
+        included do
+          belongs_to :tag, counter_cache: true, inverse_of: :taggings
+          belongs_to :taggable, polymorphic: true
+          # belongs_to :tagger, { polymorphic: true, optional: true }
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_taggable_on_mongoid/models/concerns/tagging_fields.rb

@@ -0,0 +1,22 @@
+module ActsAsTaggableOnMongoid
+  module Models
+    module Concerns
+      module TaggingFields
+        extend ActiveSupport::Concern
+
+        included do
+          include Mongoid::Document
+          include Mongoid::Timestamps
+
+          field :tag_name, type: String
+          field :context, type: String
+
+          # If/when adding the concept of a tagger, this index will need to be changed.
+          index({ taggable_id: 1, taggable_type: 1, context: 1, tag_name: 1 }, unique: true, name: "tagging_taggable_context_tag_name")
+          index(tag_name: 1)
+          index(tag_id: 1, tag_type: 1)
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_taggable_on_mongoid/models/concerns/tagging_methods.rb

@@ -0,0 +1,51 @@
+module ActsAsTaggableOnMongoid
+  module Models
+    module Concerns
+      # This module includes the methods and callbacks needed/used by a Tagging model
+      module TaggingMethods
+        extend ActiveSupport::Concern
+
+        included do
+          after_save :tagging_saved
+          after_destroy :tagging_destroyed
+          after_destroy :remove_unused_tags
+        end
+
+        ### INSTANCE METHODS:
+
+        private
+
+        def remove_unused_tags
+          return nil unless taggable
+
+          tag_definition = taggable.tag_types[context]
+
+          return unless tag_definition&.remove_unused_tags?
+
+          tag.destroy if tag.reload.taggings_count.zero?
+        end
+
+        def tagging_saved
+          tag_definition = taggable.tag_types[context]
+
+          return unless tag_definition
+
+          tag_list = taggable.public_send(tag_definition.tag_list_name)
+          tag_list.add_tagging(self)
+        end
+
+        def tagging_destroyed
+          taggable_was = taggable_type_was.constantize.where(id: taggable_id_was).first
+
+          return unless taggable_was
+
+          tag_definition = taggable_was.tag_types[context_was]
+
+          return unless tag_definition
+
+          taggable_was.public_send(tag_definition.tag_list_name).remove(tag_name_was)
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_taggable_on_mongoid/models/concerns/tagging_model.rb

@@ -0,0 +1,25 @@
+module ActsAsTaggableOnMongoid
+  module Models
+    module Concerns
+      # This module includes all methods and defintions needed/used by a Tagging model.
+      #
+      # Tagging model definitions are done via including this or the sub-modules so that
+      # the definitions of the core attributes for a Tagging model can be defined in each
+      # class separately.
+      #
+      # The primary reason for doing this is validations, which call the superclass validations
+      # for classes that inherit causing problems with independent inherted classes.
+      module TaggingModel
+        extend ActiveSupport::Concern
+
+        included do
+          include ActsAsTaggableOnMongoid::Models::Concerns::TaggingFields
+          include ActsAsTaggableOnMongoid::Models::Concerns::TaggingMethods
+          include ActsAsTaggableOnMongoid::Models::Concerns::TaggingAssociations
+          include ActsAsTaggableOnMongoid::Models::Concerns::TaggingValidations
+          include ActsAsTaggableOnMongoid::Models::Concerns::TaggingScopes
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_taggable_on_mongoid/models/concerns/tagging_scopes.rb

@@ -0,0 +1,21 @@
+module ActsAsTaggableOnMongoid
+  module Models
+    module Concerns
+      # This module includes the scopes needed/used by a Tagging model
+      module TaggingScopes
+        extend ActiveSupport::Concern
+
+        DEFAULT_CONTEXT = "tags"
+
+        included do
+          # scope :owned_by, ->(owner) { where(tagger: owner) }
+          # scope :not_owned, -> { where(tagger_id: nil, tagger_type: nil) }
+
+          scope :by_contexts, ->(*contexts) { where(:context.in => Array.wrap(contexts.presence || DEFAULT_CONTEXT)) }
+          scope :by_context, ->(context = DEFAULT_CONTEXT) { by_contexts(context.to_s) }
+          scope :for_tag, ->(tag_definition) { where(taggable_type: tag_definition.owner.name).by_context(tag_definition.tag_type) }
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_taggable_on_mongoid/models/concerns/tagging_validations.rb

@@ -0,0 +1,22 @@
+module ActsAsTaggableOnMongoid
+  module Models
+    module Concerns
+      # This module includes the validations needed/used by a Tagging model
+      module TaggingValidations
+        extend ActiveSupport::Concern
+
+        included do
+          validates :tag_name, presence: true
+          validates :context, presence: true
+          validates :tag, presence: true
+          validates :taggable, presence: true
+
+          # validates :tag_id, uniqueness: {scope: [:taggable_type, :taggable_id, :context, :tagger_id, :tagger_type]}
+          validates :tag_name, uniqueness: { scope: %i[taggable_type taggable_id context] }
+          # validates :tag_id, uniqueness: {scope: [:taggable_type, :taggable_id, :context, :tagger_id, :tagger_type]}
+          validates :tag_id, uniqueness: { scope: %i[taggable_type taggable_id context] }
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_taggable_on_mongoid/models/tag.rb

@@ -4,100 +4,7 @@ module ActsAsTaggableOnMongoid
   module Models
     # A class representing all tags that have ever been set on a model.
     class Tag
-      include Mongoid::Document
-      include Mongoid::Timestamps
-
-      field :name, type: String
-      field :taggings_count, type: Integer, default: 0
-      field :context, type: String
-      field :taggable_type, type: String
-
-      # field :type, type: String
-
-      index({ name: 1, taggable_type: 1, context: 1 }, unique: true)
-
-      ### ASSOCIATIONS:
-
-      has_many :taggings, dependent: :destroy, class_name: "ActsAsTaggableOnMongoid::Models::Tagging"
-
-      ### VALIDATIONS:
-
-      validates :name, presence: true
-      validates :context, presence: true
-      validates :taggable_type, presence: true
-      validates :name, uniqueness: { scope: %i[context taggable_type] }
-
-      ### SCOPES:
-      scope :most_used, ->(limit = 20) { order("taggings_count desc").limit(limit) }
-      scope :least_used, ->(limit = 20) { order("taggings_count asc").limit(limit) }
-
-      scope :named, ->(name) { where(name: as_8bit_ascii(name)) }
-      scope :named_any, ->(*names) { where(:name.in => names.map { |name| as_8bit_ascii(name) }) }
-      scope :named_like, ->(name) { where(name: /#{as_8bit_ascii(name)}/i) }
-      scope :named_like_any, ->(*names) { where(:name.in => names.map { |name| /#{as_8bit_ascii(name)}/i }) }
-      scope :for_context, ->(context) { where(context: context) }
-      scope :for_taggable_class, ->(taggable_type) { where(taggable_type: taggable_type.name) }
-      scope :for_tag, ->(tag_definition) { for_taggable_class(tag_definition.owner).for_context(tag_definition.tag_type) }
-
-      ### CLASS METHODS:
-
-      class << self
-        def find_or_create_all_with_like_by_name(tag_definition, *list)
-          list = ActsAsTaggableOnMongoid::TagList.new(tag_definition, *Array.wrap(list).flatten)
-
-          return [] if list.empty?
-
-          list.map do |tag_name|
-            begin
-              tries ||= 3
-
-              existing_tag = tag_definition.tags_table.for_tag(tag_definition).named(tag_name).first
-
-              existing_tag || create_tag(tag_definition, tag_name)
-            rescue Mongoid::Errors::Validations
-              # :nocov:
-              if (tries -= 1).positive?
-                retry
-              end
-
-              raise ActsAsTaggableOnMongoid::Errors::DuplicateTagError.new, "'#{tag_name}' has already been taken"
-              # :nocov:
-            end
-          end
-        end
-
-        private
-
-        def create_tag(tag_definition, name)
-          tag_definition.tags_table.create(name:          name,
-                                           context:       tag_definition.tag_type,
-                                           taggable_type: tag_definition.owner.name)
-        end
-
-        def as_8bit_ascii(string)
-          string = string.to_s
-          if defined?(Encoding)
-            string.dup.force_encoding("BINARY")
-          else
-            # :nocov:
-            string.mb_chars
-            # :nocov:
-          end
-        end
-      end
-
-      ### INSTANCE METHODS:
-
-      def ==(other)
-        super || (other.class == self.class &&
-            name == other.name &&
-            context == other.context &&
-            taggable_type == other.taggable_type)
-      end
-
-      def to_s
-        name
-      end
+      include ActsAsTaggableOnMongoid::Models::Concerns::TagModel
     end
   end
 end

data/lib/acts_as_taggable_on_mongoid/models/tagging.rb

@@ -4,77 +4,7 @@ module ActsAsTaggableOnMongoid
   module Models
     # A class representing the actual tags assigned to a particular model object
     class Tagging
-      include Mongoid::Document
-      include Mongoid::Timestamps
-
-      DEFAULT_CONTEXT = "tags"
-
-      after_save :tagging_saved
-      after_destroy :tagging_destroyed
-
-      field :tag_name, type: String
-      field :context, type: String
-
-      belongs_to :tag, counter_cache: true, inverse_of: :taggings
-      belongs_to :taggable, polymorphic: true
-      # belongs_to :tagger, { polymorphic: true, optional: true }
-
-      # If/when adding the concept of a tagger, this index will need to be changed.
-      index({ taggable_id: 1, taggable_type: 1, context: 1, tag_name: 1 }, unique: true, name: "tagging_taggable_context_tag_name")
-      index(tag_name: 1)
-      index(tag_id: 1, tag_type: 1)
-
-      # scope :owned_by, ->(owner) { where(tagger: owner) }
-      # scope :not_owned, -> { where(tagger_id: nil, tagger_type: nil) }
-
-      scope :by_contexts, ->(*contexts) { where(:context.in => Array.wrap(contexts.presence || DEFAULT_CONTEXT)) }
-      scope :by_context, ->(context = DEFAULT_CONTEXT) { by_contexts(context.to_s) }
-      scope :for_tag, ->(tag_definition) { where(taggable_type: tag_definition.owner.name).by_context(tag_definition.tag_type) }
-
-      validates :tag_name, presence: true
-      validates :context, presence: true
-      validates :tag, presence: true
-      validates :taggable, presence: true
-
-      # validates :tag_id, uniqueness: {scope: [:taggable_type, :taggable_id, :context, :tagger_id, :tagger_type]}
-      validates :tag_name, uniqueness: { scope: %i[taggable_type taggable_id context] }
-      # validates :tag_id, uniqueness: {scope: [:taggable_type, :taggable_id, :context, :tagger_id, :tagger_type]}
-      validates :tag_id, uniqueness: { scope: %i[taggable_type taggable_id context] }
-
-      after_destroy :remove_unused_tags
-
-      private
-
-      def remove_unused_tags
-        return nil unless taggable
-
-        tag_definition = taggable.tag_types[context]
-
-        return unless tag_definition&.remove_unused_tags?
-
-        tag.destroy if tag.reload.taggings_count.zero?
-      end
-
-      def tagging_saved
-        tag_definition = taggable.tag_types[context]
-
-        return unless tag_definition
-
-        tag_list = taggable.public_send(tag_definition.tag_list_name)
-        tag_list.add_tagging(self)
-      end
-
-      def tagging_destroyed
-        taggable_was = taggable_type_was.constantize.where(id: taggable_id_was).first
-
-        return unless taggable_was
-
-        tag_definition = taggable_was.tag_types[context_was]
-
-        return unless tag_definition
-
-        taggable_was.public_send(tag_definition.tag_list_name).remove(tag_name_was)
-      end
+      include ActsAsTaggableOnMongoid::Models::Concerns::TaggingModel
     end
   end
 end

data/lib/acts_as_taggable_on_mongoid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActsAsTaggableOnMongoid
-  VERSION = "6.0.1.2"
+  VERSION = "6.0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-on-mongoid
 version: !ruby/object:Gem::Version
-  version: 6.0.1.2
+  version: 6.0.1.3
 platform: ruby
 authors:
 - RealNobody
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2018-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -326,6 +326,18 @@ files:
 - lib/acts_as_taggable_on_mongoid/default_parser.rb
 - lib/acts_as_taggable_on_mongoid/errors/duplicate_tag_error.rb
 - lib/acts_as_taggable_on_mongoid/generic_parser.rb
+- lib/acts_as_taggable_on_mongoid/models/concerns/tag_associations.rb
+- lib/acts_as_taggable_on_mongoid/models/concerns/tag_fields.rb
+- lib/acts_as_taggable_on_mongoid/models/concerns/tag_methods.rb
+- lib/acts_as_taggable_on_mongoid/models/concerns/tag_model.rb
+- lib/acts_as_taggable_on_mongoid/models/concerns/tag_scopes.rb
+- lib/acts_as_taggable_on_mongoid/models/concerns/tag_validations.rb
+- lib/acts_as_taggable_on_mongoid/models/concerns/tagging_associations.rb
+- lib/acts_as_taggable_on_mongoid/models/concerns/tagging_fields.rb
+- lib/acts_as_taggable_on_mongoid/models/concerns/tagging_methods.rb
+- lib/acts_as_taggable_on_mongoid/models/concerns/tagging_model.rb
+- lib/acts_as_taggable_on_mongoid/models/concerns/tagging_scopes.rb
+- lib/acts_as_taggable_on_mongoid/models/concerns/tagging_validations.rb
 - lib/acts_as_taggable_on_mongoid/models/tag.rb
 - lib/acts_as_taggable_on_mongoid/models/tagging.rb
 - lib/acts_as_taggable_on_mongoid/tag_list.rb