mongoid 2.0.0.rc.5 → 2.0.0.rc.6

data/README.rdoc

@@ -1,8 +1,3 @@
-= PLEASE READ (03 JAN 2011)
-
-USERS CURRENTLY POINTED AT master, PLEASE MOVE TO safe_master UNTIL
-FURTHER NOTICE.
-
 = Overview
 
 == About Mongoid
@@ -16,7 +11,7 @@ Mongoid is an ODM (Object-Document-Mapper) framework for MongoDB in Ruby.
 
 == Compatibility
 
-Mongoid is developed against Ruby 1.8.7, 1.9.1, 1.9.2, and REE.
+Mongoid is developed against Ruby 1.8.7, 1.9.2, and REE.
 
 = Documentation
 
@@ -28,7 +23,7 @@ Please see the new Mongoid website for up-to-date documentation:
 
 = License
 
-Copyright (c) 2009, 2010 Durran Jordan
+Copyright (c) 2009, 2010, 2011 Durran Jordan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/config/locales/bg.yml

@@ -39,4 +39,6 @@ bg:
           references_many като масив.
         calling_document_find_with_nil_is_invalid:
           Извикването на Document#find със nil е невалидно
-
+        unsaved_document:
+          You cannot call create or create! through a relational association
+          relation (%{document}) who's parent (%{base}) is not already saved.

data/lib/config/locales/de.yml

@@ -39,3 +39,6 @@ de:
           Es ist nicht erlaubt, inverse_of für diese Beziehung zu definieren.
           Diese Option kann nur für embedded_in oder references_many als Array
           verwendet werden.
+        unsaved_document:
+          You cannot call create or create! through a relational association
+          relation (%{document}) who's parent (%{base}) is not already saved.

data/lib/config/locales/en.yml

@@ -40,3 +40,6 @@ en:
           use this option on embedded_in or references_many as array.
         calling_document_find_with_nil_is_invalid:
           Calling Document#find with nil is invalid
+        unsaved_document:
+          You cannot call create or create! through a relational association
+          relation (%{document}) who's parent (%{base}) is not already saved.

data/lib/config/locales/es.yml

@@ -39,3 +39,6 @@ es:
         association_cant_have_inverse_of:
           No está permitido definir inverse_of en esta asociación. Utilice 
           esta opción sólo en embedded_in o en references_many as array.
+        unsaved_document:
+          You cannot call create or create! through a relational association
+          relation (%{document}) who's parent (%{base}) is not already saved.

data/lib/config/locales/fr.yml

@@ -39,4 +39,7 @@ fr:
           pour les associations references_on ou references_many."
         association_cant_have_inverse_of:
           "Definir un inverse_of pour cette association n'est pas autorisé.
-          Utilisez cette option seulement sur embedded_in ou references_many."
+          Utilisez cette option seulement sur embedded_in ou references_many."
+        unsaved_document:
+          You cannot call create or create! through a relational association
+          relation (%{document}) who's parent (%{base}) is not already saved.

data/lib/config/locales/hu.yml

@@ -42,4 +42,6 @@ hu:
           esetében használható.
         calling_document_find_with_nil_is_invalid:
           Document#find parancs nil érték esetében érvénytelen.
-
+        unsaved_document:
+          You cannot call create or create! through a relational association
+          relation (%{document}) who's parent (%{base}) is not already saved.

data/lib/config/locales/it.yml

@@ -37,3 +37,6 @@ it:
         association_cant_have_inverse_of:
           Non è permesso definire un inverse_of in questa associazione.
           Usa questa opzione solo per embedded_in o references_many as array.
+        unsaved_document:
+          You cannot call create or create! through a relational association
+          relation (%{document}) who's parent (%{base}) is not already saved.

data/lib/config/locales/kr.yml

@@ -63,3 +63,6 @@ kr:
           #Defining an inverse_of on this association is not allowed. Only
           #use this option on embedded_in or references_many as array.
 
+        unsaved_document:
+          You cannot call create or create! through a relational association
+          relation (%{document}) who's parent (%{base}) is not already saved.

data/lib/config/locales/nl.yml

@@ -37,3 +37,6 @@ nl:
           alleen deze optie met embedded_in en references_many as array.
         calling_document_find_with_nil_is_invalid:
           Het is niet toegestaan om Document#find aan te roepen met de waarde nil.
+        unsaved_document:
+          You cannot call create or create! through a relational association
+          relation (%{document}) who's parent (%{base}) is not already saved.

data/lib/config/locales/pl.yml

@@ -37,3 +37,6 @@ pl:
         association_cant_have_inverse_of:
           Definiowanie inverse_of dla tej asocjacji jest niedozwolone. Używaj
           tej opcji tylko z embedded_in lub references_many as array.
