mongo_mapper 0.12.0 → 0.13.0.beta1

data/{test/functional/test_equality.rb → spec/functional/equality_spec.rb}

@@ -1,8 +1,8 @@
-require 'test_helper'
+require 'spec_helper'
 
-class EqualityTest < Test::Unit::TestCase
+describe "Equality" do
   context "Case equality" do
-    setup do
+    before do
       @person = Doc()
       @address = Doc()
 
@@ -10,7 +10,7 @@ class EqualityTest < Test::Unit::TestCase
       @address.belongs_to :person, :class => @person
     end
 
-    should "work with proxies" do
+    it "should work with proxies" do
       person = @person.create!
       address = @address.create!(:person => person)
       @person.should === address.person

data/spec/functional/extensions_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe "Core Extensions" do
+  describe "Time" do
+    let(:doc) do
+      Doc do
+        key :created_at, Time
+      end
+    end
+
+    it "should match the precision of Time types stored in the database" do
+      d = doc.create(:created_at => Time.now)
+      d.created_at.should == d.reload.created_at
+    end
+  end
+end

data/{test/functional/test_identity_map.rb → spec/functional/identity_map_spec.rb}

@@ -1,6 +1,6 @@
-require 'test_helper'
+require 'spec_helper'
 
-class IdentityMapTest < Test::Unit::TestCase
+describe "IdentityMap" do
   def assert_in_map(*resources)
     [resources].flatten.each do |resource|
       MongoMapper::Plugins::IdentityMap.include?(resource).should be_true
@@ -14,24 +14,24 @@ class IdentityMapTest < Test::Unit::TestCase
   end
 
   def expect_no_queries
-    Mongo::Collection.any_instance.expects(:find_one).never
-    Mongo::Collection.any_instance.expects(:find).never
+    Mongo::Collection.any_instance.should_receive(:find_one).never
+    Mongo::Collection.any_instance.should_receive(:find).never
   end
 
   def expects_one_query
-    Mongo::Collection.any_instance.expects(:find_one).once.returns({})
+    Mongo::Collection.any_instance.should_receive(:find_one).once.and_return({})
   end
 
   def clear_identity_map
     MongoMapper::Plugins::IdentityMap.clear
   end
 
-  should "default identity map to off" do
+  it "should default identity map to off" do
     MongoMapper::Plugins::IdentityMap.enabled?.should be_false
   end
 
   context "Document" do
-    setup do
+    before do
       @original_identity_map_enabled = MongoMapper::Plugins::IdentityMap.enabled
       MongoMapper::Plugins::IdentityMap.enabled = true
 
@@ -50,11 +50,11 @@ class IdentityMapTest < Test::Unit::TestCase
       clear_identity_map
     end
 
-    teardown do
+    after do
       MongoMapper::Plugins::IdentityMap.enabled = @original_identity_map_enabled
     end
 
-    should "be able to clear the map of all models" do
+    it "should be able to clear the map of all models" do
       person = @person_class.create(:name => 'John')
       post = @post_class.create(:title => 'IM 4eva')
 
@@ -66,19 +66,19 @@ class IdentityMapTest < Test::Unit::TestCase
     end
 
     context ".use" do
-      setup do
+      before do
         @person = @person_class.create
         clear_identity_map
       end
 
-      should "use the identity map" do
+      it "should use the identity map" do
         MongoMapper::Plugins::IdentityMap.enabled = false
         MongoMapper::Plugins::IdentityMap.use do
           @person_class.find(@person.id).should equal(@person_class.find(@person.id))
         end
       end
 
-      should "clear the map" do
+      it "should clear the map" do
         MongoMapper::Plugins::IdentityMap.enabled = false
         MongoMapper::Plugins::IdentityMap.repository['hello'] = 'world'
         MongoMapper::Plugins::IdentityMap.use do
