mongoid 5.4.1 → 6.0.0.beta

data/lib/mongoid/relations/accessors.rb

@@ -17,6 +17,7 @@ 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.
       #
@@ -31,7 +32,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.
@@ -159,7 +160,7 @@ module Mongoid
         #
         # @since 3.0.0
         def existence_check(name)
-          module_eval <<-END, __FILE__, __LINE__ + 1
+          module_eval <<-END
             def #{name}?
               without_autobuild { !__send__(:#{name}).blank? }
             end
@@ -229,6 +230,9 @@ module Mongoid
               if value = get_relation(name, metadata, object)
                 if value.respond_to?(:substitute)
                   set_relation(name, value.substitute(object.substitutable))
+                else
+                  value = __build__(name, value, metadata)
+                  set_relation(name, value.substitute(object.substitutable))
                 end
               else
                 __build__(name, object.substitutable, metadata)

data/lib/mongoid/relations/auto_save.rb

@@ -59,17 +59,25 @@ module Mongoid
           if metadata.autosave? && !metadata.embedded?
             save_method = :"autosave_documents_for_#{metadata.name}"
             define_method(save_method) do
-
               if before_callback_halted?
                 self.before_callback_halted = false
               else
                 __autosaving__ do
                   if relation = ivar(metadata.name)
-                    options = persistence_options || {}
                     if :belongs_to == metadata.macro
-                      relation.with(options).save if changed_for_autosave?(relation)
+                      if changed_for_autosave?(relation)
+                        relation.with(persistence_context) do |_relation|
+                          _relation.save
+                        end
+                      end
                     else
-                      Array(relation).each { |d| d.with(options).save if changed_for_autosave?(d) }
+                      Array(relation).each do |doc|
+                        if changed_for_autosave?(doc)
+                          doc.with(persistence_context) do |d|
+                            d.save
+                          end
+                        end
+                      end
                     end
                   end
                 end

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

@@ -17,6 +17,8 @@ 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?
           #
@@ -40,6 +42,8 @@ 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,6 +14,10 @@ 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)
@@ -28,7 +32,10 @@ module Mongoid
           # @example Unbind the document.
           #   person.addresses.unbind_one(document)
           #
-          # @param [ Document ] doc The single document to unbind.
+          # @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 unbind_one(doc)

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

@@ -17,6 +17,11 @@ 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)
@@ -32,6 +37,11 @@ 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,6 +13,8 @@ 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
@@ -25,6 +27,8 @@ 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/builders.rb

@@ -64,7 +64,7 @@ module Mongoid
         # @since 2.0.0.rc.1
         def builder(name, metadata)
           re_define_method("build_#{name}") do |*args|
-            attributes, _options = parse_args(*args)
+            attributes, options = parse_args(*args)
             document = Factory.build(metadata.klass, attributes)
             _building do
               child = send("#{name}=", document)
@@ -89,7 +89,7 @@ module Mongoid
         # @since 2.0.0.rc.1
         def creator(name, metadata)
           re_define_method("create_#{name}") do |*args|
-            attributes, _options = parse_args(*args)
+            attributes, options = parse_args(*args)
             document = Factory.build(metadata.klass, attributes)
             doc = _assigning do
               send("#{name}=", document)

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" })
           #
-          # @param [ Hash ] attributes The attributes to pull the flag from.
+          # @parma [ 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 ] metadata The relation metadata.
+      # @param [ Metadata ] The relation metadata.
       #
       # @return [ Object ] The provided object.
       #

data/lib/mongoid/relations/counter_cache.rb

@@ -11,11 +11,13 @@ module Mongoid
       # @example Reset the given counter cache
       #   post.reset_counters(:comments)
       #
-      # @param [ Symbol, Array ] counters One or more counter caches to reset
+      # @param [ Symbol, Array ] One or more counter caches to reset
       #
       # @since 4.0.0
       def reset_counters(*counters)
-        self.class.reset_counters(self, *counters)
+        self.class.with(persistence_context) do |_class|
+          _class.reset_counters(self, *counters)
+        end
       end
 
       module ClassMethods
@@ -27,8 +29,8 @@ module Mongoid
         # @example Reset the given counter cache
         #   Post.reset_counters('50e0edd97c71c17ea9000001', :comments)
         #
