mongoid 9.0.11 → 9.1.0

data/lib/mongoid/association/embedded/embedded_in/binding.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Association
     module Embedded
       class EmbeddedIn
-
         # The Binding object for embedded_in associations.
         class Binding
           include Bindable
@@ -60,13 +58,12 @@ module Mongoid
           #
           # @param [ Document ] doc The document to check.
           def check_polymorphic_inverses!(doc)
-            if inverses = _association.inverses(doc)
-              if inverses.length > 1
-                raise Errors::InvalidSetPolymorphicRelation.new(
-                    _association.name, _base.class.name, _target.class.name
-                )
-              end
-            end
+            return unless inverses = _association.inverses(doc)
+            return unless inverses.length > 1
+
+            raise Errors::InvalidSetPolymorphicRelation.new(
+              _association.name, _base.class.name, _target.class.name
+            )
           end
         end
       end

data/lib/mongoid/association/embedded/embedded_in/buildable.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Association
     module Embedded
       class EmbeddedIn
-
         # The Builder behavior for embedded_in associations.
         module Buildable
           include Threaded::Lifecycle
@@ -24,8 +22,9 @@ module Mongoid
           #   will not be accessible in the built document.
           #
           # @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 object.is_a?(Hash)
+
             if _loading?
               Factory.from_db(klass, object, nil, selected_fields)
             else

data/lib/mongoid/association/embedded/embedded_in/proxy.rb

@@ -90,6 +90,8 @@ module Mongoid
             # @param [ Array<Mongoid::Document> ] docs The parent documents
             #   that possess the given associations, which ought to be
             #   populated by the eager-loaded documents.
+            # @param [ true | false ] use_lookup Whether to use a $lookup
+            #   aggregation stage to perform the eager load.
             #
             # @return [ Mongoid::Association::Embedded::Eager ]
             def eager_loader(associations, docs)

data/lib/mongoid/association/embedded/embedded_in.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'mongoid/association/embedded/embedded_in/binding'
 require 'mongoid/association/embedded/embedded_in/buildable'
@@ -8,7 +7,6 @@ require 'mongoid/association/embedded/embedded_in/proxy'
 module Mongoid
   module Association
     module Embedded
-
       # The EmbeddedIn type association.
       class EmbeddedIn
         include Relatable
@@ -18,11 +16,11 @@ module Mongoid
         # common ones.
         #
         # @return [ Array<Symbol> ] The extra valid options.
