mongoid 3.0.0.rc → 3.0.0

data/lib/mongoid/criteria.rb

@@ -30,11 +30,8 @@ module Mongoid
     #
     # @since 1.0.0
     def ==(other)
-      case other
-      when Criteria then super
-      when Enumerable then entries == other
-      else false
-      end
+      return super if other.respond_to?(:selector)
+      entries == other
     end
 
     # Needed to properly get a criteria back as json
@@ -64,6 +61,7 @@ module Mongoid
     def build(attrs = {})
       create_document(:new, attrs)
     end
+    alias :new :build
 
     # Tells the criteria that the cursor that gets returned needs to be
     # cached. This is so multiple iterations don't hit the database multiple
@@ -150,6 +148,18 @@ module Mongoid
       @documents = docs
     end
 
+    # Is the criteria for embedded documents?
+    #
+    # @example Is the criteria for embedded documents?
+    #   criteria.embedded?
+    #
+    # @return [ true, false ] If the criteria is embedded.
+    #
+    # @since 3.0.0
+    def embedded?
+      !!@embedded
+    end
+
     # Execute the criteria or raise an error if no documents found.
     #
     # @example Execute or raise
@@ -164,9 +174,7 @@ module Mongoid
     # @since 2.0.0
     def execute_or_raise(ids, multi)
       result = multiple_from_map_or_db(ids)
-      if (result.size < ids.size) && Mongoid.raise_not_found_error
-        raise Errors::DocumentNotFound.new(klass, ids, ids - result.map(&:_id))
-      end
+      check_for_missing_documents!(result, ids)
       multi ? result : result.first
     end
 
@@ -222,7 +230,7 @@ module Mongoid
     # @since 2.0.0
     def field_list
       if options[:fields]
-        options[:fields].keys.reject!{ |key| key == "_type" }
+        options[:fields].keys.reject{ |key| key == "_type" }
       else
         []
       end
@@ -231,23 +239,20 @@ module Mongoid
     # Find the matchind document(s) in the criteria for the provided ids.
     #
     # @example Find by an id.
-    #   criteria.find(BSON::ObjectId.new)
+    #   criteria.find(Moped::BSON::ObjectId.new)
     #
     # @example Find by multiple ids.
-    #   criteria.find([ BSON::ObjectId.new, BSON::ObjectId.new ])
+    #   criteria.find([ Moped::BSON::ObjectId.new, Moped::BSON::ObjectId.new ])
     #
-    # @param [ Array<BSON::ObjectId> ] args The ids to search for.
+    # @param [ Array<Moped::BSON::ObjectId> ] args The ids to search for.
     #
     # @return [ Array<Document>, Document ] The matching document(s).
     #
     # @since 1.0.0
     def find(*args)
-      multi = args.first.is_a?(::Array) || args.first.is_a?(::Range) || args.size > 1
-      ids = *args.flat_map do |arg|
-        arg.is_a?(::Range) ? arg.to_a : arg
-      end
+      ids = args.__find_args__
       raise_invalid if ids.any?(&:nil?)
-      for_ids(ids).execute_or_raise(ids, multi)
+      for_ids(ids).execute_or_raise(ids, args.multi_arged?)
     end
 
     # Adds a criterion to the +Criteria+ that specifies an id that must be matched.
@@ -262,12 +267,12 @@ module Mongoid
     #
     # @return [ Criteria ] The cloned criteria.
     def for_ids(ids)
-      field = klass.fields["_id"]
+      ids = mongoize_ids(ids)
       method = extract_id ? :all_of : :where
       if ids.size > 1
-        send(method, { _id: { "$in" => ids.map{ |id| field.mongoize(id) }}})
+        send(method, { _id: { "$in" => ids }})
       else
-        send(method, { _id: field.mongoize(ids.first) })
+        send(method, { _id: ids.first })
       end
     end
 
