mongoid 2.4.9 → 3.0.0.rc

data/lib/mongoid/nested_attributes.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
+module Mongoid
 
   # Mongoid's implementation of Rails' nested attributes.
   module NestedAttributes
@@ -7,12 +7,14 @@ module Mongoid #:nodoc:
 
     included do
       class_attribute :nested_attributes
-      self.nested_attributes = []
+      self.nested_attributes = {}
     end
 
-    module ClassMethods #:nodoc:
+    module ClassMethods
 
-      REJECT_ALL_BLANK_PROC = proc { |attributes| attributes.all? { |key, value| key == '_destroy' || value.blank? } }
+      REJECT_ALL_BLANK_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.
@@ -33,18 +35,24 @@ module Mongoid #:nodoc:
       #   by a hash of options.
       #
       # @option *args [ true, false ] :allow_destroy Can deletion occur?
-      # @option *args [ Proc, Symbol ] :reject_if Block or symbol pointing to a class method to reject documents with.
+      # @option *args [ Proc, Symbol ] :reject_if Block or symbol pointing
+      #   to a class method to reject documents with.
       # @option *args [ Integer ] :limit The max number to create.
       # @option *args [ true, false ] :update_only Only update existing docs.
       def accepts_nested_attributes_for(*args)
         options = args.extract_options!
         options[:reject_if] = REJECT_ALL_BLANK_PROC if options[:reject_if] == :all_blank
         args.each do |name|
-          self.nested_attributes += [ "#{name}_attributes=" ]
-          define_method("#{name}_attributes=") do |attrs|
+          meth = "#{name}_attributes="
+          self.nested_attributes["#{name}_attributes"] = meth
+          metadata = relations[name.to_s]
+          unless metadata
+            raise Errors::NestedAttributesMetadataNotFound.new(self, name)
+          end
+          autosave(metadata.merge!(autosave: true))
+          re_define_method(meth) do |attrs|
             _assigning do
-              relation = relations[name.to_s]
-              relation.nested_builder(attrs, options).build(self)
+              metadata.nested_builder(attrs, options).build(self)
             end
           end
         end

data/lib/mongoid/observer.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
+module Mongoid
 
   # Observer classes respond to life cycle callbacks to implement trigger-like
   # behavior outside the original class. This is a great way to reduce the
@@ -176,6 +176,5 @@ module Mongoid #:nodoc:
       return false unless klass.respond_to?(:observers)
       klass.observers.disabled_for?(self) || Mongoid.observers.disabled_for?(self)
     end
-
   end
 end

data/lib/mongoid/paranoia.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
+module Mongoid
 
   # Include this module to get soft deletion of root level documents.
   # This will add a deleted_at field to the +Document+, managed automatically.
@@ -14,7 +14,7 @@ module Mongoid #:nodoc:
     extend ActiveSupport::Concern
 
     included do
-      field :deleted_at, :type => Time
+      field :deleted_at, type: Time
       self.paranoid = true
     end
 
@@ -56,11 +56,8 @@ module Mongoid #:nodoc:
     # @since 1.0.0
     def remove(options = {})
       time = self.deleted_at = Time.now
-      paranoid_collection.update(
-        atomic_selector,
-        { "$set" => { paranoid_field => time }},
-        Safety.merge_safety_options(options)
-      )
+      paranoid_collection.find(atomic_selector).
+        update({ "$set" => { paranoid_field => time }})
       cascade!
       @destroyed = true
       IdentityMap.remove(self)
@@ -78,7 +75,7 @@ module Mongoid #:nodoc:
     #
     # @since 1.0.0
     def destroyed?
-      @destroyed || !!deleted_at
+      (@destroyed ||= false) || !!deleted_at
     end
 
     # Restores a previously soft-deleted document. Handles this by removing the
@@ -91,10 +88,8 @@ module Mongoid #:nodoc:
     #
     # @since 1.0.0
     def restore
-      paranoid_collection.update(
-        atomic_selector,
-        { "$unset" => { paranoid_field => true }}
-      )
+      paranoid_collection.find(atomic_selector).
+        update({ "$unset" => { paranoid_field => true }})
       attributes.delete("deleted_at")
     end
 
@@ -124,21 +119,21 @@ module Mongoid #:nodoc:
       embedded? ? "#{atomic_position}.deleted_at" : "deleted_at"
     end
 
