mongoid 3.1.6 → 4.0.2

data/lib/mongoid/relations/referenced/in.rb

@@ -71,7 +71,7 @@ module Mongoid
         #
         # @since 2.0.0.rc.1
         def binding
-          Bindings::Referenced::In.new(base, target, metadata)
+          Bindings::Referenced::In.new(base, target, __metadata)
         end
 
         # Normalize the value provided as a replacement for substitution.
@@ -88,7 +88,7 @@ module Mongoid
         # @since 3.1.5
         def normalize(replacement)
           return replacement if replacement.is_a?(Document)
-          metadata.builder(klass, replacement).build
+          __metadata.builder(klass, replacement).build
         end
 
         # Are we able to persist this relation?
@@ -139,24 +139,8 @@ module Mongoid
             type.where(metadata.primary_key => object)
           end
 
-          # Get the criteria that is used to eager load a relation of this
-          # type.
-          #
-          # @example Get the eager load criteria.
-          #   Proxy.eager_load(metadata, criteria)
-          #
-          # @param [ Metadata ] metadata The relation metadata.
-          # @param [ Array<Object> ] ids The ids of the target docs.
-          #
-          # @return [ Criteria ] The criteria to eager load the relation.
-          #
-          # @since 2.2.0
-          def eager_load(metadata, ids)
-            raise Errors::EagerLoad.new(metadata.name) if metadata.polymorphic?
-            klass, _ = metadata.klass, metadata.foreign_key
-            klass.any_in("_id" => ids.uniq).each do |doc|
-              IdentityMap.set(doc)
-            end
+          def eager_load_klass
+            Relations::Eager::BelongsTo
           end
 
           # Returns true if the relation is an embedded one. In this case

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

@@ -78,12 +78,8 @@ module Mongoid
         # @return [ Document ] The new document.
         #
         # @since 2.0.0.beta.1
-        def build(attributes = {}, options = {}, type = nil)
-          if options.is_a? Class
-            options, type = {}, options
-          end
-
-          doc = Factory.build(type || klass, attributes, options)
+        def build(attributes = {}, type = nil)
+          doc = Factory.build(type || klass, attributes)
           append(doc)
           doc.apply_post_processed_defaults
           yield(doc) if block_given?
@@ -186,15 +182,15 @@ module Mongoid
         # conditions.
         #
         # @example Find by an id.
-        #   person.posts.find(Moped::BSON::ObjectId.new)
+        #   person.posts.find(BSON::ObjectId.new)
         #
         # @example Find by multiple ids.
-        #   person.posts.find([ Moped::BSON::ObjectId.new, Moped::BSON::ObjectId.new ])
+        #   person.posts.find([ BSON::ObjectId.new, BSON::ObjectId.new ])
         #
         # @note This will keep matching documents in memory for iteration
         #   later.
         #
-        # @param [ Moped::BSON::ObjectId, Array<Moped::BSON::ObjectId> ] arg The ids.
+        # @param [ BSON::ObjectId, Array<BSON::ObjectId> ] arg The ids.
         #
         # @return [ Document, Criteria ] The matching document(s).
         #
@@ -249,7 +245,7 @@ module Mongoid
         #
         # @since 2.0.0.beta.1
         def purge
-          unless metadata.destructive?
+          unless __metadata.destructive?
             nullify
           else
             after_remove_error = nil
@@ -285,10 +281,10 @@ module Mongoid
         def substitute(replacement)
           if replacement
             new_docs, docs = replacement.compact, []
-            new_ids = new_docs.map { |doc| doc.id }
+            new_ids = new_docs.map { |doc| doc._id }
             remove_not_in(new_ids)
             new_docs.each do |doc|
-              docs.push(doc) if doc.send(foreign_key) != base.id
+              docs.push(doc) if doc.send(foreign_key) != base._id
             end
             concat(docs)
           else
@@ -308,7 +304,7 @@ module Mongoid
         # @since 2.4.0
         def unscoped
           klass.unscoped.where(
-            foreign_key => Conversions.flag(base.id, metadata)
+            foreign_key => Conversions.flag(base._id, __metadata)
           )
         end
 
@@ -324,6 +320,8 @@ module Mongoid
         #
         # @since 2.0.0.rc.1
         def append(document)
+          document.with(@persistence_options) if @persistence_options
+
           execute_callback :before_add, document
           target.push(document)
           characterize_one(document)
@@ -342,7 +340,7 @@ module Mongoid
         #
         # @since 2.0.0.rc.1
         def binding