@@ -295,7 +300,9 @@ module Mongoid
     #
     # @since 2.2.1
     def from_map_or_db
-      doc = IdentityMap.get(klass, extract_id || selector)
+      id = extract_id
+      id = klass.fields["_id"].mongoize(id) if id
+      doc = IdentityMap.get(klass, id || selector.except("_type"))
       doc && doc.matches?(selector) ? doc : first
     end
 
@@ -309,13 +316,10 @@ module Mongoid
     #
     # @return [ Array<Document> ] The found documents.
     def multiple_from_map_or_db(ids)
-      return entries if klass.embedded?
-      result = []
-      ids.reject! do |id|
-        doc = IdentityMap.get(klass, id)
-        doc && doc.matches?(selector) ? result.push(doc) : false
-      end
-      ids.empty? ? result : result + any_in(id: ids).entries
+      return entries if embedded?
+      ids = mongoize_ids(ids)
+      result = from_identity_map(ids)
+      ids.empty? ? result : result + from_database(ids)
     end
 
     # Initialize the new criteria.
@@ -418,9 +422,9 @@ module Mongoid
     # @since 3.0.0
     def merge!(other)
       criteria = other.to_criteria
-      selector.update(criteria.selector)
-      options.update(criteria.options)
-      self.documents = criteria.documents.dup if criteria.documents.any?
+      selector.merge!(criteria.selector)
+      options.merge!(criteria.options)
+      self.documents = criteria.documents.dup unless criteria.documents.empty?
       self.scoping_options = criteria.scoping_options
       self.inclusions = (inclusions + criteria.inclusions.dup).uniq
       self
@@ -438,7 +442,12 @@ module Mongoid
     # @since 1.0.0
     def only(*args)
       return clone if args.empty?
-      super(*(args + [:_type]))
+      args = args.flatten
+      if klass.hereditary?
+        super(*args.push(:_type))
+      else
+        super(*args)
+      end
     end
 
     # Returns true if criteria responds to the given method.
@@ -491,8 +500,7 @@ module Mongoid
     #
     # @return [ Criteria ] The cloned criteria.
     def type(types)
-      types = [types] unless types.is_a?(Array)
-      any_in(_type: types)
+      any_in(_type: Array(types))
     end
 
     # This is the general entry point for most MongoDB queries. This either
@@ -522,6 +530,27 @@ module Mongoid
 
     private
 
+    # Are documents in the query missing, and are we configured to raise an
+    # error?
+    #
+    # @api private
+    #
+    # @example Check for missing documents.
+    #   criteria.check_for_missing_documents!([], [ 1 ])
+    #
+    # @param [ Array<Document> ] result The result.
+    # @param [ Array<Object> ] ids The ids.
+    #
+    # @raise [ Errors::DocumentNotFound ] If none are found and raising an
+    #   error.
+    #
+    # @since 3.0.0
+    def check_for_missing_documents!(result, ids)
+      if (result.size < ids.size) && Mongoid.raise_not_found_error
+        raise Errors::DocumentNotFound.new(klass, ids, ids - result.map(&:_id))
+      end
+    end
+
     # Create a document given the provided method and attributes from the
     # existing selector.
     #
@@ -572,6 +601,43 @@ module Mongoid
       @context = nil
     end
 
+    # Get documents from the database only.
+    #
+    # @api private
+    #
+    # @example Get documents from the database.
+    #   criteria.from_database(ids)
+    #
+    # @param [ Array<Object> ] ids The ids to fetch with.
+    #
+    # @return [ Array<Document> ] The matching documents.
+    #
+    # @since 3.0.0
+    def from_database(ids)
+      (ids.size > 1 ? any_in(id: ids) : where(id: ids.first)).entries
+    end
+
+    # Get documents from the identity map only.
+    #
+    # @api private
+    #
+    # @example Get documents from the identity map.
+    #   criteria.from_identity_map(ids)
+    #
+    # @param [ Array<Object> ] ids The ids to fetch with.
+    #
+    # @return [ Array<Document> ] The matching documents.
+    #
+    # @since 3.0.0
+    def from_identity_map(ids)
+      result = []
+      ids.reject! do |id|
+        doc = IdentityMap.get(klass, id)
+        doc && doc.matches?(selector) ? result.push(doc) : false
+      end
+      result
+    end
+
     # Used for chaining +Criteria+ scopes together in the for of class methods
     # on the +Document+ the criteria is for.
     #