+        unsaved_document:
+          You cannot call create or create! through a relational association
+          relation (%{document}) who's parent (%{base}) is not already saved.

data/lib/config/locales/pt-br.yml

@@ -38,3 +38,6 @@ pt-br:
         association_cant_have_inverse_of:
           A definição de inverse_of nesta associação não é permitida. Apenas
           use esta opção em embedded_in ou references_many as array.
+        unsaved_document:
+          You cannot call create or create! through a relational association
+          relation (%{document}) who's parent (%{base}) is not already saved.

data/lib/config/locales/pt.yml

@@ -38,3 +38,6 @@ pt:
         association_cant_have_inverse_of:
           A definição de inverse_of nesta associação não é permitida. Apenas
           use esta opção em embedded_in ou references_many como lista.
+        unsaved_document:
+          You cannot call create or create! through a relational association
+          relation (%{document}) who's parent (%{base}) is not already saved.

data/lib/config/locales/ro.yml

@@ -44,4 +44,6 @@ ro:
           tip embedded_in sau references_many as array.
         calling_document_find_with_nil_is_invalid:
           Folosirea metodei Document#find cu valoarea nil este invalidă.
-
+        unsaved_document:
+          You cannot call create or create! through a relational association
+          relation (%{document}) who's parent (%{base}) is not already saved.

data/lib/config/locales/sv.yml

@@ -37,4 +37,7 @@ sv:
           är endast giltigt för references_one eller references_many associationer.
         association_cant_have_inverse_of:
           Att definera inverse_of på denna association är inte tillåtet. Använd
-          endast detta alternativ på embedded_in eller references_many as array.          
+          endast detta alternativ på embedded_in eller references_many as array.
+        unsaved_document:
+          You cannot call create or create! through a relational association
+          relation (%{document}) who's parent (%{base}) is not already saved.

data/lib/config/locales/zh-CN.yml

@@ -29,3 +29,6 @@ en:
           dependent => destroy|delete 选项只有在references_one或者references_many时候有效.
         association_cant_have_inverse_of:
           在当前的关联中，不允许定义inverse_of去,其只有在embedded_in或者references_many是数组的情况下使用
+        unsaved_document:
+          You cannot call create or create! through a relational association
+          relation (%{document}) who's parent (%{base}) is not already saved.

data/lib/mongoid.rb

@@ -78,6 +78,7 @@ require "mongoid/persistence"
 require "mongoid/relations"
 require "mongoid/safety"
 require "mongoid/scope"
+require "mongoid/serialization"
 require "mongoid/state"
 require "mongoid/timestamps"
 require "mongoid/validations"

data/lib/mongoid/attributes.rb

@@ -62,7 +62,7 @@ module Mongoid #:nodoc:
     #
     # @return [ BSON::ObjectId, String ] The new id.
     def id=(new_id)
-      @attributes["_id"] = new_id
+      @attributes["_id"] = _id_type.set(new_id)
     end
     alias :_id= :id=
 

data/lib/mongoid/callbacks.rb

@@ -4,24 +4,10 @@ module Mongoid #:nodoc:
     extend ActiveSupport::Concern
     included do
       extend ActiveModel::Callbacks
+      include ActiveModel::Validations::Callbacks
 
-      define_model_callbacks \
-        :create,
-        :destroy,
-        :initialize,
-        :save,
-        :update,
-        :validation
-    end
-
-    # Determine if the document is valid.
-    #
-    # @example Is the document valid?
-    #   person.valid?
-    #
-    # @return [ true, false ] True if valid, false if not.
-    def valid?(*)
-      _run_validation_callbacks { super }
+      define_model_callbacks :initialize, :only => :after
+      define_model_callbacks :create, :destroy, :save, :update
     end
   end
 end

data/lib/mongoid/components.rb

@@ -14,7 +14,6 @@ module Mongoid #:nodoc
 
     include ActiveModel::Conversion
     include ActiveModel::Naming
-    include ActiveModel::Serialization
     include ActiveModel::MassAssignmentSecurity
     include ActiveModel::Serializers::JSON
     include ActiveModel::Serializers::Xml
@@ -38,6 +37,7 @@ module Mongoid #:nodoc
     include Mongoid::Persistence
     include Mongoid::Relations
     include Mongoid::Safety
+    include Mongoid::Serialization
     include Mongoid::State
     include Mongoid::Validations
     include Mongoid::Callbacks

data/lib/mongoid/contexts/enumerable.rb

@@ -168,6 +168,23 @@ module Mongoid #:nodoc:
         end
       end
 
