acts-as-taggable-on-mongoid 6.1.1.8 → 6.1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 923975d7d231581699ec0944f7482b0b80b66071bbf042f5ef8264dd70e6f2f9
-  data.tar.gz: 8220f30f3cc1901e0a7d2d8182b28c6cf9f7b7175e7ddddb3ee9cef52dd6cf77
+  metadata.gz: d45c548b71b63a3387393c91cee4d02f0e7531aa608e0ff5d70622361d2a796c
+  data.tar.gz: 5e565201e0be8bd6fdecba7f441acbe51c7b38af301b58ed6bcf75217dd1f587
 SHA512:
-  metadata.gz: 8115eb367985f2609847c95a54285a03d488f77eb5bbe390104539c7aec5fa68dc7530776371a888be68283cc77d0443ec01a0c7378532c5f73edee783ba93d1
-  data.tar.gz: 024c2fd74c764ab2658e1b77df1d375721c67d47fd212c4390b1494c601fe8b04cc8dd5fff65ebbe8ff7acd67572897fc3c4ab714e3122dd8cfeca24457ff66c
+  metadata.gz: fe813547f33c204e03aca29c728ea4e860738471d4b96dddce26f21161a25dd51f70c20c3b125501d79618a0bef4e7001cd1d160b03c160bbdc58e8265aae9aa
+  data.tar.gz: eeb852d2b50a68591381a864b04ba3e36280c0cdea769ebd646ce1864f1c5eaca5593dfb222227e0eb34cb02dca454c64f0beb373e374bc2c26706cb3db3383e

data/.rubocop.yml

@@ -1,7 +1,7 @@
 require: rubocop-performance
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.7.1
   Exclude:
     - 'vendor/**/*'
     - 'db/schema.rb'
@@ -409,3 +409,15 @@ Layout/HashAlignment:
     - always_ignore
     - ignore_implicit
     - ignore_explicit
+
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
+Style/ExponentialNotation:
+  Enabled: true

data/.ruby-version

@@ -1 +1 @@
-2.6.3
+2.7.1

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    acts-as-taggable-on-mongoid (6.1.1.8)
+    acts-as-taggable-on-mongoid (6.1.1.10)
       activesupport (>= 5.0)
       mongoid (>= 6.1.1, <= 7.0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.0.0)
-      activesupport (= 5.0.0)
-    activesupport (5.0.0)
+    activemodel (5.2.4.2)
+      activesupport (= 5.2.4.2)
+    activesupport (5.2.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.7.0)
@@ -22,8 +22,8 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    brakeman (4.8.0)
-    bson (4.7.1)
+    brakeman (4.8.1)
+    bson (4.8.2)
     code_analyzer (0.5.1)
       sexp_processor
     codeclimate-engine-rb (0.4.1)
@@ -38,26 +38,26 @@ GEM
     concurrent-ruby (1.1.6)
     cornucopia (0.1.56)
       activesupport (> 4.0, < 6.0)
-    database_cleaner (1.8.2)
+    database_cleaner (1.8.4)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
     docile (1.3.2)
     equalizer (0.0.11)
     erubis (2.7.0)
-    faraday (1.0.0)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    fasterer (0.8.2)
+    fasterer (0.8.3)
       colorize (~> 0.7)
       ruby_parser (>= 3.14.1)
     gem-release (2.1.1)
