mongo_mapper 0.5.8 → 0.6.0

data/test/functional/associations/test_many_embedded_proxy.rb

@@ -17,13 +17,6 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
     project.addresses.push Address.new
     project.addresses.size.should == 2
   end
-  
-  should "allow finding :all embedded documents" do
-    project = Project.new
-    project.addresses << Address.new
-    project.addresses << Address.new
-    project.save
-  end
 
   should "be embedded in document on save" do
     sb = Address.new(:city => 'South Bend', :state => 'IN')
@@ -33,10 +26,10 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
     project.addresses << chi
     project.save
 
-    from_db = Project.find(project.id)
-    from_db.addresses.size.should == 2
-    from_db.addresses[0].should == sb
-    from_db.addresses[1].should == chi
+    project = project.reload
+    project.addresses.size.should == 2
+    project.addresses[0].should == sb
+    project.addresses[1].should == chi
   end
   
   should "allow embedding arbitrarily deep" do
@@ -54,10 +47,10 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
     doc = @document.new(:person => meg)
     doc.save
     
-    from_db = @document.find(doc.id)
-    from_db.person.name.should == 'Meg'
-    from_db.person.child.name.should == 'Steve'
-    from_db.person.child.child.name.should == 'Linda'
+    doc = doc.reload
+    doc.person.name.should == 'Meg'
+    doc.person.child.name.should == 'Steve'
+    doc.person.child.child.name.should == 'Linda'
   end
   
   should "allow assignment of 'many' embedded documents using a hash" do
@@ -77,12 +70,12 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
     pet_lover.pets[1].species.should == "Siberian Husky"
     pet_lover.save.should be_true
     
-    from_db = RealPerson.find(pet_lover.id)
-    from_db.name.should == "Mr. Pet Lover"
-    from_db.pets[0].name.should == "Jimmy"
-    from_db.pets[0].species.should == "Cocker Spainel"
-    from_db.pets[1].name.should == "Sasha"
-    from_db.pets[1].species.should == "Siberian Husky"
+    pet_lover = pet_lover.reload
+    pet_lover.name.should == "Mr. Pet Lover"
+    pet_lover.pets[0].name.should == "Jimmy"
+    pet_lover.pets[0].species.should == "Cocker Spainel"
+    pet_lover.pets[1].name.should == "Sasha"
+    pet_lover.pets[1].species.should == "Siberian Husky"
   end
 
   context "embedding many embedded documents" do
@@ -108,13 +101,13 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
       doc.people << meg
       doc.save
 
-      from_db = @document.find(doc.id)
-      from_db.people.first.name.should == "Meg"
-      from_db.people.first.pets.should_not == []
-      from_db.people.first.pets.first.name.should == "Sparky"
-      from_db.people.first.pets.first.species.should == "Dog"
-      from_db.people.first.pets[1].name.should == "Koda"
-      from_db.people.first.pets[1].species.should == "Dog"
+      doc = doc.reload
+      doc.people.first.name.should == "Meg"
+      doc.people.first.pets.should_not == []
+      doc.people.first.pets.first.name.should == "Sparky"
+      doc.people.first.pets.first.species.should == "Dog"
+      doc.people.first.pets[1].name.should == "Koda"
+      doc.people.first.pets[1].species.should == "Dog"
     end
 
     should "create a reference to the root document for all embedded documents before save" do
@@ -130,70 +123,72 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
       doc.people.first.pets.first._root_document.should == doc
     end
 
-    should "create properly-named reference to parent document when building off association proxy" do
-      person = RealPerson.new
-      pet = person.pets.build
-      person.should == pet.real_person
-    end
-
-
     should "create a reference to the root document for all embedded documents" do
-      meg = Person.new(:name => "Meg")
       sparky = Pet.new(:name => "Sparky", :species => "Dog")
-
+      meg = Person.new(:name => "Meg", :pets => [sparky])
       doc = @document.new
-
-      meg.pets << sparky
-
       doc.people << meg
       doc.save
 