+      # Very basic update that will perform a simple atomic $set of the
+      # attributes provided in the hash. Can be expanded to later for more
+      # robust functionality.
+      #
+      # @example Update all matching documents.
+      #   context.update_all(:title => "Sir")
+      #
+      # @param [ Hash ] attributes The sets to perform.
+      #
+      # @since 2.0.0.rc.6
+      def update_all(attributes = nil)
+        iterate do |doc|
+          doc.update_attributes(attributes || {})
+        end
+      end
+      alias :update :update_all
+
       protected
       # Filters the documents against the criteria's selector
       def filter

data/lib/mongoid/contexts/mongo.rb

@@ -55,15 +55,18 @@ module Mongoid #:nodoc:
 
       # Get the count of matching documents in the database for the context.
       #
-      # Example:
+      # @example Get the count without skip and limit taken into consideration.
+      #   context.count
       #
-      # <tt>context.count</tt>
+      # @example Get the count with skip and limit applied.
+      #   context.count(true)
       #
-      # Returns:
+      # @param [Boolean] extras True to inclued previous skip/limit
+      #   statements in the count; false to ignore them. Defaults to `false`.
       #
-      # An +Integer+ count of documents.
-      def count
-        @count ||= klass.collection.find(selector, process_options).count
+      # @return [ Integer ] The count of documents.
+      def count(extras = false)
+        @count ||= klass.collection.find(selector, process_options).count(extras)
       end
 
       # Delete all the documents in the database matching the selector.

data/lib/mongoid/criterion/inspection.rb

@@ -13,9 +13,7 @@ module Mongoid #:nodoc:
       def inspect
         "#<Mongoid::Criteria\n" <<
         "  selector: #{selector.inspect},\n" <<
-        "  options:  #{options.inspect},\n" <<
-        "  count:    #{count.inspect},\n" <<
-        "  matching: #{entries.inspect}>\n"
+        "  options:  #{options.inspect}>\n"
       end
     end
   end

data/lib/mongoid/errors.rb

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

data/lib/mongoid/errors/unsaved_document.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+module Mongoid #:nodoc
+  module Errors #:nodoc
+
+    # Raised when attempting to call create or create! through a
+    # references_many when the parent document has not been saved. This
+    # prevents the child from getting presisted and immediately being orphaned.
+    class UnsavedDocument < MongoidError
+
+      attr_reader :base, :document
+
+      def initialize(base, document)
+        @base, @document = base, document
+        super(
+          translate(
+            "unsaved_document",
+            { :base => base.class.name, :document => document.class.name }
+          )
+        )
+      end
+    end
+  end
+end

data/lib/mongoid/extras.rb

@@ -3,7 +3,7 @@ module Mongoid #:nodoc:
   module Extras #:nodoc:
     extend ActiveSupport::Concern
     included do
-      class_inheritable_accessor :cached, :enslaved
+      class_attribute :cached, :enslaved
       self.cached = false
       self.enslaved = false
       delegate :cached?, :enslaved?, :to => "self.class"

data/lib/mongoid/fields.rb

@@ -1,46 +1,98 @@
 # encoding: utf-8
 module Mongoid #:nodoc
-  module Fields #:nodoc
+
+  # This module defines behaviour for fields.
+  module Fields
     extend ActiveSupport::Concern
+
     included do
       # Set up the class attributes that must be available to all subclasses.
       # These include defaults, fields
-      class_inheritable_accessor :fields
-
-      self.fields = {}
       delegate :defaults, :fields, :to => "self.class"
     end
 
     module ClassMethods #:nodoc
+
       # Defines all the fields that are accessable on the Document
       # For each field that is defined, a getter and setter will be
       # added as an instance method to the Document.
       #
-      # Options:
+      # @example Define a field.
+      #   field :score, :type => Integer, :default => 0
       #
-      # name: The name of the field, as a +Symbol+.
-      # options: A +Hash+ of options to supply to the +Field+.
+      # @param [ Symbol ] name The name of the field.
+      # @param [ Hash ] options The options to pass to the field.
       #
-      # Example:
-      #
-      # <tt>field :score, :default => 0</tt>
+      # @option options [ Class ] :type The type of the field.
+      # @option options [ String ] :label The label for the field.
+      # @option options [ Object, Proc ] :default The field's default
       def field(name, options = {})
         access = name.to_s
         set_field(access, options)
         attr_protected name if options[:accessible] == false
       end
 
-      # Returns the default values for the fields on the document
+      # Return the fields for this class.
+      #
+      # @example Get the fields.
+      #   Person.fields
+      #
+      # @return [ Hash ] The fields for this document.
+      #
+      # @since 2.0.0.rc.6
+      def fields
+        @fields ||= {}
+      end
+
+      # Set the fields for the class.
+      #
+      # @example Set the fields.
+      #   Person.fields = fields
+      #
+      # @param [ Hash ] fields The hash of fields to set.
+      #
+      # @since 2.0.0.rc.6
+      def fields=(fields)
+        @fields = fields
+      end
+
+      # Returns the default values for the fields on the document.
+      #
+      # @example Get the defaults.
+      #   Person.defaults
+      #
+      # @return [ Hash ] The field defaults.
       def defaults
