mongoid 8.1.12 → 9.0.0

data/lib/mongoid/association/referenced/belongs_to/binding.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 module Mongoid
   module Association

data/lib/mongoid/association/referenced/belongs_to/buildable.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 module Mongoid
   module Association

data/lib/mongoid/association/referenced/belongs_to/eager.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 module Mongoid
   module Association
@@ -6,7 +7,7 @@ module Mongoid
       class BelongsTo
 
         # Eager class for belongs_to associations.
-        class Eager < Association::Referenced::Eager::Base
+        class Eager < Association::Eager
 
           private
 

data/lib/mongoid/association/referenced/belongs_to/proxy.rb

@@ -4,11 +4,13 @@ module Mongoid
   module Association
     module Referenced
       class BelongsTo
-
-        # This class handles all behavior for associations that are either
-        # one-to-many or one-to-one, where the foreign key is stored on this side
-        # of the association and the reference is to document(s) in another
-        # collection.
+        # Transparent proxy for belong_to associations.
+        # An instance of this class is returned when calling the
+        # association getter method on the subject document.
+        # This class inherits from Mongoid::Association::Proxy and
+        # forwards most of its methods to the target of the association,
+        # i.e. the document on the opposite-side collection which must
+        # be loaded.
         class Proxy < Association::One
           include Evolvable
 
@@ -20,9 +22,9 @@ module Mongoid
           # @param [ Document ] base The document this association hangs off of.
           # @param [ Document | Array<Document> ] target The target (parent) of the
           #   association.
-          # @param [ Association ] association The association object.
+          # @param [ Mongoid::Association::Relatable ] association The association object.
           def initialize(base, target, association)
-            init(base, target, association) do
+            super do
               characterize_one(_target)
               bind_one
             end
@@ -50,11 +52,11 @@ module Mongoid
           # @return [ self | nil ] The association or nil.
           def substitute(replacement)
             unbind_one
-            if replacement
-              self._target = normalize(replacement)
-              bind_one
-              self
-            end
+            return unless replacement
+
+            self._target = normalize(replacement)
+            bind_one
+            self
           end
 
           private
@@ -81,6 +83,7 @@ module Mongoid
           # @return [ Document ] The document.
           def normalize(replacement)
             return replacement if replacement.is_a?(Document)
+
             _association.build(klass, replacement)
           end
 
@@ -95,13 +98,15 @@ module Mongoid
           end
 
           class << self
-
             # Get the Eager object for this type of association.
             #
             # @example Get the eager loader object
             #
-            # @param [ Association ] association The association object.
+            # @param [ Mongoid::Association::Relatable ] association The association object.
             # @param [ Array<Document> ] docs The array of documents.
+            #
+            # @return [ Mongoid::Association::Referenced::BelongsTo::Eager ]
+            #   The eager loader.
             def eager_loader(association, docs)
               Eager.new(association, docs)
             end

data/lib/mongoid/association/referenced/belongs_to.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require 'mongoid/association/referenced/belongs_to/binding'
 require 'mongoid/association/referenced/belongs_to/buildable'
@@ -51,7 +52,7 @@ module Mongoid
 
         # The list of association complements.
         #
-        # @return [ Array<Association> ] The association complements.
+        # @return [ Array<Mongoid::Association::Relatable> ] The association complements.
         def relation_complements
           @relation_complements ||= [ HasMany, HasOne ].freeze
         end

data/lib/mongoid/association/referenced/counter_cache.rb

@@ -1,8 +1,13 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 module Mongoid
   module Association
     module Referenced
+
+      # Mixin module included into Mongoid::Document which adds
+      # the ability to cache the count of opposite-side documents
+      # in referenced n-to-many associations.
       module CounterCache
         extend ActiveSupport::Concern
 
@@ -88,7 +93,7 @@ module Mongoid
         # @example Add the touchable.
         #   Mongoid::Association::Referenced::CounterCache.define_callbacks!(association)
         #
-        # @param [ Association ] association The association.
+        # @param [ Mongoid::Association::Relatable ] association The association.
         #
         # @return [ Class ] The association's owning class.
         def self.define_callbacks!(association)
@@ -103,7 +108,7 @@ module Mongoid
                 original, current = send("#{foreign_key}_previous_change")
 
                 unless original.nil?
-                  association.klass.with(persistence_context) do |_class|
+                  association.klass.with(persistence_context.for_child(association.klass)) do |_class|
                     _class.decrement_counter(cache_column, original)
                   end
                 end

data/lib/mongoid/association/referenced/has_and_belongs_to_many/binding.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 module Mongoid
   module Association
@@ -18,11 +19,11 @@ module Mongoid
           # @param [ Document ] doc The single document to bind.
           def bind_one(doc)
             binding do
