mongo_mapper 0.7.3 → 0.7.4

data/test/functional/test_embedded_document.rb

@@ -42,6 +42,14 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       address._parent_document.should be(doc)
       address._root_document.should be(doc)
     end
+
+    should "assign _parent_document and _root_document when loading" do
+      address = @address_class.new(:city => 'South Bend', :state => 'IN')
+      doc = @klass.create(:foo => address)
+      doc.reload
+      doc.foo._parent_document.should be(doc)
+      doc.foo._root_document.should be(doc)
+    end
   end
 
   should "correctly instantiate single collection inherited embedded documents" do

data/test/functional/test_identity_map.rb

@@ -142,7 +142,7 @@ class IdentityMapTest < Test::Unit::TestCase
 
     context "#load" do
       setup do
-        @id = Mongo::ObjectID.new
+        @id = BSON::ObjectID.new
       end
 
       should "add document to map" do
@@ -453,7 +453,7 @@ class IdentityMapTest < Test::Unit::TestCase
       
       should "not add to map when loading" do
         @post_class.without_identity_map do
-          post = @post_class.load({'_id' => Mongo::ObjectID.new, 'title' => 'Awesome!'})
+          post = @post_class.load({'_id' => BSON::ObjectID.new, 'title' => 'Awesome!'})
           assert_not_in_map(post)
         end
       end

data/test/functional/test_modifiers.rb

@@ -3,11 +3,11 @@ require 'test_helper'
 class ModifierTest < Test::Unit::TestCase
   def setup
     @page_class = Doc do
-      key :title, String
-      key :day_count, Integer, :default => 0
-      key :week_count, Integer, :default => 0
+      key :title,       String
+      key :day_count,   Integer, :default => 0
+      key :week_count,  Integer, :default => 0
       key :month_count, Integer, :default => 0
-      key :tags, Array
+      key :tags,        Array
     end
   end
 
@@ -18,268 +18,321 @@ class ModifierTest < Test::Unit::TestCase
     page.month_count.should == month_count
   end
 
-  context "using class methods" do
-    should "be able to increment with criteria and modifier hashes" do
-      page = @page_class.create(:title => 'Home')
-      page2 = @page_class.create(:title => 'Home')
-
-      @page_class.increment({:title => 'Home'}, {
-        :day_count => 1, :week_count => 2, :month_count => 3
-      })
-
-      assert_page_counts page, 1, 2, 3
-      assert_page_counts page2, 1, 2, 3
+  def assert_keys_removed(page, *keys)
+    keys.each do |key|
+      doc = @page_class.collection.find_one({:_id => page.id})
+      doc.keys.should_not include(key)
     end
+  end
 
-    should "be able to increment with ids and modifier hash" do
-      page  = @page_class.create(:title => 'Home')
-      page2 = @page_class.create(:title => 'Home')
-
-      @page_class.increment(page.id, page2.id, {
-        :day_count => 1, :week_count => 2, :month_count => 3
-      })
-
-      assert_page_counts page, 1, 2, 3
-      assert_page_counts page2, 1, 2, 3
+  context "ClassMethods" do
+    context "unset" do
+      setup do
+        @page  = @page_class.create(:title => 'Home', :tags => %w(foo bar))
+        @page2 = @page_class.create(:title => 'Home')
+      end
+
+      should "work with criteria and keys" do
+        @page_class.unset({:title => 'Home'}, :title, :tags)
+        assert_keys_removed @page, :title, :tags
+        assert_keys_removed @page2, :title, :tags
+      end
+
+      should "work with ids and keys" do
+        @page_class.unset(@page.id, @page2.id, :title, :tags)
+        assert_keys_removed @page, :title, :tags
+        assert_keys_removed @page2, :title, :tags
+      end
     end
+    
+    context "increment" do
+      setup do
+        @page  = @page_class.create(:title => 'Home')
+        @page2 = @page_class.create(:title => 'Home')
+      end
 
-    should "be able to decrement with criteria and modifier hashes" do
-      page = @page_class.create(:title => 'Home', :day_count => 1, :week_count => 2, :month_count => 3)
-      page2 = @page_class.create(:title => 'Home', :day_count => 1, :week_count => 2, :month_count => 3)
-
-      @page_class.decrement({:title => 'Home'}, {
-        :day_count => 1, :week_count => 2, :month_count => 3
-      })
-
-      assert_page_counts page, 0, 0, 0
-      assert_page_counts page2, 0, 0, 0
-    end
+      should "work with criteria and modifier hashes" do
+        @page_class.increment({:title => 'Home'}, :day_count => 1, :week_count => 2, :month_count => 3)
 
