mongoid 0.6.7 → 0.6.8

data/VERSION

@@ -1 +1 @@
-0.6.7
+0.6.8

data/lib/mongoid/attributes.rb

@@ -2,13 +2,24 @@ module Mongoid #:nodoc:
   module Attributes #:nodoc:
     # Process the provided attributes casting them to their proper values if a
     # field exists for them on the +Document+.
-    def process(fields, params)
-      attributes = HashWithIndifferentAccess.new(params)
+    def process(params)
+      @attributes = HashWithIndifferentAccess.new(params)
+      process_fields
+      process_associations
+    end
+
+    protected
+    def process_fields
       fields.values.each do |field|
-        value = field.set(attributes[field.name])
-        attributes[field.name] = value if value
+        value = field.set(@attributes[field.name])
+        @attributes[field.name] = value if value
+      end
+    end
+
+    def process_associations
+      @attributes.each_pair do |key, value|
+        @attributes[key] = send("#{key}=", value) if value.is_a?(Document)
       end
-      attributes
     end
 
   end

data/lib/mongoid/document.rb

@@ -209,8 +209,8 @@ module Mongoid #:nodoc:
 
     # Instantiate a new Document, setting the Document's attributes if given.
     # If no attributes are provided, they will be initialized with an empty Hash.
-    def initialize(attributes = {})
-      @attributes = process(fields, attributes)
+    def initialize(attrs = {})
+      process(attrs)
       @new_record = true if id.nil?
       generate_key
     end
@@ -275,7 +275,7 @@ module Mongoid #:nodoc:
     # Writes all the attributes of this Document, and delegate up to
     # the parent.
     def write_attributes(attrs)
-      @attributes = process(fields, attrs)
+      process(attrs)
       notify
     end
 

data/mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.6.7"
+  s.version = "0.6.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]

data/spec/unit/mongoid/attributes_spec.rb

@@ -26,6 +26,23 @@ describe Mongoid::Attributes do
         attrs = Person.new(@attributes).attributes
         attrs[:age].should == 30
         attrs[:terms].should == true
+        attrs[:_id].should == "1"
+      end
+
+    end
+
+    context "when associations provided in the attributes" do
+
+      before do
+        @name = Name.new(:first_name => "Testy")
+        @attributes = {
+          :name => @name
+        }
+        @person = Person.new(@attributes)
+      end
+
+      it "sets the associations" do
+        @person.name.should == @name
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors: 
 - Durran Jordan