acts-as-taggable-on-mongoid 6.0.1.5 → 6.1.1.7

data/lib/acts_as_taggable_on_mongoid/taggable/tag_type_definition/changeable.rb

@@ -11,16 +11,36 @@ module ActsAsTaggableOnMongoid
       #   * tag_list_will_change!
       #   * tag_list_changed_from_default?
       #   * tag_list_was
+      #   * tagger_tag_list_was
+      #   * tag_lists_was
       #   * reset_tag_list!
       #   * reset_tag_list_to_default!
+
+      # :reek:FeatureEnvy
+      # :reek:DuplicateMethodCall
       module Changeable
+        def default_tagger_tag_list(taggable)
+          list = ActsAsTaggableOnMongoid::TaggerTagList.new(self, nil)
+
+          list_default              = default.dup
+          list_default.taggable     = taggable
+          list_default.tagger       = list_default.tagger
+          list[list_default.tagger] = list_default
+
+          list.taggable = taggable
+
+          list
+        end
+
+        private
+
         def add_list_exists
           tag_definition = self
           tag_list_name  = tag_definition.tag_list_name
 
           owner.taggable_mixin.module_eval do
             define_method("#{tag_list_name}?") do
-              public_send(tag_list_name).present?
+              tag_list_cache_on(tag_definition).values.any?(&:present?)
             end
           end
         end
@@ -31,48 +51,29 @@ module ActsAsTaggableOnMongoid
 
           owner.taggable_mixin.module_eval do
             define_method("#{tag_list_name}_change") do
-              return nil unless public_send("#{tag_list_name}_changed?")
-
-              changed_value = public_send("#{tag_list_name}_was")
-              current_value = public_send(tag_list_name)
-
-              [changed_value, current_value] unless current_value == changed_value
+              get_tag_list_change(tag_definition)
             end
           end
         end
 
-        # rubocop:disable Metrics/AbcSize
-
         def add_list_changed
           tag_definition = self
           tag_list_name  = tag_definition.tag_list_name
 
           owner.taggable_mixin.module_eval do
             define_method("#{tag_list_name}_changed?") do
-              return false unless changed_attributes.key?(tag_list_name)
-
-              changed_value = new_record? ? tag_definition.default : changed_attributes[tag_list_name]
-              current_value = public_send(tag_list_name)
-
-              unless tag_definition.preserve_tag_order?
-                changed_value.sort!
-                current_value.sort!
-              end
-
-              current_value != changed_value
+              get_tag_list_changed(tag_definition)
             end
           end
         end
 
-        # rubocop:enable Metrics/AbcSize
-
         def add_will_change
           tag_definition = self
           tag_list_name  = tag_definition.tag_list_name
 
           owner.taggable_mixin.module_eval do
             define_method("#{tag_list_name}_will_change!") do
-              attribute_wil_change! tag_list_name
+              attribute_will_change! tag_list_name
             end
           end
         end
@@ -83,15 +84,10 @@ module ActsAsTaggableOnMongoid
 
           owner.taggable_mixin.module_eval do
             define_method("#{tag_list_name}_changed_from_default?") do
-              changed_value = tag_definition.default
-              current_value = public_send(tag_list_name)
-
-              unless tag_definition.preserve_tag_order?
-                changed_value.sort!
-                current_value.sort!
-              end
+              changed_value = tag_definition.default_tagger_tag_list(self)
+              current_value = tag_list_cache_on(tag_definition)
 
-              current_value != changed_value
+              !(changed_value <=> current_value)&.zero?
             end
           end
         end
@@ -102,13 +98,28 @@ module ActsAsTaggableOnMongoid
 
           owner.taggable_mixin.module_eval do
             define_method("#{tag_list_name}_was") do
-              return tag_definition.default if new_record?
+              get_tag_list_was tag_definition
+            end
+          end
+        end
+
+        def add_get_lists_was
+          tag_definition = self
 
