mongoid 6.1.0 → 6.1.1

data/lib/mongoid/matchable/lte.rb

@@ -8,12 +8,12 @@ module Mongoid
       # Return true if the attribute is less than or equal to the value.
       #
       # @example Do the values match?
-      #   matcher.matches?({ :key => 10 })
+      #   matcher._matches?({ :key => 10 })
       #
       # @param [ Hash ] value The values to check.
       #
       # @return [ true, false ] If a value exists.
-      def matches?(value)
+      def _matches?(value)
         determine(value, :<=)
       rescue ArgumentError
         false

data/lib/mongoid/matchable/ne.rb

@@ -8,12 +8,12 @@ module Mongoid
       # Return true if the attribute and first value are not equal.
       #
       # @example Do the values match?
-      #   matcher.matches?({ :key => 10 })
+      #   matcher._matches?({ :key => 10 })
       #
       # @param [ Hash ] value The values to check.
       #
       # @return [ true, false ] If a value exists.
-      def matches?(value)
+      def _matches?(value)
         !super(value.values.first)
       end
     end

data/lib/mongoid/matchable/nin.rb

@@ -8,12 +8,12 @@ module Mongoid
       # Return true if the attribute is not in the value list.
       #
       # @example Do the values match?
-      #   matcher.matches?({ :key => 10 })
+      #   matcher._matches?({ :key => 10 })
       #
       # @param [ Hash ] value The values to check.
       #
       # @return [ true, false ] If a value exists.
-      def matches?(value)
+      def _matches?(value)
         attribute_array = @attribute.nil? ? [nil] : Array.wrap(@attribute)
         attribute_array.none? { |e| value.values.first.include?(e) }
       end

data/lib/mongoid/matchable/or.rb

@@ -8,20 +8,20 @@ module Mongoid
       # Does the supplied query match the attribute?
       #
       # @example Does this match?
-      #   matcher.matches?("$or" => [ { field => value } ])
+      #   matcher._matches?("$or" => [ { field => value } ])
       #
       # @param [ Array ] conditions The or expression.
       #
       # @return [ true, false ] True if matches, false if not.
       #
       # @since 2.0.0.rc.7
-      def matches?(conditions)
+      def _matches?(conditions)
         conditions.each do |condition|
           res = true
           condition.keys.each do |k|
             key = k
             value = condition[k]
-            res &&= document.matches?(key => value)
+            res &&= document._matches?(key => value)
             break unless res
           end
           return res if res

data/lib/mongoid/matchable/regexp.rb

@@ -0,0 +1,27 @@
+module Mongoid
+  module Matchable
+
+    # Defines behavior for handling regular expressions in embedded documents.
+    class Regexp < Default
+
+      # Does the supplied query match the attribute?
+      #
+      # @example Does this match?
+      #   matcher._matches?(/^Em/)
+      #   matcher._matches?(BSON::Regex::Raw.new("^Em"))
+      #
+      # @param [ BSON::Regexp::Raw, Regexp ] regexp The regular expression object.
+      #
+      # @return [ true, false ] True if matches, false if not.
+      #
+      # @since 5.2.1
+      def _matches?(regexp)
+        if native_regexp = regexp.try(:compile)
+          super(native_regexp)
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/matchable/size.rb

@@ -8,12 +8,12 @@ module Mongoid
       # Return true if the attribute size is equal to the first value.
       #
       # @example Do the values match?
-      #   matcher.matches?({ :key => 10 })
+      #   matcher._matches?({ :key => 10 })
       #
       # @param [ Hash ] value The values to check.
       #
       # @return [ true, false ] If a value exists.
-      def matches?(value)
+      def _matches?(value)
         @attribute.size == value.values.first
       end
     end

data/lib/mongoid/persistable.rb

@@ -69,8 +69,6 @@ module Mongoid
     # @example Raise the validation error.
     #   Person.fail_due_to_validation!(person)
     #
-    # @param [ Document ] document The document to fail.
-    #
     # @raise [ Errors::Validations ] The validation error.
     #
     # @since 4.0.0
@@ -83,7 +81,6 @@ module Mongoid
     # @example Raise the callback error.
     #   Person.fail_due_to_callback!(person, :create!)
     #