-    should "be able to decrement with ids and modifier hash" do
-      page = @page_class.create(:title => 'Home', :day_count => 1, :week_count => 2, :month_count => 3)
-      page2 = @page_class.create(:title => 'Home', :day_count => 1, :week_count => 2, :month_count => 3)
+        assert_page_counts @page, 1, 2, 3
+        assert_page_counts @page2, 1, 2, 3
+      end
 
-      @page_class.decrement(page.id, page2.id, {
-        :day_count => 1, :week_count => 2, :month_count => 3
-      })
+      should "work with ids and modifier hash" do
+        @page_class.increment(@page.id, @page2.id, :day_count => 1, :week_count => 2, :month_count => 3)
 
-      assert_page_counts page, 0, 0, 0
-      assert_page_counts page2, 0, 0, 0
+        assert_page_counts @page, 1, 2, 3
+        assert_page_counts @page2, 1, 2, 3
+      end
+    end
+    
+    context "decrement" do
+      setup do
+        @page = @page_class.create(:title => 'Home', :day_count => 1, :week_count => 2, :month_count => 3)
+        @page2 = @page_class.create(:title => 'Home', :day_count => 1, :week_count => 2, :month_count => 3)
+      end
+
+      should "work with criteria and modifier hashes" do
+        @page_class.decrement({:title => 'Home'}, :day_count => 1, :week_count => 2, :month_count => 3)
+
+        assert_page_counts @page, 0, 0, 0
+        assert_page_counts @page2, 0, 0, 0
+      end
+
+      should "work with ids and modifier hash" do
+        @page_class.decrement(@page.id, @page2.id, :day_count => 1, :week_count => 2, :month_count => 3)
+
+        assert_page_counts @page, 0, 0, 0
+        assert_page_counts @page2, 0, 0, 0
+      end
+      
+      should "decrement with positive or negative numbers" do
+        @page_class.decrement(@page.id, @page2.id, :day_count => -1, :week_count => 2, :month_count => -3)
+
+        assert_page_counts @page, 0, 0, 0
+        assert_page_counts @page2, 0, 0, 0
+      end
     end
 
-    should "always decrement when decrement is called whether number is positive or negative" do
-      page = @page_class.create(:title => 'Home', :day_count => 1, :week_count => 2, :month_count => 3)
-      page2 = @page_class.create(:title => 'Home', :day_count => 1, :week_count => 2, :month_count => 3)
+    context "set" do
+      setup do
+        @page  = @page_class.create(:title => 'Home')
+        @page2 = @page_class.create(:title => 'Home')
+      end
 
-      @page_class.decrement(page.id, page2.id, {
-        :day_count => -1, :week_count => 2, :month_count => -3
-      })
+      should "work with criteria and modifier hashes" do
+        @page_class.set({:title => 'Home'}, :title => 'Home Revised')
 
-      assert_page_counts page, 0, 0, 0
-      assert_page_counts page2, 0, 0, 0
-    end
+        @page.reload
+        @page.title.should == 'Home Revised'
 
-    should "be able to set with criteria and modifier hashes" do
-      page  = @page_class.create(:title => 'Home')
-      page2 = @page_class.create(:title => 'Home')
+        @page2.reload
+        @page2.title.should == 'Home Revised'
+      end
 
-      @page_class.set({:title => 'Home'}, :title => 'Home Revised')
+      should "work with ids and modifier hash" do
+        @page_class.set(@page.id, @page2.id, :title => 'Home Revised')
 
-      page.reload
-      page.title.should == 'Home Revised'
+        @page.reload
+        @page.title.should == 'Home Revised'
 
-      page2.reload
-      page2.title.should == 'Home Revised'
+        @page2.reload
+        @page2.title.should == 'Home Revised'
+      end
     end
 
