mongoid 3.0.0.rc → 3.0.0

data/lib/mongoid/relations/builder.rb

@@ -17,7 +17,7 @@ module Mongoid
       #
       # @param [ Document ] base The base document.
       # @param [ Metdata ] metadata The metadata for the relation.
-      # @param [ Hash, BSON::ObjectId ] object The attributes to build from or
+      # @param [ Hash, Moped::BSON::ObjectId ] object The attributes to build from or
       #   id to query with.
       #
       # @since 2.0.0.rc.1

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

@@ -27,7 +27,7 @@ module Mongoid
             if update?
               existing.attributes = attributes
             elsif replace?
-              parent.send(metadata.setter, Mongoid::Factory.build(metadata.klass, attributes))
+              parent.send(metadata.setter, Factory.build(metadata.klass, attributes))
             elsif delete?
               parent.send(metadata.setter, nil)
             end

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

@@ -18,7 +18,7 @@ module Mongoid
             return object unless query?
             return [] if object.is_a?(Array)
             crit = metadata.criteria(Conversions.flag(object, metadata), base.class)
-            IdentityMap.get(crit.klass, crit.selector) || crit
+            IdentityMap.get_many(crit.klass, crit.selector) || crit
           end
         end
       end

data/lib/mongoid/relations/cascading.rb

@@ -27,9 +27,10 @@ module Mongoid
       def cascade!
         cascades.each do |name|
           if !metadata || !metadata.versioned?
-            meta = relations[name]
-            strategy = meta.cascade_strategy
-            strategy.new(self, meta).cascade
+            if meta = relations[name]
+              strategy = meta.cascade_strategy
+              strategy.new(self, meta).cascade
+            end
           end
         end
       end

data/lib/mongoid/relations/constraint.rb

@@ -36,7 +36,7 @@ module Mongoid
       def convert(object)
         return object if metadata.polymorphic?
         klass = metadata.klass
-        klass.using_object_ids? ? BSON::ObjectId.mongoize(object) : object
+        klass.using_object_ids? ? Moped::BSON::ObjectId.mongoize(object) : object
       end
     end
   end

data/lib/mongoid/relations/conversions.rb

@@ -20,7 +20,7 @@ module Mongoid
       # @since 2.3.0
       def flag(object, metadata)
         inverse = metadata.inverse_klass
-        if inverse.using_object_ids? || object.is_a?(BSON::ObjectId)
+        if inverse.using_object_ids? || object.is_a?(Moped::BSON::ObjectId)
           object
         else
           if object.is_a?(String)

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

@@ -74,11 +74,11 @@ module Mongoid
         def batch_replace(docs)
           if docs.blank?
             if _assigning? && !empty?
-              base.atomic_unsets.push(first.atomic_path)
+              base.add_atomic_unset(first)
             end
             batch_remove(target.dup)
           else
-            base.delayed_atomic_sets.clear
+            base.delayed_atomic_sets.clear unless _assigning?
             docs = normalize_docs(docs).compact
             target.clear and _unscoped.clear
             inserts = execute_batch_insert(docs, "$set")
@@ -100,6 +100,7 @@ module Mongoid
         # @since 3.0.0
         def add_atomic_sets(sets)
           if _assigning?
+            base.delayed_atomic_sets[path].try(:clear)
             base.collect_children.each do |child|
               child.delayed_atomic_sets.clear
             end

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

@@ -131,8 +131,8 @@ module Mongoid
         # @since 2.0.0.rc.1
         def delete(document)
           doc = target.delete_one(document)
-          _unscoped.delete_one(doc)
           if doc && !_binding?
+            _unscoped.delete_one(doc) unless doc.paranoid?
             if _assigning?
               if doc.paranoid?
                 doc.destroy(suppress: true)
@@ -141,8 +141,8 @@ module Mongoid
               end
             else
               doc.delete(suppress: true)
+              unbind_one(doc)
             end
-            unbind_one(doc)
           end
           reindex
           doc
@@ -182,10 +182,10 @@ module Mongoid
         # methods.
         #
         # @example Find a document by its id.
