mongoid 1.1.3 → 1.1.4

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

@@ -20,6 +20,27 @@ describe Mongoid::Associations::BelongsToRelated do
 
     end
 
+    context "when options have an extension" do
+
+      before do
+        @document = stub(:person_id => "5")
+        @block = Proc.new {
+          def extension
+            "Testing"
+          end
+        }
+        @options = Mongoid::Associations::Options.new(:name => :person, :extend => @block)
+        @related = stub
+        Person.expects(:find).with(@document.person_id).returns(@related)
+        @association = Mongoid::Associations::BelongsToRelated.new(@document, "5", @options)
+      end
+
+      it "adds the extension module" do
+        @association.extension.should == "Testing"
+      end
+
+    end
+
   end
 
   describe ".instantiate" do
@@ -32,7 +53,7 @@ describe Mongoid::Associations::BelongsToRelated do
       end
 
       it "delegates to new" do
-        Mongoid::Associations::BelongsToRelated.expects(:new).with(@document, "5", @options)
+        Mongoid::Associations::BelongsToRelated.expects(:new).with(@document, "5", @options, nil)
         Mongoid::Associations::BelongsToRelated.instantiate(@document, @options)
       end
 
@@ -96,18 +117,18 @@ describe Mongoid::Associations::BelongsToRelated do
       @related = stub(:id => "5")
       @child = Game.new
       @options = Mongoid::Associations::Options.new(:name => :person)
+      @association = Mongoid::Associations::BelongsToRelated.update(@related, @child, @options)
     end
 
     it "sets the related object id on the parent" do
-      Mongoid::Associations::BelongsToRelated.update(@related, @child, @options)
       @child.person_id.should == "5"
     end
 
-    it "returns the related object" do
-      Mongoid::Associations::BelongsToRelated.update(@related, @child, @options).should == @related
+    it "returns the proxy" do
+      @association.target.should == @related
     end
 
-    context "when related is nil" do
+    context "when target is nil" do
 
       it "returns nil" do
         Mongoid::Associations::BelongsToRelated.update(nil, @child, @options).should be_nil

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

@@ -2,46 +2,73 @@ require "spec_helper"
 
 describe Mongoid::Associations::BelongsTo do
 
+  let(:child) do
+    Name.new(:first_name => "Drexel", :last_name => "Spivey")
+  end
+
+  let(:target) do
+    Person.new(:title => "Pimp")
+  end
+
+  let(:options) do
+    Mongoid::Associations::Options.new(:name => :person, :inverse_of => :name)
+  end
+
+  let(:has_many_options) do
+    Mongoid::Associations::Options.new(:name => :person, :inverse_of => :addresses)
+  end
+
   describe "#find" do
 
     before do
-      @parent = Name.new(:first_name => "Drexel")
-      @options = Mongoid::Associations::Options.new(:name => :person)
-      @association = Mongoid::Associations::BelongsTo.new(@parent, @options)
+      @association = Mongoid::Associations::BelongsTo.new(target, options)
     end
 
     context "when finding by id" do
 
-      it "returns the document in the array with that id" do
-        name = @association.find(Mongo::ObjectID.new.to_s)
-        name.should == @parent
+      it "always returns the target document" do
+        @association.find("").should == target
       end
 
     end
 
   end
 
-  context "when decorating" do
+  describe "#initialize" do
 
     before do
-      @parent = Name.new(:first_name => "Drexel")
-      @options = Mongoid::Associations::Options.new(:name => :person)
-      @association = Mongoid::Associations::BelongsTo.new(@parent, @options)
+      @association = Mongoid::Associations::BelongsTo.new(target, options)
     end
 
-    context "when getting values" do
+    it "sets the target" do
+      @association.target.should == target
+    end
 
-      it "delegates to the document" do
-        @association.first_name.should == "Drexel"
-      end
+    it "sets the options" do
+      @association.options.should == options
+    end
+
+  end
 
+  describe "#initialize" do
+
+    before do
+      @parent = Person.new(:title => "Dr")
+      @name = Name.new(:first_name => "Richard", :last_name => "Dawkins")
+      @parent.name = @name
+      @block = Proc.new {
+        def extension
+          "Testing"
+        end
+      }
+      @options = Mongoid::Associations::Options.new(:name => :person, :extend => @block)
+      @association = Mongoid::Associations::BelongsTo.new(@parent, @options)
     end
 
-    context "when setting values" do
+    context "when the options have an extension" do
 
-      it "delegates to the document" do
-        @association.first_name = "Test"
-        @association.first_name.should == "Test"
+      it "adds the extension module" do
+        @association.extension.should == "Testing"
       end
 
     end
@@ -53,14 +80,13 @@ describe Mongoid::Associations::BelongsTo do
     context "when parent exists" do
 
       before do
