mongoid 9.0.10 → 9.1.0

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'mongoid/association/referenced/belongs_to/binding'
 require 'mongoid/association/referenced/belongs_to/buildable'
@@ -9,7 +8,6 @@ require 'mongoid/association/referenced/belongs_to/eager'
 module Mongoid
   module Association
     module Referenced
-
       # The BelongsTo type association.
       class BelongsTo
         include Relatable
@@ -19,19 +17,19 @@ module Mongoid
         # common ones.
         #
         # @return [ Array<Symbol> ] The extra valid options.
-        ASSOCIATION_OPTIONS = [
-            :autobuild,
-            :autosave,
-            :counter_cache,
-            :dependent,
-            :foreign_key,
-            :index,
-            :polymorphic,
-            :primary_key,
-            :touch,
-            :optional,
-            :required,
-            :scope,
+        ASSOCIATION_OPTIONS = %i[
+          autobuild
+          autosave
+          counter_cache
+          dependent
+          foreign_key
+          index
+          polymorphic
+          primary_key
+          touch
+          optional
+          required
+          scope
         ].freeze
 
         # The complete list of valid options for this association, including
@@ -48,7 +46,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.
         #
@@ -69,24 +67,33 @@ module Mongoid
         # Does this association type store the foreign key?
         #
         # @return [ true ] Always true.
-        def stores_foreign_key?; true; end
+        def stores_foreign_key?
+          true
+        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 [ false ] Always false.
-        def validation_default; false; end
+        def validation_default
+          false
+        end
 
         # Get the foreign key field for saving the association reference.
         #
         # @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
 
         # Get the association proxy class for this association type.
@@ -107,7 +114,7 @@ module Mongoid
         # class objects, and vice versa. This is obtained via the `:polymorphic` option
         # that was given when the association was defined.
         #
-        # See Mongoid::ModelResolver.resolver for how the `:polymorphic` option is 
+        # See Mongoid::ModelResolver.resolver for how the `:polymorphic` option is
         # interpreted here.
         #
         # @raise KeyError if no such resolver has been registered under the given
@@ -190,32 +197,30 @@ module Mongoid
         end
 
         def polymorph!
-          if polymorphic?
-            @owner_class.polymorphic = true
-            @owner_class.field(inverse_type, type: String)
-          end
+          return unless polymorphic?
+
+          @owner_class.polymorphic = true
+          @owner_class.field(inverse_type, type: String)
         end
 
         def polymorphic_inverses(other = nil)
-          if other
-            matches = other.relations.values.select do |rel|
-              relation_complements.include?(rel.class) &&
-                  rel.as == name &&
-                  rel.relation_class_name == inverse_class_name
-            end
-            matches.collect { |m| m.name }
+          return unless other
+
+          matches = other.relations.values.select do |rel|
+            relation_complements.include?(rel.class) &&
+              rel.as == name &&
+              rel.relation_class_name == inverse_class_name
           end
+          matches.collect { |m| m.name }
         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 }
         end
 
@@ -228,12 +233,12 @@ module Mongoid
 
         def create_foreign_key_field!
           @owner_class.field(
-              foreign_key,
-              type: FOREIGN_KEY_FIELD_TYPE,
-              identity: true,
-              overwrite: true,
-              association: self,
-              default: nil
+            foreign_key,
+            type: FOREIGN_KEY_FIELD_TYPE,
+            identity: true,
+            overwrite: true,
+            association: self,
+            default: nil
           )
         end
       end

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

@@ -1,10 +1,8 @@
 # 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.
@@ -26,7 +24,6 @@ module Mongoid
         end
 
         module ClassMethods
-
           # Reset the given counter using the .count() query from the
           # db. This method is useful in case that a counter got
           # corrupted, or a new counter was added to the collection.
@@ -56,7 +53,7 @@ module Mongoid
           # @param [ String ] id The id of the object to update.
           # @param [ Hash ] counters
           def update_counters(id, counters)
-            where(:_id => id).inc(counters)
+            where(_id: id).inc(counters)
           end
 
           # Increment the counter name from the entries that match the
@@ -113,12 +110,10 @@ module Mongoid
                   end
                 end
 
-                if record = __send__(name)
-                  unless current.nil?
-                    record[cache_column] = (record[cache_column] || 0) + 1
-                    record.class.with(record.persistence_context) do |_class|
-                      _class.increment_counter(cache_column, current) if record.persisted?
-                    end
+                if (record = __send__(name)) && !current.nil?
+                  record[cache_column] = (record[cache_column] || 0) + 1
+                  record.class.with(record.persistence_context) do |_class|
+                    _class.increment_counter(cache_column, current) if record.persisted?
                   end
                 end
               end

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

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

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

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Association
     module Referenced
       class HasAndBelongsToMany
-
         # The Builder behavior for has_and_belongs_to_many associations.
         module Buildable
-
           # This builder either takes a hash and queries for the
           # object or an array of documents, where it will just return them.
           #
@@ -21,8 +18,15 @@ module Mongoid
           # @param [ nil ] selected_fields Must be nil.
           #
           # @return [ Array<Document> ] The documents.
-          def build(base, object, type = nil, selected_fields = nil)
+          def build(_base, object, _type = nil, selected_fields = nil)
             if query?(object)