-        fields.inject({}) do |defs,(field_name,field)|
+        fields.inject({}) do |defs, (field_name,field)|
           next(defs) if field.default.nil?
           defs[field_name.to_s] = field.default
           defs
         end
       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
+      # 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)
+        subclass.fields = fields.dup
+      end
+
       protected
+
       # Define a field attribute for the +Document+.
+      #
+      # @example Set the field.
+      #   Person.set_field(:name, :default => "Test")
+      #
+      # @param [ Symbol ] name The name of the field.
+      # @param [ Hash ] options The hash of options.
       def set_field(name, options = {})
         meth = options.delete(:as) || name
         fields[name] = Field.new(name, options)
@@ -49,6 +101,16 @@ module Mongoid #:nodoc
       end
 
       # Create the field accessors.
+      #
+      # @example Generate the accessors.
+      #   Person.create_accessors(:name, "name")
+      #   person.name #=> returns the field
+      #   person.name = "" #=> sets the field
+      #   person.name? #=> Is the field present?
+      #
+      # @param [ Symbol ] name The name of the field.
+      # @param [ Symbol ] meth The name of the accessor.
+      # @param [ Hash ] options The options.
       def create_accessors(name, meth, options = {})
         generated_field_methods.module_eval do
           define_method(meth) { read_attribute(name) }
@@ -60,11 +122,15 @@ module Mongoid #:nodoc
         end
       end
 
+      # Include the field methods as a module, so they can be overridden.
+      #
+      # @example Include the fields.
+      #   Person.generated_field_methods
       def generated_field_methods
         @generated_field_methods ||= begin
-          mod = Module.new
-          include mod
-          mod
+          Module.new.tap do |mod|
+            include mod
+          end
         end
       end
     end

data/lib/mongoid/finders.rb

@@ -6,7 +6,7 @@ module Mongoid #:nodoc:
     # criteria.
     [ :all_in, :any_in, :any_of, :asc, :ascending, :avg, :desc, :descending,
       :excludes, :limit, :max, :min, :not_in, :only, :order_by,
-      :skip, :sum, :where, :near ].each do |name|
+      :skip, :sum, :where, :update, :update_all, :near ].each do |name|
       define_method(name) do |*args|
         criteria.send(name, *args)
       end

data/lib/mongoid/persistence.rb

@@ -86,6 +86,22 @@ module Mongoid #:nodoc:
       Update.new(self, options).persist
     end
 
+    # Update a single attribute and persist the entire document.
+    # This skips validation but fires the callbacks.
+    #
+    # @example Update the attribute.
+    #   person.update_attribute(:title, "Sir")
+    #
+    # @param [ Symbol, String ] name The name of the attribute.
+    # @param [ Object ] value The new value of the attribute.a
+    #
+    # @return [ true, false ] True if save was successfull, false if not.
+    #
+    # @since 2.0.0.rc.6
+    def update_attribute(name, value)
+      write_attribute(name, value) and save(:validate => false)
+    end
+
     # Update the document attributes in the datbase.
     #
     # @example Update the document's attributes

data/lib/mongoid/railtie.rb

@@ -67,18 +67,13 @@ module Rails #:nodoc:
         end
       end
 
-      # After initialization we will attempt to connect to the database, if
-      # we get an exception and can't find a mongoid.yml we will alert the user
-      # to generate one.
-      initializer "verify that mongoid is configured" do
+      # After initialization we will warn the user if we can't find a mongoid.yml and
+      # alert to create one.
+      initializer "warn when configuration is missing" do
         config.after_initialize do
-          begin
-            ::Mongoid.master
-          rescue ::Mongoid::Errors::InvalidDatabase => e
-            unless Rails.root.join("config", "mongoid.yml").file?
-              puts "\nMongoid config not found. Create a config file at: config/mongoid.yml"
-              puts "to generate one run: rails generate mongoid:config\n\n"
-            end
+          unless Rails.root.join("config", "mongoid.yml").file?
+            puts "\nMongoid config not found. Create a config file at: config/mongoid.yml"
+            puts "to generate one run: rails generate mongoid:config\n\n"
           end
         end
       end

data/lib/mongoid/relations/accessors.rb

@@ -143,7 +143,7 @@ module Mongoid # :nodoc:
             define_method("#{name}=") do |*args|
               object, options = args.first, options(args)
               variable = "@#{name}"