-        @parent = Name.new(:first_name => "Drexel")
-        @document = stub(:_parent => @parent)
-        @options = Mongoid::Associations::Options.new(:name => :person)
+        @parent = stub
+        @target = stub(:_parent => @parent)
+        @association = Mongoid::Associations::BelongsTo.instantiate(@target, options)
       end
 
-      it "delegates to new" do
-        Mongoid::Associations::BelongsTo.expects(:new).with(@parent, @options)
-        Mongoid::Associations::BelongsTo.instantiate(@document, @options)
+      it "sets the parent to the target" do
+        @association.target.should == @parent
       end
 
     end
@@ -69,11 +95,10 @@ describe Mongoid::Associations::BelongsTo do
 
       before do
         @document = stub(:_parent => nil)
-        @options = Mongoid::Associations::Options.new(:name => :person)
       end
 
       it "returns nil" do
-        Mongoid::Associations::BelongsTo.instantiate(@document, @options).should be_nil
+        Mongoid::Associations::BelongsTo.instantiate(@document, options).should be_nil
       end
 
     end
@@ -88,6 +113,42 @@ describe Mongoid::Associations::BelongsTo do
 
   end
 
+  describe "#method_missing" do
+
+    before do
+      @association = Mongoid::Associations::BelongsTo.new(target, options)
+    end
+
+    context "when method is a getter" do
+
+      it "delegates to the target" do
+        @association.title.should == "Pimp"
+      end
+
+    end
+
+    context "when method is a setter" do
+
+      before do
+        @association.title = "Dealer"
+      end
+
+      it "delegates to the target" do
+        @association.title.should == "Dealer"
+      end
+
+    end
+
+    context "when method does not exist" do
+
+      it "raises an error" do
+        lambda { @association.nothing }.should raise_error(NoMethodError)
+      end
+
+    end
+
+  end
+
   describe ".update" do
 
     context "when child is a has one" do
@@ -95,16 +156,22 @@ describe Mongoid::Associations::BelongsTo do
       before do
         @name = Name.new(:first_name => "Test", :last_name => "User")
         @person = Person.new(:title => "Mrs")
-        @options = Mongoid::Associations::Options.new(:name => :person, :inverse_of => :name)
-        Mongoid::Associations::BelongsTo.update(@person, @name, @options)
+        @association = Mongoid::Associations::BelongsTo.update(@person, @name, options)
       end
 
       it "updates the parent document" do
         @person.name.should == @name
+      end
+
+      it "updates the parent attributes" do
         @person.attributes[:name].except(:_id).should ==
           { "first_name" => "Test", "last_name" => "User", "_type" => "Name" }
       end
 
+      it "returns the proxy association" do
+        @association.target.should == @person
+      end
+
     end
 
     context "when child is a has many" do
@@ -112,8 +179,7 @@ describe Mongoid::Associations::BelongsTo do
       before do
         @address = Address.new(:street => "Broadway")
         @person = Person.new(:title => "Mrs")
-        @options = Mongoid::Associations::Options.new(:name => :person, :inverse_of => :addresses)
-        Mongoid::Associations::BelongsTo.update(@person, @address, @options)
+        Mongoid::Associations::BelongsTo.update(@person, @address, has_many_options)
       end
 
       it "updates the parent document" do

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

@@ -2,7 +2,17 @@ require "spec_helper"
 
 describe Mongoid::Associations::HasManyRelated do
 
-  let(:options) { Mongoid::Associations::Options.new(:name => :posts) }
+  let(:block) do
+    Proc.new do
+      def extension
+        "Testing"
+      end
+    end
+  end
+
+  let(:options) do
+    Mongoid::Associations::Options.new(:name => :posts, :extend => block)
+  end
 
   describe "#<<" do
 
@@ -239,24 +249,33 @@ describe Mongoid::Associations::HasManyRelated do
 
   describe ".initialize" do
 
-    context "when related id has been set" do
+    before do
+      @document = Person.new
+      @criteria = stub
+      @first = stub(:person_id => @document.id)
+      @second = stub(:person_id => @document.id)
+      @related = [@first, @second]
+      Post.expects(:all).with(:conditions => { "person_id" => @document.id }).returns(@related)
+    end
 
-      before do
-        @document = Person.new
-        @criteria = stub
-        @first = stub(:person_id => @document.id)
-        @second = stub(:person_id => @document.id)
-        @related = [@first, @second]
-      end
+    context "when related id has been set" do
 
       it "finds the object by id" do
-        Post.expects(:all).with(:conditions => { "person_id" => @document.id }).returns(@related)
         association = Mongoid::Associations::HasManyRelated.new(@document, options)
         association.should == @related
       end
 
     end
 
+    context "when the options have an extension" do
+
+      it "adds the extension module" do
+        association = Mongoid::Associations::HasManyRelated.new(@document, options)
+        association.extension.should == "Testing"
+      end
+
+    end
+
   end
 
   describe ".instantiate" do
@@ -268,7 +287,7 @@ describe Mongoid::Associations::HasManyRelated do
       end
 
       it "delegates to new" do