-    should "be able to set with ids and modifier hash" do
-      page  = @page_class.create(:title => 'Home')
-      page2 = @page_class.create(:title => 'Home')
-
-      @page_class.set(page.id, page2.id, :title => 'Home Revised')
+    context "push" do
+      setup do
+        @page  = @page_class.create(:title => 'Home')
+        @page2 = @page_class.create(:title => 'Home')
+      end
 
-      page.reload
-      page.title.should == 'Home Revised'
+      should "work with criteria and modifier hashes" do
+        @page_class.push({:title => 'Home'}, :tags => 'foo')
 
-      page2.reload
-      page2.title.should == 'Home Revised'
-    end
+        @page.reload
+        @page.tags.should == %w(foo)
 
-    should "be able to push with criteria and modifier hashes" do
-      page  = @page_class.create(:title => 'Home')
-      page2 = @page_class.create(:title => 'Home')
+        @page2.reload
+        @page.tags.should == %w(foo)
+      end
 
-      @page_class.push({:title => 'Home'}, :tags => 'foo')
+      should "work with ids and modifier hash" do
+        @page_class.push(@page.id, @page2.id, :tags => 'foo')
 
-      page.reload
-      page.tags.should == %w(foo)
+        @page.reload
+        @page.tags.should == %w(foo)
 
-      page2.reload
-      page.tags.should == %w(foo)
+        @page2.reload
+        @page.tags.should == %w(foo)
+      end
     end
 
-    should "be able to push with ids and modifier hash" do
-      page  = @page_class.create(:title => 'Home')
-      page2 = @page_class.create(:title => 'Home')
-
-      @page_class.push(page.id, page2.id, :tags => 'foo')
+    context "push_all" do
+      setup do
+        @page  = @page_class.create(:title => 'Home')
+        @page2 = @page_class.create(:title => 'Home')
+        @tags = %w(foo bar)
+      end
 
-      page.reload
-      page.tags.should == %w(foo)
+      should "work with criteria and modifier hashes" do
+        @page_class.push_all({:title => 'Home'}, :tags => @tags)
 
-      page2.reload
-      page.tags.should == %w(foo)
-    end
+        @page.reload
+        @page.tags.should == @tags
 
-    should "be able to push all with criteria and modifier hashes" do
-      page  = @page_class.create(:title => 'Home')
-      page2 = @page_class.create(:title => 'Home')
-      tags = %w(foo bar)
+        @page2.reload
+        @page.tags.should == @tags
+      end
 
-      @page_class.push_all({:title => 'Home'}, :tags => tags)
+      should "work with ids and modifier hash" do
+        @page_class.push_all(@page.id, @page2.id, :tags => @tags)
 
-      page.reload
-      page.tags.should == tags
+        @page.reload
+        @page.tags.should == @tags
 
-      page2.reload
-      page.tags.should == tags
+        @page2.reload
+        @page.tags.should == @tags
+      end
     end
 
-    should "be able to push all with ids and modifier hash" do
-      page  = @page_class.create(:title => 'Home')
-      page2 = @page_class.create(:title => 'Home')
-      tags = %w(foo bar)
+    context "pull" do
+      setup do
+        @page  = @page_class.create(:title => 'Home', :tags => %w(foo bar))
+        @page2 = @page_class.create(:title => 'Home', :tags => %w(foo bar))
+      end
 
-      @page_class.push_all(page.id, page2.id, :tags => tags)
+      should "work with criteria and modifier hashes" do
+        @page_class.pull({:title => 'Home'}, :tags => 'foo')
 
-      page.reload
-      page.tags.should == tags
+        @page.reload
+        @page.tags.should == %w(bar)
 
-      page2.reload
-      page.tags.should == tags
-    end
-
-    should "be able to pull with criteria and modifier hashes" do
-      page  = @page_class.create(:title => 'Home', :tags => %w(foo bar))
-      page2 = @page_class.create(:title => 'Home', :tags => %w(foo bar))
+        @page2.reload
+        @page.tags.should == %w(bar)
+      end
 
-      @page_class.pull({:title => 'Home'}, :tags => 'foo')
+      should "be able to pull with ids and modifier hash" do
+        @page_class.pull(@page.id, @page2.id, :tags => 'foo')
 
-      page.reload
-      page.tags.should == %w(bar)
+        @page.reload
+        @page.tags.should == %w(bar)
 
-      page2.reload
-      page.tags.should == %w(bar)
+        @page2.reload
+        @page.tags.should == %w(bar)
+      end
     end
 