-      from_db = @document.find(doc.id)
-      from_db.people.first._root_document.should == doc
-      from_db.people.first.pets.first._root_document.should == doc
+      doc = doc.reload
+      doc.people.first._root_document.should == doc
+      doc.people.first.pets.first._root_document.should == doc
     end
   end
   
-  should "allow retrieval via find(:all)" do
-    meg = Person.new(:name => "Meg")
-    sparky = Pet.new(:name => "Sparky", :species => "Dog")
-
-    meg.pets << sparky
-    
-    meg.pets.find(:all).should include(sparky)
-  end
-  
-  should "allow retrieval via find(id)" do
-    meg = Person.new(:name => "Meg")
+  should "allow finding by id" do
     sparky = Pet.new(:name => "Sparky", :species => "Dog")
-
-    meg.pets << sparky
-    
-    meg.pets.find(sparky.id).should == sparky
+    meg = Person.new(:name => "Meg", :pets => [sparky])
+    meg.pets.find(sparky._id).should == sparky
   end
   
   context "extending the association" do
+    setup do
+      @address_class = Class.new do
+        include MongoMapper::EmbeddedDocument
+        key :address, String
+        key :city, String
+        key :state, String
+        key :zip, Integer
+      end
+      
+      @project_class = Class.new do
+        include MongoMapper::Document
+        key :name, String
+      end
+      
+      @project_class.collection.remove
+    end
+    
     should "work using a block passed to many" do
-      project = Project.new(:name => "Some Project")
-      addr1 = Address.new(:address => "Gate-3 Lankershim Blvd.", :city => "Universal City", :state => "CA", :zip => "91608")
-      addr2 = Address.new(:address => "3000 W. Alameda Ave.", :city => "Burbank", :state => "CA", :zip => "91523")
-      addr3 = Address.new(:address => "111 Some Ln", :city => "Nashville", :state => "TN", :zip => "37211")
-      project.addresses = [addr1, addr2, addr3]
-      project.save
+      @project_class.many :addresses, :class => @address_class do
+        def find_all_by_state(state)
+          find_all { |a| a.state == state }
+        end
+      end
+      
+      addr1 = @address_class.new(:address => "Gate-3 Lankershim Blvd.", :city => "Universal City", :state => "CA", :zip => "91608")
+      addr2 = @address_class.new(:address => "3000 W. Alameda Ave.", :city => "Burbank", :state => "CA", :zip => "91523")
+      addr3 = @address_class.new(:address => "111 Some Ln", :city => "Nashville", :state => "TN", :zip => "37211")
+      project = @project_class.create(:name => "Some Project", :addresses => [addr1, addr2, addr3])
+      
       project.addresses.find_all_by_state("CA").should == [addr1, addr2]
     end
   
     should "work using many's :extend option" do
-      project = Project.new(:name => "Some Project")
-      person1 = Person.new(:name => "Steve")
-      person2 = Person.new(:name => "Betty")
-      person3 = Person.new(:name => "Cynthia")
-
-      project.people << person1
-      project.people << person2
-      project.people << person3
-      project.save
-      project.people.find_by_name("Steve").should == person1
+      module FindByCity
+        def find_by_city(city)
+          find_all { |a| a.city == city }
+        end
+      end
+      @project_class.many :addresses, :class => @address_class, :extend => FindByCity
+      
+      addr1 = @address_class.new(:address => "Gate-3 Lankershim Blvd.", :city => "Universal City", :state => "CA", :zip => "91608")
+      addr2 = @address_class.new(:address => "3000 W. Alameda Ave.", :city => "Burbank", :state => "CA", :zip => "91523")
+      addr3 = @address_class.new(:address => "111 Some Ln", :city => "Nashville", :state => "TN", :zip => "37211")
+      project = @project_class.create(:name => "Some Project", :addresses => [addr1, addr2, addr3])
+      
+      project.addresses.find_by_city('Burbank').should == [addr2]
     end
   end
 end