@@ -594,6 +660,22 @@ module Mongoid
       end
     end
 
+    # Convert all the ids to their proper types.
+    #
+    # @api private
+    #
+    # @example Convert the ids.
+    #   criteria.mongoize_ids(ids)
+    #
+    # @param [ Array<Object> ] ids The ids to convert.
+    #
+    # @return [ Array<Object> ] The converted ids.
+    #
+    # @since 3.0.0
+    def mongoize_ids(ids)
+      ids.map{ |id| klass.fields["_id"].mongoize(id) }
+    end
+
     # Convenience method of raising an invalid options error.
     #
     # @example Raise the error.

data/lib/mongoid/document.rb

@@ -109,7 +109,7 @@ module Mongoid
 
     # A Document's is identified absolutely by it's class and database id:
     #
-    # Person.first.identity #=> [Person, BSON::ObjectId('4f775130a04745933a000003')]
+    # Person.first.identity #=> [Person, Moped::BSON::ObjectId('4f775130a04745933a000003')]
     #
     # @example Get the identity
     #   document.identity
@@ -126,7 +126,7 @@ module Mongoid
     # an empty +Hash+.
     #
     # If a primary key is defined, the document's id will be set to that key,
-    # otherwise it will be set to a fresh +BSON::ObjectId+ string.
+    # otherwise it will be set to a fresh +Moped::BSON::ObjectId+ string.
     #
     # @example Create a new document.
     #   Person.new(:title => "Sir")
@@ -148,7 +148,7 @@ module Mongoid
           yield(self) if block_given?
         end
         apply_post_processed_defaults
-        run_callbacks(:initialize) if _initialize_callbacks.any?
+        run_callbacks(:initialize) unless _initialize_callbacks.empty?
       end
     end
 
@@ -197,8 +197,8 @@ module Mongoid
       attributes
     end
 
-    # Returns an instance of the specified class with the attributes
-    # and errors of the current document.
+    # Returns an instance of the specified class with the attributes,
+    # errors, and embedded documents of the current document.
     #
     # @example Return a subclass document as a superclass instance.
     #   manager.becomes(Person)
@@ -214,7 +214,7 @@ module Mongoid
       unless klass.include?(Mongoid::Document)
         raise ArgumentError, "A class which includes Mongoid::Document is expected"
       end
-      became = klass.instantiate(frozen? ? attributes.dup : attributes)
+      became = klass.instantiate(as_document.__deep_copy__)
       became.instance_variable_set(:@errors, errors)
       became.instance_variable_set(:@new_record, new_record?)
       became.instance_variable_set(:@destroyed, destroyed?)
@@ -311,7 +311,7 @@ module Mongoid
         doc.instance_variable_set(:@attributes, attributes)
         doc.apply_defaults
         IdentityMap.set(doc) unless _loading_revision?
-        doc.run_callbacks(:initialize) if doc._initialize_callbacks.any?
+        doc.run_callbacks(:initialize) unless doc._initialize_callbacks.empty?
         doc
       end
 

data/lib/mongoid/errors.rb

@@ -23,6 +23,7 @@ require "mongoid/errors/nested_attributes_metadata_not_found"
 require "mongoid/errors/no_default_session"
 require "mongoid/errors/no_environment"
 require "mongoid/errors/no_map_reduce_output"
