mongoid 0.10.6 → 0.11.0

data/spec/unit/mongoid/associations/belongs_to_spec.rb

@@ -54,7 +54,7 @@ describe Mongoid::Associations::BelongsTo do
 
       before do
         @parent = Name.new(:first_name => "Drexel")
-        @document = stub(:parent => @parent)
+        @document = stub(:_parent => @parent)
         @options = Mongoid::Associations::Options.new(:name => :person)
       end
 
@@ -68,7 +68,7 @@ describe Mongoid::Associations::BelongsTo do
     context "when parent is nil" do
 
       before do
-        @document = stub(:parent => nil)
+        @document = stub(:_parent => nil)
         @options = Mongoid::Associations::Options.new(:name => :person)
       end
 
@@ -102,7 +102,7 @@ describe Mongoid::Associations::BelongsTo do
       it "updates the parent document" do
         @person.name.should == @name
         @person.attributes[:name].except(:_id).should ==
-          { "first_name" => "Test", "last_name" => "User" }
+          { "first_name" => "Test", "last_name" => "User", "_type" => "Name" }
       end
 
     end

data/spec/unit/mongoid/associations/has_many_spec.rb

@@ -47,7 +47,7 @@ describe Mongoid::Associations::HasMany do
     it "adds the parent document before appending to the array" do
       @association << @address
       @association.length.should == 3
-      @address.parent.should == @document
+      @address._parent.should == @document
     end
 
     it "allows multiple additions" do
@@ -60,43 +60,86 @@ describe Mongoid::Associations::HasMany do
 
   describe "#build" do
 
-    before do
-      @association = Mongoid::Associations::HasMany.new(
-        @document,
-        Mongoid::Associations::Options.new(:name => :addresses)
-      )
-    end
+    context "when a type is not provided" do
+
+      before do
+        @association = Mongoid::Associations::HasMany.new(
+          @document,
+          Mongoid::Associations::Options.new(:name => :addresses)
+        )
+      end
+
+      it "adds a new document to the array with the suppied parameters" do
+        @association.build({ :street => "Street 1" })
+        @association.length.should == 3
+        @association[2].should be_a_kind_of(Address)
+        @association[2].street.should == "Street 1"
+      end
+
+      it "returns the newly built object in the association" do
+        address = @association.build({ :street => "Yet Another" })
+        address.should be_a_kind_of(Address)
+        address.street.should == "Yet Another"
+      end
 
-    it "adds a new document to the array with the suppied parameters" do
-      @association.build({ :street => "Street 1" })
-      @association.length.should == 3
-      @association[2].should be_a_kind_of(Address)
-      @association[2].street.should == "Street 1"
     end
 
-    it "returns the newly built object in the association" do
-      address = @association.build({ :street => "Yet Another" })
-      address.should be_a_kind_of(Address)
-      address.street.should == "Yet Another"
+    context "when a type is provided" do
+
+      before do
+        @association = Mongoid::Associations::HasMany.new(
+          @document,
+          Mongoid::Associations::Options.new(:name => :shapes)
+        )
+      end
+
+      it "instantiates a class of the type" do
+        circle = @association.build({ :radius => 100 }, Circle)
+        circle.should be_a_kind_of(Circle)
+        circle.radius.should == 100
+      end
+
     end
 
   end
 
   describe "#create" do
 
-    before do
-      @association = Mongoid::Associations::HasMany.new(
-        @document,
-        Mongoid::Associations::Options.new(:name => :addresses)
-      )
-      @address = Address.new(:street => "Yet Another")
+    context "when a type is not provided" do
+
+      before do
+        @association = Mongoid::Associations::HasMany.new(
+          @document,
+          Mongoid::Associations::Options.new(:name => :addresses)
+        )
+        @address = Address.new(:street => "Yet Another")
+      end
+
+      it "builds and saves a new object" do
+        Mongoid::Commands::Save.expects(:execute).returns(true)
+        address = @association.create({ :street => "Yet Another" })
+        address.should be_a_kind_of(Address)
+        address.street.should == "Yet Another"
+      end
+
     end
 