-        # @param [ String ] id The id of the object that will be reset.
-        # @param [ Symbol, Array ] counters One or more counter caches to reset
+        # @param [ String ] The id of the object that will be reset.
+        # @param [ Symbol, Array ] One or more counter caches to reset
         #
         # @since 3.1.0
         def reset_counters(id, *counters)
@@ -49,8 +51,8 @@ module Mongoid
         #   Post.update_counters('50e0edd97c71c17ea9000001',
         #              :comments_count => 5, :likes_count => -2)
         #
-        # @param [ String ] id The id of the object to update.
-        # @param [ Hash ] counters
+        # @param [ String ] The id of the object to update.
+        # @param [ Hash ] Key = counter_cache and Value = factor.
         #
         # @since 3.1.0
         def update_counters(id, counters)
@@ -64,8 +66,8 @@ module Mongoid
         # @example Increment comments counter
         #   Post.increment_counter(:comments_count, '50e0edd97c71c17ea9000001')
         #
-        # @param [ Symbol ] counter_name Counter cache name
-        # @param [ String ] id The id of the object that will have its counter incremented.
+        # @param [ Symbol ] Counter cache name
+        # @param [ String ] The id of the object that will have its counter incremented.
         #
         # @since 3.1.0
         def increment_counter(counter_name, id)
@@ -79,8 +81,8 @@ module Mongoid
         # @example Decrement comments counter
         #   Post.decrement_counter(:comments_count, '50e0edd97c71c17ea9000001')
         #
-        # @param [ Symbol ] counter_name Counter cache name
-        # @param [ String ] id The id of the object that will have its counter decremented.
+        # @param [ Symbol ] Counter cache name
+        # @param [ String ] The id of the object that will have its counter decremented.
         #
         # @since 3.1.0
         def decrement_counter(counter_name, id)
@@ -96,7 +98,7 @@ module Mongoid
         # @example Add the touchable.
         #   Person.add_counter_cache_callbacks(meta)
         #
-        # @param [ Metadata ] meta The metadata for the relation.
+        # @param [ Metadata ] metadata The metadata for the relation.
         #
         # @since 3.1.0
         def add_counter_cache_callbacks(meta)
@@ -105,18 +107,22 @@ module Mongoid
 
           after_update do
             if record = __send__(name)
-              foreign_key = meta.foreign_key
+              id_field = "#{name}_id"
 
-              if attribute_changed?(foreign_key)
-                original, current = attribute_change(foreign_key)
+              if attribute_changed?(id_field)
+                original, current = attribute_change(id_field)
 
                 unless original.nil?
-                  record.class.decrement_counter(cache_column, original)
+                  record.class.with(persistence_context) do |_class|
+                    _class.decrement_counter(cache_column, original)
+                  end
                 end
 
                 unless current.nil?
                   record[cache_column] = (record[cache_column] || 0) + 1
-                  record.class.increment_counter(cache_column, current) if record.persisted?
+                  record.class.with(record.persistence_context) do |_class|
+                    _class.increment_counter(cache_column, current) if record.persisted?
+                  end
                 end
               end
             end
@@ -127,7 +133,9 @@ module Mongoid
               record[cache_column] = (record[cache_column] || 0) + 1
 
               if record.persisted?
-                record.class.increment_counter(cache_column, record._id)
+                record.class.with(record.persistence_context) do |_class|
+                  _class.increment_counter(cache_column, record._id)
+                end
                 record.remove_change(cache_column)
               end
             end
@@ -138,7 +146,9 @@ module Mongoid
               record[cache_column] = (record[cache_column] || 0) - 1 unless record.frozen?
 
               if record.persisted?
-                record.class.decrement_counter(cache_column, record._id)
+                record.class.with(record.persistence_context) do |_class|
+                  _class.decrement_counter(cache_column, record._id)
+                end
                 record.remove_change(cache_column)
               end
             end

data/lib/mongoid/relations/eager.rb

@@ -9,16 +9,28 @@ module Mongoid
   module Relations
     module Eager
 
-      def eager_loadable?
-        !criteria.inclusions.empty?
+      attr_accessor :eager_loaded
+
+      def with_eager_loading(document)
+        return nil unless document
+        doc = Factory.from_db(klass, document, criteria.options[:fields])
+        eager_load_one(doc)
+        doc
+      end
+
+      def eager_load_one(doc)
+        eager_load([doc])
+      end
+
+      def eager_loadable?(document = nil)
+        return false if criteria.inclusions.empty?
+        !eager_loaded
       end
 
       def eager_load(docs)