-        #   person.addresses.find(BSON::ObjectId.new)
+        #   person.addresses.find(Moped::BSON::ObjectId.new)
         #
         # @example Find documents for multiple ids.
-        #   person.addresses.find([ BSON::ObjectId.new, BSON::ObjectId.new ])
+        #   person.addresses.find([ Moped::BSON::ObjectId.new, Moped::BSON::ObjectId.new ])
         #
         # @param [ Array<Object> ] args Various arguments.
         #

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

@@ -36,7 +36,7 @@ module Mongoid
         # @since 2.0.0.rc.1
         def substitute(replacement)
           if _assigning?
-            base.atomic_unsets.push(atomic_path)
+            base.add_atomic_unset(target)
           else
             delete if persistable?
           end

data/lib/mongoid/relations/metadata.rb

@@ -123,7 +123,7 @@ module Mongoid
       #
       # @since 2.0.0.rc.1
       def class_name
-        @class_name ||= (self[:class_name] || classify).sub(/^::/,"")
+        @class_name ||= (self[:class_name] || classify).sub(/\A::/,"")
       end
 
       # Get the foreign key contraint for the metadata.
@@ -263,7 +263,7 @@ module Mongoid
       #
       # @since 2.3.3
       def forced_nil_inverse?
-        has_key?(:inverse_of) && inverse_of.nil?
+        @forced_nil_inverse ||= has_key?(:inverse_of) && inverse_of.nil?
       end
 
       # Handles all the logic for figuring out what the foreign_key is for each
@@ -389,9 +389,11 @@ module Mongoid
       #
       # @return [ Array<Symbol> ] The inverse name.
       def inverses(other = nil)
-        return [self[:inverse_of]] if has_key?(:inverse_of)
-        return self[:as] ? [self[:as]] : lookup_inverses(other) if polymorphic?
-        @inverse ||= [(cyclic? ? cyclic_inverse : inverse_relation)]
+        if self[:polymorphic]
+          lookup_inverses(other)
+        else
+          @inverses ||= determine_inverses
+        end
       end
 
       # Get the name of the inverse relation if it exists. If this is a
@@ -862,6 +864,23 @@ module Mongoid
         relation.stores_foreign_key? && polymorphic? ? "#{name}_#{field}" : nil
       end
 
+      # Deterimene the inverses that can be memoized.
+      #
+      # @api private
+      #
+      # @example Determin the inverses.
+      #   metadata.determine_inverses
+      #
+      # @return [ Array<Symbol> ] The inverses.
+      #
+      # @since 3.0.0
+      def determine_inverses
+        return [ inverse_of ] if has_key?(:inverse_of)
+        return [ as ] if has_key?(:as)
+        return [ cyclic_inverse ] if self[:cyclic]
+        [ inverse_relation ]
+      end
+
       # Find the module the class with the specific name is in.
       # This is done by starting at the inverse_class_name's
       # module and stepping down to see where it is defined.
@@ -993,17 +1012,11 @@ module Mongoid
       def determine_inverse_relation
         default = foreign_key_match || klass.relations[inverse_klass.name.underscore]
         return default.name if default
-        candidates = inverse_relation_candidates
-
-        if candidates.size > 1
-          raise Errors::AmbiguousRelationship.new(
-            klass,
-            inverse_klass,
-            name,
-            candidates
-          )
+        names = inverse_relation_candidate_names
+        if names.size > 1
+          raise Errors::AmbiguousRelationship.new(klass, inverse_klass, name, names)
         end
-        candidates.first
+        names.first
       end
 
       # Return metadata where the foreign key matches the foreign key on this
@@ -1019,27 +1032,41 @@ module Mongoid
       # @since 2.4.11
       def foreign_key_match
         if fk = self[:foreign_key]
-          klass.relations.values.detect do |meta|
+          relations_metadata.detect do |meta|
             fk == meta.foreign_key if meta.stores_foreign_key?
           end
         end
       end
 
-      # Get the candidates for inverse relations.
+      # Get the inverse relation candidates.
       #
       # @api private
       #