-          Bindings::Referenced::Many.new(base, target, metadata)
+          Bindings::Referenced::Many.new(base, target, __metadata)
         end
 
         # Get the collection of the relation in question.
@@ -368,8 +366,8 @@ module Mongoid
         # @since 2.0.0.beta.1
         def criteria
           Many.criteria(
-            metadata,
-            Conversions.flag(base.send(metadata.primary_key), metadata),
+            __metadata,
+            Conversions.flag(base.send(__metadata.primary_key), __metadata),
             base.class
           )
         end
@@ -387,8 +385,8 @@ module Mongoid
         # @since 2.1.0
         def cascade!(document)
           if persistable?
-            if metadata.destructive?
-              document.send(metadata.dependent)
+            if __metadata.destructive?
+              document.send(__metadata.dependent)
             else
               document.save
             end
@@ -412,7 +410,7 @@ module Mongoid
             target.send(name, *args, &block)
           else
             klass.send(:with_scope, criteria) do
-              criteria.send(name, *args, &block)
+              criteria.public_send(name, *args, &block)
             end
           end
         end
@@ -488,16 +486,16 @@ module Mongoid
         # @since 2.4.0
         def remove_not_in(ids)
           removed = criteria.not_in(_id: ids)
-          if metadata.destructive?
+          if __metadata.destructive?
             removed.delete_all
           else
             removed.update_all(foreign_key => nil)
           end
           in_memory.each do |doc|
-            if !ids.include?(doc.id)
+            if !ids.include?(doc._id)
               unbind_one(doc)
               target.delete(doc)
-              if metadata.destructive?
+              if __metadata.destructive?
                 doc.destroyed = true
               end
             end
@@ -571,19 +569,8 @@ module Mongoid
             )
           end
 
-          # Eager load the relation based on the criteria.
-          #
-          # @example Eager load the criteria.
-          #   Proxy.eager_load(metadata, criteria)
-          #
-          # @param [ Metadata ] metadata The relation metadata.
-          # @param [ Array<Object> ] ids The ids of the base docs.
-          #
-          # @return [ Criteria ] The criteria to eager load the relation.
-          #
-          # @since 2.2.0
-          def eager_load(metadata, ids)
-            eager_load_ids(metadata, ids) { |doc, key| IdentityMap.set_many(doc, key) }
+          def eager_load_klass
+            Relations::Eager::HasMany
           end
 
           # Returns true if the relation is an embedded one. In this case

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

@@ -29,7 +29,7 @@ module Mongoid
           return concat(docs) if docs.size > 1
           if doc = docs.first
             append(doc)
-            base.add_to_set(foreign_key, doc.send(metadata.primary_key))
+            base.add_to_set(foreign_key => doc.send(__metadata.primary_key))
             if child_persistable?(doc)
               doc.save
             end
@@ -55,17 +55,17 @@ module Mongoid
             next unless doc
             append(doc)
             if persistable? || _creating?
-              ids[doc.id] = true
+              ids[doc._id] = true
               save_or_delay(doc, docs, inserts)
             else
               existing = base.send(foreign_key)
-              unless existing.include?(doc.id)
-                existing.push(doc.id) and unsynced(base, foreign_key)
+              unless existing.include?(doc._id)
+                existing.push(doc._id) and unsynced(base, foreign_key)
               end
             end
           end
           if persistable? || _creating?
-            base.push_all(foreign_key, ids.keys)
+            base.push(foreign_key => ids.keys)
           end
           persist_delayed(docs, inserts)
           self
@@ -77,26 +77,20 @@ module Mongoid
         # @example Build a new document on the relation.
         #   person.posts.build(:title => "A new post")
         #
-        # @overload build(attributes = {}, options = {}, type = nil)
+        # @overload build(attributes = {}, type = nil)
         #   @param [ Hash ] attributes The attributes of the new document.
-        #   @param [ Hash ] options The scoped assignment options.
         #   @param [ Class ] type The optional subclass to build.
         #
         # @overload build(attributes = {}, type = nil)
         #   @param [ Hash ] attributes The attributes of the new document.
-        #   @param [ Hash ] options The scoped assignment options.
         #   @param [ Class ] type The optional subclass to build.
         #
         # @return [ Document ] The new document.
         #
         # @since 2.0.0.beta.1
