mongoid-pre 2.0.0.beta1 → 2.0.0.pre

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

@@ -11,11 +11,7 @@ describe Mongoid::Associations::HasManyRelated do
   end
 
   let(:options) do
-    Mongoid::Associations::Options.new(
-      :name => :posts,
-      :foreign_key => "person_id",
-      :extend => block
-    )
+    Mongoid::Associations::Options.new(:name => :posts, :extend => block)
   end
 
   describe "#<<" do
@@ -45,36 +41,16 @@ describe Mongoid::Associations::HasManyRelated do
 
     context "when parent document has not been saved" do
 
-      context "when appending a non mongoid object" do
-
-        before do
-          @parent = stub(:id => "1", :new_record? => true, :class => Person)
-          Post.expects(:all).returns([])
-          @association = Mongoid::Associations::HasManyRelated.new(@parent, options)
-        end
-
-        it "appends the child document" do
-          @child.expects(:person_id=).with(@parent.id)
-          @association << @child
-          @association.size.should == 1
-        end
+      before do
+        @parent = stub(:id => "1", :new_record? => true, :class => Person)
+        Post.expects(:all).returns([])
+        @association = Mongoid::Associations::HasManyRelated.new(@parent, options)
       end
 
-      context "when appending a mongoid document" do
-
-        before do
-          @criteria = mock
-          @parent = stub(:id => "1", :new_record? => true, :class => Person)
-          Post.expects(:all).returns(@criteria)
-          @association = Mongoid::Associations::HasManyRelated.new(@parent, options)
-        end
-
-        it "appends the child document" do
-          @criteria.expects(:entries).returns([])
-          @child.expects(:person_id=).with(@parent.id)
-          @association << @child
-          @association.size.should == 1
-        end
+      it "appends the child document" do
+        @child.expects(:person_id=).with(@parent.id)
+        @association << @child
+        @association.size.should == 1
       end
 
     end
@@ -101,10 +77,8 @@ describe Mongoid::Associations::HasManyRelated do
   describe "#build" do
 
     before do
-      @criteria = mock
-      @criteria.expects(:entries).returns([])
-      @parent = stub(:id => "5", :class => Person, :new_record? => true)
-      Post.expects(:all).returns(@criteria)
+      @parent = stub(:id => "5", :class => Person)
+      Post.expects(:all).returns([])
       @association = Mongoid::Associations::HasManyRelated.new(@parent, options)
     end
 
@@ -191,23 +165,18 @@ describe Mongoid::Associations::HasManyRelated do
   describe "#create" do
 
     before do
-      @post = mock
-      @parent = stub(:id => "5", :class => Person, :new_record? => true)
+      @parent = stub(:id => "5", :class => Person)
       Post.expects(:all).returns([])
+      Mongoid::Commands::Save.expects(:execute)
       @association = Mongoid::Associations::HasManyRelated.new(@parent, options)
-      Post.expects(:instantiate).returns(@post)
     end
 
     it "builds and saves the new object" do
-      @post.expects(:run_callbacks).with(:create).yields
-      @post.expects(:save).returns(true)
       @association.create(:title => "Sassy")
     end
 
     it "returns the new object" do
-      @post.expects(:run_callbacks).with(:create).yields
-      @post.expects(:save).returns(true)
-      @association.create(:title => "Sassy").should == @post
+      @association.create(:title => "Sassy").should be_a_kind_of(Post)
     end
 
   end

data/spec/unit/mongoid/associations/{embeds_many_spec.rb → has_many_spec.rb}

@@ -1,18 +1,18 @@
 require "spec_helper"
 
-describe Mongoid::Associations::EmbedsMany do
+describe Mongoid::Associations::HasMany do
 
   before do
     @attributes = { "addresses" => [
       { "_id" => "street-1", "street" => "Street 1", "state" => "CA" },
       { "_id" => "street-2", "street" => "Street 2" } ] }
-    @document = stub(:raw_attributes => @attributes, :add_observer => true, :observe => true)
+    @document = stub(:raw_attributes => @attributes, :add_observer => true, :update => true)
   end
 
   describe "#[]" do
 
     before do