-    should "be able to pull with ids and modifier hash" do
-      page  = @page_class.create(:title => 'Home', :tags => %w(foo bar))
-      page2 = @page_class.create(:title => 'Home', :tags => %w(foo bar))
+    context "pull_all" do
+      setup do
+        @page  = @page_class.create(:title => 'Home', :tags => %w(foo bar baz))
+        @page2 = @page_class.create(:title => 'Home', :tags => %w(foo bar baz))
+      end
 
-      @page_class.pull(page.id, page2.id, :tags => 'foo')
+      should "work with criteria and modifier hashes" do
+        @page_class.pull_all({:title => 'Home'}, :tags => %w(foo bar))
 
-      page.reload
-      page.tags.should == %w(bar)
+        @page.reload
+        @page.tags.should == %w(baz)
 
-      page2.reload
-      page.tags.should == %w(bar)
-    end
+        @page2.reload
+        @page.tags.should == %w(baz)
+      end
 
-    should "be able to pull all with criteria and modifier hashes" do
-      page  = @page_class.create(:title => 'Home', :tags => %w(foo bar baz))
-      page2 = @page_class.create(:title => 'Home', :tags => %w(foo bar baz))
+      should "work with ids and modifier hash" do
+        @page_class.pull_all(@page.id, @page2.id, :tags => %w(foo bar))
 
-      @page_class.pull_all({:title => 'Home'}, :tags => %w(foo bar))
+        @page.reload
+        @page.tags.should == %w(baz)
 
-      page.reload
-      page.tags.should == %w(baz)
-
-      page2.reload
-      page.tags.should == %w(baz)
+        @page2.reload
+        @page.tags.should == %w(baz)
+      end
     end
 
-    should "be able to pull all with ids and modifier hash" do
-      page  = @page_class.create(:title => 'Home', :tags => %w(foo bar baz))
-      page2 = @page_class.create(:title => 'Home', :tags => %w(foo bar baz))
+    context "add_to_set" do
+      setup do
+        @page  = @page_class.create(:title => 'Home', :tags => 'foo')
+        @page2 = @page_class.create(:title => 'Home')
+      end
 
-      @page_class.pull_all(page.id, page2.id, :tags => %w(foo bar))
+      should "be able to add to set with criteria and modifier hash" do
+        @page_class.add_to_set({:title => 'Home'}, :tags => 'foo')
 
-      page.reload
-      page.tags.should == %w(baz)
-
-      page2.reload
-      page.tags.should == %w(baz)
-    end
+        @page.reload
+        @page.tags.should == %w(foo)
 
-    should "be able to push uniq with criteria and modifier hash" do
-      page  = @page_class.create(:title => 'Home', :tags => 'foo')
-      page2 = @page_class.create(:title => 'Home')
+        @page2.reload
+        @page.tags.should == %w(foo)
+      end
 
-      @page_class.push_uniq({:title => 'Home'}, :tags => 'foo')
+      should "be able to add to set with ids and modifier hash" do
+        @page_class.add_to_set(@page.id, @page2.id, :tags => 'foo')
 
-      page.reload
-      page.tags.should == %w(foo)
+        @page.reload
+        @page.tags.should == %w(foo)
 
-      page2.reload
-      page.tags.should == %w(foo)
+        @page2.reload
+        @page.tags.should == %w(foo)
+      end
     end
 
-    should "be able to push uniq with ids and modifier hash" do
-      page  = @page_class.create(:title => 'Home', :tags => 'foo')
-      page2 = @page_class.create(:title => 'Home')
+    context "push_uniq" do
+      setup do
+        @page  = @page_class.create(:title => 'Home', :tags => 'foo')
+        @page2 = @page_class.create(:title => 'Home')        
+      end
 
-      @page_class.push_uniq(page.id, page2.id, :tags => 'foo')
+      should "be able to push uniq with criteria and modifier hash" do
+        @page_class.push_uniq({:title => 'Home'}, :tags => 'foo')
 
-      page.reload
-      page.tags.should == %w(foo)
+        @page.reload
+        @page.tags.should == %w(foo)
 
-      page2.reload
-      page.tags.should == %w(foo)
-    end
+        @page2.reload
+        @page.tags.should == %w(foo)
+      end
 