-              if public_send "#{tag_list_name}_changed?"
-                changed_attributes[tag_list_name]
-              else
-                public_send tag_list_name
-              end
+          owner.taggable_mixin.module_eval do
+            define_method("#{tag_definition.tagger_tag_lists_name}_was") do
+              get_tag_lists_was(tag_definition)
+            end
+          end
+        end
+
+        def add_tagger_get_was
+          tag_definition = self
+          tag_list_name  = tag_definition.tag_list_name
+
+          owner.taggable_mixin.module_eval do
+            define_method("tagger_#{tag_list_name}_was") do |tagger|
+              get_tagger_list_was(tag_definition, tagger)
             end
           end
         end
@@ -119,7 +130,9 @@ module ActsAsTaggableOnMongoid
 
           owner.taggable_mixin.module_eval do
             define_method("reset_#{tag_list_name}!") do
-              public_send "#{tag_list_name}=", public_send("#{tag_list_name}_was")
+              return unless public_send("#{tag_list_name}_changed?")
+
+              tagger_tag_list_set(changed_attributes[tag_list_name].dup)
             end
           end
         end
@@ -130,7 +143,7 @@ module ActsAsTaggableOnMongoid
 
           owner.taggable_mixin.module_eval do
             define_method("reset_#{tag_list_name}_to_default!") do
-              public_send "#{tag_list_name}=", tag_definition.default
+              tagger_tag_list_set(tag_definition.default_tagger_tag_list(self))
             end
           end
         end

data/lib/acts_as_taggable_on_mongoid/taggable/tag_type_definition/list_methods.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module ActsAsTaggableOnMongoid
+  module Taggable
+    class TagTypeDefinition
+      # This module extracts out the methods used to add list methods to the taggable object
+      module ListMethods
+        def add_list_getter
+          tag_definition = self
+          tag_list_name  = tag_definition.tag_list_name
+
+          owner.taggable_mixin.module_eval do
+            define_method(tag_list_name) do
+              tag_list_on tag_definition
+            end
+
+            alias_method "#{tag_list_name}_before_type_cast".to_sym, tag_list_name.to_sym
+          end
+        end
+
+        def add_list_setter
+          tag_definition = self
+
+          owner.taggable_mixin.module_eval do
+            define_method("#{tag_definition.tag_list_name}=") do |new_tags|
+              set_tag_list(tag_definition, new_tags)
+            end
+          end
+        end
+
+        def add_all_list_getter
+          tag_definition = self
+
+          owner.taggable_mixin.module_eval do
+            define_method(tag_definition.all_tag_list_name) do
+              all_tags_list_on tag_definition
+            end
+          end
+        end
+
+        def add_tagger_tag_list
+          tag_definition = self
+          tag_list_name  = tag_definition.tagger_tag_list_name
+
+          owner.taggable_mixin.module_eval do
+            define_method(tag_list_name) do |owner|
+              return nil unless tag_definition.tagger?
+
+              tag_list_cache_on(tag_definition)[owner]
+            end
+          end
+        end
+
+        def add_tag_list_from
+          tag_definition = self
+
+          owner.taggable_mixin.module_eval do
+            define_method(tag_definition.from_list_name) do |owner|
+              public_send(tag_definition.tagger_tag_list_name, owner)
+            end
+          end
+        end
+
+        def add_tagger_tag_lists
+          tag_definition = self
+          tag_list_name  = tag_definition.tagger_tag_lists_name
+
+          owner.taggable_mixin.module_eval do
+            define_method(tag_list_name) do
+              tag_list_cache_on(tag_definition)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_taggable_on_mongoid/taggable/tag_type_definition/names.rb

@@ -10,6 +10,18 @@ module ActsAsTaggableOnMongoid
           @tag_list_name ||= "#{single_tag_type}_list"
         end
 
+        def from_list_name
+          @from_list_name ||= "#{tag_type.to_s.pluralize}_from"
+        end
+
+        def tagger_tag_list_name
+          @tagger_tag_list_name ||= "tagger_#{single_tag_type}_list"
+        end
+
+        def tagger_tag_lists_name
+          @tagger_tag_lists_name ||= "tagger_#{single_tag_type}_lists"
+        end
+
         def tag_list_variable_name
           @tag_list_variable_name ||= "@#{tag_list_name}"
         end