-              if relation_exists?(name)
+              if relation_exists?(name) && !object.is_a?(Hash)
                 set(name, ivar(name).substitute(object, options))
               else
                 build(name, object, metadata, options.merge(:eager => true))

data/lib/mongoid/relations/builders/nested_attributes/many.rb

@@ -95,15 +95,15 @@ module Mongoid # :nodoc:
           #
           # Example:
           #
-          # <tt>builder.process({ "_id" => 1, "street" => "Bond" })
+          # <tt>builder.process({ "id" => 1, "street" => "Bond" })
           #
           # Options:
           #
           # attrs: The single document attributes to process.
           def process(attrs)
             return if reject?(attrs)
-            if attrs[:_id]
-              document = existing.find(attrs[:_id])
+            if attrs[:id]
+              document = existing.find(convert_id(attrs[:id]))
               destroyable?(attrs) ? document.destroy : document.update_attributes(attrs)
             else
               existing.push(metadata.klass.new(attrs)) unless destroyable?(attrs)

data/lib/mongoid/relations/builders/nested_attributes/one.rb

@@ -69,7 +69,7 @@ module Mongoid # :nodoc:
           #
           # True if the id part of the logic will allow an update.
           def acceptable_id?
-            id = attributes[:_id]
+            id = convert_id(attributes[:id])
             existing.id == id || id.nil? || (existing.id != id && update_only?)
           end
 
@@ -83,7 +83,7 @@ module Mongoid # :nodoc:
           #
           # True if the relation should be deleted.
           def delete?
-            destroyable? && !attributes[:_id].nil?
+            destroyable? && !attributes[:id].nil?
           end
 
           # Can the existing relation potentially be deleted?

data/lib/mongoid/relations/builders/referenced/many_to_many.rb

@@ -15,7 +15,7 @@ module Mongoid # :nodoc:
           #
           # @return [ Array<Document> ] The documents.
           def build(type = nil)
-            return object.dup unless query?
+            return object.try(:dup) unless query?
             begin
               metadata.klass.find(object)
             rescue Errors::DocumentNotFound

data/lib/mongoid/relations/cascading.rb

@@ -13,7 +13,7 @@ module Mongoid # :nodoc:
       extend ActiveSupport::Concern
 
       included do
-        class_inheritable_accessor :cascades
+        class_attribute :cascades
         self.cascades = []
         delegate :cascades, :to => "self.class"
       end

data/lib/mongoid/relations/embedded/many.rb

@@ -351,7 +351,7 @@ module Mongoid # :nodoc:
         #
         # @return [ Criteria, Object ] A Criteria or return value from the target.
         def method_missing(name, *args, &block)
-          load! and return super if target.respond_to?(name)
+          load!(:binding => true) and return super if target.respond_to?(name)
           klass = metadata.klass
           klass.send(:with_scope, criteria) do
             klass.send(name, *args)

data/lib/mongoid/relations/macros.rb

@@ -9,7 +9,7 @@ module Mongoid # :nodoc:
 
       included do
         cattr_accessor :embedded
-        class_inheritable_accessor :relations
+        class_attribute :relations
         self.embedded = false
         self.relations = {}
 

data/lib/mongoid/relations/many.rb

@@ -119,6 +119,26 @@ module Mongoid #:nodoc:
         find_or(:build, attrs)
       end
 
+      # Gets the document as a serializable hash, used by ActiveModel's JSON and
+      # XML serializers. This override is just to be able to pass the :include
+      # and :except options to get associations in the hash.
+      #
+      # @example Get the serializable hash.
+      #   relation.serializable_hash
+      #
+      # @param [ Hash ] options The options to pass.
+      #
+      # @option options [ Symbol ] :include What relations to include
+      # @option options [ Symbol ] :only Limit the fields to only these.
+      # @option options [ Symbol ] :except Dont include these fields.
+      #
+      # @return [ Hash ] The documents, ready to be serialized.
+      #
+      # @since 2.0.0.rc.6
+      def serializable_hash(options = {})
+        target.map { |document| document.serializable_hash(options) }
+      end
+
       private
 
       # Get the default options used in binding functions.

data/lib/mongoid/relations/metadata.rb

@@ -425,7 +425,7 @@ module Mongoid # :nodoc:
             name.to_s << suffix
           end
         else
-          (polymorphic? ? self[:as].to_s : inverse_class_name.underscore) << suffix
+          polymorphic? ? "#{self[:as]}#{suffix}" : inverse_class_name.foreign_key
         end
       end
 

data/lib/mongoid/relations/nested_builder.rb

@@ -47,6 +47,24 @@ module Mongoid # :nodoc:
       def update_only?
         options[:update_only] || false
       end