-    should "be able to remove the last element the array" do
-      page  = @page_class.create(:title => 'Home', :tags => %w(foo bar))
-      @page_class.pop(page.id, :tags => 1)
-      page.reload
-      page.tags.should == %w(foo)
+      should "be able to push uniq with ids and modifier hash" do
+        @page_class.push_uniq(@page.id, @page2.id, :tags => 'foo')
+
+        @page.reload
+        @page.tags.should == %w(foo)
+
+        @page2.reload
+        @page.tags.should == %w(foo)
+      end
     end
 
-    should "be able to remove the first element of the array" do
-      page  = @page_class.create(:title => 'Home', :tags => %w(foo bar))
-      @page_class.pop(page.id, :tags => -1)
-      page.reload
-      page.tags.should == %w(bar)
+    context "pop" do
+      setup do
+        @page  = @page_class.create(:title => 'Home', :tags => %w(foo bar))
+      end
+
+      should "be able to remove the last element the array" do
+        @page_class.pop(@page.id, :tags => 1)
+        @page.reload
+        @page.tags.should == %w(foo)
+      end
+
+      should "be able to remove the first element of the array" do
+        @page_class.pop(@page.id, :tags => -1)
+        @page.reload
+        @page.tags.should == %w(bar)
+      end
     end
   end
 
-  context "using instance methods" do
+  context "InstanceMethods" do
+    should "be able to unset with keys" do
+      page = @page_class.create(:title => 'Foo', :tags => %w(foo))
+      page.unset(:title, :tags)
+      assert_keys_removed page, :title, :tags
+    end
+    
     should "be able to increment with modifier hashes" do
       page = @page_class.create
-
-      page.increment({:day_count => 1, :week_count => 2, :month_count => 3})
+      page.increment(:day_count => 1, :week_count => 2, :month_count => 3)
 
       assert_page_counts page, 1, 2, 3
     end
 
     should "be able to decrement with modifier hashes" do
       page = @page_class.create(:day_count => 1, :week_count => 2, :month_count => 3)
-
-      page.decrement({:day_count => 1, :week_count => 2, :month_count => 3})
+      page.decrement(:day_count => 1, :week_count => 2, :month_count => 3)
 
       assert_page_counts page, 0, 0, 0
     end
 
     should "always decrement when decrement is called whether number is positive or negative" do
       page = @page_class.create(:day_count => 1, :week_count => 2, :month_count => 3)
-
-      page.decrement({:day_count => -1, :week_count => 2, :month_count => -3})
+      page.decrement(:day_count => -1, :week_count => 2, :month_count => -3)
 
       assert_page_counts page, 0, 0, 0
     end
 
     should "be able to set with modifier hashes" do
       page  = @page_class.create(:title => 'Home')
-
       page.set(:title => 'Home Revised')
 
       page.reload
@@ -288,7 +341,6 @@ class ModifierTest < Test::Unit::TestCase
 
     should "be able to push with modifier hashes" do
       page = @page_class.create
-
       page.push(:tags => 'foo')
 
       page.reload
@@ -296,14 +348,27 @@ class ModifierTest < Test::Unit::TestCase
     end
 
     should "be able to pull with criteria and modifier hashes" do
-      page  = @page_class.create(:tags => %w(foo bar))
-
+      page = @page_class.create(:tags => %w(foo bar))
       page.pull(:tags => 'foo')
 
       page.reload
       page.tags.should == %w(bar)
     end
 
+    should "be able to add_to_set with criteria and modifier hash" do
+      page  = @page_class.create(:tags => 'foo')
+      page2 = @page_class.create
+
+      page.add_to_set(:tags => 'foo')
+      page.add_to_set(:tags => 'foo')
+
+      page.reload
+      page.tags.should == %w(foo)
+
+      page2.reload
+      page.tags.should == %w(foo)
+    end
+    
     should "be able to push uniq with criteria and modifier hash" do
       page  = @page_class.create(:tags => 'foo')
       page2 = @page_class.create
@@ -320,8 +385,7 @@ class ModifierTest < Test::Unit::TestCase
     
     should "be able to pop with modifier hashes" do
       page = @page_class.create(:tags => %w(foo bar))
-
-      page.pop({:tags => 1})
+      page.pop(:tags => 1)
 
       page.reload
       page.tags.should == %w(foo)