mongoid 0.10.6 → 0.11.0

data/spec/unit/mongoid/extensions/array/conversions_spec.rb

@@ -10,8 +10,8 @@ describe Mongoid::Extensions::Array::Conversions do
         Person.new(:_id => 2, :title => "Madam")
       ]
       array.mongoidize.should ==
-        [ HashWithIndifferentAccess.new({ :_id => 1, :title => "Sir", :age => 100 }),
-          HashWithIndifferentAccess.new({ :_id => 2, :title => "Madam", :age => 100 }) ]
+        [ HashWithIndifferentAccess.new({ :_id => 1, :title => "Sir", :age => 100, :_type => "Person" }),
+          HashWithIndifferentAccess.new({ :_id => 2, :title => "Madam", :age => 100, :_type => "Person" }) ]
     end
 
   end

data/spec/unit/mongoid/extensions/hash/assimilation_spec.rb

@@ -4,16 +4,41 @@ describe Mongoid::Extensions::Hash::Assimilation do
 
   describe "#assimilate" do
 
-    before do
-      @child = { :first_name => "Hank", :last_name => "Moody" }
-      @parent = Person.new(:title => "Mr.")
-      @options = Mongoid::Associations::Options.new(:name => :name)
+    context "when a type is not provided" do
+
+      before do
+        @child = { :first_name => "Hank", :last_name => "Moody" }
+        @parent = Person.new(:title => "Mr.")
+        @options = Mongoid::Associations::Options.new(:name => :name)
+      end
+
+      it "incorporates the hash into the object graph" do
+        @child.assimilate(@parent, @options)
+        @parent.name.first_name.should == "Hank"
+        @parent.name.last_name.should == "Moody"
+      end
+
     end
 
-    it "incorporates the hash into the object graph" do
-      @child.assimilate(@parent, @options)
-      @parent.name.first_name.should == "Hank"
-      @parent.name.last_name.should == "Moody"
+    context "when a type is provided" do
+
+      before do
+        @child = { :speed => 300 }
+        @parent = Canvas.new(:name => "web page")
+        @options = Mongoid::Associations::Options.new(:name => :writer)
+      end
+
+      it "incorporates the hash into the object graph with the supplied type" do
+        @child.assimilate(@parent, @options, HtmlWriter)
+        @parent.writer.should be_a_kind_of(HtmlWriter)
+        @parent.writer.speed.should == 300
+      end
+
+      it "adds the _type field to the hash" do
+        @child.assimilate(@parent, @options, HtmlWriter)
+        @parent.writer._type.should == "HtmlWriter"
+      end
+
     end
 
   end

data/spec/unit/mongoid/extensions/object/conversions_spec.rb

@@ -6,7 +6,7 @@ describe Mongoid::Extensions::Object::Conversions do
 
     it "returns its attributes" do
       Person.new(:_id => 1, :title => "Sir").mongoidize.should ==
-        { "_id" => 1, "title" => "Sir", "age" => 100 }
+        { "_id" => 1, "title" => "Sir", "age" => 100, "_type" => "Person" }
     end
 
   end
@@ -28,7 +28,7 @@ describe Mongoid::Extensions::Object::Conversions do
     context "when object has attributes" do
 
       before do
-        @attributes = { "_id" => "test", "title" => "Sir", "age" => 100 }
+        @attributes = { "_id" => "test", "title" => "Sir", "age" => 100, "_type" => "Person" }
         @person = Person.new(@attributes)
       end
 

data/spec/unit/mongoid/finders_spec.rb

@@ -291,7 +291,7 @@ describe Mongoid::Finders do
 
     it "returns a new criteria with select conditions added" do
       criteria = Person.where(:title => "Sir")
-      criteria.selector.should == { :title => "Sir" }
+      criteria.selector.should == { :_type => "Person", :title => "Sir" }
     end
 
   end

data/spec/unit/mongoid/timestamps_spec.rb

@@ -9,7 +9,7 @@ describe Mongoid::Timestamps do
     end
 
     it "adds created_at and updated_at to the document" do
-      fields = Person.instance_variable_get(:@fields)
+      fields = Person.fields
       fields[:created_at].should_not be_nil
       fields[:updated_at].should_not be_nil
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.10.6
+  version: 0.11.0
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-29 00:00:00 -05:00
+date: 2010-01-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.18.1
+        version: 0.18.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: mongo_ext
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.18.1
+        version: 0.18.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: durran-validatable
@@ -149,9 +149,11 @@ files:
 - mongoid.gemspec
 - perf/benchmark.rb
 - spec/integration/mongoid/associations_spec.rb
+- spec/integration/mongoid/commands_spec.rb
 - spec/integration/mongoid/criteria_spec.rb
 - spec/integration/mongoid/document_spec.rb
 - spec/integration/mongoid/finders_spec.rb
+- spec/integration/mongoid/inheritance_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/unit/mongoid/associations/belongs_to_related_spec.rb
@@ -199,7 +201,7 @@ files:
 - spec/unit/mongoid/versioning_spec.rb
 - spec/unit/mongoid_spec.rb
 has_rdoc: true
-homepage: http://github.com/durran/mongoid
+homepage: http://mongoid.org
 licenses: []
 
 post_install_message: 
@@ -228,9 +230,11 @@ specification_version: 3
 summary: ODM framework for MongoDB
 test_files: 
 - spec/integration/mongoid/associations_spec.rb
+- spec/integration/mongoid/commands_spec.rb
 - spec/integration/mongoid/criteria_spec.rb
 - spec/integration/mongoid/document_spec.rb
 - spec/integration/mongoid/finders_spec.rb
+- spec/integration/mongoid/inheritance_spec.rb
 - spec/spec_helper.rb
 - spec/unit/mongoid/associations/belongs_to_related_spec.rb
 - spec/unit/mongoid/associations/belongs_to_spec.rb