-    module ClassMethods #:nodoc:
+    module ClassMethods
 
       # Override the default +Criteria+ accessor to only get existing
-      # documents. Passes all arguments up to +NamedScope.criteria+
+      # documents.
       #
       # @example Override the criteria.
-      #   Person.criteria
+      #   Person.queryable
       #
       # @param [ Array ] args The arguments.
       #
       # @return [ Criteria ] The paranoid compliant criteria.
       #
-      # @since 1.0.0
-      def criteria(embedded = false, scoped = true)
-        scoped ? super.where(:deleted_at => nil) : super
+      # @since 3.0.0
+      def queryable
+        super.where(deleted_at: nil)
       end
 
       # Find deleted documents

data/lib/mongoid/persistence/atomic/add_to_set.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Atomic #:nodoc:
+module Mongoid
+  module Persistence
+    module Atomic
 
       # This class provides the ability to perform an explicit $addToSet
       # modification on a specific field.
@@ -23,12 +23,8 @@ module Mongoid #:nodoc:
             Array.wrap(value).each do |val|
               values.push(val) unless values.include?(val)
             end
-            values.tap do
-              if document.persisted?
-                collection.update(document.atomic_selector, operation("$addToSet"), options)
-                document.remove_change(field)
-              end
-            end
+            execute("$addToSet")
+            values
           end
         end
 

data/lib/mongoid/persistence/atomic/bit.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Atomic #:nodoc:
+module Mongoid
+  module Persistence
+    module Atomic
 
       # This operation is for performing $bit atomic operations against the
       # database.
@@ -25,10 +25,8 @@ module Mongoid #:nodoc:
               result = result | val if bit.to_s == "or"
               result
             end
-            document[field].tap do
-              collection.update(document.atomic_selector, operation("$bit"), options)
-              document.remove_change(field)
-            end
+            execute("$bit")
+            document[field]
           end
         end
       end

data/lib/mongoid/persistence/atomic/inc.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Atomic #:nodoc:
+module Mongoid
+  module Persistence
+    module Atomic
 
       # This class provides atomic $inc behaviour.
       class Inc
@@ -19,10 +19,8 @@ module Mongoid #:nodoc:
           prepare do
             current = document[field] || 0
             document[field] = current + value
-            document[field].tap do
-              collection.update(document.atomic_selector, operation("$inc"), options)
-              document.remove_change(field)
-            end
+            execute("$inc")
+            document[field]
           end
         end
       end

data/lib/mongoid/persistence/atomic/operation.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Atomic #:nodoc:
+module Mongoid
+  module Persistence
+    module Atomic
 
       # This is the included module for all atomic operation objects.
       module Operation
@@ -33,7 +33,7 @@ module Mongoid #:nodoc:
         # @since 2.0.0
         def initialize(document, field, value, options = {})
           @document, @field, @value = document, field.to_s, value
-          @options = Safety.merge_safety_options(options)
+          @options = options
         end
 
         # Get the atomic operation to perform.
@@ -75,8 +75,47 @@ module Mongoid #:nodoc:
         #
         # @since 2.1.0
         def prepare
-          yield(document).tap do
-            Threaded.clear_options!
+          doc = yield(document)
+          Threaded.clear_options!
+          doc
+        end
+
+        private
+
+        # Executes the common functionality between operations.
+        #
+        # @api private
+        #
+        # @example Execute the operation.
+        #   operation.execute("$push")
+        #
+        # @param [ String ] name The name of the operation.
+        #
+        # @since 3.0.0
+        def execute(name)
+          if document.persisted?
+            collection.find(document.atomic_selector).update(operation(name))
+            document.remove_change(field)
+          end
+        end
+
+        # Appends items to an array and executes the corresponding $push or
+        # $pushAll operation.
+        #
+        # @api private
+        #
+        # @example Execute the append.
+        #   operation.append_with("$push")
+        #
+        # @param [ String ] name The name of the operation - $push or $pushAll.
+        #
+        # @since 3.0.0
+        def append_with(name)
+          prepare do
+            document[field] = [] unless document[field]
+            docs = document.send(field).concat(value.__array__)
+            execute(name)
+            docs
           end
         end
       end

data/lib/mongoid/persistence/atomic/pop.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Atomic #:nodoc:
+module Mongoid
+  module Persistence
+    module Atomic
 
       # This class provides the ability to perform an explicit $pop
       # modification on a specific field.
