mongoid 0.9.6 → 0.9.7

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.9.6"
+  s.version = "0.9.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2009-12-09}
+  s.date = %q{2009-12-12}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"
@@ -23,9 +23,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "lib/mongoid.rb",
      "lib/mongoid/associations.rb",
-     "lib/mongoid/associations/accessor.rb",
      "lib/mongoid/associations/belongs_to.rb",
-     "lib/mongoid/associations/decorator.rb",
      "lib/mongoid/associations/has_many.rb",
      "lib/mongoid/associations/has_one.rb",
      "lib/mongoid/associations/options.rb",
@@ -38,6 +36,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/commands/delete_all.rb",
      "lib/mongoid/commands/destroy.rb",
      "lib/mongoid/commands/destroy_all.rb",
+     "lib/mongoid/commands/quick_save.rb",
      "lib/mongoid/commands/save.rb",
      "lib/mongoid/commands/validate.rb",
      "lib/mongoid/criteria.rb",
@@ -68,12 +67,11 @@ Gem::Specification.new do |s|
      "lib/mongoid/versioning.rb",
      "mongoid.gemspec",
      "perf/benchmark.rb",
+     "spec/integration/mongoid/associations_spec.rb",
      "spec/integration/mongoid/document_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
-     "spec/unit/mongoid/associations/accessor_spec.rb",
      "spec/unit/mongoid/associations/belongs_to_spec.rb",
-     "spec/unit/mongoid/associations/decorator_spec.rb",
      "spec/unit/mongoid/associations/has_many_spec.rb",
      "spec/unit/mongoid/associations/has_one_spec.rb",
      "spec/unit/mongoid/associations/options_spec.rb",
@@ -86,6 +84,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/commands/delete_spec.rb",
      "spec/unit/mongoid/commands/destroy_all_spec.rb",
      "spec/unit/mongoid/commands/destroy_spec.rb",
+     "spec/unit/mongoid/commands/quick_save_spec.rb",
      "spec/unit/mongoid/commands/save_spec.rb",
      "spec/unit/mongoid/commands/validate_spec.rb",
      "spec/unit/mongoid/commands_spec.rb",
@@ -121,11 +120,10 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{ODM framework for MongoDB}
   s.test_files = [
-    "spec/integration/mongoid/document_spec.rb",
+    "spec/integration/mongoid/associations_spec.rb",
+     "spec/integration/mongoid/document_spec.rb",
      "spec/spec_helper.rb",
-     "spec/unit/mongoid/associations/accessor_spec.rb",
      "spec/unit/mongoid/associations/belongs_to_spec.rb",
-     "spec/unit/mongoid/associations/decorator_spec.rb",
      "spec/unit/mongoid/associations/has_many_spec.rb",
      "spec/unit/mongoid/associations/has_one_spec.rb",
      "spec/unit/mongoid/associations/options_spec.rb",
@@ -138,6 +136,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/commands/delete_spec.rb",
      "spec/unit/mongoid/commands/destroy_all_spec.rb",
      "spec/unit/mongoid/commands/destroy_spec.rb",
+     "spec/unit/mongoid/commands/quick_save_spec.rb",
      "spec/unit/mongoid/commands/save_spec.rb",
      "spec/unit/mongoid/commands/validate_spec.rb",
      "spec/unit/mongoid/commands_spec.rb",

data/spec/integration/mongoid/associations_spec.rb

@@ -0,0 +1,41 @@
+require "spec_helper"
+
+describe Mongoid::Associations do
+
+  before do
+    Person.delete_all; Game.delete_all; Post.delete_all
+  end
+
+  # context "one-to-one relational associations" do
+
+    # before do
+      # @person = Person.new(:title => "Sir")
+      # @game = Game.new(:score => 1)
+      # @person.game = @game
+      # @person.save
+    # end
+
+    # it "sets the association on save" do
+      # @from_db = Person.find(@person.id)
+      # @from_db.game.should == @game
+    # end
+
+  # end
+
+  context "one-to_many relational associations" do
+
+    before do
+      @person = Person.new(:title => "Sir")
+      @post = Post.new(:title => "Testing")
+      @person.posts = [@post]
+      @person.save
+    end
+
+    it "sets the association on save" do
+      # @from_db = Person.find(@person.id)
+      # @from_db.posts.should == [@post]
+    end
+
+  end
+
+end

data/spec/integration/mongoid/document_spec.rb

@@ -49,19 +49,6 @@ describe Mongoid::Document do
 
     end
 
-    context "when creating a has one" do
-
-      before do
-        @person = Person.new(:title => "Esquire")
-        @person.name.create(:first_name => "Jorge")
-      end
-
-      it "should create and save the entire graph" do
-        person = Person.find(@person.id)
-        person.name.first_name.should == "Jorge"
-      end
-
-    end
   end
 
   context "chaining criteria scopes" do

data/spec/spec_helper.rb

@@ -133,13 +133,6 @@ class Comment < Mongoid::Document
   key :text
 end
 
-class Decorated
-  include Mongoid::Associations::Decorator
-  def initialize(doc)
-    @document = doc
-  end
-end
-
 class Post < Mongoid::Document
   include Mongoid::Versioning
   field :title
@@ -148,7 +141,7 @@ end
 
 class Game < Mongoid::Document
   field :high_score, :default => 500
-  field :score, :default => 0
+  field :score, :type => Integer, :default => 0
 end
 
 if RUBY_VERSION == '1.8.6'

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

@@ -6,9 +6,8 @@ describe Mongoid::Associations::BelongsTo do
 
     before do
       @parent = Name.new(:first_name => "Drexel")
-      @document = stub(:parent => @parent)
       @options = Mongoid::Associations::Options.new(:name => :person)
-      @association = Mongoid::Associations::BelongsTo.new(@document, @options)
+      @association = Mongoid::Associations::BelongsTo.new(@parent, @options)
     end
 
     context "when finding by id" do
@@ -26,9 +25,8 @@ describe Mongoid::Associations::BelongsTo do
 
     before do
       @parent = Name.new(:first_name => "Drexel")
-      @document = stub(:parent => @parent)
       @options = Mongoid::Associations::Options.new(:name => :person)
-      @association = Mongoid::Associations::BelongsTo.new(@document, @options)
+      @association = Mongoid::Associations::BelongsTo.new(@parent, @options)
     end
 
     context "when getting values" do
@@ -50,6 +48,38 @@ describe Mongoid::Associations::BelongsTo do
 
   end
 
+  describe ".instantiate" 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)
+      end
+
+      it "delegates to new" do
+        Mongoid::Associations::BelongsTo.expects(:new).with(@parent, @options)
+        Mongoid::Associations::BelongsTo.instantiate(@document, @options)
+      end
+
+    end
+
+    context "when parent is nil" 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
+      end
+
+    end
+
+  end
+
   describe ".macro" do
 
     it "returns :belongs_to" do

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