-        ASSOCIATION_OPTIONS = [
-            :autobuild,
-            :cyclic,
-            :polymorphic,
-            :touch,
+        ASSOCIATION_OPTIONS = %i[
+          autobuild
+          cyclic
+          polymorphic
+          touch
         ].freeze
 
         # The complete list of valid options for this association, including
@@ -44,7 +42,9 @@ module Mongoid
         # Is this association type embedded?
         #
         # @return [ true ] Always true.
-        def embedded?; true; end
+        def embedded?
+          true
+        end
 
         # The primary key
         #
@@ -54,12 +54,16 @@ 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
 
         # The default for validating the association object.
         #
         # @return [ false ] Always false.
-        def validation_default; false; end
+        def validation_default
+          false
+        end
 
         # The key that is used to get the attributes for the associated object.
         #
@@ -115,25 +119,24 @@ module Mongoid
         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.map { |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.map { |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 } unless matches.blank?
         end
       end

data/lib/mongoid/association/embedded/embeds_many/binding.rb

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

data/lib/mongoid/association/embedded/embeds_many/buildable.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Association
     module Embedded
       class EmbedsMany
-
         # Builder class for embeds_many associations.
         module Buildable
           include Threaded::Lifecycle
@@ -27,9 +25,10 @@ module Mongoid
           #   will not be accessible in the built documents.
           #
           # @return [ Array<Document ] The documents.
-          def build(base, object, type = nil, selected_fields = nil)
+          def build(base, object, _type = nil, selected_fields = nil)
             return [] if object.blank?
             return object if object.first.is_a?(Document)
+
             docs = []
             object.each do |attrs|
               if _loading? && base.persisted?

data/lib/mongoid/association/embedded/embeds_many/proxy.rb

@@ -519,7 +519,7 @@ module Mongoid
           #
           # @return [ Criteria | Object ] A Criteria or return value from the target.
           #
-          # TODO: make sure we are consistingly using respond_to_missing
+          # TODO: make sure we are consistently using respond_to_missing
           #   anywhere we define method_missing.
           # rubocop:disable Style/MissingRespondToMissing
           ruby2_keywords def method_missing(name, *args, &block)

data/lib/mongoid/association/embedded/embeds_many.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'mongoid/association/embedded/embeds_many/binding'
 require 'mongoid/association/embedded/embeds_many/buildable'
@@ -8,7 +7,6 @@ require 'mongoid/association/embedded/embeds_many/proxy'
 module Mongoid
   module Association
     module Embedded
-
       # The EmbedsMany type association.
       class EmbedsMany
         include Relatable
@@ -18,16 +16,16 @@ module Mongoid
         # common ones.
         #
         # @return [ Array<Symbol> ] The extra valid options.
-        ASSOCIATION_OPTIONS = [
-            :as,
-            :cascade_callbacks,
-            :cyclic,
-            :order,
-            :store_as,
-            :before_add,
-            :after_add,
-            :before_remove,
-            :after_remove
+        ASSOCIATION_OPTIONS = %i[
+          as
+          cascade_callbacks
+          cyclic
+          order
+          store_as
+          before_add
+          after_add
+          before_remove
+          after_remove
         ]
 
         # The complete list of valid options for this association, including
@@ -50,7 +48,7 @@ module Mongoid
         #
         # @return [ String ] The field name.
         def store_as
-          @store_as ||= (@options[:store_as].try(:to_s) || name.to_s)
+          @store_as ||= @options[:store_as].try(:to_s) || name.to_s
         end
 
         # The key that is used to get the attributes for the associated object.
@@ -63,7 +61,9 @@ module Mongoid
         # Is this association type embedded?
         #
         # @return [ true ] Always true.
-        def embedded?; true; end
+        def embedded?
+          true
+        end
 
         # Get the default validation setting for the association. Determines if
         # by default a validates associated will occur.
@@ -72,12 +72,16 @@ module Mongoid
         #   Proxy.validation_default
         #
         # @return [ true ] Always true.
-        def validation_default; true; end
+        def validation_default
+          true
+        end
 
         # Does this association type store the foreign key?
         #
         # @return [ false ] Always false.
-        def stores_foreign_key?; false; end
+        def stores_foreign_key?
+          false
+        end
 
         # The primary key
         #
@@ -163,19 +167,18 @@ module Mongoid
           @relation_complements ||= [ Embedded::EmbeddedIn ].freeze
         end
 
-        def polymorphic_inverses(other = nil)
+        def polymorphic_inverses(_other = nil)
           [ as ]
         end
 
-        def determine_inverses(other)
+        def determine_inverses(_other)
           matches = relation_class.relations.values.select do |rel|
             relation_complements.include?(rel.class) &&
               # https://jira.mongodb.org/browse/MONGOID-4882
               rel.relation_class_name.sub(/\A::/, '') == inverse_class_name
           end
-          if matches.size > 1
-            raise Errors::AmbiguousRelationship.new(relation_class, @owner_class, name, matches)
-          end
+          raise Errors::AmbiguousRelationship.new(relation_class, @owner_class, name, matches) if matches.size > 1
+
           matches.collect { |m| m.name } unless matches.blank?
         end
       end

data/lib/mongoid/association/embedded/embeds_one/binding.rb

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

data/lib/mongoid/association/embedded/embeds_one/buildable.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Association
     module Embedded
       class EmbedsOne
-
         # Builder class for embeds_one associations.
         module Buildable
           include Threaded::Lifecycle
@@ -41,10 +39,8 @@ module Mongoid
           private
 
           def clear_associated(doc)
-            if doc && (inv = inverse(doc))
-              if associated = doc.ivar(inv)
-                associated.substitute(nil)
-              end
+            if doc && (inv = inverse(doc)) && (associated = doc.ivar(inv))
+              associated.substitute(nil)
             end
           end
         end

data/lib/mongoid/association/embedded/embeds_one.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'mongoid/association/embedded/embeds_one/binding'
 require 'mongoid/association/embedded/embeds_one/buildable'
@@ -8,7 +7,6 @@ require 'mongoid/association/embedded/embeds_one/proxy'
 module Mongoid
   module Association
     module Embedded
-
       # The EmbedsOne type association.
       class EmbedsOne
         include Relatable
@@ -18,12 +16,12 @@ module Mongoid
         # common ones.
         #
         # @return [ Array<Symbol> ] The extra valid options.
-        ASSOCIATION_OPTIONS = [
-            :autobuild,
-            :as,
-            :cascade_callbacks,
-            :cyclic,
-            :store_as
+        ASSOCIATION_OPTIONS = %i[
+          autobuild
+          as
+          cascade_callbacks
+          cyclic
+          store_as
         ]
 
         # The complete list of valid options for this association, including
@@ -46,7 +44,7 @@ module Mongoid
         #
         # @return [ String ] The field name.
         def store_as
-          @store_as ||= (@options[:store_as].try(:to_s) || name.to_s)
+          @store_as ||= @options[:store_as].try(:to_s) || name.to_s
         end
 
         # The key that is used to get the attributes for the associated object.
@@ -59,7 +57,9 @@ module Mongoid
         # Is this association type embedded?
         #
         # @return [ true ] Always true.
-        def embedded?; true; end
+        def embedded?
+          true
+        end
 
         # Get the default validation setting for the association. Determines if
         # by default a validates associated will occur.
@@ -68,12 +68,16 @@ module Mongoid
         #   Proxy.validation_default
         #
         # @return [ true | false ] The validation default.
-        def validation_default; true; end
+        def validation_default
+          true
+        end
 
         # Does this association type store the foreign key?
         #
         # @return [ false ] Always false.
-        def stores_foreign_key?; false; end
+        def stores_foreign_key?
+          false
+        end
 
         # The primary key
         #
@@ -129,20 +133,18 @@ module Mongoid
           @relation_complements ||= [ Embedded::EmbeddedIn ].freeze
         end
 
-        def polymorphic_inverses(other = nil)
+        def polymorphic_inverses(_other = nil)
           [ as ]
         end
 
-        def determine_inverses(other)
+        def determine_inverses(_other)
           matches = relation_class.relations.values.select do |rel|
             relation_complements.include?(rel.class) &&
               # https://jira.mongodb.org/browse/MONGOID-4882
               rel.relation_class_name.sub(/\A::/, '') == inverse_class_name
-
-          end
-          if matches.size > 1
-            raise Errors::AmbiguousRelationship.new(relation_class, @owner_class, name, matches)
           end
+          raise Errors::AmbiguousRelationship.new(relation_class, @owner_class, name, matches) if matches.size > 1
+
           matches.collect { |m| m.name } unless matches.blank?
         end
       end

data/lib/mongoid/association/embedded.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'mongoid/association/embedded/cyclic'
 require 'mongoid/association/embedded/eager'

data/lib/mongoid/association/macros.rb

@@ -149,8 +149,6 @@ module Mongoid
           define_association!(__method__, name, options, &block)
         end
 
-        # rubocop:disable Naming/PredicateName
-
         # Adds a referenced association from a parent Document to many
         # Documents in another database or collection.
         #
@@ -169,7 +167,7 @@ module Mongoid
         # @param [ Symbol ] name The name of the association.
         # @param [ Hash ] options The association options.
         # @param &block Optional block for defining extensions.
-        def has_many(name, options = {}, &block)
+        def has_many(name, options = {}, &block) # rubocop:disable Naming/PredicatePrefix
           define_association!(__method__, name, options, &block)
         end
 
@@ -191,7 +189,7 @@ module Mongoid
         # @param [ Symbol ] name The name of the association.
         # @param [ Hash ] options The association options.
         # @param &block Optional block for defining extensions.
-        def has_and_belongs_to_many(name, options = {}, &block)
+        def has_and_belongs_to_many(name, options = {}, &block) # rubocop:disable Naming/PredicatePrefix
           define_association!(__method__, name, options, &block)
         end
 
@@ -213,12 +211,10 @@ module Mongoid
         # @param [ Symbol ] name The name of the association.
         # @param [ Hash ] options The association options.
         # @param &block Optional block for defining extensions.
-        def has_one(name, options = {}, &block)
+        def has_one(name, options = {}, &block) # rubocop:disable Naming/PredicatePrefix
           define_association!(__method__, name, options, &block)
         end
 
-        # rubocop:enable Naming/PredicateName
-
         private
 
         def define_association!(macro_name, name, options = {}, &block)

data/lib/mongoid/association/many.rb

@@ -1,16 +1,22 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Association
-
     # This is the superclass for all many to one and many to many association
     # proxies.
     class Many < Association::Proxy
       extend Forwardable
       include ::Enumerable
 
-      def_delegators :criteria, :avg, :max, :min, :sum
+      %i[avg max min sum].each do |method|
+        define_method(method) do |*args, &block|
+          if _target.respond_to?(:_loaded?) && _target._loaded?
+            _target.public_send(method, *args, &block)
+          else
+            criteria.public_send(method, *args, &block)
+          end
+        end
+      end
       def_delegators :_target, :length, :size, :any?
 
       # Is the association empty?
@@ -178,6 +184,19 @@ module Mongoid
         criteria.unscoped
       end
 
+      # For compatibility with Rails' caching. Returns a string based on the
+      # given timestamp, and includes the number of records in the relation
+      # in the version.
+      #
+      # @param [ String | Symbol ] timestamp_column the timestamp column to
+      #   use when constructing the key.
+      #
+      # @return [ String ] the cache version string
+      def cache_version(timestamp_column = :updated_at)
+        @cache_version ||= {}
+        @cache_version[timestamp_column] ||= compute_cache_version(timestamp_column)
+      end
+
       private
 
       def _session
@@ -198,6 +217,59 @@ module Mongoid
         attrs[klass.discriminator_key] = type.discriminator_value if type
         where(attrs).first || send(method, attrs, type, &block)
       end
+
+      # Computes the cache version for the relation using the given
+      # timestamp colum; see `#cache_version`.
+      #
+      # @param [ String | Symbol ] timestamp_column the timestamp column to
+      #   use when constructing the key.
+      #
+      # @return [ String ] the cache version string
+      def compute_cache_version(timestamp_column)
+        timestamp_column = timestamp_column.to_s
+
+        # has_many
+        loaded = if _target.respond_to?(:_loaded?)
+                   _target._loaded?
+                 else
+                   true
+                 end # embeds_many
+
+        size, timestamp = if loaded
+                            analyze_loaded_target(timestamp_column)
+                          else
+                            analyze_unloaded_target(timestamp_column)
+                          end
+
+        if timestamp
+          "#{size}-#{timestamp.utc.to_formatted_s(klass.cache_timestamp_format)}"
+        else
+          size.to_s
+        end
+      end
+
+      # Return a 2-tuple of the number of elements in the relation, and the
+      # largest timestamp value.
+      def analyze_loaded_target(timestamp_column)
+        newest = _target.select { |elem| elem.respond_to?(timestamp_column) }
+                        .max { |a, b| a[timestamp_column] <=> b[timestamp_column] }
+        [ _target.length, newest ? newest[timestamp_column] : nil ]
+      end
+
+      # Returns a 2-tuple of the number of elements in the relation, and the
+      # largest timestamp value. This will query the database to perform a
+      # $sum and a $max.
+      def analyze_unloaded_target(timestamp_column)
+        pipeline = criteria
+                   .group(_id: nil,
+                          count: { '$sum' => 1 },
+                          latest: { '$max' => "$#{timestamp_column}" })
+                   .pipeline
+
+        result = klass.collection.aggregate(pipeline).to_a.first
+
+        result ? [ result['count'], result['latest'] ] : [ 0 ]
+      end
     end
   end
 end

data/lib/mongoid/association/marshalable.rb

@@ -1,13 +1,10 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Association
-
     # Mixin module for Mongoid::Association::Proxy which adds
     # custom Marshal.dump functionality.
     module Marshalable
-
       # Provides the data needed to Marshal.dump an association proxy.
       #
       # @example Dump the proxy.

data/lib/mongoid/association/nested/many.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 many-to-n associations.
       class Many
@@ -17,6 +15,9 @@ module Mongoid
         # the existing association, a replacement of the association with a new
         # document, or a removal of the association.
         #
+        # It raises an argument error if the attributes are not a Hash or an
+        # Array of key/value pairs.
+        #
         # @example Build the nested attrs.
         #   many.build(person)
         #
@@ -26,14 +27,18 @@ module Mongoid
         # @return [ Array ] The attributes.
         def build(parent, options = {})
           @existing = parent.send(association.name)
-          if over_limit?(attributes)
-            raise Errors::TooManyNestedAttributeRecords.new(existing, options[:limit])
-          end
+          raise Errors::TooManyNestedAttributeRecords.new(existing, options[:limit]) if over_limit?(attributes)
+
           attributes.each do |attrs|
             if attrs.is_a?(::Hash)
               process_attributes(parent, attrs.with_indifferent_access)
-            else
+            elsif attrs.is_a?(Array) && attrs.length > 1 && attrs[1].respond_to?(:with_indifferent_access)
               process_attributes(parent, attrs[1].with_indifferent_access)
+            elsif attrs.is_a?(Array) && attrs.length.even?
+              process_attributes(parent, Hash[*attrs].with_indifferent_access)
+            else
+              raise ArgumentError,
+                    "Attributes for nested association '#{association.name}' must be a Hash or an Array of key/value pairs."
             end
           end
         end
@@ -48,13 +53,13 @@ module Mongoid
         # @param [ Hash ] attributes The attributes hash to attempt to set.
         # @param [ Hash ] options The options defined.
         def initialize(association, attributes, options = {})
-          if attributes.respond_to?(:with_indifferent_access)
-            @attributes = attributes.with_indifferent_access.sort do |a, b|
-              a[0].to_i <=> b[0].to_i
-            end
-          else
-            @attributes = attributes
-          end
+          @attributes = if attributes.respond_to?(:with_indifferent_access)
+                          attributes.with_indifferent_access.sort do |a, b|
+                            a[0].to_i <=> b[0].to_i
+                          end
+                        else
+                          attributes
+                        end
           @association = association
           @options = options
           @class_name = options[:class_name] ? options[:class_name].constantize : association.klass