-    # @param [ Document ] document The document to fail.
     # @param [ Symbol ] method The method being called.
     #
     # @raise [ Errors::Callback ] The callback error.

data/lib/mongoid/persistable/creatable.rb

@@ -42,7 +42,7 @@ module Mongoid
       #
       # @since 2.1.0
       def atomic_inserts
-        { atomic_insert_modifier => { atomic_position => as_document }}
+        { atomic_insert_modifier => { atomic_position => as_attributes }}
       end
 
       # Insert the embedded document.
@@ -76,7 +76,7 @@ module Mongoid
       #
       # @since 4.0.0
       def insert_as_root
-        collection.insert_one(as_document)
+        collection.insert_one(as_attributes)
       end
 
       # Post process an insert, which sets the new record attribute to false
@@ -165,8 +165,6 @@ module Mongoid
         #
         # @param [ Hash, Array ] attributes The attributes to create with, or an
         #   Array of multiple attributes for multiple documents.
-        # @param [ Hash ] options A mass-assignment protection options. Supports
-        #   :as and :without_protection
         #
         # @return [ Document, Array<Document> ] The newly created document(s).
         #

data/lib/mongoid/persistable/deletable.rb

@@ -137,7 +137,7 @@ module Mongoid
         # @since 1.0.0
         def delete_all(conditions = {})
           selector = hereditary? ? conditions.merge(_type: name) : conditions
-          collection.find(selector).delete_many.deleted_count
+          where(selector).delete
         end
       end
     end

data/lib/mongoid/persistable/settable.rb

@@ -28,7 +28,7 @@ module Mongoid
 
             if fields[field] && fields[field].type == Hash && attributes.key?(field)
               merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
-              value = attributes[field].merge(field_and_value_hash[field], &merger)
+              value = (attributes[field] || {}).merge(field_and_value_hash[field], &merger)
               process_attribute(field.to_s, value)
             else
               process_attribute(field.to_s, field_and_value_hash[field])

data/lib/mongoid/persistable/upsertable.rb

@@ -21,7 +21,7 @@ module Mongoid
       # @since 3.0.0
       def upsert(options = {})
         prepare_upsert(options) do
-          collection.find(atomic_selector).update_one(as_document, upsert: true)
+          collection.find(atomic_selector).update_one(as_attributes, upsert: true)
         end
       end
 

data/lib/mongoid/persistence_context.rb

@@ -44,7 +44,7 @@ module Mongoid
     # @example Create a new persistence context.
     #   PersistenceContext.new(model, collection: 'other')
     #
-    # @param [ Object ] parent The class or model instance for which a persistence context
+    # @param [ Object ] object The class or model instance for which a persistence context
     #   should be created.
     # @param [ Hash ] opts The persistence context options.
     #
@@ -67,8 +67,7 @@ module Mongoid
     #
     # @since 6.0.0
     def collection(parent = nil)
-      name = parent ? parent.collection_name : collection_name
-      client[name.to_sym]
+      parent ? parent.collection.with(client_options) : client[collection_name.to_sym]
     end
 
     # Get the collection name for this persistence context.

data/lib/mongoid/relations/accessors.rb

@@ -17,7 +17,6 @@ module Mongoid
       # @param [ String, Symbol ] name The name of the relation.
       # @param [ Hash, BSON::ObjectId ] object The id or attributes to use.
       # @param [ Metadata ] metadata The relation's metadata.
-      # @param [ true, false ] building If we are in a build operation.
       #
       # @return [ Proxy ] The relation.
       #
@@ -32,7 +31,7 @@ module Mongoid
       # @example Create the relation.
       #   person.create_relation(document, metadata)
       #
-      # @param [ Document, Array<Document ] object The relation target.
+      # @param [ Document, Array<Document> ] object The relation target.
       # @param [ Metadata ] metadata The relation metadata.
       #
       # @return [ Proxy ] The relation.

data/lib/mongoid/relations/bindings/embedded/in.rb

@@ -17,8 +17,6 @@ module Mongoid
           #   name.person.bind(:continue => true)
           #   name.person = Person.new
           #