@@ -87,7 +87,7 @@ class IdentityMapTest < Test::Unit::TestCase
         MongoMapper::Plugins::IdentityMap.repository.empty?.should be_true
       end
 
-      should "set enabled back to original status" do
+      it "should set enabled back to original status" do
         MongoMapper::Plugins::IdentityMap.enabled = false
         MongoMapper::Plugins::IdentityMap.enabled?.should be_false
         MongoMapper::Plugins::IdentityMap.use do
@@ -98,18 +98,18 @@ class IdentityMapTest < Test::Unit::TestCase
     end
 
     context ".without" do
-      setup do
+      before do
         @person = @person_class.create
         clear_identity_map
       end
 
-      should "skip the map" do
+      it "should skip the map" do
         MongoMapper::Plugins::IdentityMap.without do
           @person_class.find(@person.id).should_not equal(@person_class.find(@person.id))
         end
       end
 
-      should "set enabled back to original value" do
+      it "should set enabled back to original value" do
         MongoMapper::Plugins::IdentityMap.enabled = true
         MongoMapper::Plugins::IdentityMap.enabled?.should be_true
         MongoMapper::Plugins::IdentityMap.without do
@@ -119,32 +119,32 @@ class IdentityMapTest < Test::Unit::TestCase
       end
     end
 
-    should "default identity map to hash" do
+    it "should default identity map to hash" do
       MongoMapper::Plugins::IdentityMap.repository.should == {}
     end
 
-    should "add key to map when saved" do
+    it "should add key to map when saved" do
       person = @person_class.new
       assert_not_in_map(person)
       person.save.should be_true
       assert_in_map(person)
     end
 
-    should "allow saving with options" do
+    it "should allow saving with options" do
       person = @person_class.new
       assert_not_in_map(person)
       person.save(:validate => false).should be_true
       assert_in_map(person)
     end
 
-    should "remove key from map when deleted" do
+    it "should remove key from map when deleted" do
       person = @person_class.create(:name => 'Fred')
       assert_in_map(person)
       person.delete
       assert_not_in_map(person)
     end
 
-    should "remove key from map when destroyed" do
+    it "should remove key from map when destroyed" do
       person = @person_class.create(:name => 'Fred')
       assert_in_map(person)
       person.destroy
@@ -152,11 +152,11 @@ class IdentityMapTest < Test::Unit::TestCase
     end
 
     context "#reload" do
-      setup do
+      before do
         @person = @person_class.create(:name => 'Fred')
       end
 
-      should "re-query the object" do
+      it "should re-query the object" do
         assert_in_map(@person)
         expects_one_query
         @person.reload
@@ -164,16 +164,16 @@ class IdentityMapTest < Test::Unit::TestCase
     end
 
     context "#load" do
-      setup do
+      before do
         @id = BSON::ObjectId.new
       end
 
-      should "add document to map" do
+      it "should add document to map" do
         loaded = @person_class.load('_id' => @id, 'name' => 'Frank')
         assert_in_map(loaded)
       end
 
-      should "return document if already in map" do
+      it "should return document if already in map" do
         first_load = @person_class.load('_id' => @id, 'name' => 'Frank')
         second_load = @person_class.load('_id' => @id, 'name' => 'Frank')
         first_load.should equal(second_load)
@@ -181,22 +181,22 @@ class IdentityMapTest < Test::Unit::TestCase
     end
 
     context "#find (with one id)" do
-      should "return nil if not found " do
+      it "should return nil if not found " do
         @person_class.find(1234).should be_nil
       end
 
       context "for object not in map" do
-        setup do
+        before do
           @person = @person_class.create(:name => 'Fred')
           clear_identity_map
         end
 
-        should "query the database" do
+        it "should query the database" do
           expects_one_query
           @person_class.find(@person.id)
         end
 
-        should "add object to map" do
+        it "should add object to map" do
           assert_not_in_map(@person)
           found_person = @person_class.find(@person.id)
           assert_in_map(found_person)
