mongoid 2.0.0.rc.7 → 2.0.0.rc.8

data/lib/mongoid/document.rb

@@ -113,7 +113,7 @@ module Mongoid #:nodoc:
     # @return [ Document ] A new document.
     def initialize(attrs = nil)
       @new_record = true
-      @attributes = default_attributes
+      @attributes = apply_default_attributes
       process(attrs) do |document|
         yield self if block_given?
         identify
@@ -147,6 +147,7 @@ module Mongoid #:nodoc:
         raise Errors::DocumentNotFound.new(self.class, id) if reloaded.nil?
       end
       @attributes = {}.merge(reloaded || {})
+      apply_default_attributes
       reset_modifications
       tap do
         relations.keys.each do |name|
@@ -233,7 +234,9 @@ module Mongoid #:nodoc:
         if attributes["_id"]
           allocate.tap do |doc|
             doc.instance_variable_set(:@attributes, attributes)
+            doc.send(:apply_default_attributes)
             doc.setup_modifications
+            doc.run_callbacks(:initialize) { doc }
           end
         else
           new(attrs)
@@ -255,5 +258,27 @@ module Mongoid #:nodoc:
         :mongoid
       end
     end
+
+    # Freezes the internal attributes of the document.
+    #
+    # @example Freeze the document
+    #   document.freeze
+    #
+    # @return [ Document ] The document.
+    def freeze
+      raw_attributes.freeze
+      self
+    end
+
+    # Checks if the document is frozen
+    #
+    # @example Check if frozen
+    #   document.frozen?
+    #
+    # @return [ true, false ] True if frozen, else false.
+    def frozen?
+      raw_attributes.frozen?
+    end
+
   end
 end

data/lib/mongoid/errors.rb

@@ -6,6 +6,7 @@ require "mongoid/errors/invalid_database"
 require "mongoid/errors/invalid_field"
 require "mongoid/errors/invalid_options"
 require "mongoid/errors/invalid_type"
+require "mongoid/errors/mixed_relations"
 require "mongoid/errors/too_many_nested_attribute_records"
 require "mongoid/errors/unsaved_document"
 require "mongoid/errors/unsupported_version"

data/lib/mongoid/errors/mixed_relations.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+module Mongoid #:nodoc
+  module Errors #:nodoc
+
+    # This error is raised when trying to reference an embedded document from
+    # a document in another collection that is not it's parent.
+    #
+    # @example An illegal reference to an embedded document.
+    #   class Post
+    #     include Mongoid::Document
+    #     references_many :addresses
+    #   end
+    #
+    #   class Address
+    #     include Mongoid::Document
+    #     embedded_in :person
+    #     referenced_in :post
+    #   end
+    #
+    # @since 2.0.0
+    class MixedRelations < MongoidError
+
+      attr_reader :root_klass, :embedded_klass
+
+      def initialize(root_klass, embedded_klass)
+        @root_klass, @embedded_klass = root_klass, embedded_klass
+
+        super(
+          translate(
+            "mixed_relations",
+            { :root => root_klass, :embedded => embedded_klass }
+          )
+        )
+      end
+    end
+  end
+end

data/lib/mongoid/extensions/object_id/conversions.rb

@@ -42,6 +42,8 @@ module Mongoid #:nodoc:
         # Convert the supplied arguments to object ids based on the class
         # settings.
         #
+        # @todo Durran: This method can be refactored.
+        #
         # @example Convert a string to an object id
         #   BSON::ObjectId.convert(Person, "4c52c439931a90ab29000003")
         #
@@ -64,16 +66,17 @@ module Mongoid #:nodoc:
           return args if args.is_a?(BSON::ObjectId) || !klass.using_object_ids?
           case args
           when ::String
-            BSON::ObjectId.from_string(args)
+            args.blank? ? nil : BSON::ObjectId.from_string(args)
           when ::Array
-            args.map do |arg|
+            args.reject(&:blank?).map do |arg|
               convert(klass, arg)
             end
           when ::Hash
             args.tap do |hash|
-              args.each_pair do |key, value|
+              hash.each_pair do |key, value|
+                next unless key.to_s =~ /id/
                 begin
-                  args[key] = convert(klass, value)
+                  hash[key] = convert(klass, value)
                 rescue BSON::InvalidObjectId; end
               end
             end

data/lib/mongoid/factory.rb

@@ -14,7 +14,7 @@ module Mongoid #:nodoc:
     def self.build(klass, attributes)
       attrs = {}.merge(attributes)
       type = attrs["_type"]
-      type ? type.constantize.instantiate(attrs) : klass.instantiate(attrs)
+      type.present? ? type.constantize.instantiate(attrs) : klass.instantiate(attrs)
     end
   end
 end

data/lib/mongoid/field.rb

@@ -1,34 +1,40 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
+
+  # Defines the behaviour for defined fields in the document.
   class Field