-    it "builds and saves a new object" do
-      Mongoid::Commands::Create.expects(:execute).returns(@address)
-      address = @association.create({ :street => "Yet Another" })
-      address.should be_a_kind_of(Address)
-      address.street.should == "Yet Another"
+    context "when a type is provided" do
+
+      before do
+        @association = Mongoid::Associations::HasMany.new(
+          @document,
+          Mongoid::Associations::Options.new(:name => :shapes)
+        )
+      end
+
+      it "instantiates a class of that type" do
+        Mongoid::Commands::Save.expects(:execute).returns(true)
+        circle = @association.create({ :radius => 100 }, Circle)
+        circle.should be_a_kind_of(Circle)
+        circle.radius.should == 100
+      end
+
     end
 
   end
@@ -114,7 +157,7 @@ describe Mongoid::Associations::HasMany do
     it "adds the parent document before appending to the array" do
       @association.concat [@address]
       @association.length.should == 3
-      @address.parent.should == @document
+      @address._parent.should == @document
     end
 
   end
@@ -197,6 +240,24 @@ describe Mongoid::Associations::HasMany do
 
   end
 
+  describe "#initialize" do
+
+    before do
+      @canvas = stub(:attributes => { :shapes => [{ :_type => "Circle", :radius => 5 }] }, :update => true)
+      @association = Mongoid::Associations::HasMany.new(
+        @canvas,
+        Mongoid::Associations::Options.new(:name => :shapes)
+      )
+    end
+
+    it "creates the classes based on their types" do
+      circle = @association.first
+      circle.should be_a_kind_of(Circle)
+      circle.radius.should == 5
+    end
+
+  end
+
   describe ".instantiate" do
 
     it "delegates to new" do
@@ -260,7 +321,7 @@ describe Mongoid::Associations::HasMany do
     it "adds the parent document before appending to the array" do
       @association.push @address
       @association.length.should == 3
-      @address.parent.should == @document
+      @address._parent.should == @document
     end
 
     it "appends the document to the end of the array" do
@@ -279,12 +340,12 @@ describe Mongoid::Associations::HasMany do
     end
 
     it "parentizes the child document" do
-      @address.parent.should == @person
+      @address._parent.should == @person
     end
 
     it "sets the attributes of the child on the parent" do
       @person.attributes[:addresses].should ==
-        [{ "_id" => "madison-ave", "street" => "Madison Ave" }]
+        [{ "_id" => "madison-ave", "street" => "Madison Ave", "_type" => "Address" }]
     end
 
   end

data/spec/unit/mongoid/associations/has_one_spec.rb

@@ -3,7 +3,10 @@ require "spec_helper"
 describe Mongoid::Associations::HasOne do
 
   before do
-    @attributes = { :mixed_drink => { :name => "Jack and Coke" } }
+    @attributes = { :mixed_drink => {
+      :name => "Jack and Coke", :_type => "MixedDrink" },
+      :writer => { :speed => 50, :_type => "HtmlWriter" }
+    }
     @document = stub(:attributes => @attributes, :update => true)
   end
 
@@ -26,6 +29,24 @@ describe Mongoid::Associations::HasOne do
 
     end
 
+    context "when a type is supplied" do
+
+      before do
+        @association = Mongoid::Associations::HasOne.new(
+          @document,
+          @attributes[:writer],
+          Mongoid::Associations::Options.new(:name => :writer)
+        )
+      end
+
+      it "instantiates a class of that type" do
+        writer = @association.build({ :speed => 500 }, HtmlWriter)
+        writer.should be_a_kind_of(HtmlWriter)
+        writer.speed.should == 500
+      end
+
+    end
+
   end
 
   describe "#create" do
@@ -42,13 +63,45 @@ describe Mongoid::Associations::HasOne do
       end
 
       it "replaces and saves the existing has_one" do
-        Mongoid::Commands::Create.expects(:execute).returns(@drink)
+        Mongoid::Commands::Save.expects(:execute).returns(true)
         drink = @association.create({ :name => "Sapphire and Tonic" })
         drink.name.should == "Sapphire and Tonic"
       end
 
     end
 
