mongoid 9.0.11 → 9.1.0

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'mongoid/association/referenced/has_many/binding'
 require 'mongoid/association/referenced/has_many/buildable'
@@ -11,7 +10,6 @@ require 'mongoid/association/referenced/with_polymorphic_criteria'
 module Mongoid
   module Association
     module Referenced
-
       # The has_many association.
       class HasMany
         include Relatable
@@ -22,18 +20,18 @@ module Mongoid
         # common ones.
         #
         # @return [ Array<Symbol> ] The extra valid options.
-        ASSOCIATION_OPTIONS = [
-            :after_add,
-            :after_remove,
-            :as,
-            :autosave,
-            :before_add,
-            :before_remove,
-            :dependent,
-            :foreign_key,
-            :order,
-            :primary_key,
-            :scope,
+        ASSOCIATION_OPTIONS = %i[
+          after_add
+          after_remove
+          as
+          autosave
+          before_add
+          before_remove
+          dependent
+          foreign_key
+          order
+          primary_key
+          scope
         ].freeze
 
         # The complete list of valid options for this association, including
@@ -45,7 +43,7 @@ module Mongoid
         # The default foreign key suffix.
         #
         # @return [ String ] '_id'
-        FOREIGN_KEY_SUFFIX = '_id'.freeze
+        FOREIGN_KEY_SUFFIX = '_id'
 
         # The list of association complements.
         #
@@ -78,30 +76,38 @@ module Mongoid
           self
         end
 
-
         # Get the foreign key field on the inverse for saving the association reference.
         #
         # @return [ String ] The foreign key field on the inverse for saving the
         #   association reference.
         def foreign_key
-          @foreign_key ||= @options[:foreign_key] ? @options[:foreign_key].to_s :
+          @foreign_key ||= if @options[:foreign_key]
+                             @options[:foreign_key].to_s
+                           else
                              default_foreign_key_field
+                           end
         end
 
         # Is this association type embedded?
         #
         # @return [ false ] Always false.
-        def embedded?; false; end
+        def embedded?
+          false
+        end
 
         # The default for validation the association object.
         #
         # @return [ true ] Always true.
-        def validation_default; true; end
+        def validation_default
+          true
+        end
 
         # Does this association type store the foreign key?
         #
         # @return [ true ] Always true.
-        def stores_foreign_key?; false; end
+        def stores_foreign_key?
+          false
+        end
 
         # Get the association proxy class for this association type.
         #
@@ -200,18 +206,18 @@ module Mongoid
           @default_foreign_key_field ||= "#{inverse}#{FOREIGN_KEY_SUFFIX}"
         end
 
-        def polymorphic_inverses(other)
+        def polymorphic_inverses(_other)
           [ as ]
         end
 
         def determine_inverses(other)
           matches = (other || relation_class).relations.values.select do |rel|
             relation_complements.include?(rel.class) &&
-                rel.relation_class_name == inverse_class_name
-
+              rel.relation_class_name == inverse_class_name
           end
           if matches.size > 1
             return [ default_inverse.name ] if default_inverse
+
             raise Errors::AmbiguousRelationship.new(relation_class, @owner_class, name, matches)
           end
           matches.collect { |m| m.name } unless matches.blank?
@@ -242,7 +248,7 @@ module Mongoid
         def with_inverse_field_criterion(criteria)
           inverse_association = inverse_association(klass)
           if inverse_association.try(:inverse_of)
-            criteria.any_in(inverse_association.inverse_of => [name, nil])
+            criteria.any_in(inverse_association.inverse_of => [ name, nil ])
           else
             criteria
           end

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

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Association
     module Referenced
       class HasOne
-
         # Binding class for has_one associations.
         class Binding
           include Bindable

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'mongoid/association/referenced/with_polymorphic_criteria'
 
@@ -7,7 +6,6 @@ module Mongoid
   module Association
     module Referenced
       class HasOne
-
         # The Builder behavior for has_one associations.
         module Buildable
           include WithPolymorphicCriteria
@@ -22,11 +20,15 @@ module Mongoid
           # @param [ nil ] selected_fields Must be nil.
           #
           # @return [ Document ] A single document.
-          def build(base, object, type = nil, selected_fields = nil)
+          def build(base, object, _type = nil, selected_fields = nil)
             if query?(object)
-              if !base.new_record?
-                execute_query(object, base)
+              # Handle array of hashes from $lookup aggregation
+              if object.is_a?(Array) && object.all? { |o| o.is_a?(Hash) }
+                doc = object.first
+                return doc ? Factory.execute_from_db(klass, doc, nil, selected_fields, execute_callbacks: false) : nil
               end
+
+              execute_query(object, base) unless base.new_record?
             else
               clear_associated(object)
               object
@@ -38,10 +40,10 @@ module Mongoid
           def clear_associated(object)
             unless inverse
               raise Errors::InverseNotFound.new(
-                  @owner_class,
-                  name,
-                  object.class,
-                  foreign_key,
+                @owner_class,
+                name,
+                object.class,
+                foreign_key
               )
             end
             if object && (associated = object.send(inverse))

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Association
@@ -7,7 +6,6 @@ module Mongoid
       class HasOne
         # Eager class for has_one associations.
         class Eager < Association::Eager
-
           private
 
           def preload
@@ -28,7 +26,6 @@ module Mongoid
           def key
             @association.foreign_key
           end
-
         end
       end
     end

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'mongoid/association/referenced/has_one/binding'
 require 'mongoid/association/referenced/has_one/buildable'
@@ -9,7 +8,6 @@ require 'mongoid/association/referenced/has_one/eager'
 module Mongoid
   module Association
     module Referenced
-
       # The has_one association.
       class HasOne
         include Relatable
@@ -19,14 +17,14 @@ module Mongoid
         # common ones.
         #
         # @return [ Array<Symbol> ] The extra valid options.
-        ASSOCIATION_OPTIONS = [
-            :as,
-            :autobuild,
-            :autosave,
-            :dependent,
-            :foreign_key,
-            :primary_key,
-            :scope,
+        ASSOCIATION_OPTIONS = %i[
+          as
+          autobuild
+          autosave
+          dependent
+          foreign_key
+          primary_key
+          scope
         ].freeze
 
         # The complete list of valid options for this association, including
@@ -38,7 +36,7 @@ module Mongoid
         # The default foreign key suffix.
         #
         # @return [ String ] '_id'
-        FOREIGN_KEY_SUFFIX = '_id'.freeze
+        FOREIGN_KEY_SUFFIX = '_id'
 
         # The list of association complements.
         #
@@ -60,19 +58,26 @@ module Mongoid
         # @return [ String ] The foreign key field for saving the
         #   association reference.
         def foreign_key
-          @foreign_key ||= @options[:foreign_key] ? @options[:foreign_key].to_s :
+          @foreign_key ||= if @options[:foreign_key]
+                             @options[:foreign_key].to_s
+                           else
                              default_foreign_key_field
+                           end
         end
 
         # Is this association type embedded?
         #
         # @return [ false ] Always false.
-        def embedded?; false; end
+        def embedded?
+          false
+        end
 
         # The default for validation the association object.
         #
         # @return [ true ] Always true.
-        def validation_default; true; end
+        def validation_default
+          true
+        end
 
         # Get the association proxy class for this association type.
         #
@@ -120,7 +125,9 @@ module Mongoid
         # Does this association type store the foreign key?
         #
         # @return [ false ] Always false.
-        def stores_foreign_key?; false; end
+        def stores_foreign_key?
+          false
+        end
 
         # Get the path calculator for the supplied document.
         #
@@ -163,19 +170,17 @@ module Mongoid
           @default_foreign_key_field ||= "#{inverse}#{FOREIGN_KEY_SUFFIX}"
         end
 
-        def polymorphic_inverses(other)
+        def polymorphic_inverses(_other)
           [ as ]
         end
 
         def determine_inverses(other)
           matches = (other || relation_class).relations.values.select do |rel|
             relation_complements.include?(rel.class) &&
-                rel.relation_class_name == inverse_class_name
-
-          end
-          if matches.size > 1
-            raise Errors::AmbiguousRelationship.new(relation_class, @owner_class, name, matches)
+              rel.relation_class_name == inverse_class_name
           end
+          raise Errors::AmbiguousRelationship.new(relation_class, @owner_class, name, matches) if matches.size > 1
+
           matches.collect { |m| m.name } unless matches.blank?
         end
 

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

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Association
     module Referenced
-
       # This module handles the behavior for synchronizing foreign keys between
       # both sides of a many to many associations.
       module Syncable
-
         # Is the document able to be synced on the inverse side? This is only if
         # the key has changed and the association bindings have not been run.
         #
@@ -54,9 +51,9 @@ module Mongoid
         # @return [ Object ] The updated values.
         def remove_inverse_keys(association)
           foreign_keys = send(association.foreign_key)
-          unless foreign_keys.nil? || foreign_keys.empty?
-            association.criteria(self, foreign_keys).pull(association.inverse_foreign_key => _id)
-          end
+          return if foreign_keys.nil? || foreign_keys.empty?
+
+          association.criteria(self, foreign_keys).pull(association.inverse_foreign_key => _id)
         end
 
         # Update the inverse keys for the association.
@@ -68,32 +65,31 @@ module Mongoid
         #
         # @return [ Object ] The updated values.
         def update_inverse_keys(association)
-          if previous_changes.has_key?(association.foreign_key)
-            old, new = previous_changes[association.foreign_key]
-            adds, subs = new - (old || []), (old || []) - new
+          return unless previous_changes.has_key?(association.foreign_key)
 
-            # If we are autosaving we don't want a duplicate to get added - the
-            # $addToSet would run previously and then the $push and $each from the
-            # inverse on the autosave would cause this. We delete each id from
-            # what's in memory in case a mix of id addition and object addition
-            # had occurred.
-            if association.autosave?
-              send(association.name).in_memory.each do |doc|
-                adds.delete_one(doc._id)
-              end
-            end
+          old, new = previous_changes[association.foreign_key]
+          adds, subs = new - (old || []), (old || []) - new
 
-            unless adds.empty?
-              association.criteria(self, adds).without_options.add_to_set(association.inverse_foreign_key => _id)
-            end
-            unless subs.empty?
-              association.criteria(self, subs).without_options.pull(association.inverse_foreign_key => _id)
+          # If we are autosaving we don't want a duplicate to get added - the
+          # $addToSet would run previously and then the $push and $each from the
+          # inverse on the autosave would cause this. We delete each id from
+          # what's in memory in case a mix of id addition and object addition
+          # had occurred.
+          if association.autosave?
+            send(association.name).in_memory.each do |doc|
+              adds.delete_one(doc._id)
             end
           end
+
+          unless adds.empty?
+            association.criteria(self, adds).without_options.add_to_set(association.inverse_foreign_key => _id)
+          end
+          return if subs.empty?
+
+          association.criteria(self, subs).without_options.pull(association.inverse_foreign_key => _id)
         end
 
         module ClassMethods
-
           # Set up the syncing of many to many foreign keys.
           #
           # @example Set up the syncing.
@@ -101,10 +97,10 @@ module Mongoid
           #
           # @param [ Mongoid::Association::Relatable ] association The association metadata.
           def _synced(association)
-            unless association.forced_nil_inverse?
-              synced_save(association)
-              synced_destroy(association)
-            end
+            return if association.forced_nil_inverse?
+
+            synced_save(association)
+            synced_destroy(association)
           end
 
           private
@@ -123,9 +119,9 @@ module Mongoid
           # @return [ Class ] The class getting set up.
           def synced_save(association)
             set_callback(
-                :save,
-                :after,
-                if: ->(doc) { doc._syncable?(association) }
+              :save,
+              :after,
+              if: ->(doc) { doc._syncable?(association) }
             ) do |doc|
               doc.update_inverse_keys(association)
             end
@@ -142,8 +138,8 @@ module Mongoid
           # @return [ Class ] The class getting set up.
           def synced_destroy(association)
             set_callback(
-                :destroy,
-                :after
+              :destroy,
+              :after
             ) do |doc|
               doc.remove_inverse_keys(association)
             end

data/lib/mongoid/association/referenced.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'mongoid/association/referenced/auto_save'
 require 'mongoid/association/referenced/counter_cache'

data/lib/mongoid/association/reflections.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Association
-
     # The reflections module provides convenience methods that can retrieve
     # useful information about associations.
     module Reflections
@@ -34,7 +32,6 @@ module Mongoid
       end
 
       module ClassMethods
-
         # Returns the association metadata for the supplied name.
         #
         # @example Find association metadata by name.