-    gitlab (4.13.1)
+    gitlab (4.14.1)
       httparty (~> 0.14, >= 0.14.0)
       terminal-table (~> 1.5, >= 1.5.1)
     httparty (0.18.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (0.9.5)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     jaro_winkler (1.5.4)
@@ -65,20 +65,20 @@ GEM
     kwalify (0.7.2)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
+    mime-types-data (3.2020.0425)
     minitest (5.14.0)
-    mongo (2.11.3)
+    mongo (2.11.4)
       bson (>= 4.4.2, < 5.0.0)
-    mongoid (6.1.1)
-      activemodel (~> 5.0)
-      mongo (>= 2.4.1, < 3.0.0)
+    mongoid (7.0.2)
+      activemodel (>= 5.1, < 6.0.0)
+      mongo (>= 2.5.1, < 3.0.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    octokit (4.16.0)
+    octokit (4.18.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     parallel (1.19.1)
-    parser (2.7.0.2)
+    parser (2.7.1.1)
       ast (~> 2.4.0)
     pronto (0.10.0)
       gitlab (~> 4.0, >= 4.0.0)
@@ -105,8 +105,8 @@ GEM
       pronto (~> 0.10.0)
       rubocop (~> 0.50, >= 0.49.1)
     psych (3.1.0)
-    public_suffix (4.0.3)
-    rails_best_practices (1.19.5)
+    public_suffix (4.0.4)
+    rails_best_practices (1.20.0)
       activesupport
       code_analyzer (>= 0.5.1)
       erubis
@@ -130,7 +130,7 @@ GEM
       rspec-mocks (~> 3.9.0)
     rspec-core (3.9.1)
       rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
@@ -139,28 +139,28 @@ GEM
     rspec-support (3.9.2)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.80.0)
+    rubocop (0.82.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-performance (1.5.2)
       rubocop (>= 0.71.0)
     ruby-progressbar (1.10.1)
     ruby_parser (3.14.2)
       sexp_processor (~> 4.9)
-    rugged (0.28.4.1)
+    rugged (0.99.0)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     sexp_processor (4.14.1)
-    simplecov (0.18.2)
+    simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.0)
+    simplecov-html (0.12.2)
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
     terminal-table (1.8.0)
@@ -170,7 +170,7 @@ GEM
     timecop (0.9.1)
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.1)
+    unicode-display_width (1.7.0)
     url (0.3.2)
     virtus (1.0.5)
       axiom-types (~> 0.1)

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

@@ -57,6 +57,7 @@ module ActsAsTaggableOnMongoid
 
     autoload_under "models/concerns" do
       autoload :TagFields
+      autoload :TagHooks
       autoload :TagAssociations
       autoload :TagValidations
       autoload :TagScopes

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

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module ActsAsTaggableOnMongoid
+  module Models
+    module Concerns
+      # Update and Destroy hooks for tags to update denormalized data.
+      #
+      # NOTE:  If the tag is cached AND owned, assumptions are made about the
+      #        relationship of a Tag to the Taggings and the taggable_type.
+      #
+      #        Specifically, the taggable_type is assumed to have an ID field that
+      #        matches the owner.  This field can be specified in the tag_definition
+      #        as owner_id_field.
+      #
+      #        If there isn't a simple relationship like this then override the following
+      #        methods to update the cached data properly:
+      #         * remove_cached_taggings
+      #         * update_cached_taggings
+      module TagHooks
+        extend ActiveSupport::Concern
+
+        included do
+          after_update :denormalize_tag_name
+          after_destroy :remove_cached_taggings
+        end
+
+        private
+
+        def denormalize_tag_name
+          return unless name_changed?
+
+          update_taggings
+          update_cached_taggings
+        end
+
+        def update_taggings
+          taggings.update_all(tag_name: name)
+        end
+
+        def remove_cached_taggings
+          return if tag_definition.blank?
+          return unless tag_definition.cached_in_model?
+
+          cached_fields_query(name).update_all("$pull" => { "cached_#{tag_definition.tag_list_name}" => name })
+        end
+
+        def update_cached_taggings
+          return if tag_definition.blank?
+          return unless tag_definition.cached_in_model?
+
+          cached_fields_query(name_was).update_all("$set" => { "cached_#{tag_definition.tag_list_name}.$" => name })
+        end
+
+        def cached_fields_query(chached_field_value)
+          query = { "cached_#{tag_definition.tag_list_name}" => chached_field_value }
+
+          if owner_id.present?
+            id_field = tag_definition.owner_id_field || "#{owner_type.underscore}_id"
+
+            query[id_field] = owner_id
+          end
+
+          taggable_type.constantize.unscoped.where(query)
+        end
+      end
+    end
+  end
+end

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

@@ -22,19 +22,17 @@ module ActsAsTaggableOnMongoid
             return [] if list.empty?
 
             list.map do |tag_name|
-              begin
-                tries ||= 3
-
-                find_or_create_tag(tag_name, tag_definition, owner)
-              rescue Mongoid::Errors::Validations
-                # :nocov:
-                if (tries -= 1).positive?
-                  retry
-                end
-
-                raise ActsAsTaggableOnMongoid::Errors::DuplicateTagError.new, "'#{tag_name}' has already been taken"
-                # :nocov:
+              tries ||= 3
+
+              find_or_create_tag(tag_name, tag_definition, owner)
+            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
 
@@ -52,8 +50,6 @@ module ActsAsTaggableOnMongoid
             string.mb_chars
           end
 
-          private
-
           def find_or_create_tag(tag_name, tag_definition, owner)
             existing_tag = tag_definition.tags_table.for_tag(tag_definition).named(tag_name).owned_by(owner).first
 
@@ -75,6 +71,12 @@ module ActsAsTaggableOnMongoid
         def to_s
           name
         end
+
+        private
+
+        def tag_definition
+          @tag_definition ||= taggable_type.constantize.tag_types[context]
+        end
       end
     end
   end

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

@@ -12,6 +12,7 @@ module ActsAsTaggableOnMongoid
           include ActsAsTaggableOnMongoid::Models::Concerns::TagAssociations
           include ActsAsTaggableOnMongoid::Models::Concerns::TagValidations
           include ActsAsTaggableOnMongoid::Models::Concerns::TagScopes
+          include ActsAsTaggableOnMongoid::Models::Concerns::TagHooks
         end
       end
     end

data/lib/acts_as_taggable_on_mongoid/taggable.rb

@@ -23,6 +23,9 @@ module ActsAsTaggableOnMongoid
       #       as_list: true/false - If the cached value should be an Array or a String.  No order is guaranteed
       #                             in either case.
       #                             Defaults to true.
+      #   * owner_id_field
+      #     If cached_in_model is true, if a tag is owned, this is the field that will be checked for a matching
+      #     owner ID for tag updates and deletes.
       #   * force_lowercase
       #     If true, values stored for tags will first be downcased to make the values effectively case-insensitive
       #   * force_parameterize

data/lib/acts_as_taggable_on_mongoid/taggable/tag_type_definition.rb

@@ -37,6 +37,7 @@ module ActsAsTaggableOnMongoid
                       cached_in_model
                       force_lowercase
                       force_parameterize
+                      owner_id_field
                       remove_unused_tags
                       tags_table
                       taggings_table].each_with_object({}) { |dup_key, opts_hash| opts_hash[dup_key] = tag_definition.public_send(dup_key) }