-      # @example Get the candidates.
+      # @example Get the inverse relation candidates.
       #   metadata.inverse_relation_candidates
       #
-      # @return [ Array<Symbol> ] The candidates.
+      # @return [ Array<Metdata> ] The candidates.
       #
       # @since 3.0.0
       def inverse_relation_candidates
-        klass.relations.select do |_, meta|
+        relations_metadata.select do |meta|
           next if meta.versioned? || meta.name == name
           meta.class_name == inverse_class_name
-        end.keys.map(&:to_sym)
+        end
+      end
+
+      # Get the candidates for inverse relations.
+      #
+      # @api private
+      #
+      # @example Get the candidates.
+      #   metadata.inverse_relation_candidates
+      #
+      # @return [ Array<Symbol> ] The candidates.
+      #
+      # @since 3.0.0
+      def inverse_relation_candidate_names
+        @candidate_names ||= inverse_relation_candidates.map(&:name)
       end
 
       # Determine the key for the relation in the attributes.
@@ -1091,8 +1118,11 @@ module Mongoid
       # @return [ Array<String> ] The inverse names.
       def lookup_inverses(other)
         if other
-          matching_metas = other.class.relations.find_all { |key, meta| meta.as == name }
-          matching_metas.map { |meta| meta[1].name }
+          matches = []
+          other.class.relations.values.each do |meta|
+            matches.push(meta.name) if meta.as == name
+          end
+          matches
         end
       end
 
@@ -1113,6 +1143,20 @@ module Mongoid
           invs.first
         end
       end
+
+      # Get the relation metadata only.
+      #
+      # @api private
+      #
+      # @example Get the relation metadata.
+      #   metadata.relations_metadata
+      #
+      # @return [ Array<Metadata> ] The metadata.
+      #
+      # @since 3.0.0
+      def relations_metadata
+        klass.relations.values
+      end
     end
   end
 end

data/lib/mongoid/relations/nested_builder.rb

@@ -63,11 +63,11 @@ module Mongoid
       # @param [ Class ] klass The class we're trying to convert for.
       # @param [ String ] id The id, usually coming from the form.
       #
-      # @return [ BSON::ObjectId, String, Object ] The converted id.
+      # @return [ Moped::BSON::ObjectId, String, Object ] The converted id.
       #
       # @since 2.0.0.rc.6
       def convert_id(klass, id)
-        klass.using_object_ids? ? BSON::ObjectId.mongoize(id) : id
+        klass.using_object_ids? ? Moped::BSON::ObjectId.mongoize(id) : id
       end
     end
   end

data/lib/mongoid/relations/proxy.rb

@@ -160,15 +160,17 @@ module Mongoid
         #
         # @since 2.2.0
         def eager_load_ids(metadata, ids)
-          cleared = false
           klass, foreign_key = metadata.klass, metadata.foreign_key
-          klass.any_in(foreign_key => ids).each do |doc|
-            selector = { foreign_key => doc.send(foreign_key) }
-            unless cleared
-              IdentityMap.clear_many(klass, selector)
-              cleared = true
+          eager_loaded = klass.any_in(foreign_key => ids).entries
+          unless eager_loaded.empty?
+            eager_loaded.each do |doc|
+              base_id = doc.__send__(foreign_key)
+              yield(doc, { foreign_key => base_id })
+            end
+          else
+            ids.each do |id|
+              IdentityMap.clear_many(klass, { foreign_key => id })
             end
-            yield(doc, foreign_key => doc.send(foreign_key))
           end
         end
       end

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

@@ -50,13 +50,13 @@ module Mongoid
         #
         # @since 2.4.0
         def concat(documents)
-          inserts = []
+          docs, inserts = [], []
           documents.each do |doc|
             next unless doc
             append(doc)
-            save_or_delay(doc, inserts) if persistable?
+            save_or_delay(doc, docs, inserts) if persistable?
           end
-          persist_delayed(inserts)
+          persist_delayed(docs, inserts)
           self
         end
 
@@ -170,12 +170,12 @@ module Mongoid
         # conditions.
         #
         # @example Find by an id.