data/test/functional/associations/test_many_polymorphic_proxy.rb

@@ -34,8 +34,8 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       ]
     }.should change { Message.count }.by(3)
     
-    from_db = Room.find(room.id)
-    messages = from_db.messages.all :order => "position"
+    room = room.reload
+    messages = room.messages.all :order => "position"
     messages.size.should == 3
     messages[0].body.should == 'John entered room'
     messages[1].body.should == 'Heyyyoooo!'
@@ -48,8 +48,8 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
     room.messages.push    Exit.new(:body => 'John entered the room', :position => 2)
     room.messages.concat  Chat.new(:body => 'Holla!'             , :position => 3)
     
-    from_db = Room.find(room.id)
-    messages = from_db.messages.all :order => "position"
+    room = room.reload
+    messages = room.messages.all :order => "position"
     messages[0]._type.should == 'Enter'
     messages[1]._type.should == 'Exit'
     messages[2]._type.should == 'Chat'
@@ -59,7 +59,7 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
     should "assign foreign key" do
       room = Room.create
       message = room.messages.build
-      message.room_id.should == room.id
+      message.room_id.should == room._id
     end
     
     should "assign _type" do
@@ -79,7 +79,7 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
     should "assign foreign key" do
       room = Room.create
       message = room.messages.create
-      message.room_id.should == room.id
+      message.room_id.should == room._id
     end
     
     should "assign _type" do
@@ -254,12 +254,12 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
     
     context "with one id" do
       should "work for id in association" do
-        @lounge.messages.find(@lm2.id).should == @lm2
+        @lounge.messages.find(@lm2._id).should == @lm2
       end
       
       should "not work for id not in association" do
         lambda {
-          @lounge.messages.find(@hm2.id)
+          @lounge.messages.find!(@hm2._id)
         }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end
@@ -280,13 +280,13 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
     
     context "with multiple ids" do
       should "work for ids in association" do
-        messages = @lounge.messages.find(@lm1.id, @lm2.id)
+        messages = @lounge.messages.find(@lm1._id, @lm2._id)
         messages.should == [@lm1, @lm2]
       end
       
       should "not work for ids not in association" do
         lambda {
-          @lounge.messages.find(@lm1.id, @lm2.id, @hm2.id)
+          @lounge.messages.find!(@lm1._id, @lm2._id, @hm2._id)
         }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end

data/test/functional/associations/test_many_proxy.rb

@@ -25,9 +25,9 @@ class ManyProxyTest < Test::Unit::TestCase
     project.statuses = [Status.new("name" => "ready")]
     project.save.should be_true
 
-    from_db = Project.find(project.id)
-    from_db.statuses.size.should == 1
-    from_db.statuses[0].name.should == "ready"
+    project = project.reload
+    project.statuses.size.should == 1
+    project.statuses[0].name.should == "ready"
   end
   
   should "correctly assign foreign key when using <<, push and concat" do
@@ -36,17 +36,17 @@ class ManyProxyTest < Test::Unit::TestCase
     project.statuses.push   Status.new(:name => 'push')
     project.statuses.concat Status.new(:name => 'concat')
     
-    from_db = Project.find(project.id)
-    from_db.statuses[0].project_id.should == project.id
-    from_db.statuses[1].project_id.should == project.id
-    from_db.statuses[2].project_id.should == project.id
+    project = project.reload
+    project.statuses[0].project_id.should == project._id
+    project.statuses[1].project_id.should == project._id
+    project.statuses[2].project_id.should == project._id
   end
   
   context "build" do
     should "assign foreign key" do
       project = Project.create
       status = project.statuses.build
-      status.project_id.should == project.id
+      status.project_id.should == project._id
     end
 
     should "allow assigning attributes" do
@@ -60,7 +60,7 @@ class ManyProxyTest < Test::Unit::TestCase
     should "assign foreign key" do
       project = Project.create
       status = project.statuses.create(:name => 'Foo!')