@@ -176,6 +176,15 @@ describe Mongoid::Associations::HasMany do
 
   end
 
+  describe ".instantiate" do
+
+    it "delegates to new" do
+      Mongoid::Associations::HasMany.expects(:new).with(@document, @options)
+      Mongoid::Associations::HasMany.instantiate(@document, @options)
+    end
+
+  end
+
   describe "#length" do
 
     context "#length" do

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

@@ -14,6 +14,7 @@ describe Mongoid::Associations::HasOne do
       before do
         @association = Mongoid::Associations::HasOne.new(
           @document,
+          @attributes[:mixed_drink],
           Mongoid::Associations::Options.new(:name => :mixed_drink)
         )
       end
@@ -34,6 +35,7 @@ describe Mongoid::Associations::HasOne do
       before do
         @association = Mongoid::Associations::HasOne.new(
           @document,
+          @attributes[:mixed_drink],
           Mongoid::Associations::Options.new(:name => :mixed_drink)
         )
         @drink = MixedDrink.new(:name => "Sapphire and Tonic")
@@ -49,11 +51,12 @@ describe Mongoid::Associations::HasOne do
 
   end
 
-  describe "#decorate!" do
+  describe "#method_missing" do
 
     before do
       @association = Mongoid::Associations::HasOne.new(
         @document,
+        @attributes[:mixed_drink],
         Mongoid::Associations::Options.new(:name => :mixed_drink)
       )
     end
@@ -77,9 +80,27 @@ describe Mongoid::Associations::HasOne do
 
   end
 
+  describe ".instantiate" do
+
+    context "when attributes exist" do
+
+      before do
+        @document = stub(:attributes => { :name => { :first_name => "Test" } })
+        @options = Mongoid::Associations::Options.new(:name => :name)
+      end
+
+      it "delegates to new" do
+        Mongoid::Associations::HasOne.expects(:new).with(@document, { :first_name => "Test" }, @options)
+        Mongoid::Associations::HasOne.instantiate(@document, @options)
+      end
+
+    end
+
+  end
+
   describe ".macro" do
 
-    it "returns :has_many" do
+    it "returns :has_one" do
       Mongoid::Associations::HasOne.macro.should == :has_one
     end
 

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

@@ -84,7 +84,19 @@ describe Mongoid::Associations::Options do
 
       end
 
+    end
+
+  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
@@ -96,7 +108,6 @@ describe Mongoid::Associations::Options do
       before do
         @attributes = { :polymorphic => true }
         @options = Mongoid::Associations::Options.new(@attributes)
-
       end
 
       it "returns the attribute" do

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

