mongo_mapper 0.6.10 → 0.7.0

data/test/functional/associations/test_many_polymorphic_proxy.rb

@@ -176,22 +176,6 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
     end
     
-    context "with :all" do
-      should "work" do
-        @lounge.messages.find(:all, :order => "position").should == [@lm1, @lm2]
-      end
-      
-      should "work with conditions" do
-        messages = @lounge.messages.find(:all, :body => 'Loungin!', :order => "position")
-        messages.should == [@lm1]
-      end
-      
-      should "work with order" do
-        messages = @lounge.messages.find(:all, :order => 'position desc')
-        messages.should == [@lm2, @lm1]
-      end
-    end
-    
     context "with #all" do
       should "work" do
         @lounge.messages.all(:order => "position").should == [@lm1, @lm2]
@@ -208,17 +192,6 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
     end
     
-    context "with :first" do
-      should "work" do
-        @lounge.messages.find(:first, :order => "position asc").should == @lm1
-      end
-      
-      should "work with conditions" do
-        message = @lounge.messages.find(:first, :body => 'I love loungin!', :order => "position asc")
-        message.should == @lm2
-      end
-    end
-    
     context "with #first" do
       should "work" do
         @lounge.messages.first(:order => "position asc").should == @lm1
@@ -230,17 +203,6 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
     end
     
-    context "with :last" do
-      should "work" do
-        @lounge.messages.find(:last, :order => "position asc").should == @lm2
-      end
-      
-      should "work with conditions" do
-        message = @lounge.messages.find(:last, :body => 'Loungin!', :order => "position asc")
-        message.should == @lm1
-      end
-    end
-    
     context "with #last" do
       should "work" do
         @lounge.messages.last(:order => "position asc").should == @lm2
@@ -285,9 +247,9 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
       
       should "not work for ids not in association" do
-        lambda {
+        assert_raises(MongoMapper::DocumentNotFound) do
           @lounge.messages.find!(@lm1._id, @lm2._id, @hm2._id)
-        }.should raise_error(MongoMapper::DocumentNotFound)
+        end
       end
     end
     

data/test/functional/associations/test_one_proxy.rb

@@ -2,18 +2,10 @@ require 'test_helper'
 
 class OneProxyTest < Test::Unit::TestCase
   def setup
-    @post_class = Class.new do
-      include MongoMapper::Document
-      def self.name; 'Post' end
-    end
-    
-    @author_class = Class.new do
-      include MongoMapper::Document
+    @post_class = Doc('Post')
+    @author_class = Doc do
       key :post_id, ObjectId
     end
-    
-    @post_class.collection.remove
-    @author_class.collection.remove
   end
   
   should "default to nil" do
@@ -21,6 +13,18 @@ class OneProxyTest < Test::Unit::TestCase
     @post_class.new.author.nil?.should be_true
   end
   
+  should "send object id to target" do
+    @post_class.one :author, :class => @author_class
+    
+    post = @post_class.new
+    author = @author_class.new(:name => 'Frank')
+    post.author = author
+    author.save.should be_true
+    post.save.should be_true
+    
+    post.author.object_id.should == post.author.target.object_id
+  end
+  
   should "be able to replace the association" do
     @post_class.one :author, :class => @author_class
     
@@ -47,6 +51,17 @@ class OneProxyTest < Test::Unit::TestCase
     post.author?.should be_true
   end
   
+  should "work with criteria" do
+    @post_class.one :primary_author, :class => @author_class, :primary => true
+    @post_class.one :author, :class => @author_class
+    
+    post = @post_class.create
+    author = @author_class.create(:name => 'Frank', :primary => false, :post_id => post.id)
+    primary = @author_class.create(:name => 'Bill', :primary => true, :post_id => post.id)
+    post.author.should == author
+    post.primary_author.should == primary
+  end
+  
   should "unset the association" do
     @post_class.one :author, :class => @author_class
     post = @post_class.new

data/test/functional/test_binary.rb

@@ -2,12 +2,9 @@ require 'test_helper'
 
 class BinaryTest < Test::Unit::TestCase  
   should "serialize and deserialize correctly" do