+
+      # Convert an id to its appropriate type.
+      #
+      # @todo Durran: Move this into a common reusable place.
+      #
+      # @example Convert the id.
+      #   builder.convert_id("4d371b444835d98b8b000010")
+      #
+      # @param [ String ] id The id, usually coming from the form.
+      #
+      # @return [ BSON::ObjectId, String, Object ] The converted id.
+      #
+      # @since 2.0.0.rc.6
+      def convert_id(id)
+        return nil unless id
+        model = metadata.klass
+        model.using_object_ids? ? BSON::ObjectId.cast!(model, id) : id.class.set(id)
+      end
     end
   end
 end

data/lib/mongoid/relations/polymorphic.rb

@@ -8,7 +8,7 @@ module Mongoid # :nodoc:
       extend ActiveSupport::Concern
 
       included do
-        class_inheritable_accessor :polymorphic
+        class_attribute :polymorphic
         delegate :polymorphic?, :to => "self.class"
       end
 

data/lib/mongoid/relations/referenced/many.rb

@@ -56,6 +56,41 @@ module Mongoid #:nodoc:
           criteria.count
         end
 
+        # Creates a new document on the references many relation. This will
+        # save the document if the parent has been persisted.
+        #
+        # @example Create and save the new document.
+        #   person.posts.create(:text => "Testing")
+        #
+        # @param [ Hash ] attributes The attributes to create with.
+        # @param [ Class ] type The optional type of document to create.
+        #
+        # @return [ Document ] The newly created document.
+        def create(attributes = nil, type = nil)
+          build(attributes, type).tap do |doc|
+            base.persisted? ? doc.save : raise_unsaved(doc)
+          end
+        end
+
+        # Creates a new document on the references many relation. This will
+        # save the document if the parent has been persisted and will raise an
+        # error if validation fails.
+        #
+        # @example Create and save the new document.
+        #   person.posts.create!(:text => "Testing")
+        #
+        # @param [ Hash ] attributes The attributes to create with.
+        # @param [ Class ] type The optional type of document to create.
+        #
+        # @raise [ Errors::Validations ] If validation failed.
+        #
+        # @return [ Document ] The newly created document.
+        def create!(attributes = nil, type = nil)
+          build(attributes, type).tap do |doc|
+            base.persisted? ? doc.save! : raise_unsaved(doc)
+          end
+        end
+
         # Deletes all related documents from the database given the supplied
         # conditions.
         #
@@ -233,7 +268,7 @@ module Mongoid #:nodoc:
         #
         # @since 2.0.0.rc.1
         def append(document, options = {})
-          load! and target.push(document)
+          load!(options) and target.push(document)
           characterize_one(document)
           binding.bind_one(document, options)
         end
@@ -274,13 +309,28 @@ module Mongoid #:nodoc:
         #
         # @return [ Criteria, Object ] A Criteria or return value from the target.
         def method_missing(name, *args, &block)
-          load! and return super if [].respond_to?(name)
+          load!(:binding => true) and return super if [].respond_to?(name)
           klass = metadata.klass
           klass.send(:with_scope, criteria) do
             klass.send(name, *args)
           end
         end
 
+        # When the base is not yet saved and the user calls create or create!
+        # on the relation, this error will get raised.
+        #
+        # @example Raise the error.
+        #   relation.raise_unsaved(post)
+        #
+        # @param [ Document ] doc The child document getting created.
+        #
+        # @raise [ Errors::UnsavedDocument ] The error.
+        #
+        # @since 2.0.0.rc.6
+        def raise_unsaved(doc)
+          raise Errors::UnsavedDocument.new(base, doc)
+        end
+
         class << self
 
           # Return the builder that is responsible for generating the documents

data/lib/mongoid/relations/referenced/many_to_many.rb

@@ -7,6 +7,41 @@ module Mongoid # :nodoc:
       # many-to-many between documents in different collections.
       class ManyToMany < Referenced::Many
 
+        # Creates a new document on the references many relation. This will
+        # save the document if the parent has been persisted.
+        #
+        # @example Create and save the new document.
+        #   person.preferences.create(:text => "Testing")
+        #
+        # @param [ Hash ] attributes The attributes to create with.
+        # @param [ Class ] type The optional type of document to create.
+        #
+        # @return [ Document ] The newly created document.
+        def create(attributes = nil, type = nil)
+          build(attributes, type).tap do |doc|
+            doc.save and base.save if base.persisted?
+          end
+        end
+
+        # Creates a new document on the references many relation. This will
+        # save the document if the parent has been persisted and will raise an
+        # error if validation fails.
+        #
+        # @example Create and save the new document.
+        #   person.preferences.create!(:text => "Testing")
+        #
+        # @param [ Hash ] attributes The attributes to create with.
+        # @param [ Class ] type The optional type of document to create.
+        #
+        # @raise [ Errors::Validations ] If validation failed.
+        #
+        # @return [ Document ] The newly created document.
+        def create!(attributes = nil, type = nil)
+          build(attributes, type).tap do |doc|
+            doc.save! and base.save! if base.persisted?
+          end
+        end
+
         # Delete a single document from the relation.
         #
         # @example Delete a document.