+    context "when a type is supplied" do
+
+      before do
+        @association = Mongoid::Associations::HasOne.new(
+          @document,
+          @attributes[:writer],
+          Mongoid::Associations::Options.new(:name => :writer)
+        )
+      end
+
+      it "instantiates a class of that type" do
+        Mongoid::Commands::Save.expects(:execute).returns(true)
+        writer = @association.create({ :speed => 500 }, HtmlWriter)
+        writer.should be_a_kind_of(HtmlWriter)
+        writer.speed.should == 500
+      end
+
+    end
+
+  end
+
+  describe "#initialize" do
+
+    before do
+      @document = stub(:attributes => { :writer => { :speed => 500, :_type => "HtmlWriter" } }, :update => true)
+      @options = Mongoid::Associations::Options.new(:name => :writer)
+    end
+
+    it "delegates to new" do
+      Mongoid::Associations::HasOne.new(@document, @document.attributes[:writer], @options)
+    end
+
   end
 
   describe "#method_missing" do
@@ -168,12 +221,12 @@ describe Mongoid::Associations::HasOne do
     end
 
     it "parentizes the child document" do
-      @name.parent.should == @person
+      @name._parent.should == @person
     end
 
     it "sets the attributes of the child on the parent" do
       @person.attributes[:name].should ==
-        { "_id" => "donald", "first_name" => "Donald" }
+        { "_id" => "donald", "first_name" => "Donald", "_type" => "Name" }
     end
 
   end

data/spec/unit/mongoid/associations_spec.rb

@@ -25,12 +25,12 @@ describe Mongoid::Associations do
       end
 
       it "parentizes the association" do
-        @name.parent.should == @person
+        @name._parent.should == @person
       end
 
       it "sets the child attributes on the parent" do
         @person.attributes[:name].should ==
-          { "_id" => "test-user", "first_name" => "Test", "last_name" => "User" }
+          { "_id" => "test-user", "first_name" => "Test", "last_name" => "User", "_type" => "Name" }
       end
 
     end
@@ -46,12 +46,12 @@ describe Mongoid::Associations do
         end
 
         it "re-parentizes the association" do
-          @address.parent.should == @person
+          @address._parent.should == @person
         end
 
         it "adds the child attributes to the parent" do
           @person.attributes[:addresses].should ==
-            [{ "_id" => "picadilly-circus", "street" => "Picadilly Circus" }]
+            [{ "_id" => "picadilly-circus", "street" => "Picadilly Circus", "_type" => "Address" }]
         end
 
       end

data/spec/unit/mongoid/attributes_spec.rb

@@ -309,7 +309,7 @@ describe Mongoid::Attributes do
         it "sets the child attributes on the parent" do
           @name.write_attributes(:first_name => "Test2", :last_name => "User2")
           @person.attributes[:name].should ==
-            { "_id" => "test-user", "first_name" => "Test2", "last_name" => "User2" }
+            { "_id" => "test-user", "first_name" => "Test2", "last_name" => "User2", "_type" => "Name" }
         end
 
       end
@@ -325,7 +325,7 @@ describe Mongoid::Attributes do
         it "updates the child attributes on the parent" do
           @address.write_attributes("street" => "Test2")
           @person.attributes[:addresses].should ==
-            [ { "_id" => "test", "street" => "Test2" } ]
+            [ { "_id" => "test", "street" => "Test2", "_type" => "Address" } ]
         end
 
       end

data/spec/unit/mongoid/commands/delete_all_spec.rb

@@ -7,18 +7,19 @@ describe Mongoid::Commands::DeleteAll do
     before do
       @doc = mock
       @docs = [@doc]
-      @klass = mock
+      @klass = stub(:name => "Person")
     end
 
     context "when conditions supplied" do
 
       before do
+        @collection = mock
         @conditions = { :conditions => { :title => "Sir" } }
       end
 
       it "deletes each document that the criteria finds" do