@@ -21,10 +21,8 @@ module Mongoid #:nodoc:
             if document[field]
               values = document.send(field)
               value > 0 ? values.pop : values.shift
-              values.tap do
-                collection.update(document.atomic_selector, operation("$pop"), options)
-                document.remove_change(field) if document.persisted?
-              end
+              execute("$pop")
+              values
             end
           end
         end

data/lib/mongoid/persistence/atomic/pull.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Atomic #:nodoc:
+module Mongoid
+  module Persistence
+    module Atomic
 
       # This class provides the ability to perform an explicit $pull
       # modification on a specific field.
@@ -21,10 +21,8 @@ module Mongoid #:nodoc:
             if document[field]
               values = document.send(field)
               values.delete(value)
-              values.tap do
-                collection.update(document.atomic_selector, operation("$pull"), options)
-                document.remove_change(field) if document.persisted?
-              end
+              execute("$pull")
+              values
             end
           end
         end

data/lib/mongoid/persistence/atomic/pull_all.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Atomic #:nodoc:
+module Mongoid
+  module Persistence
+    module Atomic
 
       # This class provides the ability to perform an explicit $pullAll
       # modification on a specific field.
@@ -21,10 +21,8 @@ module Mongoid #:nodoc:
             if document[field]
               values = document.send(field)
               values.delete_if { |val| value.include?(val) }
-              values.tap do
-                collection.update(document.atomic_selector, operation("$pullAll"), options)
-                document.remove_change(field) if document.persisted?
-              end
+              execute("$pullAll")
+              values
             end
           end
         end

data/lib/mongoid/persistence/atomic/push.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Atomic #:nodoc:
+module Mongoid
+  module Persistence
+    module Atomic
 
       # This class provides the ability to perform an explicit $push modification
       # on a specific field.
@@ -17,13 +17,7 @@ module Mongoid #:nodoc:
         #
         # @since 2.0.0
         def persist
-          prepare do
-            document[field] = [] unless document[field]
-            document.send(field).push(value).tap do |value|
-              collection.update(document.atomic_selector, operation("$push"), options)
-              document.remove_change(field)
-            end
-          end
+          append_with("$push")
         end
       end
     end

data/lib/mongoid/persistence/atomic/push_all.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Atomic #:nodoc:
+module Mongoid
+  module Persistence
+    module Atomic
 
       # This class provides the ability to perform an explicit $pushAll modification
       # on a specific field.
@@ -17,13 +17,7 @@ module Mongoid #:nodoc:
         #
         # @since 2.1.0
         def persist
-          prepare do
-            document[field] = [] unless document[field]
-            document.send(field).concat(value).tap do |value|
-              collection.update(document.atomic_selector, operation("$pushAll"), options)
-              document.remove_change(field)
-            end
-          end
+          append_with("$pushAll")
         end
       end
     end

data/lib/mongoid/persistence/atomic/rename.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Atomic #:nodoc:
+module Mongoid
+  module Persistence
+    module Atomic
 
       # Performs an atomic rename operation.
       class Rename
@@ -19,10 +19,9 @@ module Mongoid #:nodoc:
           prepare do
             @value = value.to_s
             document[value] = document.attributes.delete(field)
-            document[value].tap do
-              collection.update(document.atomic_selector, operation("$rename"), options)
-              document.remove_change(value)
-            end
+            execute("$rename")
+            document.remove_change(value)
+            document[value]
           end
         end
       end

data/lib/mongoid/persistence/atomic/sets.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Atomic #:nodoc:
+module Mongoid
+  module Persistence
+    module Atomic
 
       # This class provides atomic $set behaviour.
       class Sets
@@ -18,10 +18,8 @@ module Mongoid #:nodoc:
         def persist
           prepare do
             document[field] = value
-            document[field].tap do
-              collection.update(document.atomic_selector, operation("$set"), options)
-              document.remove_change(field)
-            end
+            execute("$set")
+            document[field]
           end
         end
       end

data/lib/mongoid/persistence/atomic/unset.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Atomic #:nodoc:
+module Mongoid
+  module Persistence
+    module Atomic
 
       # Performs atomic $unset operations.
       class Unset
@@ -18,8 +18,7 @@ module Mongoid #:nodoc:
         def persist
           prepare do
             document.attributes.delete(field)
-            collection.update(document.atomic_selector, operation("$unset"), options)
-            document.remove_change(value)
+            execute("$unset")
           end
         end
       end

data/lib/mongoid/persistence/atomic.rb