-        Mongoid::Associations::HasManyRelated.expects(:new).with(@document, options)
+        Mongoid::Associations::HasManyRelated.expects(:new).with(@document, options, nil)
         association = Mongoid::Associations::HasManyRelated.instantiate(@document, options)
       end
 
@@ -359,7 +378,8 @@ describe Mongoid::Associations::HasManyRelated do
     end
 
     it "returns the related objects" do
-      Mongoid::Associations::HasManyRelated.update(@related, @parent, options).should == @related
+      @proxy = Mongoid::Associations::HasManyRelated.update(@related, @parent, options)
+      @proxy.target.should == @related
     end
 
   end

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

@@ -200,7 +200,10 @@ describe Mongoid::Associations::HasMany do
   describe "#find" do
 
     before do
-      @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Associations::Options.new(:name => :addresses))
+      @association = Mongoid::Associations::HasMany.new(
+        @document,
+        Mongoid::Associations::Options.new(:name => :addresses)
+      )
     end
 
     context "when finding all" do
@@ -259,18 +262,43 @@ describe Mongoid::Associations::HasMany do
 
   describe "#initialize" do
 
-    before do
-      @canvas = stub(:raw_attributes => { "shapes" => [{ "_type" => "Circle", "radius" => 5 }] }, :update => true)
-      @association = Mongoid::Associations::HasMany.new(
-        @canvas,
-        Mongoid::Associations::Options.new(:name => :shapes)
-      )
+    context "when no extension exists" do
+
+      before do
+        @canvas = stub(:raw_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
 
-    it "creates the classes based on their types" do
-      circle = @association.first
-      circle.should be_a_kind_of(Circle)
-      circle.radius.should == 5
+    context "when an extension is in the options" do
+
+      before do
+        @person = Person.new
+        @block = Proc.new do
+          def extension
+            "Testing"
+          end
+        end
+        @association = Mongoid::Associations::HasMany.new(
+          @person,
+          Mongoid::Associations::Options.new(:name => :addresses, :extend => @block)
+        )
+      end
+
+      it "adds the extension module" do
+        @association.extension.should == "Testing"
+      end
+
     end
 
   end
@@ -399,7 +427,11 @@ describe Mongoid::Associations::HasMany do
     before do
       @address = Address.new(:street => "Madison Ave")
       @person = Person.new(:title => "Sir")
-      Mongoid::Associations::HasMany.update([@address], @person, Mongoid::Associations::Options.new(:name => :addresses))
+      @association = Mongoid::Associations::HasMany.update(
+        [@address],
+        @person,
+        Mongoid::Associations::Options.new(:name => :addresses)
+      )
     end
 
     it "parentizes the child document" do
@@ -411,6 +443,10 @@ describe Mongoid::Associations::HasMany do
         [{ "_id" => "madison-ave", "street" => "Madison Ave", "_type" => "Address" }]
     end
 
+    it "returns the association proxy" do
+      @association.target.size.should == 1
+    end
+
   end
 
 end

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

@@ -3,7 +3,16 @@ require "spec_helper"
 describe Mongoid::Associations::HasOneRelated do
 
   let(:document) { stub(:id => "1") }
-  let(:options) { Mongoid::Associations::Options.new(:name => :game) }
+  let(:block) do
+    Proc.new do
+      def extension
+        "Testing"
+      end
+    end
+  end
+  let(:options) do
+    Mongoid::Associations::Options.new(:name => :game, :extend => block)
+  end
 
   describe "#build" do
 
@@ -82,12 +91,27 @@ describe Mongoid::Associations::HasOneRelated do
       @person.game.should == @game
     end
 
+    context "when the options have an extension" do
+
+      before do
+        @parent = stub(:id => "5", :class => Person)
+        @game = Game.new
+        Game.expects(:first).returns(@game)
+        @association = Mongoid::Associations::HasOneRelated.new(@parent, options)
+      end
+
+      it "adds the extension to the module" do
+        @association.extension.should == "Testing"
+      end
+
+    end
+
   end
 
   describe ".instantiate" do
 
     it "delegates to new" do
-      Mongoid::Associations::HasOneRelated.expects(:new).with(document, options)
+      Mongoid::Associations::HasOneRelated.expects(:new).with(document, options, nil)
       Mongoid::Associations::HasOneRelated.instantiate(document, options)
     end
 
@@ -144,9 +168,10 @@ describe Mongoid::Associations::HasOneRelated do
       Mongoid::Associations::HasOneRelated.update(@game, @person, options)
     end
 
-    it "returns the child" do
+    it "returns the proxy" do
       @game.expects(:person=).with(@person)
-      Mongoid::Associations::HasOneRelated.update(@game, @person, options).should == @game
+      @proxy = Mongoid::Associations::HasOneRelated.update(@game, @person, options)
+      @proxy.target.should == @game
     end
 
   end