-              inverse_keys = doc.you_must(_association.inverse_foreign_key)
+              inverse_keys = try_method(doc, _association.inverse_foreign_key) unless doc.frozen?
               if inverse_keys
                 record_id = inverse_record_id(doc)
                 unless inverse_keys.include?(record_id)
-                  doc.you_must(_association.inverse_foreign_key_setter, inverse_keys.push(record_id))
+                  try_method(doc, _association.inverse_foreign_key_setter, inverse_keys.push(record_id))
                 end
                 doc.reset_relation_criteria(_association.inverse)
               end
@@ -38,7 +39,7 @@ module Mongoid
           def unbind_one(doc)
             binding do
               _base.send(_association.foreign_key).delete_one(record_id(doc))
-              inverse_keys = doc.you_must(_association.inverse_foreign_key)
+              inverse_keys = try_method(doc, _association.inverse_foreign_key) unless doc.frozen?
               if inverse_keys
                 inverse_keys.delete_one(inverse_record_id(doc))
                 doc.reset_relation_criteria(_association.inverse)
@@ -49,6 +50,11 @@ module Mongoid
           end
 
           # Find the inverse id referenced by inverse_keys
+          #
+          # @param [ Mongoid::Document ] doc The document for which
+          #   to determine the inverse id.
+          #
+          # @return [ BSON::ObjectId ] The inverse id.
           def inverse_record_id(doc)
             if pk = _association.options[:inverse_primary_key]
               _base.send(pk)
@@ -62,6 +68,12 @@ module Mongoid
             end
           end
 
+          # Find the inverse association given a document.
+          #
+          # @param [ Mongoid::Document ] doc The document for which
+          #   to determine the inverse association.
+          #
+          # @return [ Mongoid::Association::Relatable ] The inverse association.
           def determine_inverse_association(doc)
             doc.relations[_base.class.name.demodulize.underscore.pluralize]
           end

data/lib/mongoid/association/referenced/has_and_belongs_to_many/buildable.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 module Mongoid
   module Association

data/lib/mongoid/association/referenced/has_and_belongs_to_many/eager.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 module Mongoid
   module Association
@@ -6,7 +7,7 @@ module Mongoid
       class HasAndBelongsToMany
 
         # Eager class for has_and_belongs_to_many associations.
-        class Eager < Association::Referenced::Eager::Base
+        class Eager < Association::Eager
 
           private
 

data/lib/mongoid/association/referenced/has_and_belongs_to_many/proxy.rb

@@ -4,10 +4,39 @@ module Mongoid
   module Association
     module Referenced
       class HasAndBelongsToMany
-
-        # This class defines the behavior for all associations that are a
-        # many-to-many between documents in different collections.
+        # Transparent proxy for has_and_belongs_to_many associations.
+        # An instance of this class is returned when calling
+        # the association getter method on the subject document.
+        # This class inherits from Mongoid::Association::Proxy and
+        # forwards most of its methods to the target of the association,
+        # i.e. the array of documents on the opposite-side collection
+        # which must be loaded.
         class Proxy < Referenced::HasMany::Proxy
+          # class-level methods for HasAndBelongsToMany::Proxy
+          module ClassMethods
+            # Get the Eager object for this type of association.
+            #
+            # @example Get the eager loader object
+            #
+            # @param [ Mongoid::Association::Relatable ] association The association metadata.
+            # @param [ Array<Document> ] docs The array of documents.
+            def eager_loader(association, docs)
+              Eager.new(association, docs)
+            end
+
+            # Returns true if the association is an embedded one. In this case
+            # always false.
+            #
+            # @example Is this association embedded?
+            #   Referenced::ManyToMany.embedded?
+            #
+            # @return [ false ] Always false.
+            def embedded?
+              false
+            end
+          end
+
+          extend ClassMethods
 
           # Appends a document or array of documents to the association. Will set
           # the parent and update the index in the process.
@@ -24,10 +53,13 @@ module Mongoid
           # @param [ Document... ] *args Any number of documents.
           #
           # @return [ Array<Document> ] The loaded docs.
+          #
+          # rubocop:disable Metrics/AbcSize
           def <<(*args)
             docs = args.flatten
             return concat(docs) if docs.size > 1
-            if doc = docs.first
+
+            if (doc = docs.first)
               append(doc) do
                 # We ignore the changes to the value for the foreign key in the
                 # changed_attributes hash in this block of code for two reasons:
@@ -50,18 +82,16 @@ module Mongoid
                 #    See MONGOID-4843 for a longer discussion about this.
                 reset_foreign_key_changes do
                   _base.add_to_set(foreign_key => doc.public_send(_association.primary_key))
-
-                  if child_persistable?(doc)
-                    doc.save
-                  end
+                  doc.save if child_persistable?(doc)
                   reset_unloaded
                 end
               end
             end
             unsynced(_base, foreign_key) and self
           end