-        docs.tap do |d|
-          if eager_loadable?
-            preload(criteria.inclusions, d)
-          end
-        end
+        return false unless eager_loadable?
+        preload(criteria.inclusions, docs)
+        self.eager_loaded = true
       end
 
       def preload(relations, docs)

data/lib/mongoid/relations/eager/base.rb

@@ -12,8 +12,8 @@ module Mongoid
         # @example Create the new belongs to eager load preloader.
         #   BelongsTo.new(relations_metadata, parent_docs)
         #
-        # @param [ Array<Metadata> ] associations Relations to eager load
-        # @param [ Array<Document> ] docs Documents to preload the relations
+        # @param [ Array<Metadata> ] Relations to eager load
+        # @param [ Array<Document> ] Documents to preload the relations
         #
         # @return [ Base ] The eager load preloader
         #
@@ -84,7 +84,7 @@ module Mongoid
         # @example Set docs into parent with pk = "foo"
         #   loader.set_on_parent("foo", docs)
         #
-        # @param [ ObjectId ] id parent`s id
+        # @param [ ObjectId ] parent`s id
         # @param [ Document, Array ] element to push into the parent
         #
         # @since 4.0.0
@@ -140,12 +140,12 @@ module Mongoid
         # @example Set docs into parent using the current relation name.
         #   loader.set_relation(doc, docs)
         #
-        # @param [ Document ] doc
+        # @param [ Document ] document
         # @param [ Document, Array ] element to set into the parent
         #
         # @since 4.0.0
         def set_relation(doc, element)
-          doc.set_relation(@metadata.name, element) unless doc.blank?
+          doc.set_relation(@metadata.name, element)
         end
       end
     end

data/lib/mongoid/relations/embedded/batchable.rb

@@ -13,15 +13,15 @@ module Mongoid
         # made to the database.
         #
         # @example Execute the batch push.
-        #   batchable.batch_push([ doc_one, doc_two ])
+        #   batchable.batch_insert([ doc_one, doc_two ])
         #
         # @param [ Array<Document> ] docs The docs to add.
         #
         # @return [ Array<Hash> ] The inserts.
         #
-        # @since 5.4.0
-        def batch_push(docs)
-          execute_batch_push(docs)
+        # @since 3.0.0
+        def batch_insert(docs)
+          execute_batch_insert(docs, "$pushAll")
         end
 
         # Clear all of the docs out of the relation in a single swipe.
@@ -89,7 +89,7 @@ module Mongoid
             base.delayed_atomic_sets.clear unless _assigning?
             docs = normalize_docs(docs).compact
             target.clear and _unscoped.clear
-            inserts = execute_batch_set(docs)
+            inserts = execute_batch_insert(docs, "$set")
             add_atomic_sets(inserts)
           end
         end
@@ -122,50 +122,26 @@ module Mongoid
         # @api private
         #
         # @example Perform a batch operation.
-        #   batchable.execute_batch_set(docs)
+        #   batchable.execute_batch(docs, "$set")
         #
         # @param [ Array<Document> ] docs The docs to persist.
         # @param [ String ] operation The atomic operation.
         #
         # @return [ Array<Hash> ] The inserts.
         #
-        # @since 5.4.0
-        def execute_batch_set(docs)
+        # @since 3.0.0
+        def execute_batch_insert(docs, operation)
           self.inserts_valid = true
           inserts = pre_process_batch_insert(docs)
           if insertable?
             collection.find(selector).update_one(
-              positionally(selector, '$set' => { path => inserts })
+              positionally(selector, operation => { path => inserts })
             )
             post_process_batch_insert(docs)
           end
           inserts
         end
 
-        # Perform a batch persist of the provided documents with $push and $each.
-        #
-        # @api private
-        #
-        # @example Perform a batch push.
-        #   batchable.execute_batch_push(docs)
-        #
-        # @param [ Array<Document> ] docs The docs to persist.
-        # @param [ String ] operation The atomic operation.
-        #
-        # @return [ Array<Hash> ] The inserts.
-        #
-        # @since 5.4.0
-        def execute_batch_push(docs)
-          self.inserts_valid = true
-          pushes = pre_process_batch_insert(docs)
-          if insertable?
-            collection.find(selector).update_one(
-                positionally(selector, '$push' => { path => { '$each' => pushes } }))
-            post_process_batch_insert(docs)
-          end
-          pushes
-        end
-
         # Are we in a state to be able to batch insert?
         #
         # @api private