-      status.project_id.should == project.id
+      status.project_id.should == project._id
     end
     
     should "save record" do
@@ -81,7 +81,7 @@ class ManyProxyTest < Test::Unit::TestCase
     should "assign foreign key" do
       project = Project.create
       status = project.statuses.create!(:name => 'Foo!')
-      status.project_id.should == project.id
+      status.project_id.should == project._id
     end
     
     should "save record" do
@@ -105,7 +105,6 @@ class ManyProxyTest < Test::Unit::TestCase
     end
   end
   
-  
   context "count" do
     should "work scoped to association" do
       project = Project.create
@@ -316,25 +315,25 @@ class ManyProxyTest < Test::Unit::TestCase
     
     context "with one id" do
       should "work for id in association" do
-        @project1.statuses.find(@complete.id).should == @complete
+        @project1.statuses.find(@complete._id).should == @complete
       end
       
       should "not work for id not in association" do
         lambda {
-          @project1.statuses.find(@archived.id)
+          @project1.statuses.find!(@archived._id)
         }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end
     
     context "with multiple ids" do
       should "work for ids in association" do
-        statuses = @project1.statuses.find(@brand_new.id, @complete.id)
+        statuses = @project1.statuses.find(@brand_new._id, @complete._id)
         statuses.should == [@brand_new, @complete]
       end
       
       should "not work for ids not in association" do
         lambda {
-          @project1.statuses.find(@brand_new.id, @complete.id, @archived.id)
+          @project1.statuses.find!(@brand_new._id, @complete._id, @archived._id)
         }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end

data/test/functional/test_associations.rb

@@ -14,7 +14,7 @@ class AssociationsTest < Test::Unit::TestCase
       include MongoMapper::EmbeddedDocument
       
       key :name, String
-      key :post_id, String
+      key :post_id, ObjectId
       
       belongs_to :post, :class_name => 'AssociationsTest::AwesomeUser'
     end
@@ -22,7 +22,7 @@ class AssociationsTest < Test::Unit::TestCase
     class AwesomePost
       include MongoMapper::Document
       
-      key :creator_id, String
+      key :creator_id, ObjectId
       
       belongs_to :creator, :class_name => 'AssociationsTest::AwesomeUser'
       many :tags, :class_name => 'AssociationsTest::AwesomeTag', :foreign_key => :post_id
@@ -38,7 +38,7 @@ class AssociationsTest < Test::Unit::TestCase
     post2 = AwesomePost.create(:creator => user, :tags => [tag2])
     user.posts.should == [post1, post2]
     
-    post1_from_db = AwesomePost.find(post1.id)
-    post1_from_db.tags.should == [tag1]
+    post1 = post1.reload
+    post1.tags.should == [tag1]
   end  
 end

data/test/functional/test_binary.rb

@@ -12,7 +12,7 @@ class BinaryTest < Test::Unit::TestCase
     doc = klass.new(:contents => '010101')
     doc.save
     
-    doc = klass.find(doc.id)
+    doc = doc.reload
     doc.contents.to_s.should == ByteBuffer.new('010101').to_s
   end
 end

data/test/functional/test_dirty.rb

@@ -55,17 +55,17 @@ class DirtyTest < Test::Unit::TestCase
     should "not happen when loading from database" do
       doc = @document.create(:phrase => 'Foo')
       
-      from_db = @document.find(doc.id)
-      from_db.changed?.should be_false
+      doc = doc.reload
+      doc.changed?.should be_false
     end
     
     should "happen if changed after loading from database" do
       doc = @document.create(:phrase => 'Foo')
       
-      from_db = @document.find(doc.id)
-      from_db.changed?.should be_false
-      from_db.phrase = 'Bar'
-      from_db.changed?.should be_true
+      doc = doc.reload
+      doc.changed?.should be_false
+      doc.phrase = 'Bar'
+      doc.changed?.should be_true
     end
   end
   

data/test/functional/test_document.rb