+          # rubocop:enable Metrics/AbcSize
 
-          alias :push :<<
+          alias push <<
 
           # Appends an array of documents to the association. Performs a batch
           # insert of the documents instead of persisting one at a time.
@@ -74,22 +104,8 @@ module Mongoid
           # @return [ Array<Document> ] The documents.
           def concat(documents)
             ids, docs, inserts = {}, [], []
-            documents.each do |doc|
-              next unless doc
-              append(doc)
-              if persistable? || _creating?
-                ids[doc.public_send(_association.primary_key)] = true
-                save_or_delay(doc, docs, inserts)
-              else
-                existing = _base.public_send(foreign_key)
-                unless existing.include?(doc.public_send(_association.primary_key))
-                  existing.push(doc.public_send(_association.primary_key)) and unsynced(_base, foreign_key)
-                end
-              end
-            end
-            if persistable? || _creating?
-              _base.push(foreign_key => ids.keys)
-            end
+            documents.each { |doc| append_document(doc, ids, docs, inserts) }
+            _base.push(foreign_key => ids.keys) if persistable? || _creating?
             persist_delayed(docs, inserts)
             self
           end
@@ -115,7 +131,7 @@ module Mongoid
             doc
           end
 
-          alias :new :build
+          alias new build
 
           # Delete the document from the association. This will set the foreign key
           # on the document to nil. If the dependent options on the association are
@@ -150,46 +166,15 @@ module Mongoid
           #
           # @param [ Array<Document> ] replacement The replacement documents.
           def nullify(replacement = [])
-            _target.each do |doc|
-              execute_callback :before_remove, doc
-            end
-            unless _association.forced_nil_inverse?
-              if field = _association.options[:inverse_primary_key]
-                ipk = _base.public_send(field)
-              else
-                ipk = _base._id
-              end
-              if replacement
-                objects_to_clear = _base.public_send(foreign_key) - replacement.collect do |object|
-                  object.public_send(_association.primary_key)
-                end
-                criteria(objects_to_clear).pull(inverse_foreign_key => ipk)
-              else
-                criteria.pull(inverse_foreign_key => ipk)
-              end
-            end
-            if persistable?
-              _base.set(foreign_key => _base.public_send(foreign_key).clear)
-            end
-            after_remove_error = nil
-            many_to_many = _target.clear do |doc|
-              unbind_one(doc)
-              unless _association.forced_nil_inverse?
-                doc.changed_attributes.delete(inverse_foreign_key)
-              end
-              begin
-                execute_callback :after_remove, doc
-              rescue => e
-                after_remove_error = e
-              end
-            end
-            raise after_remove_error if after_remove_error
-            many_to_many
+            _target.each { |doc| execute_callback :before_remove, doc }
+            cleanup_inverse_for(replacement) unless _association.forced_nil_inverse?
+            _base.set(foreign_key => _base.public_send(foreign_key).clear) if persistable?
+            clear_target_for_nullify
           end
 
-          alias :nullify_all :nullify
-          alias :clear :nullify
-          alias :purge :nullify
+          alias nullify_all nullify
+          alias clear nullify
+          alias purge nullify
 
           # Substitutes the supplied target documents for the existing documents
           # in the association. If the new target is nil, perform the necessary
@@ -203,11 +188,11 @@ module Mongoid
           # @return [ Many ] The association.
           def substitute(replacement)
             purge(replacement)
-            unless replacement.blank?
-              push(replacement.compact.uniq)
-            else
+            if replacement.blank?
               reset_unloaded
               clear_foreign_key_changes
+            else
+              push(replacement.compact.uniq)
             end
             self
           end
@@ -241,14 +226,11 @@ module Mongoid
           #
           # @api private
           def reset_foreign_key_changes
-            if _base.changed_attributes.key?(foreign_key)
-              fk = _base.changed_attributes[foreign_key].dup
-              yield if block_given?
-              _base.changed_attributes[foreign_key] = fk
-            else
-              yield if block_given?
-              clear_foreign_key_changes
-            end
+            prior_fk_change = _base.changed_attributes.key?(foreign_key)
+            fk = _base.changed_attributes[foreign_key].dup
+            yield if block_given?
+            _base.changed_attributes[foreign_key] = fk
+            clear_foreign_key_changes unless prior_fk_change
           end
 
           # Appends the document to the target array, updating the index on the
@@ -289,7 +271,7 @@ module Mongoid
           # @return [ true | false ] If the document can be persisted.
           def child_persistable?(doc)
             (persistable? || _creating?) &&
-                !(doc.persisted? && _association.forced_nil_inverse?)
+              !(doc.persisted? && _association.forced_nil_inverse?)
           end
 
           # Returns the criteria object for the target class with its documents set
