mongo_mapper 0.8.6 → 0.9.0

data/test/functional/associations/test_many_polymorphic_proxy.rb

@@ -138,6 +138,7 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       @hm2 = Message.create(:body => 'Hall the king!', :position => 2)
       @hall.messages = [@hm1, @hm2, @hm3]
       @hall.save
+      @hall.reload
     end
 
     context "dynamic finders" do

data/test/functional/associations/test_one_embedded_proxy.rb

@@ -20,7 +20,7 @@ class OneEmbeddedProxyTest < Test::Unit::TestCase
     @post_class.one :author, :class => @author_class
 
     post = @post_class.create
-    author = post.author.build(:name => "John")
+    author = post.build_author(:name => "John")
     post.author.should be_instance_of(@author_class)
     post.author.should be_new
     post.author.name.should == 'John'
@@ -48,7 +48,7 @@ class OneEmbeddedProxyTest < Test::Unit::TestCase
   should "not have problem loading root document if embedded one is nil" do
     @post_class.one :author, :class => @author_class
     post = @post_class.create
-    
+
     lambda {
       @post_class.find(post.id)
     }.should_not raise_error
@@ -78,4 +78,23 @@ class OneEmbeddedProxyTest < Test::Unit::TestCase
     post.author?.should be_true
   end
 
+  should "initialize id for nested embedded document created from hash" do
+    @address_class = EDoc('Address') do
+      key :city, String
+      key :state, String
+    end
+    @author_class.one(:address, :class => @address_class)
+    @post_class.one(:author, :class => @author_class)
+
+    post = @post_class.create(:title => 'Post Title', :author => {
+      :name => 'Frank',
+      :address => {
+        :city => 'Boston',
+        :state => 'MA'
+      }
+    })
+
+    post.author.address.id.should_not be_nil
+  end
+
 end

data/test/functional/associations/test_one_proxy.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'models'
 
 class OneProxyTest < Test::Unit::TestCase
   def setup
@@ -13,6 +14,11 @@ class OneProxyTest < Test::Unit::TestCase
     @post_class.new.author.nil?.should be_true
   end
 
+  should "return nil instead of a proxy" do
+    @post_class.one :author, :class => @author_class
+    nil.should === @post_class.new.author
+  end
+
   should "allow assignment of associated document using a hash" do
     @post_class.one :author, :class => @author_class
 
@@ -42,6 +48,26 @@ class OneProxyTest < Test::Unit::TestCase
         post.author = new_author
         post.author.should == new_author
       end
+
+      should "generate a new proxy instead of modifying the existing one" do
+        @post_class.one :author, :class => @author_class
+
+        post = @post_class.new
+        author = @author_class.new(:name => 'Frank')
+        post.author = author
+        post.reload
+
+        post.author.should == author
+        post.author.nil?.should be_false
+
+        original_author = post.author
+        original_author.name.should == 'Frank'
+        new_author = @author_class.new(:name => 'Emily')
+        post.author = new_author
+        post.author.should == new_author
+
+        original_author.name.should == 'Frank'
+      end
     end
 
     context "with a Hash" do
@@ -85,13 +111,12 @@ class OneProxyTest < Test::Unit::TestCase
 
   should "unset the association" do
     @post_class.one :author, :class => @author_class
-    post = @post_class.new
-    author = @author_class.new
-    post.author = author
+    post = @post_class.create
+    author = @author_class.create
+    post.update_attributes!(:author => author)
     post.reload
-
     post.author = nil
-    post.author.nil?.should be_false
+    post.author.nil?.should be_true
   end
 
   should "work with :dependent delete" do
@@ -136,7 +161,7 @@ class OneProxyTest < Test::Unit::TestCase
     @post_class.one :author, :class => @author_class
 
     post = @post_class.create
-    author = post.author.build(:name => 'John')
+    author = post.build_author(:name => 'John')
     post.author.should be_instance_of(@author_class)
     post.author.should be_new
     post.author.name.should == 'John'
@@ -148,7 +173,7 @@ class OneProxyTest < Test::Unit::TestCase
     @post_class.one :author, :class => @author_class
 
     post = @post_class.create
-    author = post.author.create(:name => 'John')
+    author = post.create_author(:name => 'John')
     post.author.should be_instance_of(@author_class)
     post.author.should_not be_new
     post.author.name.should == 'John'
@@ -165,13 +190,13 @@ class OneProxyTest < Test::Unit::TestCase
     should "raise exception if invalid" do
       post = @post_class.create
       assert_raises(MongoMapper::DocumentNotValid) do
-        post.author.create!
+        post.create_author!
       end
     end
 
     should "work if valid" do
       post = @post_class.create
-      author = post.author.create!(:name => 'John')
+      author = post.create_author!(:name => 'John')
       post.author.should be_instance_of(@author_class)
       post.author.should_not be_new
       post.author.name.should == 'John'
@@ -179,4 +204,19 @@ class OneProxyTest < Test::Unit::TestCase
       post.author.post_id.should == post.id
     end
   end