-        def build(attributes = {}, options = {}, type = nil)
-          if options.is_a? Class
-            options, type = {}, options
-          end
-
-          doc = Factory.build(type || klass, attributes, options)
-          base.send(foreign_key).push(doc.id)
+        def build(attributes = {}, type = nil)
+          doc = Factory.build(type || klass, attributes)
+          base.send(foreign_key).push(doc._id)
           append(doc)
           doc.apply_post_processed_defaults
           unsynced(doc, inverse_foreign_key)
@@ -120,7 +114,7 @@ module Mongoid
         def delete(document)
           doc = super
           if doc && persistable?
-            base.pull(foreign_key, doc.send(metadata.primary_key))
+            base.pull(foreign_key => doc.send(__metadata.primary_key))
             target._unloaded = criteria
             unsynced(base, foreign_key)
           end
@@ -139,19 +133,16 @@ module Mongoid
           target.each do |doc|
             execute_callback :before_remove, doc
           end
-          unless metadata.forced_nil_inverse?
-            criteria.pull(inverse_foreign_key, base.id)
+          unless __metadata.forced_nil_inverse?
+            criteria.pull(inverse_foreign_key => base._id)
           end
           if persistable?
-            base.set(
-              foreign_key,
-              base.send(foreign_key).clear
-            )
+            base.set(foreign_key => base.send(foreign_key).clear)
           end
           after_remove_error = nil
           many_to_many = target.clear do |doc|
             unbind_one(doc)
-            unless metadata.forced_nil_inverse?
+            unless __metadata.forced_nil_inverse?
               doc.changed_attributes.delete(inverse_foreign_key)
             end
             begin
@@ -230,7 +221,7 @@ module Mongoid
         #
         # @since 2.0.0.rc.1
         def binding
-          Bindings::Referenced::ManyToMany.new(base, target, metadata)
+          Bindings::Referenced::ManyToMany.new(base, target, __metadata)
         end
 
         # Determine if the child document should be persisted.
@@ -247,7 +238,7 @@ module Mongoid
         # @since 3.0.20
         def child_persistable?(doc)
           (persistable? || _creating?) &&
-            !(doc.persisted? && metadata.forced_nil_inverse?)
+            !(doc.persisted? && __metadata.forced_nil_inverse?)
         end
 
         # Returns the criteria object for the target class with its documents set
@@ -258,7 +249,7 @@ module Mongoid
         #
         # @return [ Criteria ] A new criteria.
         def criteria
-          ManyToMany.criteria(metadata, base.send(foreign_key))
+          ManyToMany.criteria(__metadata, base.send(foreign_key))
         end
 
         # Flag the base as unsynced with respect to the foreign key.
@@ -320,22 +311,8 @@ module Mongoid
             )
           end
 
-          # Get the criteria that is used to eager load a relation of this
-          # type.
-          #
-          # @example Get the eager load criteria.
-          #   Proxy.eager_load(metadata, criteria)
-          #
-          # @param [ Metadata ] metadata The relation metadata.
-          # @param [ Array<Object> ] ids The ids of the documents to load.
-          #
-          # @return [ Criteria ] The criteria to eager load the relation.
-          #
-          # @since 2.2.0
-          def eager_load(metadata, ids)
-            metadata.klass.any_in(_id: ids).each do |doc|
-              IdentityMap.set(doc)
-            end
+          def eager_load_klass
+            Relations::Eager::HasAndBelongsToMany
           end
 
           # Returns true if the relation is an embedded one. In this case

data/lib/mongoid/relations/referenced/one.rb

@@ -53,13 +53,13 @@ module Mongoid
         def substitute(replacement)
           unbind_one
           if persistable?
-            if metadata.destructive?
-              send(metadata.dependent)
+            if __metadata.destructive?
+              send(__metadata.dependent)
             else
               save if persisted?
             end
           end
-          One.new(base, replacement, metadata) if replacement
+          One.new(base, replacement, __metadata) if replacement
         end
 
         private
@@ -73,7 +73,7 @@ module Mongoid
         #
         # @return [ Binding ] The binding object.
         def binding
-          Bindings::Referenced::One.new(base, target, metadata)
+          Bindings::Referenced::One.new(base, target, __metadata)
         end
 
         # Are we able to persist this relation?
@@ -122,33 +122,14 @@ module Mongoid
           # @since 2.1.0
           def criteria(metadata, object, type = nil)
             crit = metadata.klass.where(metadata.foreign_key => object)
-
             if metadata.polymorphic?
               crit = crit.where(metadata.type => type.name)
             end