data/lib/acts_as_taggable_on_mongoid/taggable/tagged_with_query/all_tags_query.rb

@@ -10,7 +10,7 @@ module ActsAsTaggableOnMongoid
         end
 
         def included_ids
-          selector         = Origin::Selector.new
+          selector         = Mongoid::Criteria::Queryable::Selector.new
           selector[:count] = tag_list.count
 
           build_ids_from(selector)

data/lib/acts_as_taggable_on_mongoid/taggable/tagged_with_query/any_tags_query.rb

@@ -10,7 +10,7 @@ module ActsAsTaggableOnMongoid
         end
 
         def included_ids
-          selector         = Origin::Selector.new
+          selector         = Mongoid::Criteria::Queryable::Selector.new
           selector[:count] = { "$gt" => 0 }
 
           build_ids_from(selector)

data/lib/acts_as_taggable_on_mongoid/taggable/tagged_with_query/exclude_tags_query.rb

@@ -10,7 +10,7 @@ module ActsAsTaggableOnMongoid
         end
 
         def included_ids
-          selector         = Origin::Selector.new
+          selector         = Mongoid::Criteria::Queryable::Selector.new
           selector[:count] = { "$gt" => 0 }
 
           ids = build_ids_from(selector)

data/lib/acts_as_taggable_on_mongoid/taggable/tagged_with_query/match_all_tags_query.rb

@@ -10,7 +10,7 @@ module ActsAsTaggableOnMongoid
         end
 
         def included_ids
-          selector         = Origin::Selector.new
+          selector         = Mongoid::Criteria::Queryable::Selector.new
           selector[:count] = { "$ne" => tag_list.count }
 
           AllTagsQuery.new(tag_definition, tag_list, options).included_ids -

data/lib/acts_as_taggable_on_mongoid/taggable/tagger_relation.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module ActsAsTaggableOnMongoid
+  module Taggable
+    # Overides of methods from Mongoid::Processing which process attributes for methods like
+    # `assign_attributes`, `create`, `new`, and `update_attributes`
+    #
+    # The need for this override is because the base method splits the order that methods are
+    # processed in to process relationships after processing other attributes.
+    #
+    # However, tag lists may rely upon values set in relationships - forcing us to process
+    # tag lists AFTER relationships have been processed - preventing the need to order attributes
+    # (which wouldn't help anyway because of the way process_attributes works.)
+    #
+    # ONLY taggings that have a default and which accept tagger values and which default the
+    # tagger based on the taggable object could be affected by other attributes set at the same time
+    # as the tag list.  Thus only those tag values are delayed until after all other attributes are set.
+    module TaggerRelation
+      def process_attributes(attrs = nil)
+        update_attrs, defaulted_attrs = atom_attributes_without_defaults(attrs)
+
+        super(update_attrs)
+
+        defaulted_attrs.each do |key, value|
+          public_send("#{key}=", value)
+        end
+      end
+
+      private
+
+      def atom_attributes_without_defaults(attrs)
+        return_attributes    = {}
+        defaulted_attributes = {}
+
+        sanitize_for_mass_assignment(attrs)&.each do |key, value|
+          tag_def = atom_tag_definition_from_type(key)
+
+          if tag_def&.tag_list_uses_default_tagger?
+            defaulted_attributes[key] = value
+          else
+            return_attributes[key] = value
+          end
+        end
+
+        [return_attributes, defaulted_attributes]
+      end
+
+      def atom_tag_definition_from_type(key)
+        tag_types.detect { |_type, tag_definition| tag_definition.tag_list_name == key.to_s }&.last
+      end
+    end
+  end
+end

data/lib/acts_as_taggable_on_mongoid/taggable/utils/tag_list_diff.rb

@@ -18,7 +18,7 @@ module ActsAsTaggableOnMongoid
         def initialize(tag_definition:, tags:, current_tags:)
           @tag_definition = tag_definition
           @tags           = tags
