mongoid 2.1.9 → 2.2.0

data/lib/mongoid/keys.rb

@@ -7,13 +7,36 @@ module Mongoid #:nodoc:
     extend ActiveSupport::Concern
 
     attr_reader :identifier
-    delegate :primary_key, :using_object_ids?, :to => "self.class"
 
     included do
       cattr_accessor :primary_key, :using_object_ids
       self.using_object_ids = true
     end
 
+    # Get the document's primary key.
+    #
+    # @note Refactored from using delegate for class load performance.
+    #
+    # @example Get the primary key.
+    #   model.primary_key
+    #
+    # @return [ Array ] The primary key
+    def primary_key
+      self.class.primary_key
+    end
+
+    # Is the document using object ids?
+    #
+    # @note Refactored from using delegate for class load performance.
+    #
+    # @example Is the document using object ids?
+    #   model.using_object_ids?
+    #
+    # @return [ true, false ] Using object ids.
+    def using_object_ids?
+      self.class.using_object_ids?
+    end
+
     private
 
     # Determines if any field that the document id is composed of has changed.

data/lib/mongoid/nested_attributes.rb

@@ -5,13 +5,23 @@ module Mongoid #:nodoc:
   module NestedAttributes
     extend ActiveSupport::Concern
 
-    delegate :nested_attributes, :to => "self.class"
-
     included do
       class_attribute :nested_attributes
       self.nested_attributes = []
     end
 
+    # Get the nested attributes.
+    #
+    # @note Refactored from using delegate for class load performance.
+    #
+    # @example Get the nested attributes.
+    #   model.nested_attributes
+    #
+    # @return [ Array<String> ] The nested attributes methods.
+    def nested_attributes
+      self.class.nested_attributes
+    end
+
     module ClassMethods #:nodoc:
 
       REJECT_ALL_BLANK_PROC = proc { |attributes| attributes.all? { |_, value| value.blank? } }
@@ -44,8 +54,10 @@ module Mongoid #:nodoc:
         args.each do |name|
           self.nested_attributes += [ "#{name}_attributes=" ]
           define_method("#{name}_attributes=") do |attrs|
-            relation = relations[name.to_s]
-            relation.nested_builder(attrs, options).build(self)
+            assigning do
+              relation = relations[name.to_s]
+              relation.nested_builder(attrs, options).build(self)
+            end
           end
         end
       end

data/lib/mongoid/persistence.rb

@@ -67,7 +67,11 @@ module Mongoid #:nodoc:
     #
     # @return [ true, false ] True if validation passed.
     def save!(options = {})
-      self.class.fail_validate!(self) unless upsert(options); true
+      unless upsert(options)
+        self.class.fail_validate!(self) if errors.any?
+        self.class.fail_callback!(self, :save!)
+      end
+      return true
     end
 
     # Update the document in the datbase.
@@ -124,7 +128,10 @@ module Mongoid #:nodoc:
     # @return [ true, false ] True if validation passed.
     def update_attributes!(attributes = {})
       update_attributes(attributes).tap do |result|
-        self.class.fail_validate!(self) unless result
+        unless result
+          self.class.fail_validate!(self) if errors.any?
+          self.class.fail_callback!(self, :update_attributes!)
+        end
       end
     end
 
@@ -159,7 +166,9 @@ module Mongoid #:nodoc:
       #
       # @return [ Document ] The newly created document.
       def create(attributes = {}, &block)
-        new(attributes, &block).tap { |doc| doc.save }
+        creating do
+          new(attributes, &block).tap { |doc| doc.save }
+        end
       end
 
       # Create a new document. This will instantiate a new document and
@@ -174,9 +183,12 @@ module Mongoid #:nodoc:
       #
       # @return [ Document ] The newly created document.
       def create!(attributes = {}, &block)
-        document = new(attributes, &block)
-        fail_validate!(document) if document.insert.errors.any?
-        document
+        creating do
+          new(attributes, &block).tap do |doc|
+            fail_validate!(doc) if doc.insert.errors.any?
+            fail_callback!(doc, :create!) if doc.new?
+          end
+        end
       end
 
       # Delete all documents given the supplied conditions. If no conditions
@@ -230,6 +242,38 @@ module Mongoid #:nodoc:
       def fail_validate!(document)
         raise Errors::Validations.new(document)
       end
+
+      # Raise an error if a callback failed.
+      #
+      # @example Raise the callback error.
+      #   Person.fail_callback!(person, :create!)
+      #
+      # @param [ Document ] document The document to fail.
+      # @param [ Symbol ] method The method being called.
+      #
+      # @since 2.2.0
+      def fail_callback!(document, method)
+        raise Errors::Callback.new(document.class, method)
+      end
+
+      private
+
+      # Execute a block in creating mode.
+      #
+      # @example Execute in creating mode.
+      #   creating do
+      #     relation.push(doc)
+      #   end
+      #
+      # @return [ Object ] The return value of the block.
+      #
+      # @since 2.1.0
+      def creating
+        Threaded.begin_create
+        yield
+      ensure
+        Threaded.exit_create
+      end
     end
   end
 end