-          # @param [ Hash ] options The binding options.
-          #
           # @option options [ true, false ] :continue Continue binding the inverse.
           # @option options [ true, false ] :binding Are we in build mode?
           #
@@ -42,8 +40,6 @@ module Mongoid
           #   name.person.unbind(:continue => true)
           #   name.person = nil
           #
-          # @param [ Hash ] options The options to pass through.
-          #
           # @option options [ true, false ] :continue Do we continue unbinding?
           #
           # @since 2.0.0.rc.1

data/lib/mongoid/relations/bindings/embedded/many.rb

@@ -14,10 +14,6 @@ module Mongoid
           #   person.addresses.bind_one(address)
           #
           # @param [ Document ] doc The single document to bind.
-          # @param [ Hash ] options The binding options.
-          #
-          # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
           def bind_one(doc)
@@ -32,10 +28,7 @@ module Mongoid
           # @example Unbind the document.
           #   person.addresses.unbind_one(document)
           #
-          # @param [ Hash ] options The binding options.
-          #
-          # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :binding Are we in build mode?
+          # @param [ Document ] doc The single document to unbind.
           #
           # @since 2.0.0.rc.1
           def unbind_one(doc)

data/lib/mongoid/relations/bindings/embedded/one.rb

@@ -17,11 +17,6 @@ module Mongoid
           #   person.name.bind(:continue => true)
           #   person.name = Name.new
           #
-          # @param [ Hash ] options The options to pass through.
-          #
-          # @option options [ true, false ] :continue Do we continue binding?
-          # @option options [ true, false ] :binding Are we in build mode?
-          #
           # @since 2.0.0.rc.1
           def bind_one
             target.parentize(base)
@@ -37,11 +32,6 @@ module Mongoid
           #   person.name.unbind(:continue => true)
           #   person.name = nil
           #
-          # @param [ Hash ] options The options to pass through.
-          #
-          # @option options [ true, false ] :continue Do we continue unbinding?
-          # @option options [ true, false ] :binding Are we in build mode?
-          #
           # @since 2.0.0.rc.1
           def unbind_one
             binding do

data/lib/mongoid/relations/bindings/referenced/many.rb

@@ -13,8 +13,6 @@ module Mongoid
           # @example Bind one document.
           #   person.posts.bind_one(post)
           #
-          # @param [ Document ] doc The single document to bind.
-          #
           # @since 2.0.0.rc.1
           def bind_one(doc)
             binding do
@@ -27,8 +25,6 @@ module Mongoid
           # @example Unbind the document.
           #   person.posts.unbind_one(document)
           #
-          # @param [ Document ] document The document to unbind.
-          #
           # @since 2.0.0.rc.1
           def unbind_one(doc)
             binding do

data/lib/mongoid/relations/bindings/referenced/many_to_many.rb

@@ -26,8 +26,8 @@ module Mongoid
                 end
                 doc.reset_relation_criteria(metadata.inverse)
               end
-              base.synced[metadata.foreign_key] = true
-              doc.synced[metadata.inverse_foreign_key] = true
+              base._synced[metadata.foreign_key] = true
+              doc._synced[metadata.inverse_foreign_key] = true
             end
           end
 
@@ -45,8 +45,8 @@ module Mongoid
                 inverse_keys.delete_one(inverse_record_id(doc))
                 doc.reset_relation_criteria(metadata.inverse)
               end
-              base.synced[metadata.foreign_key] = true
-              doc.synced[metadata.inverse_foreign_key] = true
+              base._synced[metadata.foreign_key] = true
+              doc._synced[metadata.inverse_foreign_key] = true
             end
           end
 

data/lib/mongoid/relations/builders/embedded/one.rb

@@ -12,7 +12,7 @@ module Mongoid
           # @example Build the document.
           #   Builder.new(meta, attrs).build
           #
-          # @param [ String ] type Not used in this context.
+          # @param [ String ] _type Not used in this context.
           #
           # @return [ Document ] A single document.
           def build(_type = nil)

data/lib/mongoid/relations/builders/nested_attributes/many.rb

@@ -60,7 +60,7 @@ module Mongoid
           # @example Is the document destroyable?
           #   destroyable?({ :_destroy => "1" })
           #