@@ -25,6 +25,24 @@ describe Mongoid::Associations::RelatesToMany do
 
   end
 
+  describe ".instantiate" do
+
+    context "when related id has been set" do
+
+      before do
+        @document = Person.new
+        @options = Mongoid::Associations::Options.new(:name => :posts)
+      end
+
+      it "delegates to new" do
+        Mongoid::Associations::RelatesToMany.expects(:new).with(@document, @options)
+        association = Mongoid::Associations::RelatesToMany.instantiate(@document, @options)
+      end
+
+    end
+
+  end
+
   describe ".macro" do
 
     it "returns :relates_to_many" do
@@ -49,6 +67,10 @@ describe Mongoid::Associations::RelatesToMany do
       @second.person_id.should == @parent.id
     end
 
+    it "returns the related objects" do
+      Mongoid::Associations::RelatesToMany.update(@related, @parent, @options).should == @related
+    end
+
   end
 
 end

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

@@ -14,7 +14,7 @@ describe Mongoid::Associations::RelatesToOne do
 
       it "finds the object by id" do
         Game.expects(:find).with(@document.game_id).returns(@related)
-        association = Mongoid::Associations::RelatesToOne.new(@document, @options)
+        association = Mongoid::Associations::RelatesToOne.new(@document, "5", @options)
         association.should == @related
       end
 
@@ -22,6 +22,66 @@ describe Mongoid::Associations::RelatesToOne do
 
   end
 
+  describe ".instantiate" do
+
+    context "when foreign key is not nil" do
+
+      before do
+        @document = stub(:game_id => "5")
+        @options = Mongoid::Associations::Options.new(:name => :game)
+      end
+
+      it "delegates to new" do
+        Mongoid::Associations::RelatesToOne.expects(:new).with(@document, "5", @options)
+        Mongoid::Associations::RelatesToOne.instantiate(@document, @options)
+      end
+
+    end
+
+    context "when foreign key is nil" do
+
+      before do
+        @document = stub(:game_id => nil)
+        @options = Mongoid::Associations::Options.new(:name => :game)
+      end
+
+      it "returns nil" do
+        Mongoid::Associations::RelatesToOne.instantiate(@document, @options).should be_nil
+      end
+
+    end
+
+  end
+
+  describe "#method_missing" do
+
+    before do
+      @game = Game.new(:score => 5000)
+      @document = stub(:game_id => "5")
+      @options = Mongoid::Associations::Options.new(:name => :game)
+      Game.expects(:find).with(@document.game_id).returns(@game)
+      @association = Mongoid::Associations::RelatesToOne.new(@document, "5", @options)
+    end
+
+    context "when getting values" do
+
+      it "delegates to the document" do
+        @association.score.should == 5000
+      end
+
+    end
+
+    context "when setting values" do
+
+      it "delegates to the document" do
+        @association.score = 400
+        @association.score.should == 400
+      end
+
+    end
+
+  end
+
   describe ".macro" do
 
     it "returns :relates_to_one" do
@@ -43,6 +103,10 @@ describe Mongoid::Associations::RelatesToOne do
       @parent.game_id.should == "5"
     end
 
+    it "returns the related object" do
+      Mongoid::Associations::RelatesToOne.update(@related, @parent, @options).should == @related
+    end
+
   end
 
 end

data/spec/unit/mongoid/associations_spec.rb

@@ -184,9 +184,10 @@ describe Mongoid::Associations do
 
   describe ".has_one" do
 
-    it "adds a new Association to the collection" do
+    it "adds a new Association to the document" do
       person = Person.new
       person.name.should_not be_nil
+      person.attributes[:name].should be_nil
     end
 
     it "creates a reader for the association" do
@@ -262,4 +263,55 @@ describe Mongoid::Associations do
 
   end
 
+  describe "#update_associations" do
+
+    context "when associations exist" do
+
+      before do
+        @related = stub(:id => "100", :person= => true)
+        @person = Person.new
+        @person.posts = [@related]
+      end
+
+      it "saves each association" do
+        @related.expects(:quick_save).returns(@related)
+        @person.update_associations(:posts)
+      end
+
+    end
+
+    context "when no associations exist" do
+
+      before do
+        @person = Person.new
+      end
+
+      it "does nothing" do
+        @person.update_associations(:posts)
+        @person.posts.first.should be_nil
+      end
+
+    end
+
+  end
+
+  describe "#update_association" do
+
+    context "when the association exists" do
+
+      before do
+        @related = stub(:id => "100", :person= => true)
+        @person = Person.new
+        @person.game = @related
+      end
+
+      it "saves each association" do
+        @related.expects(:quick_save).returns(@related)
+        @person.update_association(:game)
+      end
+
+    end
+
+  end
+
 end