+require "mongoid/errors/no_metadata"
 require "mongoid/errors/no_parent"
 require "mongoid/errors/no_session_config"
 require "mongoid/errors/no_sessions_config"

data/lib/mongoid/errors/no_metadata.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+module Mongoid
+  module Errors
+
+    # Used when trying to persist data when metadata has not been set.
+    class NoMetadata < MongoidError
+
+      # Create the new error.
+      #
+      # @example Create the error.
+      #   NoMetadata.new(Address)
+      #
+      # @param [ Class ] klass The document class.
+      #
+      # @since 3.0.0
+      def initialize(klass)
+        super(compose_message("no_metadata", { klass: klass }))
+      end
+    end
+  end
+end

data/lib/mongoid/evolvable.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+module Mongoid
+
+  # Contains behaviour specific to evolving for origin queries.
+  module Evolvable
+
+    # Evolve the document into an object id.
+    #
+    # @example Evolve the document.
+    #   document.__evolve_object_id__
+    #
+    # @return [ Object ] The document's id.
+    #
+    # @since 3.0.0
+    def __evolve_object_id__
+      id
+    end
+  end
+end

data/lib/mongoid/extensions.rb

@@ -3,7 +3,7 @@ unless defined?(Boolean)
   class Boolean; end
 end
 
-class BSON::ObjectId
+class Moped::BSON::ObjectId
   undef :as_json
   def as_json(options = nil)
     to_s

data/lib/mongoid/extensions/array.rb

@@ -12,7 +12,32 @@ module Mongoid
       #
       # @since 3.0.0
       def __evolve_object_id__
-        map!(&:__evolve_object_id__).compact!
+        map!(&:__evolve_object_id__)
+        self
+      end
+
+      # Get the array of args as arguments for a find query.
+      #
+      # @example Get the array as find args.
+      #   [ 1, 2, 3 ].__find_args__
+      #
+      # @return [ Array ] The array of args.
+      #
+      # @since 3.0.0
+      def __find_args__
+        flat_map{ |a| a.__find_args__ }.uniq_by{ |a| a.to_s }
+      end
+
+      # Mongoize the array into an array of object ids.
+      #
+      # @example Evolve the array to object ids.
+      #   [ id ].__mongoize_object_id__
+      #
+      # @return [ Array<Moped::BSON::ObjectId> ] The converted array.
+      #
+      # @since 3.0.0
+      def __mongoize_object_id__
+        map!(&:__mongoize_object_id__).compact!
         self
       end
 
@@ -28,6 +53,18 @@ module Mongoid
         ::Time.configured.local(*self)
       end
 
+      # Is the array a set of multiple arguments in a method?
+      #
+      # @example Is this multi args?
+      #   [ 1, 2, 3 ].multi_arged?
+      #
+      # @return [ true, false ] If the array is multi args.
+      #
+      # @since 3.0.0
+      def multi_arged?
+        first.resizable? || size > 1
+      end
+
       # Turn the object from the ruby type we deal with to a Mongo friendly
       # type.
       #

data/lib/mongoid/extensions/big_decimal.rb

@@ -30,7 +30,7 @@ module Mongoid
         # @since 3.0.0
         def demongoize(object)
           if object
-            object.numeric? ? ::BigDecimal.new(object) : object
+            object.numeric? ? ::BigDecimal.new(object.to_s) : object
           end
         end
       end

data/lib/mongoid/extensions/date_time.rb

@@ -13,7 +13,12 @@ module Mongoid
       # @since 3.0.0
       def __mongoize_time__
         return self if utc? && Mongoid.use_utc?
-        ::Time.configured.local(year, month, day, hour, min, sec)
+        if Mongoid.use_activesupport_time_zone?
+          in_time_zone(::Time.zone)
+        else
+          time = to_time
+          time.respond_to?(:getlocal) ? time.getlocal : time
+        end
       end
 
       # Turn the object from the ruby type we deal with to a Mongo friendly