mongoid 3.0.0.rc → 3.0.0

data/lib/mongoid/extensions/false_class.rb

@@ -3,6 +3,18 @@ module Mongoid
   module Extensions
     module FalseClass
 
+      # Get the value of the object as a mongo friendy sort value.
+      #
+      # @example Get the object as sort criteria.
+      #   object.__sortable__
+      #
+      # @return [ Integer ] 0.
+      #
+      # @since 3.0.0
+      def __sortable__
+        0
+      end
+
       # Is the passed value a boolean?
       #
       # @example Is the value a boolean type?

data/lib/mongoid/extensions/float.rb

@@ -15,6 +15,18 @@ module Mongoid
         ::Time.at(self)
       end
 
+      # Is the float a number?
+      #
+      # @example Is the object a number?.
+      #   object.numeric?
+      #
+      # @return [ true ] Always true.
+      #
+      # @since 3.0.0
+      def numeric?
+        true
+      end
+
       module ClassMethods
 
         # Turn the object from the ruby type we deal with to a Mongo friendly

data/lib/mongoid/extensions/hash.rb

@@ -15,6 +15,38 @@ module Mongoid
         update_values(&:__evolve_object_id__)
       end
 
+      # Mongoizes each value in the hash to an object id if it is convertable.
+      #
+      # @example Convert the hash values.
+      #   { field: id }.__mongoize_object_id__
+      #
+      # @return [ Hash ] The converted hash.
+      #
+      # @since 3.0.0
+      def __mongoize_object_id__
+        update_values(&:__mongoize_object_id__)
+      end
+
+      # Consolidate the key/values in the hash under an atomic $set.
+      #
+      # @example Consolidate the hash.
+      #   { name: "Placebo" }.__consolidate__
+      #
+      # @return [ Hash ] A new consolidated hash.
+      #
+      # @since 3.0.0
+      def __consolidate__
+        consolidated = {}
+        each_pair do |key, value|
+          if key =~ /\$/
+            (consolidated[key] ||= {}).merge!(value)
+          else
+            (consolidated["$set"] ||= {}).merge!(key => value)
+          end
+        end
+        consolidated
+      end
+
       # Get the id attribute from this hash, whether it's prefixed with an
       # underscore or is a symbol.
       #
@@ -25,7 +57,7 @@ module Mongoid
       #
       # @since 2.3.2
       def extract_id
-        self["id"] || self["_id"] || self[:id] || self[:_id]
+        self["_id"] || self["id"] || self[:id] || self[:_id]
       end
 
       # Turn the object from the ruby type we deal with to a Mongo friendly

data/lib/mongoid/extensions/integer.rb

@@ -15,6 +15,18 @@ module Mongoid
         ::Time.at(self)
       end
 
+      # Is the integer a number?
+      #
+      # @example Is the object a number?.
+      #   object.numeric?
+      #
+      # @return [ true ] Always true.
+      #
+      # @since 3.0.0
+      def numeric?
+        true
+      end
+
       # Is the object not to be converted to bson on criteria creation?
       #
       # @example Is the object unconvertable?

data/lib/mongoid/extensions/object.rb

@@ -14,6 +14,19 @@ module Mongoid
       def __evolve_object_id__
         self
       end
+      alias :__mongoize_object_id__ :__evolve_object_id__
+
+      # Convert the object to args for a find query.
+      #
+      # @example Convert the object to args.
+      #   object.__find_args__
+      #
+      # @return [ Object ] self.
+      #
+      # @since 3.0.0
+      def __find_args__
+        self
+      end
 
       # Mongoize a plain object into a time.
       #
@@ -27,6 +40,18 @@ module Mongoid
         self
       end
 
+      # Get the value of the object as a mongo friendy sort value.
+      #
+      # @example Get the object as sort criteria.
+      #   object.__sortable__
+      #
+      # @return [ Object ] self.
+      #
+      # @since 3.0.0
+      def __sortable__
+        self
+      end
+
       # Do or do not, there is no try. -- Yoda.
       #
       # @example Do or do not.
@@ -74,6 +99,30 @@ module Mongoid
         self
       end
 