-      @association = Mongoid::Associations::EmbedsMany.new(
+      @association = Mongoid::Associations::HasMany.new(
         @document,
         Mongoid::Associations::Options.new(:name => :addresses)
       )
@@ -40,7 +40,7 @@ describe Mongoid::Associations::EmbedsMany do
   describe "#<<" do
 
     before do
-      @association = Mongoid::Associations::EmbedsMany.new(
+      @association = Mongoid::Associations::HasMany.new(
         @document,
         Mongoid::Associations::Options.new(:name => :addresses)
       )
@@ -80,7 +80,7 @@ describe Mongoid::Associations::EmbedsMany do
     context "when a type is not provided" do
 
       before do
-        @association = Mongoid::Associations::EmbedsMany.new(
+        @association = Mongoid::Associations::HasMany.new(
           @document,
           Mongoid::Associations::Options.new(:name => :addresses)
         )
@@ -104,7 +104,7 @@ describe Mongoid::Associations::EmbedsMany do
     context "when a type is provided" do
 
       before do
-        @association = Mongoid::Associations::EmbedsMany.new(
+        @association = Mongoid::Associations::HasMany.new(
           @document,
           Mongoid::Associations::Options.new(:name => :shapes)
         )
@@ -125,19 +125,18 @@ describe Mongoid::Associations::EmbedsMany do
     context "when a type is not provided" do
 
       before do
-        @association = Mongoid::Associations::EmbedsMany.new(
+        @association = Mongoid::Associations::HasMany.new(
           @document,
           Mongoid::Associations::Options.new(:name => :addresses)
         )
-        @address = mock(:parentize => true, :write_attributes => true)
-        Address.expects(:instantiate).returns(@address)
-        @address.expects(:run_callbacks).with(:create).yields
+        @address = Address.new(:street => "Yet Another")
       end
 
       it "builds and saves a new object" do
-        @address.expects(:save).returns(true)
+        Mongoid::Commands::Save.expects(:execute).returns(true)
         address = @association.create({ :street => "Yet Another" })
-        address.should == @address
+        address.should be_a_kind_of(Address)
+        address.street.should == "Yet Another"
       end
 
     end
@@ -145,71 +144,27 @@ describe Mongoid::Associations::EmbedsMany do
     context "when a type is provided" do
 
       before do
-        @association = Mongoid::Associations::EmbedsMany.new(
+        @association = Mongoid::Associations::HasMany.new(
           @document,
           Mongoid::Associations::Options.new(:name => :shapes)
         )
-        @circle = mock(:parentize => true, :write_attributes => true)
-        Circle.expects(:instantiate).returns(@circle)
-        @circle.expects(:run_callbacks).with(:create).yields
       end
 
       it "instantiates a class of that type" do
-        @circle.expects(:save).returns(true)
+        Mongoid::Commands::Save.expects(:execute).returns(true)
         circle = @association.create({ :radius => 100 }, Circle)
-        circle.should == @circle
-      end
-
-    end
-
-  end
-
-  describe "#create!" do
-
-    context "when validations pass" do
-
-      before do
-        @association = Mongoid::Associations::EmbedsMany.new(
-          @document,
-          Mongoid::Associations::Options.new(:name => :addresses)
-        )
-        @address = mock(:parentize => true, :write_attributes => true, :errors => [])
-        Address.expects(:instantiate).returns(@address)
-        @address.expects(:run_callbacks).with(:create).yields
+        circle.should be_a_kind_of(Circle)
+        circle.radius.should == 100
       end
 
-      it "builds and saves a new object" do
-        @address.expects(:save).returns(true)
-        address = @association.create!({ :street => "Yet Another" })
-        address.should == @address
-      end
     end
 
-    context "when validations fail" do
-
-      before do
-        @association = Mongoid::Associations::EmbedsMany.new(
-          @document,
-          Mongoid::Associations::Options.new(:name => :addresses)
-        )
-        @address = mock(:parentize => true, :write_attributes => true, :errors => [ "test" ])
-        Address.expects(:instantiate).returns(@address)
-        @address.expects(:run_callbacks).with(:create).yields
-      end
-
-      it "builds and saves a new object" do
-        @address.expects(:save).returns(false)
-        lambda {
-          @association.create!({ :street => "Yet Another" })
-        }.should raise_error(Mongoid::Errors::Validations)
-      end
-    end
   end
 
   describe "#concat" do
 
     before do
-      @association = Mongoid::Associations::EmbedsMany.new(
+      @association = Mongoid::Associations::HasMany.new(
         @document,
         Mongoid::Associations::Options.new(:name => :addresses)
       )
@@ -227,7 +182,7 @@ describe Mongoid::Associations::EmbedsMany do
   describe "#clear" do
 
     before do
-      @association = Mongoid::Associations::EmbedsMany.new(
+      @association = Mongoid::Associations::HasMany.new(
         @document,
         Mongoid::Associations::Options.new(:name => :addresses)
       )
@@ -245,7 +200,7 @@ describe Mongoid::Associations::EmbedsMany do
   describe "#find" do
 
     before do
-      @association = Mongoid::Associations::EmbedsMany.new(
+      @association = Mongoid::Associations::HasMany.new(
         @document,
         Mongoid::Associations::Options.new(:name => :addresses)
       )
@@ -275,7 +230,7 @@ describe Mongoid::Associations::EmbedsMany do
     context "when there are elements in the array" do
 
       before do
-        @association = Mongoid::Associations::EmbedsMany.new(
+        @association = Mongoid::Associations::HasMany.new(
           @document,
           Mongoid::Associations::Options.new(:name => :addresses)
         )
@@ -291,7 +246,7 @@ describe Mongoid::Associations::EmbedsMany do
     context "when the array is empty" do
 
       before do
-        @association = Mongoid::Associations::EmbedsMany.new(
+        @association = Mongoid::Associations::HasMany.new(
           Person.new,
           Mongoid::Associations::Options.new(:name => :addresses)
         )
@@ -310,8 +265,8 @@ describe Mongoid::Associations::EmbedsMany do
     context "when no extension exists" do
 
       before do
-        @canvas = stub(:raw_attributes => { "shapes" => [{ "_type" => "Circle", "radius" => 5 }] }, :observe => true)
-        @association = Mongoid::Associations::EmbedsMany.new(
+        @canvas = stub(:raw_attributes => { "shapes" => [{ "_type" => "Circle", "radius" => 5 }] }, :update => true)
+        @association = Mongoid::Associations::HasMany.new(
           @canvas,
           Mongoid::Associations::Options.new(:name => :shapes)
         )
@@ -334,7 +289,7 @@ describe Mongoid::Associations::EmbedsMany do
             "Testing"
           end
         end
-        @association = Mongoid::Associations::EmbedsMany.new(
+        @association = Mongoid::Associations::HasMany.new(
           @person,
           Mongoid::Associations::Options.new(:name => :addresses, :extend => @block)
         )
@@ -351,8 +306,8 @@ describe Mongoid::Associations::EmbedsMany do
   describe ".instantiate" do
 
     it "delegates to new" do
-      Mongoid::Associations::EmbedsMany.expects(:new).with(@document, @options)
-      Mongoid::Associations::EmbedsMany.instantiate(@document, @options)
+      Mongoid::Associations::HasMany.expects(:new).with(@document, @options)
+      Mongoid::Associations::HasMany.instantiate(@document, @options)
     end
 
   end
@@ -362,7 +317,7 @@ describe Mongoid::Associations::EmbedsMany do
     context "#length" do
 
       it "returns the length of the delegated array" do
-        @association = Mongoid::Associations::EmbedsMany.new(
+        @association = Mongoid::Associations::HasMany.new(
           @document,
           Mongoid::Associations::Options.new(:name => :addresses)
         )
@@ -375,8 +330,8 @@ describe Mongoid::Associations::EmbedsMany do
 
   describe ".macro" do
 
-    it "returns :embeds_many" do
-      Mongoid::Associations::EmbedsMany.macro.should == :embeds_many
+    it "returns :has_many" do
+      Mongoid::Associations::HasMany.macro.should == :has_many
     end
 
   end
@@ -384,7 +339,7 @@ describe Mongoid::Associations::EmbedsMany do
   describe "#nested_build" do
 
     before do
-      @association = Mongoid::Associations::EmbedsMany.new(
+      @association = Mongoid::Associations::HasMany.new(
         @document,
         Mongoid::Associations::Options.new(:name => :addresses)
       )
@@ -403,7 +358,7 @@ describe Mongoid::Associations::EmbedsMany do
     context "when the association class has a criteria class method" do
 
       before do
-        @association = Mongoid::Associations::EmbedsMany.new(
+        @association = Mongoid::Associations::HasMany.new(
           @document,
           Mongoid::Associations::Options.new(:name => :addresses)
         )
@@ -430,7 +385,7 @@ describe Mongoid::Associations::EmbedsMany do
     context "when no class method exists" do
 
       before do
-        @association = Mongoid::Associations::EmbedsMany.new(
+        @association = Mongoid::Associations::HasMany.new(
           @document,
           Mongoid::Associations::Options.new(:name => :addresses)
         )
@@ -447,7 +402,7 @@ describe Mongoid::Associations::EmbedsMany do
   describe "#paginate" do
 
     before do
-      @association = Mongoid::Associations::EmbedsMany.new(
+      @association = Mongoid::Associations::HasMany.new(
         @document,
         Mongoid::Associations::Options.new(:name => :addresses)
       )
@@ -466,7 +421,7 @@ describe Mongoid::Associations::EmbedsMany do
   describe "#push" do
 
     before do
-      @association = Mongoid::Associations::EmbedsMany.new(
+      @association = Mongoid::Associations::HasMany.new(
         @document,
         Mongoid::Associations::Options.new(:name => :addresses)
       )
@@ -491,7 +446,7 @@ describe Mongoid::Associations::EmbedsMany do
     before do
       @address = Address.new(:street => "Madison Ave")
       @person = Person.new(:title => "Sir")
-      @association = Mongoid::Associations::EmbedsMany.update(
+      @association = Mongoid::Associations::HasMany.update(
         [@address],
         @person,
         Mongoid::Associations::Options.new(:name => :addresses)

data/spec/unit/mongoid/associations/{embeds_one_spec.rb → has_one_spec.rb}

@@ -1,13 +1,13 @@
 require "spec_helper"
 
-describe Mongoid::Associations::EmbedsOne do
+describe Mongoid::Associations::HasOne do
 
   before do
     @attributes = { "mixed_drink" => {
       "name" => "Jack and Coke", "_type" => "MixedDrink" },
       "writer" => { "speed" => 50, "_type" => "HtmlWriter" }
     }
-    @document = stub(:raw_attributes => @attributes, :observe => true)
+    @document = stub(:raw_attributes => @attributes, :update => true)
   end
 
   describe "#build_*" do
@@ -15,7 +15,7 @@ describe Mongoid::Associations::EmbedsOne do
     context "when attributes provided" do
 
       before do
-        @association = Mongoid::Associations::EmbedsOne.new(
+        @association = Mongoid::Associations::HasOne.new(
           @document,
           @attributes["mixed_drink"],
           Mongoid::Associations::Options.new(:name => :mixed_drink)
@@ -32,7 +32,7 @@ describe Mongoid::Associations::EmbedsOne do
     context "when a type is supplied" do
 
       before do
-        @association = Mongoid::Associations::EmbedsOne.new(
+        @association = Mongoid::Associations::HasOne.new(
           @document,
           @attributes["writer"],
           Mongoid::Associations::Options.new(:name => :writer)
@@ -75,7 +75,7 @@ describe Mongoid::Associations::EmbedsOne do
         end
       }
       @options = Mongoid::Associations::Options.new(:name => :name, :extend => @block)
-      @association = Mongoid::Associations::EmbedsOne.new(@parent, {}, @options)
+      @association = Mongoid::Associations::HasOne.new(@parent, {}, @options)
     end
 
     context "when the options have an extension" do
@@ -94,7 +94,7 @@ describe Mongoid::Associations::EmbedsOne do
 
       before do
         @document = Person.new
-        @association = Mongoid::Associations::EmbedsOne.instantiate(
+        @association = Mongoid::Associations::HasOne.instantiate(
           @document,
           Mongoid::Associations::Options.new(:name => :name)
         )
@@ -110,7 +110,7 @@ describe Mongoid::Associations::EmbedsOne do
 
       before do
         @document = stub(:raw_attributes => { "name" => {} })
-        @association = Mongoid::Associations::EmbedsOne.instantiate(
+        @association = Mongoid::Associations::HasOne.instantiate(
           @document,
           Mongoid::Associations::Options.new(:name => :name)
         )
@@ -130,8 +130,8 @@ describe Mongoid::Associations::EmbedsOne do
       end
 
       it "delegates to new" do
-        Mongoid::Associations::EmbedsOne.expects(:new).with(@document, { "first_name" => "Test" }, @options)
-        Mongoid::Associations::EmbedsOne.instantiate(@document, @options)
+        Mongoid::Associations::HasOne.expects(:new).with(@document, { "first_name" => "Test" }, @options)
+        Mongoid::Associations::HasOne.instantiate(@document, @options)
       end
 
     end
@@ -141,7 +141,7 @@ describe Mongoid::Associations::EmbedsOne do
   describe "#method_missing" do
 
     before do
-      @association = Mongoid::Associations::EmbedsOne.new(
+      @association = Mongoid::Associations::HasOne.new(
         @document,
         @attributes["mixed_drink"],
         Mongoid::Associations::Options.new(:name => :mixed_drink)
@@ -172,7 +172,7 @@ describe Mongoid::Associations::EmbedsOne do
     context "when attributes provided" do
 
       before do
-        @association = Mongoid::Associations::EmbedsOne.new(
+        @association = Mongoid::Associations::HasOne.new(
           @document,
           @attributes["mixed_drink"],
           Mongoid::Associations::Options.new(:name => :mixed_drink)
@@ -190,8 +190,8 @@ describe Mongoid::Associations::EmbedsOne do
 
   describe ".macro" do
 
-    it "returns :embeds_one" do
-      Mongoid::Associations::EmbedsOne.macro.should == :embeds_one
+    it "returns :has_one" do
+      Mongoid::Associations::HasOne.macro.should == :has_one
     end
 
   end
@@ -203,7 +203,7 @@ describe Mongoid::Associations::EmbedsOne do
       before do
         @name = Name.new(:first_name => "Donald")
         @person = Person.new(:title => "Sir")
-        @association = Mongoid::Associations::EmbedsOne.update(
+        @association = Mongoid::Associations::HasOne.update(
           @name,
           @person,
           Mongoid::Associations::Options.new(:name => :name)
@@ -230,7 +230,7 @@ describe Mongoid::Associations::EmbedsOne do
       before do
         @name = Name.new(:first_name => "Donald")
         @person = Person.new(:title => "Sir")
-        Mongoid::Associations::EmbedsOne.update(
+        Mongoid::Associations::HasOne.update(
           nil,
           @person,
           Mongoid::Associations::Options.new(:name => :name)
@@ -248,7 +248,7 @@ describe Mongoid::Associations::EmbedsOne do
   describe "#to_a" do
 
     before do
-      @association = Mongoid::Associations::EmbedsOne.new(
+      @association = Mongoid::Associations::HasOne.new(
         @document,
         @attributes["mixed_drink"],
         Mongoid::Associations::Options.new(:name => :mixed_drink)
@@ -266,9 +266,9 @@ describe Mongoid::Associations::EmbedsOne do
     context "when the document is not nil" do
 
       before do
-        @document = stub(:raw_attributes => { "name" => { "first_name" => "Test" } }, :observe => true)
+        @document = stub(:raw_attributes => { "name" => { "first_name" => "Test" } }, :update => true)
         @options = Mongoid::Associations::Options.new(:name => :name)
-        @association = Mongoid::Associations::EmbedsOne.instantiate(@document, @options)
+        @association = Mongoid::Associations::HasOne.instantiate(@document, @options)
       end
 
       it "validates the document" do

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

@@ -75,29 +75,15 @@ describe Mongoid::Associations::Options do
 
   describe "#foreign_key" do
 
-    context "when no custom key defined" do
-
-      before do
-        @attributes = { :name => :posts }
-        @options = Mongoid::Associations::Options.new(@attributes)
-      end
-
-      it "returns the association foreign_key" do
-        @options.foreign_key.should == "post_id"
-      end
+    before do
+      @attributes = { :name => :game }
+      @options = Mongoid::Associations::Options.new(@attributes)
     end
 
-    context "when a custom key is defined" do
-
-      before do
-        @attributes = { :name => :posts, :foreign_key => "blog_post_id" }
-        @options = Mongoid::Associations::Options.new(@attributes)
-      end
-
-      it "returns the custom foreign_key" do
-        @options.foreign_key.should == "blog_post_id"
-      end
+    it "returns the association foreign_key" do
+      @options.foreign_key.should == "game_id"
     end
+
   end
 
   describe "#inverse_of" do
@@ -160,6 +146,19 @@ describe Mongoid::Associations::Options do
 
   end
 
+  describe "#parent_key" do
+
+    before do
+      @attributes = { :parent_key => :person_id }
+      @options = Mongoid::Associations::Options.new(@attributes)
+    end
+
+    it "returns the parent's foreign key value" do
+      @options.parent_key.should == :person_id
+    end
+
+  end
+
   describe "#polymorphic" do
 
     context "when attribute provided" do