@@ -204,16 +204,16 @@ class IdentityMapTest < Test::Unit::TestCase
       end
 
       context "for object in map" do
-        setup do
+        before do
           @person = @person_class.create(:name => 'Fred')
         end
 
-        should "not query database" do
+        it "should not query database" do
           expect_no_queries
           @person_class.find(@person.id)
         end
 
-        should "return exact object" do
+        it "should return exact object" do
           assert_in_map(@person)
           found_person = @person_class.find(@person.id)
           found_person.should equal(@person)
@@ -222,7 +222,7 @@ class IdentityMapTest < Test::Unit::TestCase
     end
 
     context "#find (with one id and options)" do
-      setup do
+      before do
         @person = @person_class.create(:name => 'Fred')
         @post1  = @person.posts.create(:title => 'I Love Mongo')
         @post2  = @person.posts.create(:title => 'Migrations Suck!')
@@ -234,25 +234,25 @@ class IdentityMapTest < Test::Unit::TestCase
       #
       # I'm open to not making this query if someone can figure out reliable
       # way to check if document matches criteria without querying.
-      should "query the database" do
+      it "should query the database" do
         assert_in_map(@post1)
         expects_one_query
         @person.posts.find(@post1.id)
       end
 
-      should "return exact object" do
+      it "should return exact object" do
         assert_in_map(@post1)
         post = @person.posts.find(@post1.id)
         post.should equal(@post1)
       end
 
-      should "return nil if not found " do
+      it "should return nil if not found " do
         @person.posts.find(1234).should be_nil
       end
     end
 
     context "#find (with multiple ids)" do
-      should "add all documents to map" do
+      it "should add all documents to map" do
         person1 = @person_class.create(:name => 'Fred')
         person2 = @person_class.create(:name => 'Bill')
         person3 = @person_class.create(:name => 'Jesse')
@@ -262,7 +262,7 @@ class IdentityMapTest < Test::Unit::TestCase
         assert_in_map(people)
       end
 
-      should "add missing documents to map and return existing ones" do
+      it "should add missing documents to map and return existing ones" do
         person1 = @person_class.create(:name => 'Fred')
         clear_identity_map
         person2 = @person_class.create(:name => 'Bill')
@@ -280,38 +280,38 @@ class IdentityMapTest < Test::Unit::TestCase
 
     context "#first" do
       context "for object not in map" do
-        setup do
+        before do
           @person = @person_class.create(:name => 'Fred')
           clear_identity_map
         end
 
-        should "query the database" do
+        it "should query the database" do
           expects_one_query
           @person_class.first(:_id => @person.id)
         end
 
-        should "add object to map" do
+        it "should add object to map" do
           assert_not_in_map(@person)
           found_person = @person_class.first(:_id => @person.id)
           assert_in_map(found_person)
         end
 
-        should "return nil if not found" do
+        it "should return nil if not found" do
           @person_class.first(:name => 'Bill').should be_nil
         end
       end
 
       context "for object in map" do
-        setup do
+        before do
           @person = @person_class.create(:name => 'Fred')
         end
 
-        should "not query database" do
+        it "should not query database" do
           expect_no_queries
           @person_class.first(:_id => @person.id)
         end
 
-        should "return exact object" do
+        it "should return exact object" do
           assert_in_map(@person)
           found_person = @person_class.first(:_id => @person.id)
           found_person.should equal(@person)
@@ -320,7 +320,7 @@ class IdentityMapTest < Test::Unit::TestCase
     end
 
     context "#all" do
-      should "add all documents to map" do
+      it "should add all documents to map" do
         person1 = @person_class.create(:name => 'Fred')
         person2 = @person_class.create(:name => 'Bill')
         person3 = @person_class.create(:name => 'Jesse')
@@ -330,7 +330,7 @@ class IdentityMapTest < Test::Unit::TestCase
         assert_in_map(people)
       end
 