+      # Is the object multi args.
+      #
+      # @example Is the object multi args?
+      #   object.multi_arged?
+      #
+      # @return [ false ] false.
+      #
+      # @since 3.0.0
+      def multi_arged?
+        false
+      end
+
+      # Is the object a number?
+      #
+      # @example Is the object a number?.
+      #   object.numeric?
+      #
+      # @return [ false ] Always false.
+      #
+      # @since 3.0.0
+      def numeric?
+        false
+      end
+
       # Remove the instance variable for the provided name.
       #
       # @example Remove the instance variable
@@ -148,7 +197,8 @@ module Mongoid
         #
         # @since 3.0.0
         def __mongoize_fk__(constraint, object)
-          object.blank? ? nil : constraint.convert(object)
+          return nil if !object || object == ""
+          constraint.convert(object)
         end
 
         # Convert the object from it's mongo friendly ruby type to this type.

data/lib/mongoid/extensions/object_id.rb

@@ -14,6 +14,7 @@ module Mongoid
       def __evolve_object_id__
         self
       end
+      alias :__mongoize_object_id__ :__evolve_object_id__
 
       module ClassMethods
 
@@ -42,7 +43,7 @@ module Mongoid
         #
         # @since 3.0.0
         def mongoize(object)
-          evolve(object)
+          object.__mongoize_object_id__
         end
       end
     end

data/lib/mongoid/extensions/range.rb

@@ -3,6 +3,18 @@ module Mongoid
   module Extensions
     module Range
 
+      # Get the range as arguments for a find.
+      #
+      # @example Get the range as find args.
+      #   range.__find_args__
+      #
+      # @return [ Array ] The range as an array.
+      #
+      # @since 3.0.0
+      def __find_args__
+        to_a
+      end
+
       # Turn the object from the ruby type we deal with to a Mongo friendly
       # type.
       #
@@ -16,6 +28,18 @@ module Mongoid
         ::Range.mongoize(self)
       end
 
+      # Is this a resizable object.
+      #
+      # @example Is this resizable?
+      #   range.resizable?
+      #
+      # @return [ true ] True.
+      #
+      # @since 3.0.0
+      def resizable?
+        true
+      end
+
       module ClassMethods
 
         # Convert the object from it's mongo friendly ruby type to this type.

data/lib/mongoid/extensions/string.rb

@@ -11,13 +11,23 @@ module Mongoid
       # @example Evolve the string.
       #   "test".__evolve_object_id__
       #
-      # @return [ String, Moped::BSON::ObjectId, nil ] The evolved string.
+      # @return [ String, Moped::BSON::ObjectId ] The evolved string.
       #
       # @since 3.0.0
       def __evolve_object_id__
-        unless blank?
-          BSON::ObjectId.legal?(self) ? BSON::ObjectId.from_string(self) : self
-        end
+        convert_to_object_id
+      end
+
+      # Mongoize the string into an object id if possible.
+      #
+      # @example Evolve the string.
+      #   "test".__mongoize_object_id__
+      #
+      # @return [ String, Moped::BSON::ObjectId, nil ] The mongoized string.
+      #
+      # @since 3.0.0
+      def __mongoize_object_id__
+        convert_to_object_id unless blank?
       end
 
       # Mongoize the string for storage.
@@ -53,7 +63,7 @@ module Mongoid
       #
       # @since 2.3.1
       def mongoid_id?
-        self =~ /^(|_)id$/
+        self =~ /\A(|_)id$/
       end
 
       # Is the string a number?
@@ -116,6 +126,22 @@ module Mongoid
         @unconvertable_to_bson ||= false
       end
 
+      private
+
+      # If the string is a legal object id, convert it.
+      #
+      # @api private
+      #
+      # @example Convert to the object id.
+      #   string.convert_to_object_id
+      #
+      # @return [ String, Moped::BSON::ObjectId ] The string or the id.
+      #
+      # @since 3.0.0
+      def convert_to_object_id
+        Moped::BSON::ObjectId.legal?(self) ? Moped::BSON::ObjectId.from_string(self) : self
+      end
+
       module ClassMethods
 
         # Convert the object from it's mongo friendly ruby type to this type.

data/lib/mongoid/extensions/true_class.rb