-        #   person.posts.find(BSON::ObjectId.new)
+        #   person.posts.find(Moped::BSON::ObjectId.new)
         #
         # @example Find by multiple ids.
-        #   person.posts.find([ BSON::ObjectId.new, BSON::ObjectId.new ])
+        #   person.posts.find([ Moped::BSON::ObjectId.new, Moped::BSON::ObjectId.new ])
         #
-        # @param [ BSON::ObjectId, Array<BSON::ObjectId> ] arg The ids.
+        # @param [ Moped::BSON::ObjectId, Array<Moped::BSON::ObjectId> ] arg The ids.
         #
         # @return [ Document, Criteria ] The matching document(s).
         #
@@ -387,13 +387,14 @@ module Mongoid
         # @example Persist the delayed batch inserts.
         #   relation.persist_delayed([ doc ])
         #
-        # @param [ Array<Document> ] inserts The delayed inserts.
+        # @param [ Array<Document> ] docs The delayed inserts.
+        # @param [ Array<Hash> ] inserts The raw insert document.
         #
         # @since 3.0.0
-        def persist_delayed(inserts)
-          if inserts.any?
-            collection.insert(inserts.map(&:as_document))
-            inserts.each do |doc|
+        def persist_delayed(docs, inserts)
+          unless docs.empty?
+            collection.insert(inserts)
+            docs.each do |doc|
               doc.new_record = false
               doc.run_after_callbacks(:create, :save)
               doc.post_persist
@@ -478,10 +479,11 @@ module Mongoid
         # @param [ Array<Document> ] inserts The inserts.
         #
         # @since 3.0.0
-        def save_or_delay(doc, inserts)
+        def save_or_delay(doc, docs, inserts)
           if doc.new_record? && doc.valid?(:create)
-            inserts.push(doc)
             doc.run_before_callbacks(:save, :create)
+            docs.push(doc)
+            inserts.push(doc.as_document)
           else
             doc.save
           end
@@ -520,18 +522,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_metadata.inverse_of_field
-              crit = crit.any_in(inverse_metadata.inverse_of_field => [metadata.name, nil])
-            end
-
-            crit
+            with_inverse_field_criterion(
+              with_polymorphic_criterion(
+                metadata.klass.where(metadata.foreign_key => object),
+                metadata,
+                type
+              ),
+              metadata
+            )
           end
 
           # Eager load the relation based on the criteria.
@@ -688,6 +686,52 @@ module Mongoid
           def validation_default
             true
           end
+
+          private
+
+          # Decorate the criteria with polymorphic criteria, if applicable.
+          #
+          # @api private
+          #
+          # @example Get the criteria with polymorphic criterion.
+          #   Proxy.with_polymorphic_criterion(criteria, metadata)
+          #
+          # @param [ Criteria ] criteria The criteria to decorate.
+          # @param [ Metadata ] metadata The metadata.
+          # @param [ Class ] type The optional type.
+          #
+          # @return [ Criteria ] The criteria.
+          #
+          # @since 3.0.0
+          def with_polymorphic_criterion(criteria, metadata, type = nil)
+            if metadata.polymorphic?
+              criteria.where(metadata.type => type.name)
+            else
+              criteria
+            end
+          end
+
+          # Decorate the criteria with inverse field criteria, if applicable.
+          #
+          # @api private
+          #
+          # @example Get the criteria with polymorphic criterion.
+          #   Proxy.with_inverse_field_criterion(criteria, metadata)
+          #
+          # @param [ Criteria ] criteria The criteria to decorate.
+          # @param [ Metadata ] metadata The metadata.
+          #
+          # @return [ Criteria ] The criteria.
+          #
+          # @since 3.0.0
+          def with_inverse_field_criterion(criteria, metadata)
+            inverse_metadata = metadata.inverse_metadata(metadata.klass)
+            if inverse_metadata.try(:inverse_of_field)
+              criteria.any_in(inverse_metadata.inverse_of_field => [ metadata.name, nil ])
+            else
+              criteria
+            end
+          end
         end
       end
     end