@@ -17,6 +17,7 @@ class DocumentTest < Test::Unit::TestCase
 
   context "Saving a document with a custom id" do
     should "clear custom id flag when saved" do
+      @document.key :_id, String
       doc = @document.new(:id => '1234')
       doc.using_custom_id?.should be_true
       doc.save.should be_true
@@ -37,7 +38,7 @@ class DocumentTest < Test::Unit::TestCase
 
   context "Loading a document from the database with keys that are not defined" do
     setup do
-      @id = Mongo::ObjectID.new.to_s
+      @id = Mongo::ObjectID.new
       @document.collection.insert({
         :_id            => @id,
         :first_name     => 'John',
@@ -80,7 +81,7 @@ class DocumentTest < Test::Unit::TestCase
         doc.tags = %w(foo bar)
         doc.save
         doc.tags.should == %w(foo bar)
-        @document.find(doc.id).tags.should == %w(foo bar)
+        doc.reload.tags.should == %w(foo bar)
       end
 
       should "work with assignment then <<" do
@@ -102,7 +103,7 @@ class DocumentTest < Test::Unit::TestCase
         doc.tags << "bar"
         doc.save
         doc.tags.should == %w(foo bar)
-        @document.find(doc.id).tags.should == %w(foo bar)
+        doc.reload.tags.should == %w(foo bar)
       end
     end
 
@@ -135,7 +136,7 @@ class DocumentTest < Test::Unit::TestCase
         doc.foo = {:baz => 'bar'}
         doc.save
 
-        doc = @document.find(doc.id)
+        doc = doc.reload
         doc.foo[:baz].should == 'bar'
         doc.foo['baz'].should == 'bar'
       end
@@ -156,12 +157,11 @@ class DocumentTest < Test::Unit::TestCase
         doc = @document.new
         doc.save
 
-        from_db = @document.find(doc.id)
-        from_db.window.should == WindowSize.new(600, 480)
+        doc = doc.reload
+        doc.window.should == WindowSize.new(600, 480)
       end
     end
 
-
     context "Creating a single document" do
       setup do
         @doc_instance = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
@@ -174,6 +174,8 @@ class DocumentTest < Test::Unit::TestCase
       should "automatically set id" do
         @doc_instance.id.should_not be_nil
         @doc_instance.id.size.should == 24
+        @doc_instance.id.should be_instance_of(String)
+        @doc_instance._id.should be_instance_of(Mongo::ObjectID)
       end
 
       should "no longer be new?" do
@@ -226,7 +228,7 @@ class DocumentTest < Test::Unit::TestCase
     context "Updating a document" do
       setup do
         doc = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
-        @doc_instance = @document.update(doc.id, {:age => 40})
+        @doc_instance = @document.update(doc._id, {:age => 40})
       end
 
       should "update attributes provided" do
@@ -246,8 +248,8 @@ class DocumentTest < Test::Unit::TestCase
     should "raise error when updating single doc if not provided id and attributes" do
       doc = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
       lambda { @document.update }.should raise_error(ArgumentError)
-      lambda { @document.update(doc.id) }.should raise_error(ArgumentError)
-      lambda { @document.update(doc.id, [1]) }.should raise_error(ArgumentError)
+      lambda { @document.update(doc._id) }.should raise_error(ArgumentError)
+      lambda { @document.update(doc._id, [1]) }.should raise_error(ArgumentError)
     end
 
     context "Updating multiple documents" do
@@ -256,8 +258,8 @@ class DocumentTest < Test::Unit::TestCase
         @doc2 = @document.create({:first_name => 'Steve', :last_name => 'Smith', :age => '28'})
 
         @doc_instances = @document.update({
-          @doc1.id => {:age => 30},
-          @doc2.id => {:age => 30},
+          @doc1._id => {:age => 30},
+          @doc2._id => {:age => 30},
         })
       end
 
@@ -272,8 +274,8 @@ class DocumentTest < Test::Unit::TestCase
       end
 
       should "update the documents" do
-        @document.find(@doc1.id).age.should == 30
-        @document.find(@doc2.id).age.should == 30
+        @document.find(@doc1._id).age.should == 30
+        @document.find(@doc2._id).age.should == 30
       end
     end
 
@@ -288,33 +290,41 @@ class DocumentTest < Test::Unit::TestCase
         @doc3 = @document.create({:first_name => 'Steph', :last_name => 'Nunemaker', :age => '26'})
       end
 
-      should "raise document not found if nothing provided" do
-        lambda { @document.find }.should raise_error(MongoMapper::DocumentNotFound)
+      should "return nil if nothing provided for find" do
+        @document.find.should be_nil
+      end
+
+      should "raise document not found if nothing provided for find!" do
+        lambda { @document.find! }.should raise_error(MongoMapper::DocumentNotFound)
       end
 
       context "with a single id" do
         should "work" do
-          @document.find(@doc1.id).should == @doc1
+          @document.find(@doc1._id).should == @doc1
+        end
+
+        should "return nil if document not found with find" do
+          @document.find(123).should be_nil
         end
 
-        should "raise error if document not found" do
+        should "raise error if document not found with find!" do
           lambda {
-            @document.find(123)
+            @document.find!(123)
           }.should raise_error(MongoMapper::DocumentNotFound)
         end
       end
 
       context "with multiple id's" do
         should "work as arguments" do
-          @document.find(@doc1.id, @doc2.id).should == [@doc1, @doc2]
+          @document.find(@doc1._id, @doc2._id).should == [@doc1, @doc2]
         end
 
         should "work as array" do
-          @document.find([@doc1.id, @doc2.id]).should == [@doc1, @doc2]
+          @document.find([@doc1._id, @doc2._id]).should == [@doc1, @doc2]
         end
 
         should "return array if array only has one element" do
-          @document.find([@doc1.id]).should == [@doc1]
+          @document.find([@doc1._id]).should == [@doc1]
         end
       end
 
@@ -434,8 +444,8 @@ class DocumentTest < Test::Unit::TestCase
       end
 
       should "be able to find by id" do
-        @document.find_by_id(@doc1.id).should == @doc1
-        @document.find_by_id(@doc2.id).should == @doc2
+        @document.find_by_id(@doc1._id).should == @doc1
+        @document.find_by_id(@doc2._id).should == @doc2
       end
 
       should "return nil if document not found" do
@@ -447,7 +457,7 @@ class DocumentTest < Test::Unit::TestCase
       setup do
         @doc1 = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
         @doc2 = @document.create({:first_name => 'Steve', :last_name => 'Smith', :age => '28'})
-        @document.delete(@doc1.id)
+        @document.delete(@doc1._id)
       end
 
       should "remove document from collection" do
@@ -455,7 +465,7 @@ class DocumentTest < Test::Unit::TestCase
       end
 
       should "not remove other documents" do
-        @document.find(@doc2.id).should_not be(nil)
+        @document.find(@doc2._id).should_not be(nil)
       end
     end
 
@@ -464,7 +474,7 @@ class DocumentTest < Test::Unit::TestCase
         @doc1 = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
         @doc2 = @document.create({:first_name => 'Steve', :last_name => 'Smith', :age => '28'})
         @doc3 = @document.create({:first_name => 'Steph', :last_name => 'Nunemaker', :age => '26'})
-        @document.delete(@doc1.id, @doc2.id)
+        @document.delete(@doc1._id, @doc2._id)
 
         @document.count.should == 1
       end
@@ -473,7 +483,7 @@ class DocumentTest < Test::Unit::TestCase
         @doc1 = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
         @doc2 = @document.create({:first_name => 'Steve', :last_name => 'Smith', :age => '28'})
         @doc3 = @document.create({:first_name => 'Steph', :last_name => 'Nunemaker', :age => '26'})
-        @document.delete([@doc1.id, @doc2.id])
+        @document.delete([@doc1._id, @doc2._id])
 
         @document.count.should == 1
       end
@@ -506,7 +516,7 @@ class DocumentTest < Test::Unit::TestCase
       setup do
         @doc1 = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
         @doc2 = @document.create({:first_name => 'Steve', :last_name => 'Smith', :age => '28'})
-        @document.destroy(@doc1.id)
+        @document.destroy(@doc1._id)
       end
 
       should "remove document from collection" do
@@ -514,7 +524,7 @@ class DocumentTest < Test::Unit::TestCase
       end
 
       should "not remove other documents" do
-        @document.find(@doc2.id).should_not be(nil)
+        @document.find(@doc2._id).should_not be(nil)
       end
     end
 
@@ -523,8 +533,8 @@ class DocumentTest < Test::Unit::TestCase
         @doc1 = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
         @doc2 = @document.create({:first_name => 'Steve', :last_name => 'Smith', :age => '28'})
         @doc3 = @document.create({:first_name => 'Steph', :last_name => 'Nunemaker', :age => '26'})
-        @document.destroy(@doc1.id, @doc2.id)
-
+        @document.destroy(@doc1._id, @doc2._id)
+        
         @document.count.should == 1
       end
 
@@ -532,7 +542,7 @@ class DocumentTest < Test::Unit::TestCase
         @doc1 = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
         @doc2 = @document.create({:first_name => 'Steve', :last_name => 'Smith', :age => '28'})
         @doc3 = @document.create({:first_name => 'Steph', :last_name => 'Nunemaker', :age => '26'})
-        @document.destroy([@doc1.id, @doc2.id])
+        @document.destroy([@doc1._id, @doc2._id])
 
         @document.count.should == 1
       end
@@ -586,7 +596,7 @@ class DocumentTest < Test::Unit::TestCase
       context "many" do
         context "=> destroy" do
           setup do
-            Property.key :thing_id, String
+            Property.key :thing_id, ObjectId
             Property.belongs_to :thing, :dependent => :destroy
             Thing.many :properties, :dependent => :destroy
 
@@ -609,7 +619,7 @@ class DocumentTest < Test::Unit::TestCase
 
         context "=> delete_all" do
           setup do
-            Property.key :thing_id, String
+            Property.key :thing_id, ObjectId
             Property.belongs_to :thing
             Thing.has_many :properties, :dependent => :delete_all
 
@@ -632,7 +642,7 @@ class DocumentTest < Test::Unit::TestCase
 
         context "=> nullify" do
           setup do
-            Property.key :thing_id, String
+            Property.key :thing_id, ObjectId
             Property.belongs_to :thing
             Thing.has_many :properties, :dependent => :nullify
 
@@ -657,7 +667,7 @@ class DocumentTest < Test::Unit::TestCase
       context "belongs_to" do
         context "=> destroy" do
           setup do
-            Property.key :thing_id, String
+            Property.key :thing_id, ObjectId
             Property.belongs_to :thing, :dependent => :destroy
             Thing.has_many :properties
 
@@ -777,25 +787,24 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "update attributes in the database" do
-      from_db = @document.find(@doc.id)
-      from_db.should == @doc
-      from_db.first_name.should == 'John'
-      from_db.age.should == 27
+      doc = @doc.reload
+      doc.should == @doc
+      doc.first_name.should == 'John'
+      doc.age.should == 27
     end
 
     should "allow to add custom attributes to the document" do
       @doc = @document.new(:first_name => 'David', :age => '26', :gender => 'male', :tags => [1, "2"])
       @doc.save
-      from_db = @document.find(@doc.id)
-      from_db.gender.should == 'male'
-      from_db.tags.should == [1, "2"]
+      doc = @doc.reload
+      doc.gender.should == 'male'
+      doc.tags.should == [1, "2"]
     end
 
     should "allow to use custom methods to assign properties" do
-      person = RealPerson.new(:realname => "David")
+      person = RealPerson.new(:realname => 'David')
       person.save
-      from_db = RealPerson.find(person.id)
-      from_db.name.should == "David"
+      person.reload.name.should == 'David'
     end
 
     context "with key of type date" do
@@ -825,17 +834,16 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "update attributes in the database" do
-      from_db = @document.find(@doc.id)
-      from_db.first_name.should == 'Johnny'
-      from_db.age.should == 30
+      doc = @doc.reload
+      doc.first_name.should == 'Johnny'
+      doc.age.should == 30
     end
 
     should "allow updating custom attributes" do
       @doc = @document.new(:first_name => 'David', :age => '26', :gender => 'male')
       @doc.gender = 'Male'
       @doc.save
-      from_db = @document.find(@doc.id)
-      from_db.gender.should == 'Male'
+      @doc.reload.gender.should == 'Male'
     end
   end
 
@@ -860,16 +868,15 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "update attributes in the database" do
-      from_db = @document.find(@doc.id)
-      from_db.should == @doc
-      from_db.first_name.should == 'Johnny'
-      from_db.age.should == 30
+      doc = @doc.reload
+      doc.should == @doc
+      doc.first_name.should == 'Johnny'
+      doc.age.should == 30
     end
 
     should "allow updating custom attributes" do
       @doc.update_attributes(:gender => 'mALe')
-      from_db = @document.find(@doc.id)
-      from_db.gender.should == 'mALe'
+      @doc.reload.gender.should == 'mALe'
     end
   end
 
@@ -889,9 +896,9 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "update attributes in the database" do
-      from_db = @document.find(@doc.id)
-      from_db.first_name.should == 'Johnny'
-      from_db.age.should == 30
+      doc = @doc.reload
+      doc.first_name.should == 'Johnny'
+      doc.age.should == 30
     end
   end
 
@@ -1023,14 +1030,14 @@ class DocumentTest < Test::Unit::TestCase
       steph = DocDaughter.create(:name => 'Steph')
 
       lambda {
-        DocSon.find(steph.id)
+        DocSon.find!(steph._id)
       }.should raise_error(MongoMapper::DocumentNotFound)
     end
 
     should "not raise error for find with parent" do
       john = DocSon.create(:name => 'John')
 
-      DocParent.find(john.id).should == john
+      DocParent.find!(john._id).should == john
     end
 
     should "count scoped to class" do
@@ -1065,7 +1072,7 @@ class DocumentTest < Test::Unit::TestCase
       steph = DocDaughter.create(:name => 'Steph')
 
       lambda {
-        DocSon.destroy(steph.id)
+        DocSon.destroy(steph._id)
       }.should raise_error(MongoMapper::DocumentNotFound)
     end
 
@@ -1074,7 +1081,7 @@ class DocumentTest < Test::Unit::TestCase
       steph = DocDaughter.create(:name => 'Steph')
 
       lambda {
-        DocSon.delete(steph.id)
+        DocSon.delete(steph._id)
       }.should_not change { DocParent.count }
     end
 
@@ -1134,9 +1141,9 @@ class DocumentTest < Test::Unit::TestCase
         @document.update(doc._id, { :first_name => 'Johnny' })
       end
 
-      from_db = @document.find(doc.id)
-      from_db.created_at.should == old_created_at
-      from_db.updated_at.should_not == old_updated_at
+      doc = doc.reload
+      doc.created_at.should == old_created_at
+      doc.updated_at.should_not == old_updated_at
     end
   end
 
@@ -1166,7 +1173,7 @@ class DocumentTest < Test::Unit::TestCase
   context "reload" do
     setup do
       @doc_instance_1 = @document.create({:first_name => 'Ryan', :last_name => 'Koopmans', :age => '37'})
-      @doc_instance_2 = @document.update(@doc_instance_1.id, {:age => '39'})
+      @doc_instance_2 = @document.update(@doc_instance_1._id, {:age => '39'})
     end
 
     should "load fresh information from the database" do