-    klass = Class.new do
-      include MongoMapper::Document
-      set_collection_name 'test'
+    klass = Doc do
       key :contents, Binary
     end
-    klass.collection.remove
     
     doc = klass.new(:contents => '010101')
     doc.save
@@ -18,12 +15,9 @@ class BinaryTest < Test::Unit::TestCase
   
   context "Saving a document with a blank binary value" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
+      @document = Doc do
         key :file, Binary
       end
-      @document.collection.remove
     end
 
     should "not fail" do

data/test/functional/test_callbacks.rb

@@ -3,10 +3,7 @@ require 'test_helper'
 class CallbacksTest < Test::Unit::TestCase
   context "Defining and running callbacks" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-        
+      @document = Doc do
         key :name, String
         
         [ :before_validation_on_create, :before_validation_on_update,
@@ -30,7 +27,6 @@ class CallbacksTest < Test::Unit::TestCase
           @history = nil
         end
       end
-      @document.collection.remove
     end
     
     should "get the order right for creating documents" do

data/test/functional/test_dirty.rb

@@ -1,26 +1,17 @@
 require 'test_helper'
-require 'models'
 
 class DirtyTest < Test::Unit::TestCase
   def setup
-    @document = Class.new do
-      include MongoMapper::Document
-      set_collection_name 'test'
-      key :phrase, String
-    end
-    @document.collection.remove
-    
-    Status.collection.remove
-    Project.collection.remove
+    @document = Doc { key :phrase, String }
   end
-  
+
   context "marking changes" do
     should "not happen if there are none" do
       doc = @document.new
       doc.phrase_changed?.should be_false
       doc.phrase_change.should be_nil
     end
-    
+
     should "happen when change happens" do
       doc = @document.new
       doc.phrase = 'Golly Gee Willikers Batman'
@@ -28,12 +19,12 @@ class DirtyTest < Test::Unit::TestCase
       doc.phrase_was.should be_nil
       doc.phrase_change.should == [nil, 'Golly Gee Willikers Batman']
     end
-    
+
     should "happen when initializing" do
       doc = @document.new(:phrase => 'Foo')
       doc.changed?.should be_true
     end
-    
+
     should "clear changes on save" do
       doc = @document.new
       doc.phrase = 'Golly Gee Willikers Batman'
@@ -42,7 +33,7 @@ class DirtyTest < Test::Unit::TestCase
       doc.phrase_changed?.should_not be_true
       doc.phrase_change.should be_nil
     end
-    
+
     should "clear changes on save!" do
       doc = @document.new
       doc.phrase = 'Golly Gee Willikers Batman'
@@ -51,15 +42,18 @@ class DirtyTest < Test::Unit::TestCase
       doc.phrase_changed?.should_not be_true
       doc.phrase_change.should be_nil
     end
-    
+
     should "not happen when loading from database" do
       doc = @document.create(:phrase => 'Foo')
+      doc = @document.find(doc.id)
+      
+      doc.changed?.should be_false
       doc.phrase = 'Fart'
       doc.changed?.should be_true
       doc.reload
       doc.changed?.should be_false
     end
-    
+
     should "happen if changed after loading from database" do
       doc = @document.create(:phrase => 'Foo')
       doc.reload
@@ -68,7 +62,7 @@ class DirtyTest < Test::Unit::TestCase
       doc.changed?.should be_true
     end
   end
-  
+
   context "blank new value and type integer" do
     should "not mark changes" do
       @document.key :age, Integer
@@ -115,7 +109,7 @@ class DirtyTest < Test::Unit::TestCase
     should "be hash of keys with values of changes if there are changes" do
       doc = @document.new
       doc.phrase = 'A penny saved is a penny earned.'
-      doc.changes.should == {'phrase' => [nil, 'A penny saved is a penny earned.']}
+      doc.changes['phrase'].should == [nil, 'A penny saved is a penny earned.']
     end
   end
   
@@ -150,10 +144,20 @@ class DirtyTest < Test::Unit::TestCase
   
   context "changing a foreign key through association" do
     should "mark changes" do
-      status = Status.create(:name => 'Foo')
-      status.project = Project.create(:name => 'Bar')
-      status.changed?.should be_true
-      status.changed.should == %w(project_id)
+      project_class = Doc do
+        key :name, String
+      end
+      
+      milestone_class = Doc do
+        key :project_id, ObjectId
+        key :name, String
+      end
+      milestone_class.belongs_to :project, :class => project_class
+      
+      milestone = milestone_class.create(:name => 'Launch')
+      milestone.project = project_class.create(:name => 'Harmony')
+      milestone.changed?.should be_true
+      milestone.changed.should == %w(project_id)
     end
   end
 end

data/test/functional/test_document.rb

@@ -3,8 +3,7 @@ require 'models'
 
 class DocumentTest < Test::Unit::TestCase
   def setup
-    @document = Class.new do
-      include MongoMapper::Document
+    @document = Doc do
       set_collection_name 'users'
 
       key :first_name, String
@@ -12,10 +11,9 @@ class DocumentTest < Test::Unit::TestCase
       key :age, Integer
       key :date, Date
     end
-    @document.collection.remove
   end
   
-  context "Using key with type Array" do
+  context "array key" do
     setup do
       @document.key :tags, Array
     end
@@ -62,7 +60,7 @@ class DocumentTest < Test::Unit::TestCase
     end
   end
 
-  context "Using key with type Hash" do
+  context "hash key" do
     setup do
       @document.key :foo, Hash
     end
@@ -97,7 +95,7 @@ class DocumentTest < Test::Unit::TestCase
     end
   end
 
-  context "Using key with custom type with default" do
+  context "custom type key with default" do
     setup do
       @document.key :window, WindowSize, :default => WindowSize.new(600, 480)
     end
@@ -143,12 +141,7 @@ class DocumentTest < Test::Unit::TestCase
     end
     
     should "not fail if no attributes provided" do
-      document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-      end
-      document.collection.remove
-      
+      document = Doc()
       lambda { document.create }.should change { document.count }.by(1)
     end
   end
@@ -246,7 +239,19 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "raise document not found if nothing provided for find!" do
-      lambda { @document.find! }.should raise_error(MongoMapper::DocumentNotFound)
+      assert_raises(MongoMapper::DocumentNotFound) do
+        @document.find!
+      end
+    end
+    
+    should "raise error if trying to find with :all, :first, or :last" do
+      [:all, :first, :last].each do |m|
+        assert_raises(ArgumentError) { @document.find(m) }
+      end
+
+      [:all, :first, :last].each do |m|
+        assert_raises(ArgumentError) { @document.find!(m) }
+      end
     end
 
     context "(with a single id)" do
@@ -259,9 +264,7 @@ class DocumentTest < Test::Unit::TestCase
       end
 
       should "raise error if document not found with find!" do
-        lambda {
-          @document.find!(123)
-        }.should raise_error(MongoMapper::DocumentNotFound)
+        assert_raises(MongoMapper::DocumentNotFound) { @document.find!(123) }
       end
     end
 
@@ -274,7 +277,17 @@ class DocumentTest < Test::Unit::TestCase
         @document.find([@doc1._id, @doc2._id]).should == [@doc1, @doc2]
       end
 
-      should "return array if array only has one element" do
+      should "compact not found when using find" do
+        @document.find(@doc1._id, 1234).should == [@doc1]
+      end
+
+      should "raise error if not all found when using find!" do
+        assert_raises(MongoMapper::DocumentNotFound) do
+          @document.find!(@doc1._id, 1234)
+        end
+      end
+
+      should "return array if array with one element" do
         @document.find([@doc1._id]).should == [@doc1]
       end
     end
@@ -284,43 +297,21 @@ class DocumentTest < Test::Unit::TestCase
       @document.all(:last_name => 'Nunemaker', :order => 'age desc').should == [@doc1, @doc3]
     end
 
-    context "(with :all)" do
-      should "find all documents" do
-        @document.find(:all, :order => 'first_name').should == [@doc1, @doc3, @doc2]
-      end
-
-      should "be able to add conditions" do
-        @document.find(:all, :first_name => 'John').should == [@doc1]
-      end
-    end
-
-    context "(with #all)" do
+    context "#all" do
       should "find all documents based on criteria" do
         @document.all(:order => 'first_name').should == [@doc1, @doc3, @doc2]
         @document.all(:last_name => 'Nunemaker', :order => 'age desc').should == [@doc1, @doc3]
       end
     end
 
-    context "(with :first)" do
-      should "find first document" do
-        @document.find(:first, :order => 'first_name').should == @doc1
-      end
-    end
-
-    context "(with #first)" do
+    context "#first" do
       should "find first document based on criteria" do
         @document.first(:order => 'first_name').should == @doc1
         @document.first(:age => 28).should == @doc2
       end
     end
 
-    context "(with :last)" do
-      should "find last document" do
-        @document.find(:last, :order => 'age').should == @doc2
-      end
-    end
-
-    context "(with #last)" do
+    context "#last" do
       should "find last document based on criteria" do
         @document.last(:order => 'age').should == @doc2
         @document.last(:order => 'age', :age => 28).should == @doc2
@@ -331,7 +322,7 @@ class DocumentTest < Test::Unit::TestCase
       end
     end
 
-    context "(with :find_by)" do
+    context "#find_by..." do
       should "find document based on argument" do
         @document.find_by_first_name('John').should == @doc1
         @document.find_by_last_name('Nunemaker', :order => 'age desc').should == @doc1
@@ -347,7 +338,19 @@ class DocumentTest < Test::Unit::TestCase
       end
     end
 
-    context "(with dynamic finders)" do
+    context "#find_each" do
+      should "yield all documents found, based on criteria" do
+        yield_documents = []
+        @document.find_each(:order => "first_name") {|doc| yield_documents << doc }
+        yield_documents.should == [@doc1, @doc3, @doc2]
+
+        yield_documents = []
+        @document.find_each(:last_name => 'Nunemaker', :order => 'age desc') {|doc| yield_documents << doc }
+        yield_documents.should == [@doc1, @doc3]
+      end
+    end
+
+    context "dynamic finders" do
       should "find document based on all arguments" do
         @document.find_by_first_name_and_last_name_and_age('John', 'Nunemaker', 27).should == @doc1
       end
@@ -400,7 +403,44 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "return nil if document not found" do
-      @document.find_by_id(1234).should be(nil)
+      @document.find_by_id(1234).should be_nil
+    end
+  end
+
+  context "first_or_create" do
+    should "find if exists" do
+      created = @document.create(:first_name => 'John', :last_name => 'Nunemaker')
+      lambda {
+        found = @document.first_or_create(:first_name => 'John', :last_name => 'Nunemaker')
+        found.should == created
+      }.should_not change { @document.count }
+    end
+
+    should "create if not found" do
+      lambda {
+        created = @document.first_or_create(:first_name => 'John', :last_name => 'Nunemaker')
+        created.first_name.should == 'John'
+        created.last_name.should == 'Nunemaker'
+      }.should change { @document.count }.by(1)
+    end
+  end
+
+  context "first_or_new" do
+    should "find if exists" do
+      created = @document.create(:first_name => 'John', :last_name => 'Nunemaker')
+      lambda {
+        found = @document.first_or_new(:first_name => 'John', :last_name => 'Nunemaker')
+        found.should == created
+      }.should_not change { @document.count }
+    end
+
+    should "initialize if not found" do
+      lambda {
+        created = @document.first_or_new(:first_name => 'John', :last_name => 'Nunemaker')
+        created.first_name.should == 'John'
+        created.last_name.should == 'Nunemaker'
+        created.should be_new
+      }.should_not change { @document.count }
     end
   end
 
@@ -541,11 +581,9 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "return 0 if the collection does not exist" do
-      klass = Class.new do
-        include MongoMapper::Document
+      klass = Doc do
         set_collection_name 'foobarbazwickdoesnotexist'
       end
-      @document.collection.remove
 
       klass.count.should == 0
     end
@@ -567,10 +605,10 @@ class DocumentTest < Test::Unit::TestCase
     @document.new.database.should == @document.database
   end
 
-  context "#save (new document)" do
+  context "#update_attributes (new document)" do
     setup do
       @doc = @document.new(:first_name => 'John', :age => '27')
-      @doc.save
+      @doc.update_attributes(:first_name => 'Johnny', :age => 30)
     end
 
     should "insert document into the collection" do
@@ -582,46 +620,27 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "save attributes" do
-      @doc.first_name.should == 'John'
-      @doc.age.should == 27
+      @doc.first_name.should == 'Johnny'
+      @doc.age.should == 30
     end
 
     should "update attributes in the database" do
       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
-      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.save
-      person.reload.name.should == 'David'
+      doc.first_name.should == 'Johnny'
+      doc.age.should == 30
     end
 
-    context "with key of type date" do
-      should "save the date value as a Time object" do
-        doc = @document.new(:first_name => 'John', :age => '27', :date => "12/01/2009")
-        doc.save
-        doc.date.should == Date.new(2009, 12, 1)
-      end
+    should "allow updating custom attributes" do
+      @doc.update_attributes(:gender => 'mALe')
+      @doc.reload.gender.should == 'mALe'
     end
   end
 
-  context "#save (existing document)" do
+  context "#update_attributes (existing document)" do
     setup do
       @doc = @document.create(:first_name => 'John', :age => '27')
-      @doc.first_name = 'Johnny'
-      @doc.age = 30
-      @doc.save
+      @doc.update_attributes(:first_name => 'Johnny', :age => 30)
     end
 
     should "not insert document into collection" do
@@ -638,19 +657,26 @@ class DocumentTest < Test::Unit::TestCase
       doc.first_name.should == 'Johnny'
       doc.age.should == 30
     end
+  end
 
-    should "allow updating custom attributes" do
-      @doc = @document.new(:first_name => 'David', :age => '26', :gender => 'male')
-      @doc.gender = 'Male'
-      @doc.save
-      @doc.reload.gender.should == 'Male'
+  context "#update_attributes (return value)" do
+    setup do
+      @document.key :foo, String, :required => true
     end
-  end
 
-  context "#update_attributes (new document)" do
+    should "be true if document valid" do
+      @document.new.update_attributes(:foo => 'bar').should be_true
+    end
+
+    should "be false if document not valid" do
+      @document.new.update_attributes({}).should be_false
+    end
+  end
+  
+  context "#save (new document)" do
     setup do
       @doc = @document.new(:first_name => 'John', :age => '27')
-      @doc.update_attributes(:first_name => 'Johnny', :age => 30)
+      @doc.save
     end
 
     should "insert document into the collection" do
@@ -662,27 +688,54 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "save attributes" do
-      @doc.first_name.should == 'Johnny'
-      @doc.age.should == 30
+      @doc.first_name.should == 'John'
+      @doc.age.should == 27
     end
 
     should "update attributes in the database" do
       doc = @doc.reload
       doc.should == @doc
-      doc.first_name.should == 'Johnny'
-      doc.age.should == 30
+      doc.first_name.should == 'John'
+      doc.age.should == 27
     end
 
-    should "allow updating custom attributes" do
-      @doc.update_attributes(:gender => 'mALe')
-      @doc.reload.gender.should == 'mALe'
+    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
+      doc = @doc.reload
+      doc.gender.should == 'male'
+      doc.tags.should == [1, "2"]
+    end
+
+    should "allow to use custom methods to assign properties" do
+      klass = Doc do
+        key :name, String
+        
+        def realname=(value)
+          self.name = value
+        end
+      end
+      
+      person = klass.new(:realname => 'David')
+      person.save
+      person.reload.name.should == 'David'
+    end
+
+    context "with key of type date" do
+      should "save the date value as a Time object" do
+        doc = @document.new(:first_name => 'John', :age => '27', :date => "12/01/2009")
+        doc.save
+        doc.date.should == Date.new(2009, 12, 1)
+      end
     end
   end
 
-  context "#update_attributes (existing document)" do
+  context "#save (existing document)" do
     setup do
       @doc = @document.create(:first_name => 'John', :age => '27')
-      @doc.update_attributes(:first_name => 'Johnny', :age => 30)
+      @doc.first_name = 'Johnny'
+      @doc.age = 30
+      @doc.save
     end
 
     should "not insert document into collection" do
@@ -699,68 +752,82 @@ class DocumentTest < Test::Unit::TestCase
       doc.first_name.should == 'Johnny'
       doc.age.should == 30
     end
-  end
-
-  context "#update_attributes" do
-    setup do
-      @document.key :foo, String, :required => true
-    end
-
-    should "return true if document valid" do
-      @document.new.update_attributes(:foo => 'bar').should be_true
-    end
 
-    should "return false if document not valid" do
-      @document.new.update_attributes({}).should be_false
+    should "allow updating custom attributes" do
+      @doc = @document.new(:first_name => 'David', :age => '26', :gender => 'male')
+      @doc.gender = 'Male'
+      @doc.save
+      @doc.reload.gender.should == 'Male'
     end
   end
-  
+
   context "#save (with validations off)" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
+      @document = Doc do
         key :name, String, :required => true
       end
-      @document.collection.remove
     end
 
-    should "insert document" do
+    should "insert invalid document" do
       doc = @document.new
+      doc.expects(:valid?).never
       doc.save(:validate => false)
       @document.count.should == 1
     end
-    
-    should "work with false passed to save" do
-      doc = @document.new
-      doc.save(false)
-      @document.count.should == 1
-    end
   end
   
   context "#save (with options)" do
     setup do
-      MongoMapper.ensured_indexes = []
-      
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
+      @document = Doc do
         key :name, String
-        ensure_index :name, :unique => true
+        set_collection_name 'test_indexes'
       end
-      @document.collection.drop_indexes
-      
-      MongoMapper.ensure_indexes!
+      drop_indexes(@document)
+      @document.ensure_index :name, :unique => true
     end
-    
+
     should "allow passing safe" do
-      doc = @document.new(:name => 'John')
-      doc.save
-      
+      @document.create(:name => 'John')
       assert_raises(Mongo::OperationFailure) do
         @document.new(:name => 'John').save(:safe => true)
       end
     end
+
+    should "raise argument error if options has unsupported key" do
+      assert_raises(ArgumentError) do
+        @document.new.save(:foo => true)
+      end
+    end
+  end
+  
+  context "#save! (with options)" do
+    setup do
+      @document = Doc do
+        key :name, String
+        set_collection_name 'test_indexes'
+      end
+      drop_indexes(@document)
+      @document.ensure_index :name, :unique => true
+    end
+
+    should "allow passing safe" do
+      @document.create(:name => 'John')
+      assert_raises(Mongo::OperationFailure) do
+        @document.new(:name => 'John').save!(:safe => true)
+      end
+    end
+
+    should "raise argument error if options has unsupported key" do
+      assert_raises(ArgumentError) do
+        @document.new.save!(:foo => true)
+      end
+    end
+
+    should "raise argument error if using validate as that would be pointless with save!" do
+      assert_raises(ArgumentError) do
+        @document.new.save!(:validate => false)
+      end
+    end
   end
 
   context "#destroy" do
@@ -843,7 +910,7 @@ class DocumentTest < Test::Unit::TestCase
       @parent.save
       @daughter.save
 
-      collection = DocParent.find(:all)
+      collection = DocParent.all
       collection.size.should == 2
       collection.first.should be_kind_of(DocParent)
       collection.first.name.should == "Daddy Warbucks"
@@ -967,11 +1034,19 @@ class DocumentTest < Test::Unit::TestCase
 
   context "timestamping" do
     setup do
-      @document.timestamps!
+      @klass = Doc do
+        set_collection_name 'users'
+
+        key :first_name, String
+        key :last_name, String
+        key :age, Integer
+        key :date, Date
+      end
+      @klass.timestamps!
     end
 
     should "set created_at and updated_at on create" do
-      doc = @document.new(:first_name => 'John', :age => 27)
+      doc = @klass.new(:first_name => 'John', :age => 27)
       doc.created_at.should be(nil)
       doc.updated_at.should be(nil)
       doc.save
@@ -981,7 +1056,7 @@ class DocumentTest < Test::Unit::TestCase
     
     should "not overwrite created_at if it already exists" do
       original_created_at = 1.month.ago
-      doc = @document.new(:first_name => 'John', :age => 27, :created_at => original_created_at)
+      doc = @klass.new(:first_name => 'John', :age => 27, :created_at => original_created_at)
       doc.created_at.to_i.should == original_created_at.to_i
       doc.updated_at.should be_nil
       doc.save
@@ -990,7 +1065,7 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "set updated_at on field update but leave created_at alone" do
-      doc = @document.create(:first_name => 'John', :age => 27)
+      doc = @klass.create(:first_name => 'John', :age => 27)
       old_created_at = doc.created_at
       old_updated_at = doc.updated_at
       doc.first_name = 'Johnny'
@@ -1004,12 +1079,12 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "set updated_at on document update but leave created_at alone" do
-      doc = @document.create(:first_name => 'John', :age => 27)
+      doc = @klass.create(:first_name => 'John', :age => 27)
       old_created_at = doc.created_at
       old_updated_at = doc.updated_at
 
       Timecop.freeze(Time.now + 5.seconds) do
-        @document.update(doc._id, { :first_name => 'Johnny' })
+        @klass.update(doc._id, { :first_name => 'Johnny' })
       end
 
       doc = doc.reload
@@ -1040,7 +1115,7 @@ class DocumentTest < Test::Unit::TestCase
     end
   end
 
-  context "#exist?" do
+  context "#exists?" do
     setup do
       @doc = @document.create(:first_name => "James", :age => 27)
     end
@@ -1065,14 +1140,11 @@ class DocumentTest < Test::Unit::TestCase
 
   context "#reload" do
     setup do
-      @foo_class = Class.new do
-        include MongoMapper::Document
+      @foo_class = Doc do
         key :name
       end
-      @foo_class.collection.remove
       
-      @bar_class = Class.new do
-        include MongoMapper::EmbeddedDocument
+      @bar_class = EDoc do
         key :name
       end
       
@@ -1107,19 +1179,14 @@ class DocumentTest < Test::Unit::TestCase
     should "return self" do
       @instance.reload.object_id.should == @instance.object_id
     end
-  end
-  
-  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
-      doc.using_custom_id?.should be_false
+    
+    should "raise DocumentNotFound if not found" do
+      @instance.destroy
+      assert_raises(MongoMapper::DocumentNotFound) { @instance.reload }
     end
   end
 
-  context "Loading a document from the database with keys that are not defined" do
+  context "database has keys not defined in model" do
     setup do
       @id = Mongo::ObjectID.new
       @document.collection.insert({
@@ -1144,28 +1211,22 @@ class DocumentTest < Test::Unit::TestCase
 
   context "Indexing" do
     setup do
-      MongoMapper.ensured_indexes = []
-      @document.collection.drop_indexes
+      drop_indexes(@document)
     end
 
     should "allow creating index for a key" do
       @document.ensure_index :first_name
-      MongoMapper.ensure_indexes!
-
       @document.should have_index('first_name_1')
     end
 
     should "allow creating unique index for a key" do
       @document.ensure_index :first_name, :unique => true
-      MongoMapper.ensure_indexes!
-
       @document.should have_index('first_name_1')
     end
 
     should "allow creating index on multiple keys" do
       @document.ensure_index [[:first_name, 1], [:last_name, -1]]
-      MongoMapper.ensure_indexes!
-
+      
       # order is different for different versions of ruby so instead of
       # just checking have_index('first_name_1_last_name_-1') I'm checking
       # the values of the indexes to make sure the index creation was successful
@@ -1177,8 +1238,6 @@ class DocumentTest < Test::Unit::TestCase
 
     should "work with :index shortcut when defining key" do
       @document.key :father, String, :index => true
-      MongoMapper.ensure_indexes!
-
       @document.should have_index('father_1')
     end
   end