mongoid 3.0.0.rc → 3.0.0

data/lib/mongoid/fields/standard.rb

@@ -112,12 +112,12 @@ module Mongoid
         @metadata ||= options[:metadata]
       end
 
-      # Is the field a BSON::ObjectId?
+      # Is the field a Moped::BSON::ObjectId?
       #
-      # @example Is the field a BSON::ObjectId?
+      # @example Is the field a Moped::BSON::ObjectId?
       #   field.object_id_field?
       #
-      # @return [ true, false ] If the field is a BSON::ObjectId.
+      # @return [ true, false ] If the field is a Moped::BSON::ObjectId.
       #
       # @since 2.2.0
       def object_id_field?

data/lib/mongoid/finders.rb

@@ -52,7 +52,7 @@ module Mongoid
     # on the conditions provided and the first parameter.
     #
     # @example Find a single document by an id.
-    #   Person.find(BSON::ObjectId)
+    #   Person.find(Moped::BSON::ObjectId)
     #
     # @param [ Array ] args An assortment of finder options.
     #
@@ -112,9 +112,7 @@ module Mongoid
     # Find the first +Document+ given the conditions.
     #
     # @example Find the first document.
-    #   Person.first(:conditions => { :attribute => "value" })
-    #
-    # @param [ Array ] args The conditions with options.
+    #   Person.first
     #
     # @return [ Document ] The first matching document.
     def first
@@ -124,9 +122,7 @@ module Mongoid
     # Find the last +Document+ given the conditions.
     #
     # @example Find the last document.
-    #   Person.last(:conditions => { :attribute => "value" })
-    #
-    # @param [ Array ] args The conditions with options.
+    #   Person.last
     #
     # @return [ Document ] The last matching document.
     def last

data/lib/mongoid/hierarchy.rb

@@ -79,7 +79,7 @@ module Mongoid
     #
     # @since 2.0.0.beta.1
     def remove_child(child)
-      name = child.metadata.name
+      name = child.metadata_name
       if child.embedded_one?
         remove_ivar(name)
       else
@@ -128,6 +128,24 @@ module Mongoid
       def hereditary?
         Mongoid::Document > superclass
       end
+
+      # When inheriting, we want to copy the fields 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.fields = fields.dup
+        subclass.pre_processed_defaults = pre_processed_defaults.dup
+        subclass.post_processed_defaults = post_processed_defaults.dup
+        subclass.scopes = scopes.dup
+      end
     end
   end
 end

data/lib/mongoid/identity_map.rb

@@ -16,8 +16,7 @@ module Mongoid
     #
     # @since 2.4.10
     def clear_many(klass, selector)
-      documents = documents_for(klass)[selector]
-      documents.clear if documents
+      documents_for(klass)[selector] = {}
     end
 
     # Get a document from the identity map by its id.
@@ -44,6 +43,23 @@ module Mongoid
       end
     end
 
+    # Get many documents from the map via the selector
+    #
+    # @example Get the document from the map.
+    #   map.get(Person, { post_id: post })
+    #
+    # @param [ Class ] klass The class of the document.
+    # @param [ Hash ] idenfier The selector.
+    #
+    # @return [ Array<Document> ] The matching documents.
+    #
+    # @since 3.0.0
+    def get_many(klass, identifier)
+      if Mongoid.using_identity_map? && klass
+        documents_for(klass)[identifier].try(:values)
+      end
+    end
+
     # Remove the document from the identity map.
     #
     # @example Remove the document.
@@ -88,7 +104,7 @@ module Mongoid
     #
     # @since 2.2.0
     def set_many(document, selector)
-      (documents_for(document.class)[selector] ||= []).push(document)
+      (documents_for(document.class)[selector] ||= {})[document.id] = document
     end
 
     # Set a document in the identity map for the provided selector.
@@ -103,7 +119,7 @@ module Mongoid
     #
     # @since 2.2.0
     def set_one(document, selector)
-     documents_for(document.class)[selector] = document
+      documents_for(document.class)[selector] = document
     end
 
     private

data/lib/mongoid/indexes/validators/options.rb

@@ -7,7 +7,7 @@ module Mongoid
       module Options
         extend self
 
-        VALID_OPTIONS = [ :background, :drop_dups, :name, :sparse, :unique ]
+        VALID_OPTIONS = [ :background, :drop_dups, :name, :sparse, :unique, :max, :min ]
         VALID_TYPES = [ 1, -1, "2d" ]
 
         # Validate the index specification.

data/lib/mongoid/multi_parameter_attributes.rb

@@ -55,7 +55,7 @@ module Mongoid
         multi_parameter_attributes = {}
 
         attrs.each_pair do |key, value|