data/lib/mongoid/safety.rb

@@ -199,7 +199,7 @@ module Mongoid #:nodoc:
       def update_attributes!(attributes = {})
         target.write_attributes(attributes)
         update(:safe => safety_options).tap do |result|
-          target.class.fail_validate!(self) unless result
+          target.class.fail_validate!(target) unless result
         end
       end
     end

data/lib/mongoid/serialization.rb

@@ -0,0 +1,99 @@
+# encoding: utf-8
+module Mongoid # :nodoc:
+
+  # This module provides the extra behaviour for including relations in JSON
+  # and XML serialization.
+  module Serialization
+    extend ActiveSupport::Concern
+    include ActiveModel::Serialization
+
+    # Gets the document as a serializable hash, used by ActiveModel's JSON and
+    # XML serializers. This override is just to be able to pass the :include
+    # and :except options to get associations in the hash.
+    #
+    # @example Get the serializable hash.
+    #   document.serializable_hash
+    #
+    # @example Get the serializable hash with options.
+    #   document.serializable_hash(:include => :addresses)
+    #
+    # @param [ Hash ] options The options to pass.
+    #
+    # @option options [ Symbol ] :include What relations to include
+    # @option options [ Symbol ] :only Limit the fields to only these.
+    # @option options [ Symbol ] :except Dont include these fields.
+    #
+    # @return [ Hash ] The document, ready to be serialized.
+    #
+    # @since 2.0.0.rc.6
+    def serializable_hash(options = nil)
+      options ||= {}
+      super(options).tap do |attrs|
+        serialize_relations(attrs, options) if options[:include]
+      end
+    end
+
+    private
+
+    # For each of the provided include options, get the relation needed and
+    # provide it in the hash.
+    #
+    # @example Serialize the included relations.
+    #   document.serialize_relations({}, :include => :addresses)
+    #
+    # @param [ Hash ] attributes The attributes to serialize.
+    # @param [ Hash ] options The serialization options.
+    #
+    # @option options [ Symbol ] :include What relations to include
+    # @option options [ Symbol ] :only Limit the fields to only these.
+    # @option options [ Symbol ] :except Dont include these fields.
+    #
+    # @since 2.0.0.rc.6
+    def serialize_relations(attributes = {}, options = {})
+      inclusions = options.delete(:include)
+      relation_names(inclusions).each do |name|
+        metadata = relations[name.to_s]
+        relation = send(metadata.name, false, :eager => true)
+        if relation
+          attributes[metadata.name.to_s] =
+            relation.serializable_hash(relation_options(inclusions, options, name))
+        end
+      end
+    end
+
+    # Since the inclusions can be a hash, symbol, or array of symbols, this is
+    # provided as a convenience to parse out the names.
+    #
+    # @example Get the relation names.
+    #   document.relation_names(:include => [ :addresses ])
+    #
+    # @param [ Hash, Symbol, Array<Symbol ] inclusions The inclusions.
+    #
+    # @return [ Array<Symbol> ] The names of the included relations.
+    #
+    # @since 2.0.0.rc.6
+    def relation_names(inclusions)
+      inclusions.is_a?(Hash) ? inclusions.keys : Array.wrap(inclusions)
+    end
+
+    # Since the inclusions can be a hash, symbol, or array of symbols, this is
+    # provided as a convenience to parse out the options.
+    #
+    # @example Get the relation options.
+    #   document.relation_names(:include => [ :addresses ])
+    #
+    # @param [ Hash, Symbol, Array<Symbol ] inclusions The inclusions.
+    # @param [ Symbol ] name The name of the relation.
+    #
+    # @return [ Hash ] The options for the relation.
+    #
+    # @since 2.0.0.rc.6
+    def relation_options(inclusions, options, name)
+      if inclusions.is_a?(Hash)
+        inclusions[name]
+      else
+        { :except => options[:except], :only => options[:only] }
+      end
+    end
+  end
+end

data/lib/mongoid/timestamps.rb

@@ -13,7 +13,7 @@ module Mongoid #:nodoc:
       set_callback :create, :before, :set_created_at
       set_callback :save, :before, :set_updated_at
 
-      class_inheritable_accessor :record_timestamps, :instance_writer => false
+      class_attribute :record_timestamps
       self.record_timestamps = true
     end
 

data/lib/mongoid/validations.rb

