mongoid 9.0.11 → 9.1.0

data/lib/mongoid/association/nested/nested_buildable.rb

@@ -1,15 +1,12 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Association
     module Nested
-
       # Mixin module containing common functionality used to
       # perform #accepts_nested_attributes_for attribute assignment
       # on associations.
       module Buildable
-
         attr_accessor :attributes, :existing, :association, :options
 
         # Determines if destroys are allowed for this document.
@@ -33,12 +30,12 @@ module Mongoid
         # @return [ true | false ] True and call proc or method if rejectable, false if not.
         def reject?(document, attrs)
           case callback = options[:reject_if]
-            when Symbol
-              document.method(callback).arity == 0 ? document.send(callback) : document.send(callback, attrs)
-            when Proc
-              callback.call(attrs)
-            else
-              false
+          when Symbol
+            (document.method(callback).arity == 0) ? document.send(callback) : document.send(callback, attrs)
+          when Proc
+            callback.call(attrs)
+          else
+            false
           end
         end
 

data/lib/mongoid/association/nested/one.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Association
     module Nested
-
       # Builder class used to perform #accepts_nested_attributes_for
       # attribute assignment on one-to-n associations.
       class One
@@ -27,6 +25,7 @@ module Mongoid
         # @return [ Document ] The built document.
         def build(parent)
           return if reject?(parent, attributes)
+
           @existing = parent.send(association.name)
           if update?
             delete_id(attributes)
@@ -158,11 +157,9 @@ module Mongoid
 
           # otherwise, an attempt has been made to set the _id of an existing,
           # persisted document.
-          if Mongoid::Config.immutable_ids
-            raise Errors::ImmutableAttribute.new(:_id, id)
-          else
-            Mongoid::Warnings.warn_mutable_ids
-          end
+          raise Errors::ImmutableAttribute.new(:_id, id) if Mongoid::Config.immutable_ids
+
+          Mongoid::Warnings.warn_mutable_ids
         end
       end
     end

data/lib/mongoid/association/nested.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'mongoid/association/nested/nested_buildable'
 require 'mongoid/association/nested/many'
@@ -8,9 +7,8 @@ require 'mongoid/association/nested/one'
 module Mongoid
   module Association
     module Nested
-
       # The flags indicating that an association can be destroyed.
-      DESTROY_FLAGS = [1, "1", true, "true"].freeze
+      DESTROY_FLAGS = [ 1, '1', true, 'true' ].freeze
     end
   end
 end

data/lib/mongoid/association/one.rb

@@ -1,13 +1,10 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Association
-
     # This is the superclass for one to one relations and defines the common
     # behavior or those proxies.
     class One < Association::Proxy
-
       # Clear this relation - same as calling #delete on the document.
       #
       # @example Clear the relation.

data/lib/mongoid/association/options.rb

@@ -1,12 +1,9 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Association
-
     # Options context used for all association types.
     module Options
-
       # Returns the name of the parent to a polymorphic child.
       #
       # @return [ String | Symbol ] The name.
@@ -71,7 +68,7 @@ module Mongoid
       def autosave
         !!@options[:autosave]
       end
-      alias :autosave? :autosave
+      alias autosave? autosave
 
       # Whether the association is counter-cached.
       #
@@ -83,7 +80,9 @@ module Mongoid
       # Whether this association is polymorphic.
       #
       # @return [ true | false ] Whether the association is polymorphic.
-      def polymorphic?; false; end
+      def polymorphic?
+        false
+      end
 
       # Whether the association has callbacks cascaded down from the parent.
       #
@@ -100,7 +99,9 @@ module Mongoid
       # Whether the association has forced nil inverse (So no foreign keys are saved).
       #
       # @return [ false ] Default is false.
-      def forced_nil_inverse?; false; end
+      def forced_nil_inverse?
+        false
+      end
 
       # The field for saving the associated object's type.
       #
@@ -111,7 +112,7 @@ module Mongoid
       #
       # @return [ nil ] Default is nil.
       def touch_field
-        @touch_field ||= options[:touch] if (options[:touch].is_a?(String) || options[:touch].is_a?(Symbol))
+        @touch_field ||= options[:touch] if options[:touch].is_a?(String) || options[:touch].is_a?(Symbol)
       end
 
       # Whether the association object should be automatically touched

data/lib/mongoid/association/referenced/auto_save.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 automatically save opposite-side documents
       # in referenced associations when saving the subject document.

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

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Association
     module Referenced
       class BelongsTo
-
         # Binding class for belongs_to associations.
         class Binding
           include Bindable
@@ -30,14 +28,12 @@ module Mongoid
                 bind_polymorphic_inverse_type(_base, key)
               end
 
-              if inverse = _association.inverse(_target)
-                if set_base_association
-                  if _base.referenced_many?
-                    _target.__send__(inverse).push(_base)
-                  else
-                    remove_associated(_target)
-                    _target.set_relation(inverse, _base)
-                  end
+              if (inverse = _association.inverse(_target)) && set_base_association
+                if _base.referenced_many?
+                  _target.__send__(inverse).push(_base)
+                else
+                  remove_associated(_target)
+                  _target.set_relation(inverse, _base)
                 end
               end
             end
@@ -77,11 +73,11 @@ module Mongoid
           # @param [ Document ] doc The document to check.
           def check_polymorphic_inverses!(doc)
             inverses = _association.inverses(doc)
-            if inverses.length > 1 && _base.send(_association.foreign_key).nil?
-              raise Errors::InvalidSetPolymorphicRelation.new(
-                  _association.name, _base.class.name, _target.class.name
-              )
-            end
+            return unless inverses.length > 1 && _base.send(_association.foreign_key).nil?
+
+            raise Errors::InvalidSetPolymorphicRelation.new(
+              _association.name, _base.class.name, _target.class.name
+            )
           end
         end
       end

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

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Association
     module Referenced
       class BelongsTo
-
         # The Builder behavior for belongs_to 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,8 +18,25 @@ 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)
             return object unless query?(object)
+
+            # Handle array from $lookup aggregation (returns array even for belongs_to)
+            if object.is_a?(Array)
+              first = object.first
+              case first
+              when nil, Mongoid::Document then return first
+              when Hash then return Factory.execute_from_db(klass, first, nil, selected_fields,
+                                                            execute_callbacks: false)
+              else raise ArgumentError, 'Cannot build belongs_to association from array'
+              end
+            end
+
+            # Handle single hash from $lookup with $unwind
+            if object.is_a?(Hash)
+              return Factory.execute_from_db(klass, object, nil, selected_fields, execute_callbacks: false)
+            end
+
             execute_query(object, type)
           end
 
@@ -33,7 +47,11 @@ module Mongoid
           end
 
           def query_criteria(object, type)
-            cls = type ? (type.is_a?(String) ? type.constantize : type) : relation_class
+            cls = if type
+                    type.is_a?(String) ? type.constantize : type
+                  else
+                    relation_class
+                  end
             crit = cls.criteria
             crit = crit.apply_scope(scope)
             crit.where(primary_key => object)

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

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Association
     module Referenced
       class BelongsTo
-
         # Eager class for belongs_to associations.
         class Eager < Association::Eager
-
           private
 
           def preload
@@ -45,6 +42,7 @@ module Mongoid
 
             @docs.each_with_object({}) do |doc, keys_by_type|
               next unless doc.respond_to?(inverse_type_field) && doc.respond_to?(group_by_key)
+
               inverse_type_name = doc.send(inverse_type_field)
               # If a particular document does not have a value for this
               # association, inverse_type_name will be nil.

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