-          if key =~ /^([^\(]+)\((\d+)([if])\)$/
+          if key =~ /\A([^\(]+)\((\d+)([if])\)$/
             key, index = $1, $2.to_i
             (multi_parameter_attributes[key] ||= {})[index] = value.empty? ? nil : value.send("to_#{$3}")
           else

data/lib/mongoid/paranoia.rb

@@ -16,6 +16,9 @@ module Mongoid
     included do
       field :deleted_at, type: Time
       self.paranoid = true
+
+      default_scope where(deleted_at: nil)
+      scope :deleted, ne(deleted_at: nil)
     end
 
     # Delete the paranoid +Document+ from the database completely. This will
@@ -118,37 +121,5 @@ module Mongoid
     def paranoid_field
       embedded? ? "#{atomic_position}.deleted_at" : "deleted_at"
     end
-
-    module ClassMethods
-
-      # Override the default +Criteria+ accessor to only get existing
-      # documents.
-      #
-      # @example Override the criteria.
-      #   Person.queryable
-      #
-      # @param [ Array ] args The arguments.
-      #
-      # @return [ Criteria ] The paranoid compliant criteria.
-      #
-      # @since 3.0.0
-      def queryable
-        super.where(deleted_at: nil)
-      end
-
-      # Find deleted documents
-      #
-      # @example Find deleted documents.
-      #   Person.deleted
-      #   Company.first.employees.deleted
-      #   Person.deleted.find("4c188dea7b17235a2a000001").first
-      #
-      # @return [ Criteria ] The deleted criteria.
-      #
-      # @since 1.0.0
-      def deleted
-        where(:deleted_at.ne => nil)
-      end
-    end
   end
 end

data/lib/mongoid/persistence.rb

@@ -3,6 +3,7 @@ require "mongoid/persistence/atomic"
 require "mongoid/persistence/deletion"
 require "mongoid/persistence/insertion"
 require "mongoid/persistence/modification"
+require "mongoid/persistence/upsertion"
 require "mongoid/persistence/operations"
 
 module Mongoid
@@ -62,6 +63,25 @@ module Mongoid
     end
     alias :delete :remove
 
+    # Save the document - will perform an insert if the document is new, and
+    # update if not.
+    #
+    # @example Save the document.
+    #   document.save
+    #
+    # @param [ Hash ] options Options to pass to the save.
+    #
+    # @return [ true, false ] True is success, false if not.
+    #
+    # @since 1.0.0
+    def save(options = {})
+      if new_record?
+        insert(options).persisted?
+      else
+        update(options)
+      end
+    end
+
     # Save the document - will perform an insert if the document is new, and
     # update if not. If a validation error occurs an error will get raised.
     #
@@ -72,8 +92,8 @@ module Mongoid
     #
     # @return [ true, false ] True if validation passed.
     def save!(options = {})
-      unless upsert(options)
-        self.class.fail_validate!(self) if errors.any?
+      unless save(options)
+        self.class.fail_validate!(self) unless errors.empty?
         self.class.fail_callback!(self, :save!)
       end
       return true
@@ -100,7 +120,7 @@ module Mongoid
       current = Time.now
       write_attribute(:updated_at, current) if fields["updated_at"]
       write_attribute(field, current) if field
-      collection.find(atomic_selector).update(atomic_updates)
+      _root.collection.find(atomic_selector).update(atomic_updates)
       without_autobuild do
         touchables.each { |name| send(name).try(:touch) }
       end
@@ -168,29 +188,27 @@ module Mongoid
     def update_attributes!(attributes = {}, options = {})
       result = update_attributes(attributes, options)
       unless result
-        self.class.fail_validate!(self) if errors.any?
+        self.class.fail_validate!(self) unless errors.empty?
         self.class.fail_callback!(self, :update_attributes!)
       end
       result
     end
 
-    # Upsert the document - will perform an insert if the document is new, and
-    # update if not.
+    # Perform an upsert of the document. If the document does not exist in the
+    # database, then Mongo will insert a new one, otherwise the fields will get
+    # overwritten with new values on the existing document.
     #
     # @example Upsert the document.
     #   document.upsert
     #
-    # @param [ Hash ] options Options to pass to the upsert.
+    # @param [ Hash ] options The validation options.
     #
-    # @return [ true, false ] True is success, false if not.
+    # @return [ true ] True.
+    #
+    # @since 3.0.0
     def upsert(options = {})
-      if new_record?
-        insert(options).persisted?
-      else
-        update(options)
-      end
+      Operations.upsert(self, options).persist
     end
-    alias :save :upsert
 
     module ClassMethods #:nodoc:
 
@@ -230,7 +248,7 @@ module Mongoid
       def create!(attributes = {}, options = {}, &block)
         _creating do
           doc = new(attributes, options, &block)
-          fail_validate!(doc) if doc.insert.errors.any?
+          fail_validate!(doc) unless doc.insert.errors.empty?
           fail_callback!(doc, :create!) if doc.new_record?
           doc
         end

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

@@ -93,7 +93,7 @@ module Mongoid
         #
         # @since 3.0.0
         def execute(name)
-          if document.persisted?
+          if !document.new_record?
             collection.find(document.atomic_selector).update(operation(name))
             document.remove_change(field)
           end

data/lib/mongoid/persistence/operations.rb

@@ -2,6 +2,7 @@
 require "mongoid/persistence/operations/insert"
 require "mongoid/persistence/operations/remove"
 require "mongoid/persistence/operations/update"
+require "mongoid/persistence/operations/upsert"
 require "mongoid/persistence/operations/embedded/insert"
 require "mongoid/persistence/operations/embedded/remove"
 
@@ -192,6 +193,21 @@ module Mongoid
         def update(doc, options = {})
           Update.new(doc, options)
         end
+
+        # Get the appropriate upsert operation based on the document.
+        #
+        # @example Get the upsert operation.
+        #   Operations.upsert(doc, options)
+        #
+        # @param [ Document ] doc The document to persist.
+        # @param [ Hash ] options The persistence options.
+        #
+        # @return [ Operations ] The operation.
+        #
+        # @since 3.0.0
+        def upsert(doc, options = {})
+          Upsert.new(doc, options)
+        end
       end
     end
   end

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

@@ -24,7 +24,7 @@ module Mongoid
         # @return [ true ] Always true.
         def persist
           prepare do |doc|
-            collection.find({ _id: doc.id }).remove
+            collection.find(doc.atomic_selector).remove
           end
         end
       end

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

@@ -0,0 +1,28 @@
+# encoding: utf-8
+module Mongoid
+  module Persistence
+    module Operations
+
+      # Wraps behaviour for performing upserts in Mongodb. No matter if the
+      # document has been modified or not, it will be sent to the db and Mongo
+      # will determin whether or not to insert or update.
+      class Upsert
+        include Upsertion, Operations
+
+        # Persist the upsert operation.
+        #
+        # @example Execute the upsert.
+        #   operation.persist
+        #
+        # @return [ true ] Always true.
+        #
+        # @since 3.0.0
+        def persist
+          prepare do
+            collection.find(selector).update(document.as_document, [ :upsert ])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/persistence/upsertion.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+module Mongoid
+  module Persistence
+
+    # Contains common logic for upsert operations.
+    module Upsertion
+
+      # Wrap all the common upsert logic for root docments.
+      #
+      # @example Execute common upsert logic.
+      #   prepare do |doc|
+      #     collection.find({ :_id => 1 }).upsert({ name: "test" }, [ :upsert ])
+      #   end
+      #
+      # @param [ Proc ] block The block to call.
+      #
+      # @return [ true, false ] If the save passed or not.
+      #
+      # @since 3.0.0
+      def prepare(&block)
+        return false if validating? && document.invalid?(:upsert)
+        result = document.run_callbacks(:upsert) do
+          yield(document); true
+        end
+        document.post_persist unless result == false
+        result
+      end
+    end
+  end
+end

data/lib/mongoid/relations.rb

@@ -83,6 +83,22 @@ module Mongoid
       metadata && metadata.macro == :embeds_one
     end
 
+    # Get the metadata name for this document. If no metadata was defined
+    # will raise an error.
+    #
+    # @example Get the metadata name.
+    #   document.metadata_name
+    #
+    # @raise [ Errors::NoMetadata ] If no metadata is present.
+    #
+    # @return [ Symbol ] The metadata name.
+    #
+    # @since 3.0.0
+    def metadata_name
+      raise Errors::NoMetadata.new(self.class.name) unless metadata
+      metadata.name
+    end
+
     # Determine if the document is part of an references_many relation.
     #
     # @example Is the document in a references many?

data/lib/mongoid/relations/accessors.rb

@@ -15,7 +15,7 @@ module Mongoid
       #   person.__build__(:addresses, { :id => 1 }, metadata)
       #
       # @param [ String, Symbol ] name The name of the relation.
-      # @param [ Hash, BSON::ObjectId ] object The id or attributes to use.
+      # @param [ Hash, Moped::BSON::ObjectId ] object The id or attributes to use.
       # @param [ Metadata ] metadata The relation's metadata.
       # @param [ true, false ] building If we are in a build operation.
       #

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

@@ -25,7 +25,7 @@ module Mongoid
               bind_polymorphic_inverse_type(base, target.class.model_name)
               if inverse = metadata.inverse(target)
                 if set_base_metadata
-                  bind_inverse_of_field(base, base.metadata.name)
+                  bind_inverse_of_field(base, base.metadata_name)
                   if base.referenced_many?
                     target.__send__(inverse).push(base) unless Mongoid.using_identity_map?
                   else