-      should "add missing documents to map and return existing ones" do
+      it "should add missing documents to map and return existing ones" do
         person1 = @person_class.create(:name => 'Fred')
         clear_identity_map
         person2 = @person_class.create(:name => 'Bill')
@@ -346,23 +346,35 @@ class IdentityMapTest < Test::Unit::TestCase
     end
 
     context "#find_by_id" do
-      setup do
+      before do
         @person = @person_class.create(:name => 'Bill')
       end
 
-      should "return nil for document id not found in collection" do
+      it "should return nil for document id not found in collection" do
         assert_in_map(@person)
         @person_class.find_by_id(BSON::ObjectId.new).should be_nil
       end
     end
 
+    context "#remove_documents_from_map" do
+      before do
+        @person = @person_class.create(:name => 'Fred')
+      end
+
+      it "should remove documents from the map" do
+        assert_in_map @person
+        @person_class.remove_documents_from_map(@person)
+        assert_not_in_map @person
+      end
+    end
+
     context "querying and selecting certain fields" do
-      setup do
+      before do
         @person = @person_class.create(:name => 'Bill')
         clear_identity_map
       end
 
-      should "not add to map" do
+      it "should not add to map" do
         assert_not_in_map(@person)
         @person_class.first(:_id => @person.id, :select => 'name').should == @person
         @person_class.first(:_id => @person.id, 'fields' => ['name']).should == @person
@@ -372,20 +384,20 @@ class IdentityMapTest < Test::Unit::TestCase
         assert_not_in_map(@person)
       end
 
-      should "not add to map using where and each" do
+      it "should not add to map using where and each" do
         @person_class.where(:id => @person.id).each{|_|}
         assert_in_map(@person)
         @person_class.where(:id => @person.id).only(:id).each{|_|}
         assert_not_in_map(@person)
       end
 
-      should "return nil if not found" do
+      it "should return nil if not found" do
         @person_class.fields(:name).find(BSON::ObjectId.new).should be_nil
       end
     end
 
     context "single collection inherited models" do
-      setup do
+      before do
         class ::Item
           include MongoMapper::Document
 
@@ -405,13 +417,13 @@ class IdentityMapTest < Test::Unit::TestCase
         end
       end
 
-      teardown do
+      after do
         Object.send :remove_const, 'Item' if defined?(::Item)
         Object.send :remove_const, 'Blog' if defined?(::Blog)
         Object.send :remove_const, 'BlogPost' if defined?(::BlogPost)
       end
 
-      should "not query when finding by _id and _type" do
+      it "should not query when finding by _id and _type" do
         blog = Blog.create(:title => 'Blog')
         post = BlogPost.create(:title => 'Mongo Rocks', :blog => blog)
         clear_identity_map
@@ -425,12 +437,12 @@ class IdentityMapTest < Test::Unit::TestCase
         Blog.find(blog.id)
       end
 
-      should "load from map when using parent collection inherited class" do
+      it "should load from map when using parent collection inherited class" do
         blog = Blog.create(:title => 'Jill')
         Item.find(blog.id).should equal(blog)
       end
 
-      should "work correctly with belongs to proxy" do
+      it "should work correctly with belongs to proxy" do
         root = Item.create(:title => 'Root')
         assert_in_map(root)
 
@@ -439,7 +451,7 @@ class IdentityMapTest < Test::Unit::TestCase
         root.should equal(blog.parent.target)
       end
 
-      should "work correctly with one proxy" do
+      it "should work correctly with one proxy" do
         blog = Blog.create(:title => 'Jill')
         assert_in_map(blog)
 
@@ -448,7 +460,7 @@ class IdentityMapTest < Test::Unit::TestCase
         blog.should equal(root.blog.target)
       end
 
-      should "work correctly with one proxy create" do
+      it "should work correctly with one proxy create" do
         root = Item.create(:title => 'Root')
         blog = root.create_blog(:title => 'Blog')
         blog.parent.should equal(root)