-        @klass.expects(:find).with(:all, @conditions).returns(@docs)
-        Mongoid::Commands::Delete.expects(:execute).with(@doc)
+        @klass.expects(:collection).returns(@collection)
+        @collection.expects(:remove).with(@conditions[:conditions].merge(:_type => "Person"))
         Mongoid::Commands::DeleteAll.execute(@klass, @conditions)
       end
 

data/spec/unit/mongoid/commands/delete_spec.rb

@@ -6,7 +6,7 @@ describe Mongoid::Commands::Delete do
 
     before do
       @collection = mock
-      @document = stub(:collection => @collection, :id => "1", :parent => false)
+      @document = stub(:collection => @collection, :id => "1", :_parent => false)
     end
 
     it "removes the document from its collection" do

data/spec/unit/mongoid/commands/destroy_all_spec.rb

@@ -7,12 +7,13 @@ describe Mongoid::Commands::DestroyAll do
     before do
       @doc = mock
       @docs = [@doc]
-      @klass = mock
+      @klass = stub(:name => "Person")
       @conditions = { :conditions => { :title => "Sir" } }
+      @expected = { :conditions => { :title => "Sir", :_type => "Person" } }
     end
 
     it "destroys each document that the criteria finds" do
-      @klass.expects(:find).with(:all, @conditions).returns(@docs)
+      @klass.expects(:find).with(:all, @expected).returns(@docs)
       Mongoid::Commands::Destroy.expects(:execute).with(@doc)
       Mongoid::Commands::DestroyAll.execute(@klass, @conditions)
     end

data/spec/unit/mongoid/commands/destroy_spec.rb

@@ -9,7 +9,7 @@ describe Mongoid::Commands::Destroy do
       @document = stub(:run_callbacks => true,
                        :collection => @collection,
                        :id => "1",
-                       :parent => false)
+                       :_parent => false)
     end
 
     it "runs the before and after destroy callbacks" do

data/spec/unit/mongoid/commands/save_spec.rb

@@ -10,12 +10,12 @@ describe Mongoid::Commands::Save do
       @parent = stub(:collection => @parent_collection,
                      :valid? => true,
                      :run_callbacks => true,
-                     :parent => nil,
+                     :_parent => nil,
                      :attributes => {},
                      :new_record= => false)
       @document = stub(:collection => @doc_collection,
                        :run_callbacks => true,
-                       :parent => @parent,
+                       :_parent => @parent,
                        :attributes => {},
                        :new_record= => false)
     end
@@ -48,7 +48,7 @@ describe Mongoid::Commands::Save do
       context "when the document has no parent" do
 
         before do
-          @document.expects(:parent).returns(nil)
+          @document.expects(:_parent).returns(nil)
         end
 
         it "calls save on the document collection" do

data/spec/unit/mongoid/commands_spec.rb

@@ -37,8 +37,8 @@ describe Mongoid::Commands do
         @person = Person.new
       end
 
-      it "delegates to the Create command" do
-        Mongoid::Commands::Create.expects(:execute).with(@person, true).returns(true)
+      it "delegates to the save command" do
+        Mongoid::Commands::Save.expects(:execute).with(@person, true).returns(true)
         @person.save
       end
 
@@ -51,7 +51,7 @@ describe Mongoid::Commands do
       end
 
       it "passes the validate param to the command" do
-        Mongoid::Commands::Create.expects(:execute).with(@person, false).returns(true)
+        Mongoid::Commands::Save.expects(:execute).with(@person, false).returns(true)
         @person.save(false)
       end
 
@@ -85,15 +85,15 @@ describe Mongoid::Commands do
         @person = Person.new
       end
 
-      it "delegates to the Create command" do
-        Mongoid::Commands::Create.expects(:execute).with(@person, true).returns(true)
+      it "delegates to the save command" do
+        Mongoid::Commands::Save.expects(:execute).with(@person, true).returns(true)
         @person.save!
       end
 
       context "when validation fails" do
 
         it "it raises an error " do
-          Mongoid::Commands::Create.expects(:execute).with(@person, true).returns(false)
+          Mongoid::Commands::Save.expects(:execute).with(@person, true).returns(false)
           lambda { @person.save! }.should raise_error
         end