-
-            inverse_metadata = metadata.inverse_metadata(metadata.klass)
-            if inverse_metadata.inverse_of_field
-              crit = crit.any_in(inverse_metadata.inverse_of_field => [metadata.name, nil])
-            end
-
             crit
           end
 
-          # Get the criteria that is used to eager load a relation of this
-          # type.
-          #
-          # @example Get the eager load criteria.
-          #   Proxy.eager_load(metadata, criteria)
-          #
-          # @param [ Metadata ] metadata The relation metadata.
-          # @param [ Array<Object> ] ids The ids of the base docs.
-          #
-          # @return [ Criteria ] The criteria to eager load the relation.
-          #
-          # @since 2.2.0
-          def eager_load(metadata, ids)
-            eager_load_ids(metadata, ids) { |doc, key| IdentityMap.set_one(doc, key) }
+          def eager_load_klass
+            Relations::Eager::HasOne
           end
 
           # Returns true if the relation is an embedded one. In this case

data/lib/mongoid/relations/synchronization.rb

@@ -61,7 +61,7 @@ module Mongoid
       def remove_inverse_keys(meta)
         foreign_keys = send(meta.foreign_key)
         unless foreign_keys.nil? || foreign_keys.empty?
-          meta.criteria(foreign_keys, self.class).pull(meta.inverse_foreign_key, id)
+          meta.criteria(foreign_keys, self.class).pull(meta.inverse_foreign_key => _id)
         end
       end
 
@@ -87,15 +87,15 @@ module Mongoid
           # had occurred.
           if meta.autosave?
             send(meta.name).in_memory.each do |doc|
-              adds.delete_one(doc.id)
+              adds.delete_one(doc._id)
             end
           end
 
           unless adds.empty?
-            meta.criteria(adds, self.class).without_options.add_to_set(meta.inverse_foreign_key, id)
+            meta.criteria(adds, self.class).without_options.add_to_set(meta.inverse_foreign_key => _id)
           end
           unless subs.empty?
-            meta.criteria(subs, self.class).without_options.pull(meta.inverse_foreign_key, id)
+            meta.criteria(subs, self.class).without_options.pull(meta.inverse_foreign_key => _id)
           end
         end
       end

data/lib/mongoid/relations/targets/enumerable.rb

@@ -59,7 +59,7 @@ module Mongoid
         #
         # @since 2.1.0
         def <<(document)
-          _added[document.id] = document
+          _added[document._id] = document
           self
         end
         alias :push :<<
@@ -110,9 +110,9 @@ module Mongoid
         #
         # @since 2.1.0
         def delete(document)
-          doc = (_loaded.delete(document.id) || _added.delete(document.id))
+          doc = (_loaded.delete(document._id) || _added.delete(document._id))
           unless doc
-            if _unloaded && _unloaded.where(_id: document.id).exists?
+            if _unloaded && _unloaded.where(_id: document._id).exists?
               yield(document) if block_given?
               return document
             end
@@ -128,7 +128,7 @@ module Mongoid
         #
         # @example Delete all matching documents.
         #   enumerable.delete_if do |doc|
-        #     dod.id == id
+        #     dod._id == _id
         #   end
         #
         # @return [ Array<Document> ] The remaining docs.
@@ -138,8 +138,8 @@ module Mongoid
           load_all!
           deleted = in_memory.select(&block)
           deleted.each do |doc|
-            _loaded.delete(doc.id)
-            _added.delete(doc.id)
+            _loaded.delete(doc._id)
+            _added.delete(doc._id)
           end
           self
         end
@@ -179,8 +179,8 @@ module Mongoid
             end
           else
             unloaded_documents.each do |doc|
-              document = _added.delete(doc.id) || _loaded.delete(doc.id) || doc
-              _loaded[document.id] = document
+              document = _added.delete(doc._id) || _loaded.delete(doc._id) || doc
+              _loaded[document._id] = document
               yield(document)
             end
           end
@@ -237,7 +237,7 @@ module Mongoid
           else
             @_added, @executed = {}, true
             @_loaded = target.inject({}) do |_target, doc|
-              _target[doc.id] = doc
+              _target[doc._id] = doc
               _target
             end
           end
@@ -255,7 +255,7 @@ module Mongoid
         # @since 3.0.0
         def include?(doc)
           return super unless _unloaded
-          _unloaded.where(_id: doc.id).exists? || _added.has_key?(doc.id)
+          _unloaded.where(_id: doc._id).exists? || _added.has_key?(doc._id)
         end
 
         # Inspection will just inspect the entries for nice array-style