@@ -3,6 +3,18 @@ module Mongoid
   module Extensions
     module TrueClass
 
+      # Get the value of the object as a mongo friendy sort value.
+      #
+      # @example Get the object as sort criteria.
+      #   object.__sortable__
+      #
+      # @return [ Integer ] 1.
+      #
+      # @since 3.0.0
+      def __sortable__
+        1
+      end
+
       # Is the passed value a boolean?
       #
       # @example Is the value a boolean type?

data/lib/mongoid/fields.rb

@@ -24,9 +24,9 @@ module Mongoid
       field(:_type, default: ->{ self.class.name if hereditary? }, type: String)
       field(
         :_id,
-        default: ->{ BSON::ObjectId.new },
+        default: ->{ Moped::BSON::ObjectId.new },
         pre_processed: true,
-        type: BSON::ObjectId
+        type: Moped::BSON::ObjectId
       )
 
       alias :id :_id
@@ -94,6 +94,21 @@ module Mongoid
       apply_post_processed_defaults
     end
 
+    # Returns an array of names for the attributes available on this object.
+    #
+    # Provides the field names in an ORM-agnostic way. Rails v3.1+ uses this
+    # method to automatically wrap params in JSON requests.
+    #
+    # @example Get the field names
+    #   docment.attribute_names
+    #
+    # @return [ Array<String> ] The field names
+    #
+    # @since 3.0.0
+    def attribute_names
+      self.class.attribute_names
+    end
+
     # Is the document using object ids?
     #
     # @note Refactored from using delegate for class load performance.
@@ -148,7 +163,7 @@ module Mongoid
       # Returns an array of names for the attributes available on this object.
       #
       # Provides the field names in an ORM-agnostic way. Rails v3.1+ uses this
-      # meathod to automatically wrap params in JSON requests.
+      # method to automatically wrap params in JSON requests.
       #
       # @example Get the field names
       #   Model.attribute_names
@@ -185,22 +200,6 @@ module Mongoid
         added
       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, subclass.pre_processed_defaults, subclass.post_processed_defaults =
-          fields.dup, pre_processed_defaults.dup, post_processed_defaults.dup
-      end
-
       # Replace a field with a new type.
       #
       # @example Replace the field.
@@ -217,13 +216,13 @@ module Mongoid
         add_field(name, fields[name].options.merge(type: type))
       end
 
-      # Convenience method for determining if we are using +BSON::ObjectIds+ as
+      # Convenience method for determining if we are using +Moped::BSON::ObjectIds+ as
       # our id.
       #
       # @example Does this class use object ids?
       #   person.using_object_ids?
       #
-      # @return [ true, false ] If the class uses BSON::ObjectIds for the id.
+      # @return [ true, false ] If the class uses Moped::BSON::ObjectIds for the id.
       #
       # @since 1.0.0
       def using_object_ids?

data/lib/mongoid/fields/foreign_key.rb

@@ -62,9 +62,11 @@ module Mongoid
       #
       # @since 3.0.0
       def evolve(object)
-        return object.id if object.is_a?(Document)
-        evolved = mongoize(object)
-        type.resizable? ? evolved.first : evolved
+        if object_id_field? || object.is_a?(Document)
+          object.__evolve_object_id__
+        else
+          related_id_field.evolve(object)
+        end
       end
 
       # Mongoize the object into the Mongo friendly value.
@@ -81,16 +83,16 @@ module Mongoid
         if type.resizable? || object_id_field?
           type.__mongoize_fk__(constraint, object)
         else
-          metadata.klass.fields["_id"].mongoize(object)
+          related_id_field.mongoize(object)
         end
       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?
@@ -115,6 +117,20 @@ module Mongoid
         serialize_default(default_val[])
       end
 
+      # Get the id field of the relation.
+      #
+      # @api private
+      #
+      # @example Get the related id field.
+      #   field.related_id_field
+      #
+      # @return [ Fields::Standard ] The field.
+      #
+      # @since 3.0.0
+      def related_id_field
+        @related_id_field ||= metadata.klass.fields["_id"]
+      end
+
       # This is used when default values need to be serialized. Most of the
       # time just return the object.
       #