mongoid 2.4.0 → 2.4.12

data/lib/mongoid/named_scope.rb

@@ -56,7 +56,8 @@ module Mongoid #:nodoc:
         (class << self; self; end).class_eval <<-EOT
           def #{name}(*args)
             scope = scopes[:#{name}]
-            scope.extend(criteria.fuse(scope.conditions.as_conditions(*args)))
+            conditions = scope.conditions.as_conditions(*args)
+            scope.extend(criteria.fuse(conditions))
           end
         EOT
       end
@@ -123,6 +124,21 @@ module Mongoid #:nodoc:
         end
       end
 
+      # When inheriting, we want to copy the scopes from the parent class and
+      # set the on the child to start, mimicking the behaviour of the old
+      # class_inheritable_accessor that was deprecated in Rails edge.
+      #
+      # @example Inherit from this class.
+      #   Person.inherited(Doctor)
+      #
+      # @param [ Class ] subclass The inheriting class.
+      #
+      # @since 2.0.0.rc.6
+      def inherited(subclass)
+        super
+        subclass.scopes = scopes.dup
+      end
+
       protected
 
       # Warns or raises exception if overriding another scope or method.

data/lib/mongoid/nested_attributes.rb

@@ -12,7 +12,7 @@ module Mongoid #:nodoc:
 
     module ClassMethods #:nodoc:
 
-      REJECT_ALL_BLANK_PROC = proc { |attributes| attributes.all? { |_, value| value.blank? } }
+      REJECT_ALL_BLANK_PROC = proc { |attributes| attributes.all? { |key, value| key == '_destroy' || value.blank? } }
 
       # Used when needing to update related models from a parent relation. Can
       # be used on embedded or referenced relations.

data/lib/mongoid/observer.rb

@@ -170,5 +170,12 @@ module Mongoid #:nodoc:
         end
       end
     end
+
+    def disabled_for?(object)
+      klass = object.class
+      return false unless klass.respond_to?(:observers)
+      klass.observers.disabled_for?(self) || Mongoid.observers.disabled_for?(self)
+    end
+
   end
 end

data/lib/mongoid/persistence/insertion.rb

@@ -25,11 +25,12 @@ module Mongoid #:nodoc:
               doc.run_callbacks(:create) do
                 yield(doc)
                 doc.new_record = false
-                doc.reset_persisted_children and true
+                true
               end
             end
 
             unless result == false
+              doc.reset_persisted_children
               doc.move_changes
               Threaded.clear_options!
             end

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

@@ -42,15 +42,6 @@ module Mongoid #:nodoc:
         def persist
           prepare do
             unless updates.empty?
-              # @todo Durran: This is a temporary fix for #791 until we rewrite
-              # the dirty tracking to properly flag a document as changed if
-              # only embedded documents have changed.
-              if document.respond_to?(:updated_at)
-                if document.timestamping? && !document.updated_at_changed?
-                  document.updated_at = Time.now
-                end
-              end
-
               collection.update(selector, updates, options)
               conflicts.each_pair do |key, value|
                 collection.update(selector, { key => value }, options)

data/lib/mongoid/persistence.rb

@@ -116,8 +116,8 @@ module Mongoid #:nodoc:
     # @param [ Hash ] attributes The attributes to update.
     #
     # @return [ true, false ] True if validation passed, false if not.
-    def update_attributes(attributes = {})
-      write_attributes(attributes); save
+    def update_attributes(attributes = {}, options = {})
+      assign_attributes(attributes, options); save
     end
 
     # Update the document attributes in the database and raise an error if
@@ -131,8 +131,8 @@ module Mongoid #:nodoc:
     # @raise [ Errors::Validations ] If validation failed.
     #
     # @return [ true, false ] True if validation passed.
-    def update_attributes!(attributes = {})
-      update_attributes(attributes).tap do |result|
+    def update_attributes!(attributes = {}, options = {})
+      update_attributes(attributes, options).tap do |result|
         unless result
           self.class.fail_validate!(self) if errors.any?
           self.class.fail_callback!(self, :update_attributes!)
@@ -151,7 +151,7 @@ module Mongoid #:nodoc:
     # @return [ true, false ] True is success, false if not.
     def upsert(options = {})
       if new_record?
-        insert(options).persisted?
+        !insert(options).new_record?
       else
         update(options)
       end

data/lib/mongoid/railtie.rb

@@ -23,8 +23,27 @@ module Rails #:nodoc:
         config.respond_to?(:app_generators) ? :app_generators : :generators
       end
 
+      # Maping of rescued exceptions to HTTP responses
+      #
+      # @example
+      #   railtie.rescue_responses
+      #
+      # @ return [Hash] rescued responses
+      #
+      # @since 2.4.3
+      def self.rescue_responses
+        {
+          "Mongoid::Errors::DocumentNotFound" => :not_found,
+          "Mongoid::Errors::Validations" => 422
+        }
+      end
+
       config.send(generator).orm :mongoid, :migration => false
 
+      if config.action_dispatch.rescue_responses
+        config.action_dispatch.rescue_responses.merge!(rescue_responses)
+      end
+
       rake_tasks do
         load "mongoid/railties/database.rake"
       end
@@ -81,10 +100,9 @@ module Rails #:nodoc:
       # 404s and not 500s, validation errors are 422s.
       initializer "load http errors" do |app|
         config.after_initialize do
-          ActionDispatch::ShowExceptions.rescue_responses.update({
-            "Mongoid::Errors::DocumentNotFound" => :not_found,
-            "Mongoid::Errors::Validations" => 422
-          })
+          unless config.action_dispatch.rescue_responses
+            ActionDispatch::ShowExceptions.rescue_responses.update(Railtie.rescue_responses)
+          end
         end
       end
 

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

@@ -19,17 +19,15 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def bind
+            base.you_must(metadata.foreign_key_setter, target.id)
+            if metadata.inverse_type
+              base.you_must(metadata.inverse_type_setter, target.class.model_name)
+            end
             unless _binding?
               _binding do
                 inverse = metadata.inverse(target)
-                base.you_must(metadata.foreign_key_setter, target.id)
-                if metadata.inverse_type
-                  base.you_must(metadata.inverse_type_setter, target.class.model_name)
-                end
                 if inverse
-                  inverse_metadata = metadata.inverse_metadata(target)
-                  if inverse_metadata != metadata && !inverse_metadata.nil?
-                    base.metadata = inverse_metadata
+                  if set_base_metadata
                     if base.referenced_many?
                       target.send(inverse).push(base) unless Mongoid.identity_map_enabled?
                     else
@@ -51,14 +49,15 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def unbind
+            base.you_must(metadata.foreign_key_setter, nil)
+            if metadata.inverse_type
+              base.you_must(metadata.inverse_type_setter, nil)
+            end
             unless _binding?
               _binding do
                 inverse = metadata.inverse(target)
-                base.you_must(metadata.foreign_key_setter, nil)
-                if metadata.inverse_type
-                  base.you_must(metadata.inverse_type_setter, nil)
-                end
                 if inverse
+                  set_base_metadata
                   if base.referenced_many?
                     target.send(inverse).delete(base)
                   else
@@ -69,6 +68,27 @@ module Mongoid # :nodoc:
             end
           end
           alias :unbind_one :unbind
+
+          private
+
+          # Ensure that the metadata on the base is correct, for the cases
+          # where we have multiple belongs to definitions and were are setting
+          # different parents in memory in order.
+          #
+          # @api private
+          #
+          # @example Set the base metadata.
+          #   binding.set_base_metadata
+          #
+          # @return [ true, false ] If the metadata changed.
+          #
+          # @since 2.4.4
+          def set_base_metadata
+            inverse_metadata = metadata.inverse_metadata(target)
+            if inverse_metadata != metadata && !inverse_metadata.nil?
+              base.metadata = inverse_metadata
+            end
+          end
         end
       end
     end

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

@@ -17,12 +17,12 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def bind_one(doc)
+            doc.you_must(metadata.foreign_key_setter, base.id)
+            if metadata.type
+              doc.you_must(metadata.type_setter, base.class.model_name)
+            end
             unless _binding?
               _binding do
-                doc.you_must(metadata.foreign_key_setter, base.id)
-                if metadata.type
-                  doc.you_must(metadata.type_setter, base.class.model_name)
-                end
                 doc.send(metadata.inverse_setter, base)
               end
             end
@@ -37,12 +37,12 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def unbind_one(doc)
+            doc.you_must(metadata.foreign_key_setter, nil)
+            if metadata.type
+              doc.you_must(metadata.type_setter, nil)
+            end
             unless _binding?
               _binding do
-                doc.you_must(metadata.foreign_key_setter, nil)
-                if metadata.type
-                  doc.you_must(metadata.type_setter, nil)
-                end
                 doc.send(metadata.inverse_setter, nil)
               end
             end

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

@@ -19,13 +19,13 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def bind
+            target.you_must(metadata.foreign_key_setter, base.id)
+            if metadata.type
+              target.you_must(metadata.type_setter, base.class.model_name)
+            end
             unless _binding?
               _binding do
-                target.you_must(metadata.foreign_key_setter, base.id)
                 target.send(metadata.inverse_setter, base)
-                if metadata.type
-                  target.you_must(metadata.type_setter, base.class.model_name)
-                end
               end
             end
           end
@@ -40,13 +40,13 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def unbind
+            target.you_must(metadata.foreign_key_setter, nil)
+            if metadata.type
+              target.you_must(metadata.type_setter, nil)
+            end
             unless _binding?
               _binding do
-                target.you_must(metadata.foreign_key_setter, nil)
                 target.send(metadata.inverse_setter, nil)
-                if metadata.type
-                  target.you_must(metadata.type_setter, nil)
-                end
               end
             end
           end

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

@@ -92,7 +92,9 @@ module Mongoid # :nodoc:
           def process(parent, attrs)
             return if reject?(parent, attrs)
             if id = attrs.extract_id
-              doc = existing.find(convert_id(existing.first.class, id))
+              first = existing.first
+              converted = first ? convert_id(first.class, id) : id
+              doc = existing.find(converted)
               if destroyable?(attrs)
                 existing.delete(doc)
                 doc.destroy unless doc.embedded?

data/lib/mongoid/relations/cascading/delete.rb

@@ -2,7 +2,24 @@
 module Mongoid # :nodoc:
   module Relations #:nodoc:
     module Cascading #:nodoc:
-      class Delete < Strategy
+      class Delete
+
+        attr_accessor :document, :relation, :metadata
+
+        # Initialize the new cascade strategy, which will set up the relation
+        # and the metadata.
+        #
+        # @example Instantiate the strategy
+        #   Strategy.new(document, metadata)
+        #
+        # @param [ Document ] document The document to cascade from.
+        # @param [ Metadata ] metadata The relation's metadata.
+        #
+        # @return [ Strategy ] The new strategy.
+        def initialize(document, metadata)
+          @document, @metadata = document, metadata
+          @relation = document.send(metadata.name)
+        end
 
         # Execute the cascading deletion for the relation if it already exists.
         # This should be optimized in the future potentially not to load all
@@ -10,8 +27,18 @@ module Mongoid # :nodoc:
         #
         # @example Perform the cascading delete.
         #   strategy.cascade
+        #
+        # @since 2.0.0
         def cascade
-          Array.wrap(relation).each { |doc| doc.delete } if relation
+          if relation
+            if relation.cascades.empty?
+              safety = Threaded.safety_options
+              relation.clear
+              Threaded.safety_options = safety
+            else
+              ::Array.wrap(relation).each { |doc| doc.delete }
+            end
+          end
         end
       end
     end

data/lib/mongoid/relations/cascading/destroy.rb

@@ -2,7 +2,24 @@
 module Mongoid # :nodoc:
   module Relations #:nodoc:
     module Cascading #:nodoc:
-      class Destroy < Strategy
+      class Destroy
+
+        attr_accessor :document, :relation, :metadata
+
+        # Initialize the new cascade strategy, which will set up the relation
+        # and the metadata.
+        #
+        # @example Instantiate the strategy
+        #   Strategy.new(document, metadata)
+        #
+        # @param [ Document ] document The document to cascade from.
+        # @param [ Metadata ] metadata The relation's metadata.
+        #
+        # @return [ Strategy ] The new strategy.
+        def initialize(document, metadata)
+          @document, @metadata = document, metadata
+          @relation = document.send(metadata.name)
+        end
 
         # Execute the cascading deletion for the relation if it already exists.
         # This should be optimized in the future potentially not to load all

data/lib/mongoid/relations/cascading/nullify.rb

@@ -2,7 +2,24 @@
 module Mongoid # :nodoc:
   module Relations #:nodoc:
     module Cascading #:nodoc:
-      class Nullify < Strategy
+      class Nullify
+
+        attr_accessor :document, :relation, :metadata
+
+        # Initialize the new cascade strategy, which will set up the relation
+        # and the metadata.
+        #
+        # @example Instantiate the strategy
+        #   Strategy.new(document, metadata)
+        #
+        # @param [ Document ] document The document to cascade from.
+        # @param [ Metadata ] metadata The relation's metadata.
+        #
+        # @return [ Strategy ] The new strategy.
+        def initialize(document, metadata)
+          @document, @metadata = document, metadata
+          @relation = document.send(metadata.name)
+        end
 
         # This cascade does not delete the referenced relations, but instead
         # sets the foreign key values to nil.

data/lib/mongoid/relations/cascading.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require "mongoid/relations/cascading/strategy"
 require "mongoid/relations/cascading/delete"
 require "mongoid/relations/cascading/destroy"
 require "mongoid/relations/cascading/nullify"

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

@@ -55,13 +55,13 @@ module Mongoid #:nodoc:
         #
         # @since 2.0.0
         def atomically(modifier, &block)
-          updater = Threaded.update_consumer(root_class) ||
-            Threaded.set_update_consumer(root_class, MODIFIERS[modifier].new)
+          updater = Threaded.update_consumer(collection_name) ||
+            Threaded.set_update_consumer(collection_name, MODIFIERS[modifier].new)
           count_executions do
             block.call if block
           end.tap do
             if @executions.zero?
-              Threaded.set_update_consumer(root_class, nil)
+              Threaded.set_update_consumer(collection_name, nil)
               updater.execute(collection)
             end
           end

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

@@ -28,6 +28,22 @@ module Mongoid # :nodoc:
         end
         alias :push :<<
 
+        # Get this relation as as its representation in the database.
+        #
+        # @example Convert the relation to an attributes hash.
+        #   person.addresses.as_document
+        #
+        # @return [ Array<Hash> ] The relation as stored in the db.
+        #
+        # @since 2.0.0.rc.1
+        def as_document
+          [].tap do |attributes|
+            _unscoped.each do |doc|
+              attributes.push(doc.as_document)
+            end
+          end
+        end
+
         # Appends an array of documents to the relation. Performs a batch
         # insert of the documents instead of persisting one at a time.
         #
@@ -78,6 +94,7 @@ module Mongoid # :nodoc:
           Factory.build(type || metadata.klass, attributes, options).tap do |doc|
             doc.identify
             append(doc)
+            doc.apply_proc_defaults
             yield(doc) if block_given?
             doc.run_callbacks(:build) { doc }
           end
@@ -172,12 +189,16 @@ module Mongoid # :nodoc:
           target.delete_one(document).tap do |doc|
             _unscoped.delete_one(doc)
             if doc && !_binding?
-              if _assigning? && !doc.paranoid?
-                base.add_atomic_pull(doc)
+              if _assigning?
+                if doc.paranoid?
+                  doc.destroy(:suppress => true)
+                else
+                  base.add_atomic_pull(doc)
+                end
               else
                 doc.delete(:suppress => true)
+                unbind_one(doc)
               end
-              unbind_one(doc)
             end
             reindex
           end
@@ -283,46 +304,41 @@ module Mongoid # :nodoc:
           tap do |proxy|
             if replacement.blank?
               if _assigning? && !proxy.empty?
-                base.atomic_unsets.push(proxy.first.atomic_path)
+                base.atomic_unsets.push(_unscoped.first.atomic_path)
               end
               proxy.clear
             else
               atomically(:$set) do
+                base.delayed_atomic_sets.clear unless _assigning?
                 if replacement.first.is_a?(Hash)
-                  replacement = Many.builder(base, metadata, replacement).build
+                  replacement = replacement.map do |doc|
+                    attributes = { :metadata => metadata, :_parent => base }
+                    attributes.merge!(doc)
+                    Factory.build(klass, attributes)
+                  end
                 end
                 docs = replacement.compact
                 proxy.target = docs
                 self._unscoped = docs.dup
-                if _assigning?
-                  base.delayed_atomic_sets[metadata.name.to_s] = proxy.as_document
-                end
                 proxy.target.each_with_index do |doc, index|
                   integrate(doc)
                   doc._index = index
                   doc.save if base.persisted? && !_assigning?
                 end
+                if _assigning?
+                  name = _unscoped.first.atomic_path
+                  base.delayed_atomic_sets[name].try(:clear)
+                  base._children.each do |child|
+                    child.delayed_atomic_sets.clear
+                  end
+                  base.instance_variable_set(:@_children, nil)
+                  base.delayed_atomic_sets[name] = proxy.as_document
+                end
               end
             end
           end
         end
 
-        # Get this relation as as its representation in the database.
-        #
-        # @example Convert the relation to an attributes hash.
-        #   person.addresses.as_document
-        #
-        # @return [ Array<Hash> ] The relation as stored in the db.
-        #
-        # @since 2.0.0.rc.1
-        def as_document
-          [].tap do |attributes|
-            _unscoped.each do |doc|
-              attributes.push(doc.as_document)
-            end
-          end
-        end
-
         # Return the relation with all previous scoping removed. This is the
         # exact representation of the docs in the database.
         #
@@ -350,10 +366,10 @@ module Mongoid # :nodoc:
         #
         # @since 2.0.0.rc.1
         def append(document)
-          target.push(document)
+          target.push(*scope([document]))
           _unscoped.push(document)
           integrate(document)
-          document._index = target.size - 1
+          document._index = _unscoped.size - 1
         end
 
         # Instantiate the binding associated with this relation.
@@ -383,6 +399,22 @@ module Mongoid # :nodoc:
           end
         end
 
+        # Deletes one document from the target and unscoped.
+        #
+        # @api private
+        #
+        # @example Delete one document.
+        #   relation.delete_one(doc)
+        #
+        # @param [ Document ] document The document to delete.
+        #
+        # @since 2.4.7
+        def delete_one(document)
+          target.delete_one(document)
+          _unscoped.delete_one(document)
+          reindex
+        end
+
         # Integrate the document into the relation. will set its metadata and
         # attempt to bind the inverse.
         #

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

@@ -39,7 +39,7 @@ module Mongoid # :nodoc:
             if _assigning?
               base.atomic_unsets.push(proxy.atomic_path)
             else
-              proxy.delete if persistable?
+              proxy.destroy if persistable?
             end
             proxy.unbind_one
             return nil unless replacement

data/lib/mongoid/relations/metadata.rb

@@ -717,6 +717,19 @@ module Mongoid # :nodoc:
         !!self[:versioned]
       end
 
+      # Returns the metadata itself. Here for compatibility with Rails
+      # association metadata.
+      #
+      # @example Get the options.
+      #   metadata.options
+      #
+      # @return [ Metadata ] self.
+      #
+      # @since 2.4.6
+      def options
+        self
+      end
+
       # Returns default order for this association.
       #
       # @example Get default order
@@ -848,7 +861,7 @@ module Mongoid # :nodoc:
       #
       # @since 2.0.0.rc.1
       def determine_inverse_relation
-        default = klass.relations[inverse_klass.name.underscore]
+        default = foreign_key_match || klass.relations[inverse_klass.name.underscore]
         return default.name if default
         klass.relations.each_pair do |key, meta|
           next if meta.versioned? || meta.name == name
@@ -859,6 +872,25 @@ module Mongoid # :nodoc:
         return nil
       end
 
+      # Return metadata where the foreign key matches the foreign key on this
+      # relation.
+      #
+      # @api private
+      #
+      # @example Return a foreign key match.
+      #   meta.foreign_key_match
+      #
+      # @return [ Metadata ] A match, if any.
+      #
+      # @since 2.4.11
+      def foreign_key_match
+        if fk = self[:foreign_key]
+          klass.relations.values.detect do |meta|
+            fk == meta.foreign_key if meta.stores_foreign_key?
+          end
+        end
+      end
+
       # Determine the key for the relation in the attributes.
       #
       # @example Get the key.

data/lib/mongoid/relations/one.rb

@@ -6,6 +6,18 @@ module Mongoid # :nodoc:
     # behaviour or those proxies.
     class One < Proxy
 
+      # Clear this relation - same as calling #delete on the document.
+      #
+      # @example Clear the relation.
+      #   relation.clear
+      #
+      # @return [ true, false ] If the delete suceeded.
+      #
+      # @since 3.0.0
+      def clear
+        target.delete
+      end
+
       # Get all the documents in the relation that are loaded into memory.
       #
       # @example Get the in memory documents.