@@ -12,8 +12,8 @@ require "mongoid/persistence/atomic/rename"
 require "mongoid/persistence/atomic/sets"
 require "mongoid/persistence/atomic/unset"
 
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
+module Mongoid
+  module Persistence
 
     # This module provides the explicit atomic operations helpers on the
     # document itself.

data/lib/mongoid/persistence/deletion.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
+module Mongoid
+  module Persistence
 
     # Contains common logic for delete operations.
     module Deletion

data/lib/mongoid/persistence/insertion.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
+module Mongoid
+  module Persistence
 
     # Contains common logic for insertion operations.
     module Insertion
@@ -19,23 +19,17 @@ module Mongoid #:nodoc:
       #
       # @since 2.1.0
       def prepare(&block)
-        document.tap do |doc|
-          unless validating? && document.invalid?(:create)
-            result = doc.run_callbacks(:save) do
-              doc.run_callbacks(:create) do
-                yield(doc)
-                doc.new_record = false
-                true
-              end
-            end
-
-            unless result == false
-              doc.reset_persisted_children
-              doc.move_changes
-              Threaded.clear_options!
+        unless validating? && document.invalid?(:create)
+          result = document.run_callbacks(:save) do
+            document.run_callbacks(:create) do
+              yield(document)
+              document.new_record = false
+              true
             end
           end
+          document.post_persist unless result == false
         end
+        document
       end
     end
   end

data/lib/mongoid/persistence/modification.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
+module Mongoid
+  module Persistence
 
     # Contains common logic for modification operations.
     module Modification
@@ -20,17 +20,13 @@ module Mongoid #:nodoc:
       # @since 2.1.0
       def prepare(&block)
         return false if validating? && document.invalid?(:update)
-        document.run_callbacks(:save) do
+        result = document.run_callbacks(:save) do
           document.run_callbacks(:update) do
             yield(document); true
           end
-        end.tap do |result|
-          unless result == false
-            document.reset_persisted_children
-            document.move_changes
-            Threaded.clear_options!
-          end
         end
+        document.post_persist unless result == false
+        result
       end
     end
   end

data/lib/mongoid/persistence/operations/embedded/insert.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Operations #:nodoc:
-      module Embedded #:nodoc:
+module Mongoid
+  module Persistence
+    module Operations
+      module Embedded
 
         # Insert is a persistence command responsible for taking a document that
         # has not been saved to the database and saving it. This specific class
@@ -28,10 +28,11 @@ module Mongoid #:nodoc:
           # @return [ Document ] The document to be inserted.
           def persist
             prepare do
-              if parent.new?
+              raise Errors::NoParent.new(document.class.name) unless parent
+              if parent.new_record?
                 parent.insert
               else
-                collection.update(parent.atomic_selector, inserts, options)
+                collection.find(parent.atomic_selector).update(inserts)
               end
             end
           end

data/lib/mongoid/persistence/operations/embedded/remove.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Operations #:nodoc:
-      module Embedded #:nodoc:
+module Mongoid
+  module Persistence
+    module Operations
+      module Embedded
 
         # Remove is a persistence command responsible for deleting a document from
         # the database.
@@ -29,7 +29,7 @@ module Mongoid #:nodoc:
             prepare do |doc|
               parent.remove_child(doc) if notifying_parent?
               if parent.persisted?
-                collection.update(parent.atomic_selector, deletes, options)
+                collection.find(parent.atomic_selector).update(deletes)
               end
             end
           end

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Operations #:nodoc:
+module Mongoid
+  module Persistence
+    module Operations
 
       # Insert is a persistence command responsible for taking a document that
       # has not been saved to the database and saving it.
@@ -24,7 +24,7 @@ module Mongoid #:nodoc:
         # @return [ Document ] The document to be inserted.
         def persist
           prepare do |doc|
-            collection.insert(doc.as_document, options)
+            collection.insert(doc.as_document)
             IdentityMap.set(doc)
           end
         end

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Operations #:nodoc:
+module Mongoid
+  module Persistence
+    module Operations
 
       # Remove is a persistence command responsible for deleting a document from
       # the database.
@@ -24,7 +24,7 @@ module Mongoid #:nodoc:
         # @return [ true ] Always true.
         def persist
           prepare do |doc|
-            collection.remove({ :_id => doc.id }, options)
+            collection.find({ _id: doc.id }).remove
           end
         end
       end