+
+  context "namespaced foreign keys" do
+    setup do
+      News::Paper.one :article, :class_name => 'News::Article'
+      News::Article.belongs_to :paper, :class_name => 'News::Paper'
+
+      @paper = News::Paper.create
+    end
+
+    should "properly infer the foreign key" do
+      article = @paper.create_article
+      article.should respond_to(:paper_id)
+      article.paper_id.should == @paper.id
+    end
+  end
 end

data/test/functional/test_associations.rb

@@ -36,6 +36,8 @@ class AssociationsTest < Test::Unit::TestCase
     tag2 = AwesomeTag.new(:name => 'grand')
     post1 = AwesomePost.create(:creator => user, :tags => [tag1])
     post2 = AwesomePost.create(:creator => user, :tags => [tag2])
+
+    user.reload
     user.posts.should == [post1, post2]
 
     post1 = post1.reload

data/test/functional/test_caching.rb

@@ -8,6 +8,7 @@ class CachingTest < Test::Unit::TestCase
         plugin MongoMapper::Plugins::Caching
       end
       @klass.stubs(:name).returns('Post')
+      @klass.any_instance.stubs(:persisted?).returns(true)
       @klass.any_instance.stubs(:[]).returns(nil)
       @klass.any_instance.stubs(:[]=).returns(nil)
     end
@@ -15,7 +16,7 @@ class CachingTest < Test::Unit::TestCase
     context "new" do
       setup do
         @doc = @klass.new
-        @doc.stubs(:new?).returns(true)
+        @doc.stubs(:persisted?).returns(false)
       end
 
       should "be class/new" do
@@ -35,7 +36,7 @@ class CachingTest < Test::Unit::TestCase
       setup do
         @object_id = BSON::ObjectId.new
         @doc = @klass.new
-        @doc.stubs(:new?).returns(false)
+        @doc.stubs(:persisted).returns(true)
         @doc.stubs(:id).returns(@object_id)
       end
 

data/test/functional/test_callbacks.rb

@@ -4,15 +4,13 @@ module CallbacksSupport
   def self.included base
     base.key :name, String
 
-    [ :before_validation_on_create, :before_validation_on_update,
-      :before_validation, :after_validation,
+    [ :before_validation, :after_validation,
       :before_create,     :after_create,
       :before_update,     :after_update,
       :before_save,       :after_save,
-      :before_destroy,    :after_destroy].each do |callback|
-      callback_method = "#{callback}_callback"
-      base.send(callback, callback_method)
-      define_method(callback_method) do
+      :before_destroy,    :after_destroy
+    ].each do |callback|
+      base.send(callback) do
         history << callback.to_sym
       end
     end
@@ -29,8 +27,23 @@ module CallbacksSupport
 end
 
 class CallbacksTest < Test::Unit::TestCase
-  CreateCallbackOrder = [:before_validation, :before_validation_on_create, :after_validation, :before_save, :before_create, :after_create, :after_save]
-  UpdateCallbackOrder = [:before_validation, :before_validation_on_update, :after_validation, :before_save, :before_update, :after_update, :after_save]
+  CreateCallbackOrder = [
+    :before_validation,
+    :after_validation,
+    :before_save,
+    :before_create,
+    :after_create,
+    :after_save
+  ]
+
+  UpdateCallbackOrder = [
+    :before_validation,
+    :after_validation,
+    :before_save,
+    :before_update,
+    :after_update,
+    :after_save
+  ]
 
   context "Defining and running callbacks on documents" do
     setup do
@@ -102,11 +115,8 @@ class CallbacksTest < Test::Unit::TestCase
       child = @child_class.new(:name => 'Child', :children => [grand])
       root  = @root_class.create(:name => 'Parent', :children => [child])
 
-      child = root.children.first
-      child.history.should == CreateCallbackOrder
-
-      grand = root.children.first.children.first
-      grand.history.should == CreateCallbackOrder
+      root.children.first.history.should == CreateCallbackOrder
+      root.children.first.children.first.history.should == CreateCallbackOrder
     end
 
     should "get the order right based on root document updating" do
@@ -116,11 +126,8 @@ class CallbacksTest < Test::Unit::TestCase
       root.clear_history
       root.update_attributes(:name => 'Updated Parent')
 
-      child = root.children.first
-      child.history.should == UpdateCallbackOrder
-
-      grand = root.children.first.children.first
-      grand.history.should == UpdateCallbackOrder
+      root.children.first.history.should == UpdateCallbackOrder
+      root.children.first.children.first.history.should == UpdateCallbackOrder
     end
 
     should "work for before and after destroy" do

data/test/functional/test_dirty.rb

@@ -160,4 +160,126 @@ class DirtyTest < Test::Unit::TestCase
       milestone.changed.should == %w(project_id)
     end
   end