-    attr_reader :copyable, :klass, :label, :name, :options, :type
+
+    attr_accessor :type
+    attr_reader :copyable, :klass, :label, :name, :options
 
     # Get the default value for the field.
     #
-    # Returns:
+    # @example Get the default.
+    #   field.default
     #
-    # The typecast default value.
+    # @return [ Object ] The typecast default value.
+    #
+    # @since 1.0.0
     def default
       copy.respond_to?(:call) ? copy : set(copy)
     end
 
-    # Create the new field with a name and optional additional options. Valid
-    # options are :default
+    # Create the new field with a name and optional additional options.
     #
-    # Options:
+    # @example Create the new field.
+    #   Field.new(:name, :type => String)
     #
-    # name: The name of the field as a +Symbol+.
-    # options: A +Hash+ of options for the field.
+    # @param [ Hash ] options The field options.
     #
-    # Example:
+    # @option options [ Class ] :type The class of the field.
+    # @option options [ Object ] :default The default value for the field.
+    # @option options [ String ] :label The field's label.
     #
-    # <tt>Field.new(:score, :default => 0)</tt>
+    # @since 1.0.0
     def initialize(name, options = {})
-      check_name!(name)
       @type = options[:type] || Object
-      @name, @default = name, options[:default]
+      @name, @default, @label = name, options[:default], options[:label]
       @copyable = (@default.is_a?(Array) || @default.is_a?(Hash))
-      @label = options[:label]
       @options = options
       check_default!
     end
@@ -40,19 +46,20 @@ module Mongoid #:nodoc:
     # If the field is an identity field, ie an id, it performs the necessary
     # cast.
     #
-    # Example:
+    # @example Get the setter value.
+    #   field.set("New Value")
     #
-    # <tt>field.set("New Value")</tt>
+    # @param [ Object ] object The value to cast to a database value.
     #
-    # Returns:
+    # @return [ Object ] The typecast value.
     #
-    # The new value.
+    # @since 1.0.0
     def set(object)
       unless options[:identity]
         type.set(object)
       else
         if object.blank?
-          type.set(object)
+          type.set(object) if object.is_a?(Array)
         else
           options[:metadata].constraint.convert(object)
         end
@@ -61,30 +68,40 @@ module Mongoid #:nodoc:
 
     # Used for retrieving the object out of the attributes hash.
     #
-    # Example:
+    # @example Get the value.
+    #   field.get("Value")
     #
-    # <tt>field.get("Value")</tt>
+    # @param [ Object ] The object to cast from the database.
     #
-    # Returns:
+    # @return [ Object ] The converted value.
     #
-    # The converted value.
+    # @since 1.0.0
     def get(object)
       type.get(object)
     end
 
     protected
-    # Slightly faster default check.
+
+    # Copy the default value if copyable.
+    #
+    # @example Copy the default.
+    #   field.copy
+    #
+    # @return [ Object ] The copied object or the original.
+    #
+    # @since 1.0.0
     def copy
       copyable ? @default.dup : @default
     end
 
-    # Check if the name is valid.
-    def check_name!(name)
-      if Mongoid.destructive_fields.include?(name.to_s)
-        raise Mongoid::Errors::InvalidField.new(name)
-      end
-    end
-
+    # Checks if the default value is of the same type as the field.
+    #
+    # @example Check the default value.
+    #   field.check_default!
+    #
+    # @raise [ Errors::InvalidType ] If the types differ.
+    #
+    # @since 1.0.0
     def check_default!
       return if @default.is_a?(Proc)
       if !@default.nil? && !@default.is_a?(type)

data/lib/mongoid/fields.rb

@@ -9,11 +9,17 @@ module Mongoid #:nodoc
       # Set up the class attributes that must be available to all subclasses.
       # These include defaults, fields
       delegate :defaults, :fields, :to => "self.class"
+
+      field(:_type, :type => String)
+      field(:_id, :type => BSON::ObjectId)
+
+      alias :id :_id
+      alias :id= :_id=
     end
 
     module ClassMethods #:nodoc
 
-      # Defines all the fields that are accessable on the Document
+      # Defines all the fields that are accessible on the Document
       # For each field that is defined, a getter and setter will be
       # added as an instance method to the Document.
       #
@@ -71,7 +77,7 @@ module Mongoid #:nodoc
       end
 
       # When inheriting, we want to copy the fields from the parent class and
-      # set the on the child to start, mimicing the behaviour of the old
+      # 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.
@@ -81,6 +87,7 @@ module Mongoid #:nodoc
       #
       # @since 2.0.0.rc.6
       def inherited(subclass)
+        super
         subclass.fields = fields.dup
       end
 

data/lib/mongoid/finders.rb