-          # @parma [ Hash ] attributes The attributes to pull the flag from.
+          # @param [ Hash ] attributes The attributes to pull the flag from.
           #
           # @return [ true, false ] If the relation can potentially be deleted.
           def destroyable?(attributes)

data/lib/mongoid/relations/conversions.rb

@@ -13,7 +13,7 @@ module Mongoid
       #   Conversions.flag(metadata, 15)
       #
       # @param [ Object ] object The object to flag.
-      # @param [ Metadata ] The relation metadata.
+      # @param [ Metadata ] metadata The relation metadata.
       #
       # @return [ Object ] The provided object.
       #

data/lib/mongoid/relations/counter_cache.rb

@@ -11,7 +11,7 @@ module Mongoid
       # @example Reset the given counter cache
       #   post.reset_counters(:comments)
       #
-      # @param [ Symbol, Array ] One or more counter caches to reset
+      # @param [ Symbol, Array ] counters One or more counter caches to reset
       #
       # @since 4.0.0
       def reset_counters(*counters)
@@ -29,8 +29,8 @@ module Mongoid
         # @example Reset the given counter cache
         #   Post.reset_counters('50e0edd97c71c17ea9000001', :comments)
         #
-        # @param [ String ] The id of the object that will be reset.
-        # @param [ Symbol, Array ] One or more counter caches to reset
+        # @param [ String ] id The id of the object that will be reset.
+        # @param [ Symbol, Array ] counters One or more counter caches to reset
         #
         # @since 3.1.0
         def reset_counters(id, *counters)
@@ -51,8 +51,8 @@ module Mongoid
         #   Post.update_counters('50e0edd97c71c17ea9000001',
         #              :comments_count => 5, :likes_count => -2)
         #
-        # @param [ String ] The id of the object to update.
-        # @param [ Hash ] Key = counter_cache and Value = factor.
+        # @param [ String ] id The id of the object to update.
+        # @param [ Hash ] counters
         #
         # @since 3.1.0
         def update_counters(id, counters)
@@ -66,8 +66,8 @@ module Mongoid
         # @example Increment comments counter
         #   Post.increment_counter(:comments_count, '50e0edd97c71c17ea9000001')
         #
-        # @param [ Symbol ] Counter cache name
-        # @param [ String ] The id of the object that will have its counter incremented.
+        # @param [ Symbol ] counter_name Counter cache name
+        # @param [ String ] id The id of the object that will have its counter incremented.
         #
         # @since 3.1.0
         def increment_counter(counter_name, id)
@@ -81,8 +81,8 @@ module Mongoid
         # @example Decrement comments counter
         #   Post.decrement_counter(:comments_count, '50e0edd97c71c17ea9000001')
         #
-        # @param [ Symbol ] Counter cache name
-        # @param [ String ] The id of the object that will have its counter decremented.
+        # @param [ Symbol ] counter_name Counter cache name
+        # @param [ String ] id The id of the object that will have its counter decremented.
         #
         # @since 3.1.0
         def decrement_counter(counter_name, id)
@@ -98,7 +98,7 @@ module Mongoid
         # @example Add the touchable.
         #   Person.add_counter_cache_callbacks(meta)
         #
-        # @param [ Metadata ] metadata The metadata for the relation.
+        # @param [ Metadata ] meta The metadata for the relation.
         #
         # @since 3.1.0
         def add_counter_cache_callbacks(meta)

data/lib/mongoid/relations/eager.rb

@@ -22,19 +22,14 @@ module Mongoid
       end
 
       def preload(relations, docs)
-        grouped_relations = relations.group_by do |metadata|
-          metadata.inverse_class_name
-        end
-        grouped_relations.keys.each do |_klass|
-          grouped_relations[_klass] = grouped_relations[_klass].group_by do |metadata|
-            metadata.relation
+        relations.group_by(&:inverse_class_name)
+                 .values
+                 .each do |associations|
+          associations.group_by(&:relation)
+                      .each do |relation, association|
+            relation.eager_load_klass.new(association, docs).run
           end
         end
-        grouped_relations.each do |_klass, associations|
-          docs = associations.collect do |_relation, association|
-            _relation.eager_load_klass.new(association, docs).run
-          end.flatten
-        end
       end
     end
   end