@@ -319,29 +301,85 @@ module Mongoid
             true
           end
 
-          class << self
+          # Does the cleanup for the inverse of the association when
+          # replacing the relation with another list of documents.
+          #
+          # @param [ Array<Document> | nil ] replacement the list of documents
+          #   that will replace the current list.
+          def cleanup_inverse_for(replacement)
+            if replacement
+              new_ids = replacement.collect { |doc| doc.public_send(_association.primary_key) }
+              objects_to_clear = _base.public_send(foreign_key) - new_ids
+              criteria(objects_to_clear).pull(inverse_foreign_key => inverse_primary_key)
+            else
+              criteria.pull(inverse_foreign_key => inverse_primary_key)
+            end
+          end
 
-            # Get the Eager object for this type of association.
-            #
-            # @example Get the eager loader object
-            #
-            # @param [ Association ] association The association object.
-            # @param [ Array<Document> ] docs The array of documents.
-            def eager_loader(association, docs)
-              Eager.new(association, docs)
+          # The inverse primary key
+          #
+          # @return [ Object ] the inverse primary key
+          def inverse_primary_key
+            if (field = _association.options[:inverse_primary_key])
+              _base.public_send(field)
+            else
+              _base._id
             end
+          end
 
-            # Returns true if the association is an embedded one. In this case
-            # always false.
-            #
-            # @example Is this association embedded?
-            #   Referenced::ManyToMany.embedded?
-            #
-            # @return [ false ] Always false.
-            def embedded?
-              false
+          # Clears the _target list and executes callbacks for each document.
+          # If an exception occurs in an after_remove hook, the exception is
+          # saved, the processing completes, and *then* the exception is
+          # re-raised.
+          #
+          # @return [ Array<Document> ] the replacement documents
+          def clear_target_for_nullify
+            after_remove_error = nil
+            many_to_many = _target.clear do |doc|
+              unbind_one(doc)
+              doc.changed_attributes.delete(inverse_foreign_key) unless _association.forced_nil_inverse?
+
+              begin
+                execute_callback :after_remove, doc
+              rescue StandardError => e
+                after_remove_error = e
+              end
+            end
+
+            raise after_remove_error if after_remove_error
+
+            many_to_many
+          end
+
+          # Processes a single document as part of a ``concat`` command.
+          #
+          # @param [ Mongoid::Document ] doc the document to append
+          # @param [ Hash ] ids the mapping of primary keys that have been
+          #   visited
+          # @param [ Array ] docs the list of new docs to be inserted later,
+          #   in bulk
+          # @param [ Array ] inserts the list of Hashes of attributes that will
+          #   be inserted (corresponding to the ``docs`` list)
+          #
+          # rubocop:disable Metrics/AbcSize
+          def append_document(doc, ids, docs, inserts)
+            return unless doc
+
+            append(doc)
+
+            pk = doc.public_send(_association.primary_key)
+            if persistable? || _creating?
+              ids[pk] = true
+              save_or_delay(doc, docs, inserts)
+            else
+              existing = _base.public_send(foreign_key)
+              return if existing.include?(pk)
+
+              existing.push(pk)
+              unsynced(_base, foreign_key)
             end
           end
+          # rubocop:enable Metrics/AbcSize
         end
       end
     end

data/lib/mongoid/association/referenced/has_and_belongs_to_many.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require 'mongoid/association/referenced/has_and_belongs_to_many/binding'
 require 'mongoid/association/referenced/has_and_belongs_to_many/buildable'
@@ -53,7 +54,7 @@ module Mongoid
 
         # The list of association complements.
         #
-        # @return [ Array<Association> ] The association complements.
+        # @return [ Array<Mongoid::Association::Relatable> ] The association complements.
         def relation_complements
           @relation_complements ||= [ self.class ].freeze
         end
@@ -263,8 +264,12 @@ module Mongoid
 
         def query_criteria(id_list)
           crit = relation_class.criteria
-          crit = crit.apply_scope(scope)
-          crit = crit.all_of(primary_key => {"$in" => id_list || []})
+          crit = if id_list
+            crit = crit.apply_scope(scope)
+            crit.all_of(primary_key => { "$in" => id_list })
+          else
+            crit.none
+          end
           with_ordering(crit)
         end
       end

data/lib/mongoid/association/referenced/has_many/binding.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 module Mongoid
   module Association

data/lib/mongoid/association/referenced/has_many/buildable.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 module Mongoid
   module Association

data/lib/mongoid/association/referenced/has_many/eager.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 module Mongoid
   module Association
@@ -6,7 +7,7 @@ module Mongoid
       class HasMany
 
         # Eager class for has_many associations.
-        class Eager < Association::Referenced::Eager::Base
+        class Eager < Association::Eager
 
           private