mongoid 2.8.1 → 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.rb

@@ -5,7 +5,7 @@ require "mongoid/persistence/insertion"
 require "mongoid/persistence/modification"
 require "mongoid/persistence/operations"
 
-module Mongoid #:nodoc:
+module Mongoid
 
   # The persistence module is a mixin to provide database accessor methods for
   # the document. These correspond to the appropriate accessors on a
@@ -19,7 +19,7 @@ module Mongoid #:nodoc:
     extend ActiveSupport::Concern
     include Atomic
 
-    # Remove the document from the datbase with callbacks.
+    # Remove the document from the database with callbacks.
     #
     # @example Destroy a document.
     #   document.destroy
@@ -29,11 +29,11 @@ module Mongoid #:nodoc:
     # @return [ true, false ] True if successful, false if not.
     def destroy(options = {})
       self.flagged_for_destroy = true
-      run_callbacks(:destroy) do
+      result = run_callbacks(:destroy) do
         remove(options)
-      end.tap do
-        self.flagged_for_destroy = false
       end
+      self.flagged_for_destroy = false
+      result
     end
 
     # Insert a new document into the database. Will return the document
@@ -49,7 +49,7 @@ module Mongoid #:nodoc:
       Operations.insert(self, options).persist
     end
 
-    # Remove the document from the datbase.
+    # Remove the document from the database.
     #
     # @example Remove the document.
     #   document.remove
@@ -79,8 +79,7 @@ module Mongoid #:nodoc:
       return true
     end
 
-
-    # Touch the document, in effect updating its updated_at timestamp and
+    # Touch the document, in effect updating it's updated_at timestamp and
     # optionally the provided field to the current time. If any belongs_to
     # relations exist with a touch option, they will be updated as well.
     #
@@ -94,25 +93,21 @@ module Mongoid #:nodoc:
     #
     # @param [ Symbol ] field The name of an additional field to update.
     #
-    # @return [ true/false ] false if record is new_record otherwise true.
+    # @return [ true ] true.
     #
-    # @since 2.6.0
+    # @since 3.0.0
     def touch(field = nil)
-      return false if _root.new_record?
       current = Time.now
       write_attribute(:updated_at, current) if fields["updated_at"]
       write_attribute(field, current) if field
-
-      touches = touch_atomic_updates(field)
-      unless touches.empty?
-        _root.collection.update(atomic_selector, touches)
+      collection.find(atomic_selector).update(atomic_updates)
+      without_autobuild do
+        touchables.each { |name| send(name).try(:touch) }
       end
-
-      touchables.each { |name| send(name).try(:touch) }
       move_changes and true
     end
 
-    # Update the document in the datbase.
+    # Update the document in the database.
     #
     # @example Update an existing document.
     #   document.update
@@ -133,15 +128,21 @@ module Mongoid #:nodoc:
     # @param [ Symbol, String ] name The name of the attribute.
     # @param [ Object ] value The new value of the attribute.a
     #
+    # @raise [ Errors::ReadonlyAttribute ] If the field cannot be changed due
+    #   to being flagged as reaodnly.
+    #
     # @return [ true, false ] True if save was successfull, false if not.
     #
     # @since 2.0.0.rc.6
     def update_attribute(name, value)
+      unless attribute_writable?(name.to_s)
+        raise Errors::ReadonlyAttribute.new(name, value)
+      end
       write_attribute(name, value)
-      save(:validate => false)
+      save(validate: false)
     end
 
-    # Update the document attributes in the datbase.
+    # Update the document attributes in the database.
     #
     # @example Update the document's attributes
     #   document.update_attributes(:title => "Sir")
@@ -165,12 +166,12 @@ module Mongoid #:nodoc:
     #
     # @return [ true, false ] True if validation passed.
     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!)
-        end
+      result = update_attributes(attributes, options)
+      unless result
+        self.class.fail_validate!(self) if errors.any?
+        self.class.fail_callback!(self, :update_attributes!)
       end
+      result
     end
 
     # Upsert the document - will perform an insert if the document is new, and
@@ -184,7 +185,7 @@ module Mongoid #:nodoc:
     # @return [ true, false ] True is success, false if not.
     def upsert(options = {})
       if new_record?
-        !insert(options).new_record?
+        insert(options).persisted?
       else
         update(options)
       end
@@ -207,7 +208,9 @@ module Mongoid #:nodoc:
       # @return [ Document ] The newly created document.
       def create(attributes = {}, options = {}, &block)
         _creating do
-          new(attributes, options, &block).tap { |doc| doc.save }
+          doc = new(attributes, options, &block)
+          doc.save
+          doc
         end
       end
 
@@ -226,10 +229,10 @@ module Mongoid #:nodoc:
       # @return [ Document ] The newly created document.
       def create!(attributes = {}, options = {}, &block)
         _creating do
-          new(attributes, options, &block).tap do |doc|
-            fail_validate!(doc) if doc.insert.errors.any?
-            fail_callback!(doc, :create!) if doc.new?
-          end
+          doc = new(attributes, options, &block)
+          fail_validate!(doc) if doc.insert.errors.any?
+          fail_callback!(doc, :create!) if doc.new_record?
+          doc
         end
       end
 
@@ -249,11 +252,12 @@ module Mongoid #:nodoc:
       def delete_all(conditions = nil)
         conds = conditions || {}
         selector = conds[:conditions] || conds
-        selector.merge!(:_type => name) if hereditary?
-        collection.find(selector).count.tap do
-          collection.remove(selector, Safety.merge_safety_options)
-          Threaded.clear_options!
-        end
+        selector.merge!(_type: name) if hereditary?
+        coll = collection
+        deleted = coll.find(selector).count
+        coll.find(selector).remove_all
+        Threaded.clear_options!
+        deleted
       end
 
       # Delete all documents given the supplied conditions. If no conditions
@@ -272,9 +276,9 @@ module Mongoid #:nodoc:
       def destroy_all(conditions = nil)
         conds = conditions || {}
         documents = where(conds[:conditions] || conds)
-        documents.count.tap do
-          documents.each { |doc| doc.destroy }
-        end
+        destroyed = documents.count
+        documents.each { |doc| doc.destroy }
+        destroyed
       end
 
       # Raise an error if validation failed.

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/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