@@ -8,46 +8,57 @@ module Mongoid #:nodoc:
   # provide: validates_associated and validates_uniqueness_of.
   module Validations
     extend ActiveSupport::Concern
+    include ActiveModel::Validations
 
-    included do
-      include ActiveModel::Validations
+    attr_accessor :validated
 
-      attr_accessor :validated
-
-      # Overrides the default ActiveModel behaviour since we need to handle
-      # validations of relations slightly different than just calling the
-      # getter.
-      #
-      # @todo Durran: Why does moving the ActiveModel::Validations include
-      #   statement outside of the block bomb the test suite. This feels dirty.
-      #
-      # @example Read the value.
-      #   person.read_attribute_for_validation(:addresses)
-      #
-      # @param [ Symbol ] attr The name of the field or relation.
-      #
-      # @return [ Object ] The value of the field or the relation.
-      #
-      # @since 2.0.0.rc.1
-      def read_attribute_for_validation(attr)
-        if relations[attr.to_s]
-          send(attr, false, :continue => false, :eager => true)
-        else
-          send(attr)
-        end
+    # Overrides the default ActiveModel behaviour since we need to handle
+    # validations of relations slightly different than just calling the
+    # getter.
+    #
+    # @example Read the value.
+    #   person.read_attribute_for_validation(:addresses)
+    #
+    # @param [ Symbol ] attr The name of the field or relation.
+    #
+    # @return [ Object ] The value of the field or the relation.
+    #
+    # @since 2.0.0.rc.1
+    def read_attribute_for_validation(attr)
+      if relations[attr.to_s]
+        send(attr, false, :eager => true)
+      else
+        send(attr)
       end
+    end
 
-      # Used to prevent infinite loops in associated validations.
-      #
-      # @example Is the document validated?
-      #   document.validated?
-      #
-      # @return [ true, false ] Has the document already been validated?
-      #
-      # @since 2.0.0.rc.2
-      def validated?
-        !!@validated
-      end
+    # Determine if the document is valid.
+    #
+    # @example Is the document valid?
+    #   person.valid?
+    #
+    # @example Is the document valid in a context?
+    #   person.valid?(:create)
+    #
+    # @param [ Symbol ] context The optional validation context.
+    #
+    # @return [ true, false ] True if valid, false if not.
+    #
+    # @since 2.0.0.rc.6
+    def valid?(context = nil)
+      super context ? context : (new? ? :create : :update)
+    end
+
+    # Used to prevent infinite loops in associated validations.
+    #
+    # @example Is the document validated?
+    #   document.validated?
+    #
+    # @return [ true, false ] Has the document already been validated?
+    #
+    # @since 2.0.0.rc.2
+    def validated?
+      !!@validated
     end
 
     module ClassMethods #:nodoc:

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid #:nodoc
-  VERSION = "2.0.0.rc.5"
+  VERSION = "2.0.0.rc.6"
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - rc
-  - 5
-  version: 2.0.0.rc.5
+  - 6
+  version: 2.0.0.rc.6
 platform: ruby
 authors: 
 - Durran Jordan
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-16 00:00:00 +01:00
+date: 2011-01-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,9 +72,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 1
-        - 5
-        version: 1.1.5
+        - 2
+        version: "1.2"
   type: :runtime
   prerelease: false
   version_requirements: *id004
@@ -87,9 +86,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 1
-        - 5
-        version: 1.1.5
+        - 2
+        version: "1.2"
   type: :development
   prerelease: false
   version_requirements: *id005
@@ -201,6 +199,7 @@ files:
 - lib/mongoid/errors/invalid_type.rb
 - lib/mongoid/errors/mongoid_error.rb
 - lib/mongoid/errors/too_many_nested_attribute_records.rb
+- lib/mongoid/errors/unsaved_document.rb
 - lib/mongoid/errors/unsupported_version.rb
 - lib/mongoid/errors/validations.rb
 - lib/mongoid/errors.rb
@@ -324,6 +323,7 @@ files:
 - lib/mongoid/safe.rb
 - lib/mongoid/safety.rb
 - lib/mongoid/scope.rb
+- lib/mongoid/serialization.rb
 - lib/mongoid/state.rb
 - lib/mongoid/timestamps.rb
 - lib/mongoid/validations/associated.rb
@@ -338,7 +338,7 @@ files:
 - lib/rails/generators/mongoid/model/templates/model.rb
 - lib/rails/generators/mongoid_generator.rb
 - lib/rails/mongoid.rb
-- MIT_LICENSE
+- LICENSE
 - README.rdoc
 - Rakefile
 has_rdoc: true
@@ -355,7 +355,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3904513981579822953
+      hash: 1229276417221731393
       segments: 
       - 0
       version: "0"