data/lib/mongoid/persistence/operations.rb

@@ -155,10 +155,7 @@ module Mongoid #:nodoc:
       # @since 2.1.0
       def init_updates
         document.atomic_updates.tap do |updates|
-          conflicts = updates.delete(:other)
-          if conflicts
-            @conflicts = { "$pushAll" => conflicts }
-          end
+          @conflicts = updates.delete(:conflicts) || {}
         end
       end
 

data/lib/mongoid/persistence/operations/update.rb

@@ -43,7 +43,9 @@ module Mongoid #:nodoc:
           prepare do
             unless updates.empty?
               collection.update(selector, updates, options)
-              collection.update(selector, conflicts, options) if conflicts
+              conflicts.each_pair do |key, value|
+                collection.update(selector, { key => value }, options)
+              end
             end
           end
         end

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

@@ -12,13 +12,12 @@ module Mongoid # :nodoc:
           # the existing relation, a replacement of the relation with a new
           # document, or a removal of the relation.
           #
-          # Example:
+          # @example Build the nested attrs.
+          #   many.build(person)
           #
-          # <tt>many.build(person)</tt>
+          # @param [ Document ] parent The parent document of the relation.
           #
-          # Options:
-          #
-          # parent: The parent document of the relation.
+          # @return [ Array ] The attributes.
           def build(parent)
             @existing = parent.send(metadata.name)
             if over_limit?(attributes)
@@ -36,19 +35,12 @@ module Mongoid # :nodoc:
           # Create the new builder for nested attributes on one-to-many
           # relations.
           #
-          # Example:
-          #
-          # <tt>One.new(metadata, attributes, options)</tt>
-          #
-          # Options:
-          #
-          # metadata: The relation metadata
-          # attributes: The attributes hash to attempt to set.
-          # options: The options defined.
+          # @example Initialize the builder.
+          #   One.new(metadata, attributes, options)
           #
-          # Returns:
-          #
-          # A new builder.
+          # @param [ Metadata ] metadata The relation metadata.
+          # @param [ Hash ] attributes The attributes hash to attempt to set.
+          # @param [ Hash ] options The options defined.
           def initialize(metadata, attributes, options = {})
             if attributes.respond_to?(:with_indifferent_access)
               @attributes = attributes.with_indifferent_access.sort do |a, b|
@@ -65,17 +57,12 @@ module Mongoid # :nodoc:
 
           # Can the existing relation potentially be deleted?
           #
-          # Example:
-          #
-          # <tt>destroyable?({ :_destroy => "1" })</tt>
-          #
-          # Options:
-          #
-          # attributes: The attributes to pull the flag from.
+          # @example Is the document destroyable?
+          #   destroyable?({ :_destroy => "1" })
           #
-          # Returns:
+          # @parma [ Hash ] attributes The attributes to pull the flag from.
           #
-          # True if the relation can potentially be deleted.
+          # @return [ true, false ] If the relation can potentially be deleted.
           def destroyable?(attributes)
             destroy = attributes.delete(:_destroy)
             [ 1, "1", true, "true" ].include?(destroy) && allow_destroy?
@@ -84,17 +71,12 @@ module Mongoid # :nodoc:
           # Are the supplied attributes of greater number than the supplied
           # limit?
           #
-          # Example:
+          # @example Are we over the set limit?
+          #   builder.over_limit?({ "street" => "Bond" })
           #
-          # <tt>builder.over_limit?({ "street" => "Bond" })</tt>
+          # @param [ Hash ] attributes The attributes being set.
           #
-          # Options:
-          #
-          # attributes: The attributes being set.
-          #
-          # Returns:
-          #
-          # True if a limit supplied and the attributes are of greater number.
+          # @return [ true, false ] If the attributes exceed the limit.
           def over_limit?(attributes)
             limit = options[:limit]
             limit ? attributes.size > limit : false
@@ -103,20 +85,21 @@ module Mongoid # :nodoc:
           # Process each set of attributes one at a time for each potential
           # new, existing, or ignored document.
           #
-          # Example:
-          #
-          # <tt>builder.process({ "id" => 1, "street" => "Bond" })
+          # @example Process the attributes
+          #   builder.process({ "id" => 1, "street" => "Bond" })
           #
-          # Options:
-          #
-          # attrs: The single document attributes to process.
+          # @param [ Hash ] attrs The single document attributes to process.
           def process(attrs)
             return if reject?(attrs)
             if id = attrs["id"] || attrs["_id"]
-              document = existing.find(convert_id(id))
-              destroyable?(attrs) ? existing.delete(document) : document.update_attributes(attrs)
+              doc = existing.find(convert_id(id))
+              if destroyable?(attrs)
+                existing.delete(doc)
+              else
+                metadata.embedded? ? doc.attributes = attrs : doc.update_attributes(attrs)
+              end
             else
-              existing.push(Mongoid::Factory.build(metadata.klass, attrs)) unless destroyable?(attrs)
+              existing.push(Factory.build(metadata.klass, attrs)) unless destroyable?(attrs)
             end
           end
         end

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

@@ -17,7 +17,8 @@ module Mongoid # :nodoc:
           def build(type = nil)
             return object unless query?
             return [] if object.is_a?(Array)