-          @current_tags   = current_tags
+          @current_tags   = current_tags.map(&:tag).compact
 
           @old_tags = {}
           @new_tags = {}
@@ -35,7 +35,7 @@ module ActsAsTaggableOnMongoid
           new_tags.each do |tag|
             tagging = taggable.
                 public_send(tag_definition.taggings_name).
-                new(tag_name: tag.name, context: tag_definition.tag_type, taggable: taggable, tag: tag)
+                new(tag_name: tag.name, context: tag_definition.tag_type, taggable: taggable, tag: tag, tagger: tag.owner)
 
             next if tagging.save
             next if ignore_tagging_error(tagging)
@@ -50,8 +50,8 @@ module ActsAsTaggableOnMongoid
 
           taggable.
               public_send(tag_definition.taggings_name).
-              by_context(tag_definition.tag_type).
-              where(:tag_name.in => old_tags.map(&:name)).
+              by_tag_type(tag_definition.tag_type).
+              where(:tag_id.in => old_tags.map(&:id)).
               destroy_all
         end
 
@@ -94,14 +94,16 @@ module ActsAsTaggableOnMongoid
 
         # :reek:NestedIterators
         def preserve_new_tag_list_order
-          preserved_tags = new_tags | current_tags[first_ordered_difference..-1] & shared_tags
-
           # Order the array of tag objects to match the tag list
           @new_tags = tags.map do |tag|
-            preserved_tags.detect { |preserved_tag| preserved_tag.name == tag.name }
+            preserved_tags.detect { |preserved_tag| preserved_tag.name == tag.name && preserved_tag.owner == tag.owner }
           end.compact
         end
 
+        def preserved_tags
+          @preserved_tags ||= new_tags | current_tags[first_ordered_difference..-1] & shared_tags
+        end
+
         def first_ordered_difference
           return @first_ordered_difference if defined?(@first_ordered_difference)
 

data/lib/acts_as_taggable_on_mongoid/tagger.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module ActsAsTaggableOnMongoid
+  # This module defines the class methods to be added to the Mongoid model so that
+  # tags can be defined on and added to a model.
+  #
+  # When a tag is added to a model, additional modules will be included to add methods that
+  # are needed only if a tag is actually being used.
+  module Tagger
+    extend ActiveSupport::Concern
+
+    # rubocop:disable Metrics/BlockLength
+
+    class_methods do
+      # Options include:
+      #   * tags_table
+      #     The class to use for Tags
+      #   * taggings_table
+      #     The class to use for Taggings
+
+      # Make a model a tagger.  This allows a model to claim ownership of taggings and their tags.
+      #
+      # Example:
+      #   class User
+      #     acts_as_tagger
+      #   end
+      def acts_as_tagger(options = {})
+        options = options.with_indifferent_access
+
+        add_taggings_tagger_relation(options)
+        add_tags_owner_relation(options)
+
+        include ActsAsTaggableOnMongoid::Tagger::TagMethods
+      end
+
+      private
+
+      def add_tags_owner_relation(options)
+        tags_table = options[:tags_table] || ActsAsTaggableOnMongoid.tags_table
+        table_name = tags_table.name
+        tags_name  = "owned_#{table_name.demodulize.underscore.downcase.pluralize.to_sym}"
+
+        return if relations[tags_name.to_s]
+
+        has_many tags_name,
+                 as:         :owner,
+                 dependent:  :destroy,
+                 class_name: table_name
+      end
+
+      def add_taggings_tagger_relation(options)
+        taggings_table = options[:taggings_table] || ActsAsTaggableOnMongoid.taggings_table
+        table_name     = taggings_table.name
+        taggings_name  = "owned_#{table_name.demodulize.underscore.downcase.pluralize.to_sym}"
+
+        return if relations[taggings_name.to_s]
+
+        has_many taggings_name,
+                 as:         :tagger,
+                 dependent:  :destroy,
+                 class_name: table_name
+      end
+    end
+
+    # rubocop:enable Metrics/BlockLength
+  end
+end