-end
+
+  context "save with an invalid document" do
+    should "not clear changes" do
+      validated_class = Doc do
+        key :name, String
+        key :required, String, :required=>true
+      end
+      validated_doc = validated_class.new
+      validated_doc.name = "I'm a changin"
+      validated_doc.save
+      validated_doc.changed?.should be_true
+
+      validated_doc.required = 1
+      validated_doc.save
+      validated_doc.changed?.should be_false
+    end
+  end
+
+  context "changing an already changed attribute" do
+    should "preserve the original value" do
+      doc = @document.create(:a=>"b")
+      doc.a = "c"
+      doc.a_change.should == ["b","c"]
+      doc.a = "d"
+      doc.a_change.should == ["b","d"]
+    end
+    should "reset changes when set back to the original value" do
+      doc = @document.create(:a=>"b")
+      doc.a = "c"
+      doc.a = "b"
+      doc.changed?.should be_false
+    end
+  end
+
+  context "reset_attribute!" do
+    should "reset the attribute back to the previous value" do
+      doc = @document.create(:a=>"b")
+      doc.a = "c"
+      doc.reset_a!
+      doc.changed?.should be_false
+      doc.a.should == "b"
+    end
+    should "reset the attribute back to the original value after several changes" do
+      doc = @document.create(:a=>"b")
+      doc.a = "c"
+      doc.a = "d"
+      doc.a = "e"
+      doc.reset_a!
+      doc.changed?.should be_false
+      doc.a.should == "b"
+    end
+  end
+
+  context "previous_changes" do
+    should "reflect previously committed change" do
+      doc = @document.create(:a=>"b")
+      doc.a = "c"
+      changes = doc.changes
+      doc.save!
+      doc.previous_changes.should == changes
+    end
+
+    should "not include attributes loaded from db" do
+      doc = @document.create(:a => "b")
+      @document.find(doc.id).previous_changes.should be_blank
+    end
+  end
+
+  context "Embedded documents" do
+    setup do
+      @edoc = EDoc('Duck') { key :name, String }
+      @edoc.plugin MongoMapper::Plugins::Dirty
+      @document = Doc('Long') { key :name, String }
+      @document.many :ducks, :class=>@edoc
+      @doc = @document.new
+      @duck = @doc.ducks.build
+    end
+
+    should "track changes" do
+      @duck.name = "hi"
+      @duck.changed?.should be_true
+    end
+
+    should "clear changes when saved" do
+      @duck.name = "hi"
+      @duck.changed?.should be_true
+      @duck.save!
+      @duck.changed?.should_not be_true
+    end
+
+    should "clear changes when the parent is saved" do
+      @duck.name = "hi"
+      @duck.changed?.should be_true
+      @doc.save!
+      @duck.changed?.should_not be_true
+    end
+
+    context "with nested embedded documents" do
+      setup do
+        @inner_edoc = EDoc('Dong') {key :name, String}
+        @inner_edoc.plugin MongoMapper::Plugins::Dirty
+        @edoc.many :dongs, :class=>@inner_edoc
+        @dong = @duck.dongs.build
+      end
+
+      should "track changes" do
+        @dong.name = "hi"
+        @dong.changed?.should be_true
+      end
+
+      should "clear changes when the root saves" do
+        @dong.name = "hi"
+        @dong.changed?.should be_true
+        @doc.save!
+        @dong.changed?.should be_false
+      end
+
+    end
+
+  end
+
+
+end

data/test/functional/test_document.rb

@@ -192,11 +192,15 @@ class DocumentTest < Test::Unit::TestCase
 
       @document.many :foos, :class => @foo_class
       @document.many :bars, :class => @bar_class
+      @document.belongs_to :foo, :class => @foo_class
+      @document.one :bar, :class => @bar_class
 
       @instance = @document.create({
-        :age => 39,
+        :age  => 39,
         :foos => [@foo_class.new(:name => '1')],
         :bars => [@bar_class.new(:name => '1')],
+        :foo  => @foo_class.new(:name => '2'),
+        :bar  => @bar_class.new(:name => '2')
       })
     end
 
@@ -207,12 +211,27 @@ class DocumentTest < Test::Unit::TestCase
       @instance.age.should == 39
     end
 
-    should "reset all associations" do
+    should "reset many associations" do
       @instance.foos.expects(:reset).at_least_once
       @instance.bars.expects(:reset).at_least_once
       @instance.reload
     end
 
+    should "reset belongs_to association" do
+      @instance.foo = nil
+      @instance.reload
+      @instance.foo.should_not be_nil
+    end
+
+    should "reset one association" do
+      @instance.bar = nil
+      @instance.reload
+      @instance.bar.should_not be_nil
+    end
+
+    should "reset nil one association" do
+    end
+
     should "reinstantiate embedded associations" do
       @instance.reload
       @instance.bars.first.name.should == '1'
@@ -250,4 +269,9 @@ class DocumentTest < Test::Unit::TestCase
       doc.skills.should == ['ruby', 'rails', 'javascript', 'xhtml', 'css']
     end
   end
+
+  should "not walk ObjectSpace when creating a model" do
+    ObjectSpace.expects(:each_object).never
+    Doc()
+  end
 end