-            metadata.criteria(convertable(metadata, object))
+            crit = metadata.criteria(convertable(metadata, object))
+            IdentityMap.get(crit.klass, crit.selector) || crit
           end
 
           private

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

@@ -17,7 +17,7 @@ module Mongoid # :nodoc:
           def build(type = nil)
             return object unless query?
             criteria = metadata.criteria(object)
-            IdentityMap.match(criteria) || criteria.first
+            IdentityMap.get(criteria.klass, criteria.selector) || criteria.first
           end
         end
       end

data/lib/mongoid/relations/cascading.rb

@@ -15,7 +15,6 @@ module Mongoid # :nodoc:
       included do
         class_attribute :cascades
         self.cascades = []
-        delegate :cascades, :to => "self.class"
       end
 
       # Perform all cascading deletes, destroys, or nullifies. Will delegate to
@@ -33,6 +32,18 @@ module Mongoid # :nodoc:
         end
       end
 
+      # Get the cascading definitions.
+      #
+      # @note Refactored from using delegate for class load performance.
+      #
+      # @example Get the cascades.
+      #   model.cascades
+      #
+      # @return [ Array<String> ] The cascading relation names.
+      def cascades
+        self.class.cascades
+      end
+
       module ClassMethods #:nodoc:
 
         # Attempt to add the cascading information for the document to know how

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

@@ -26,7 +26,7 @@ module Mongoid # :nodoc:
             args.flatten.each do |doc|
               next unless doc
               append(doc)
-              doc.save if persistable?
+              doc.save if persistable? && !assigning?
             end
           end
         end
@@ -124,7 +124,11 @@ module Mongoid # :nodoc:
         def delete(document)
           target.delete_one(document).tap do |doc|
             if doc && !binding?
-              doc.delete(:suppress => true)
+              if assigning?
+                base.add_atomic_pull(doc)
+              else
+                doc.delete(:suppress => true)
+              end
               unbind_one(doc)
             end
             reindex
@@ -228,6 +232,9 @@ module Mongoid # :nodoc:
         def substitute(replacement)
           tap do |proxy|
             if replacement.blank?
+              if assigning?
+                base.atomic_unsets.push(proxy.first.atomic_path)
+              end
               proxy.clear
             else
               atomically(:$set) do
@@ -238,7 +245,7 @@ module Mongoid # :nodoc:
                 proxy.target.each_with_index do |doc, index|
                   integrate(doc)
                   doc._index = index
-                  doc.save if base.persisted?
+                  doc.save if base.persisted? && !assigning?
                 end
               end
             end
@@ -377,7 +384,7 @@ module Mongoid # :nodoc:
           criteria.size.tap do
             criteria.each do |doc|
               target.delete_one(doc)
-              doc.send(method, :suppress => true)
+              doc.send(method, :suppress => true) unless assigning?
               unbind_one(doc)
             end
             reindex

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

@@ -36,7 +36,11 @@ module Mongoid # :nodoc:
         # @since 2.0.0.rc.1
         def substitute(replacement)
           tap do |proxy|
-            proxy.delete
+            if assigning?
+              base.atomic_unsets.push(proxy.atomic_path)
+            else
+              proxy.delete
+            end
             proxy.unbind_one
             return nil unless replacement
             proxy.target = replacement
@@ -69,7 +73,7 @@ module Mongoid # :nodoc:
         #
         # @since 2.1.0
         def persistable?
-          base.persisted? && !binding? && !building?
+          base.persisted? && !binding? && !building? && !assigning?
         end
 
         class << self

data/lib/mongoid/relations/macros.rb

@@ -7,10 +7,6 @@ module Mongoid # :nodoc:
     module Macros
       extend ActiveSupport::Concern
 
-      # Convenience methods for the instance to know about attributes that
-      # are located at the class level.
-      delegate :associations, :relations, :to => "self.class"
-
       included do
         cattr_accessor :embedded
         class_attribute :relations
@@ -27,6 +23,19 @@ module Mongoid # :nodoc:
         end
       end
 
+      # Get the metadata for all the defined relations.
+      #
+      # @note Refactored from using delegate for class load performance.
+      #
+      # @example Get the relations.
+      #   model.relations
+      #
+      # @return [ Hash<String, Metadata> ] The relation metadata.
+      def relations
+        self.class.relations
+      end
+      alias :associations :relations
+
       module ClassMethods #:nodoc:
 
         # Adds the relation back to the parent document. This macro is
@@ -241,14 +250,12 @@ module Mongoid # :nodoc:
         #
         # @return [ Metadata ] The metadata for the relation.
         def characterize(name, relation, options, &block)
-          Metadata.new(
-            options.merge(
-              :relation => relation,
-              :extend => create_extension_module(name, &block),
-              :inverse_class_name => self.name,
-              :name => name
-            )
-          )
+          Metadata.new({
+            :relation => relation,
+            :extend => create_extension_module(name, &block),
+            :inverse_class_name => self.name,
+            :name => name
+          }.merge(options))
         end
 
         # Generate a named extension module suitable for marshaling