mongoid 9.0.10 → 9.1.0

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

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Association
     module Embedded
-
       # This module provides convenience macros for using cyclic embedded
       # associations.
       module Cyclic
@@ -15,7 +13,6 @@ module Mongoid
         end
 
         module ClassMethods
-
           # Create a cyclic embedded association that creates a tree hierarchy for
           # the document and many embedded child documents.
           #
@@ -38,10 +35,10 @@ module Mongoid
           # or its children.
           def recursively_embeds_many(options = {})
             embeds_many(
-                cyclic_child_name,
-                options.merge(class_name: self.name, cyclic: true)
+              cyclic_child_name,
+              options.merge(class_name: name, cyclic: true)
             )
-            embedded_in cyclic_parent_name, class_name: self.name, cyclic: true
+            embedded_in cyclic_parent_name, class_name: name, cyclic: true
           end
 
           # Create a cyclic embedded association that creates a single self
@@ -66,10 +63,10 @@ module Mongoid
           # or its children.
           def recursively_embeds_one(options = {})
             embeds_one(
-                cyclic_child_name(false),
-                options.merge(class_name: self.name, cyclic: true)
+              cyclic_child_name(false),
+              options.merge(class_name: name, cyclic: true)
             )
-            embedded_in cyclic_parent_name, class_name: self.name, cyclic: true
+            embedded_in cyclic_parent_name, class_name: name, cyclic: true
           end
 
           private
@@ -81,7 +78,7 @@ module Mongoid
           #
           # @return [ String ] "parent_" plus the class name underscored.
           def cyclic_parent_name
-            ("parent_#{self.name.demodulize.underscore.singularize}").to_sym
+            :"parent_#{name.demodulize.underscore.singularize}"
           end
 
           # Determines the child name given the class.
@@ -94,7 +91,7 @@ module Mongoid
           # @return [ String ] "child_" plus the class name underscored in
           #   singular or plural form.
           def cyclic_child_name(many = true)
-            ("child_#{self.name.demodulize.underscore.send(many ? :pluralize : :singularize)}").to_sym
+            :"child_#{name.demodulize.underscore.send(many ? :pluralize : :singularize)}"
           end
         end
       end

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

@@ -1,23 +1,18 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Association
     module Embedded
-
       # Eager class for embedded associations (embedded_in, embeds_many,
       # embeds_one).
       class Eager < Association::Eager
-
         private
 
         # Embedded associations have no preload phase, since the embedded
         # documents are loaded with the parent document. This method is
         # implemented as a no-op to represent that.
-        def preload
-        end
+        def preload; end
       end
-
     end
   end
 end

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)