@@ -1,12 +1,15 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
-  module Finders #:nodoc:
+
+  # This module defines the finder methods that hang off the document at the
+  # class level.
+  module Finders
 
     # Delegate to the criteria methods that are natural for creating a new
     # criteria.
     [ :all_in, :any_in, :any_of, :asc, :ascending, :avg, :desc, :descending,
       :excludes, :limit, :max, :min, :not_in, :only, :order_by,
-      :skip, :sum, :where, :update, :update_all, :near ].each do |name|
+      :skip, :sum, :without, :where, :update, :update_all, :near ].each do |name|
       define_method(name) do |*args|
         criteria.send(name, *args)
       end
@@ -28,7 +31,7 @@ module Mongoid #:nodoc:
     #
     # <tt>Person.count(:conditions => { :attribute => "value" })</tt>
     def count(*args)
-      Criteria.translate(self, false, *args).count
+      find(:all, *args).count
     end
 
     # Returns true if there are on document in database based on the
@@ -36,17 +39,7 @@ module Mongoid #:nodoc:
     #
     # <tt>Person.exists?(:conditions => { :attribute => "value" })</tt>
     def exists?(*args)
-      Criteria.translate(self, false, *args).limit(1).count == 1
-    end
-
-    # Helper to initialize a new +Criteria+ object for this class, or return
-    # the currently scoped +Criteria+ object.
-    #
-    # Example:
-    #
-    # <tt>Person.criteria</tt>
-    def criteria(embedded = false)
-      scope_stack.last || Criteria.new(self, embedded)
+       find(:all, *args).limit(1).count == 1
     end
 
     # Find a +Document+ in several different ways.
@@ -71,16 +64,7 @@ module Mongoid #:nodoc:
     #
     # A document or criteria.
     def find(*args)
-      raise Errors::InvalidOptions.new(
-        :calling_document_find_with_nil_is_invalid, {}
-      ) if args[0].nil?
-      type, criteria = Criteria.parse!(self, false, *args)
-      case type
-      when :first then return criteria.one
-      when :last then return criteria.last
-      else
-        return criteria
-      end
+      criteria.find(*args)
     end
 
     # Find the first +Document+ given the conditions, or creates a new document
@@ -91,8 +75,8 @@ module Mongoid #:nodoc:
     # args: A +Hash+ of attributes
     #
     # <tt>Person.find_or_create_by(:attribute => "value")</tt>
-    def find_or_create_by(attrs = {})
-      find_or(:create, attrs)
+    def find_or_create_by(attrs = {}, &block)
+      find_or(:create, attrs, &block)
     end
 
     # Find the first +Document+ given the conditions, or instantiates a new document
@@ -103,8 +87,8 @@ module Mongoid #:nodoc:
     # args: A +Hash+ of attributes
     #
     # <tt>Person.find_or_initialize_by(:attribute => "value")</tt>
-    def find_or_initialize_by(attrs = {})
-      find_or(:new, attrs)
+    def find_or_initialize_by(attrs = {}, &block)
+      find_or(:new, attrs, &block)
     end
 
     # Find the first +Document+ given the conditions.
@@ -143,31 +127,13 @@ module Mongoid #:nodoc:
     #
     # Returns paginated array of docs.
     def paginate(params = {})
-      Criteria.translate(self, false, params).paginate
+      find(:all, params).paginate
     end
 
     protected
     # Find the first object or create/initialize it.
-    def find_or(method, attrs = {})
-      first(:conditions => attrs) || send(method, attrs)
-    end
-
-    # Initializes and returns the current scope stack.
-    def scope_stack
-      scope_stack_for = Thread.current[:mongoid_scope_stack] ||= {}
-      scope_stack_for[object_id] ||= []
-    end
-
-    # Pushes the provided criteria onto the scope stack, and removes it after the
-    # provided block is yielded.
-    def with_scope(criteria)
-      scope_stack = self.scope_stack
-      scope_stack << criteria
-      begin
-        yield criteria
-      ensure
-        scope_stack.pop
-      end
+    def find_or(method, attrs = {}, &block)
+      first(:conditions => attrs) || send(method, attrs, &block)
     end
   end
 end

data/lib/mongoid/identity.rb

@@ -12,8 +12,7 @@ module Mongoid #:nodoc:
     # @example Create the id and set the type.
     #   identity.create
     def create
-      identify
-      type
+      identify.tap { type }
     end
 
     # Create the new identity generator - this will be expanded in the future
@@ -49,8 +48,11 @@ module Mongoid #:nodoc:
     # @example Set the id.
     #   identity.identify
     def identify
-      document.id = compose.join(" ").identify if document.primary_key
-      document.id = generate_id if document.id.blank?
+      if !document.embedded? || Mongoid.embedded_object_id
+        document.id = compose.join(" ").identify if document.primary_key
+        document.id = generate_id if document.id.blank?
+      end
+      document.id
     end
 
     # Set the _type field on the document if the document is hereditary or in a