+              # Handle array of hashes from $lookup aggregation
+              if object.is_a?(Array) && object.all? { |o| o.is_a?(Hash) }
+                return object.map do |attrs|
+                  Factory.execute_from_db(klass, attrs, nil, selected_fields, execute_callbacks: false)
+                end
+              end
+
               query_criteria(object)
             else
               object.try(:dup)

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

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Association
     module Referenced
       class HasAndBelongsToMany
-
         # Eager class for has_and_belongs_to_many associations.
         class Eager < Association::Eager
-
           private
 
           def preload

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

@@ -1,5 +1,4 @@
 # 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'
@@ -9,7 +8,6 @@ require 'mongoid/association/referenced/has_and_belongs_to_many/eager'
 module Mongoid
   module Association
     module Referenced
-
       # The HasAndBelongsToMany type association.
       class HasAndBelongsToMany
         include Relatable
@@ -19,21 +17,21 @@ module Mongoid
         # common ones.
         #
         # @return [ Array<Symbol> ] The extra valid options.
-        ASSOCIATION_OPTIONS = [
-            :after_add,
-            :after_remove,
-            :autosave,
-            :before_add,
-            :before_remove,
-            :counter_cache,
-            :dependent,
-            :foreign_key,
-            :index,
-            :order,
-            :primary_key,
-            :inverse_primary_key,
-            :inverse_foreign_key,
-            :scope,
+        ASSOCIATION_OPTIONS = %i[
+          after_add
+          after_remove
+          autosave
+          before_add
+          before_remove
+          counter_cache
+          dependent
+          foreign_key
+          index
+          order
+          primary_key
+          inverse_primary_key
+          inverse_foreign_key
+          scope
         ].freeze
 
         # The complete list of valid options for this association, including
@@ -50,7 +48,7 @@ module Mongoid
         # The default foreign key suffix.
         #
         # @return [ String ] '_ids'
-        FOREIGN_KEY_SUFFIX = '_ids'.freeze
+        FOREIGN_KEY_SUFFIX = '_ids'
 
         # The list of association complements.
         #
@@ -70,12 +68,16 @@ module Mongoid
         # 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 [ false ] Always false.
-        def validation_default; true; end
+        def validation_default
+          true
+        end
 
         # Are ids only saved on this side of the association?
         #
@@ -87,7 +89,9 @@ module Mongoid
         # Does this association type store the foreign key?
         #
         # @return [ true ] Always true.
-        def stores_foreign_key?; true; end
+        def stores_foreign_key?
+          true
+        end
 
         # Get the association proxy class for this association type.
         #
@@ -100,8 +104,11 @@ 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
 
         # The criteria used for querying this association.
@@ -203,17 +210,17 @@ module Mongoid
         end
 
         def setup_syncing!
-          unless forced_nil_inverse?
-            synced_save
-            synced_destroy
-          end
+          return if forced_nil_inverse?
+
+          synced_save
+          synced_destroy
         end
 
         def synced_destroy
           assoc = self
           inverse_class.set_callback(
-              :destroy,
-              :after
+            :destroy,
+            :after
           ) do |doc|
             doc.remove_inverse_keys(assoc)
           end
@@ -222,9 +229,9 @@ module Mongoid
         def synced_save
           assoc = self
           inverse_class.set_callback(
-              :persist_parent,
-              :after,
-              if: ->(doc){ doc._syncable?(assoc) }
+            :persist_parent,
+            :after,
+            if: ->(doc) { doc._syncable?(assoc) }
           ) do |doc|
             doc.update_inverse_keys(assoc)
           end
@@ -233,24 +240,22 @@ module Mongoid
         def create_foreign_key_field!
           inverse_class.aliased_associations[foreign_key] = name.to_s
           @owner_class.field(
-              foreign_key,
-              type: FOREIGN_KEY_FIELD_TYPE,
-              identity: true,
-              overwrite: true,
-              association: self,
-              default: nil
+            foreign_key,
+            type: FOREIGN_KEY_FIELD_TYPE,
+            identity: true,
+            overwrite: true,
+            association: self,
+            default: nil
           )
         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
 
@@ -265,11 +270,11 @@ module Mongoid
         def query_criteria(id_list)
           crit = relation_class.criteria
           crit = if id_list
-            crit = crit.apply_scope(scope)
-            crit.all_of(primary_key => { "$in" => id_list })
-          else
-            crit.none
-          end
+                   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,11 +1,9 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Association
     module Referenced
       class HasMany
-
         # Binding class for has_many associations.
         class Binding
           include Bindable

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

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Association
     module Referenced
       class HasMany
-
         # The Builder behavior for has_many associations.
         module Buildable
-
           # This method either takes an _id or an object and queries for the
           # inverse side using the id or sets the object.
           #
@@ -21,9 +18,18 @@ module Mongoid
           # @param [ nil ] selected_fields Must be nil.
           #
           # @return [ Document ] A single document.
-          def build(base, object, type = nil, selected_fields = nil)
-            return (object || []) unless query?(object)
+          def build(base, object, _type = nil, selected_fields = nil)
+            return object || [] unless query?(object)
+
+            # Handle array of hashes from $lookup aggregation
+            if object.is_a?(Array) && object.all? { |o| o.is_a?(Hash) }
+              return object.map do |attrs|
+                Factory.execute_from_db(klass, attrs, nil, selected_fields, execute_callbacks: false)
+              end
+            end
+
             return [] if object.is_a?(Array)
+
             query_criteria(object, base)
           end
 

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

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Association
     module Referenced
       class HasMany
-
         # Eager class for has_many associations.
         class Eager < Association::Eager
-
           private
 
           def preload