@@ -189,6 +190,7 @@ module ActsAsTaggableOnMongoid
                                   :cached_in_model,
                                   :force_lowercase,
                                   :force_parameterize,
+                                  :owner_id_field,
                                   :remove_unused_tags,
                                   :tags_table,
                                   :taggings_table,

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

@@ -6,6 +6,7 @@ module ActsAsTaggableOnMongoid
       # This module defines methods used to evaluate the attributes of the Tag Type Definition
       module Attributes
         attr_reader :cached_in_model,
+                    :owner_id_field,
                     :default
 
         def parser

data/lib/acts_as_taggable_on_mongoid/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-on-mongoid
 version: !ruby/object:Gem::Version
-  version: 6.1.1.8
+  version: 6.1.1.10
 platform: ruby
 authors:
 - RealNobody
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-28 00:00:00.000000000 Z
+date: 2020-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -334,6 +334,7 @@ files:
 - 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_hooks.rb
 - lib/acts_as_taggable_on_mongoid/models/concerns/tag_methods.rb
 - lib/acts_as_taggable_on_mongoid/models/concerns/tag_migration.rb
 - lib/acts_as_taggable_on_mongoid/models/concerns/tag_model.rb
@@ -391,7 +392,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A partial mongoid implementation of tagging based on/inspired by acts-as-taggable-on.