mongo_mapper 0.7.0 → 0.7.1

data/mongo_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_mapper}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2010-02-10}
+  s.date = %q{2010-03-09}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]
@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
      "LICENSE",
      "README.rdoc",
      "Rakefile",
-     "VERSION",
      "bin/mmconsole",
      "lib/mongo_mapper.rb",
      "lib/mongo_mapper/document.rb",
@@ -51,20 +50,25 @@ Gem::Specification.new do |s|
      "lib/mongo_mapper/plugins/inspect.rb",
      "lib/mongo_mapper/plugins/keys.rb",
      "lib/mongo_mapper/plugins/logger.rb",
+     "lib/mongo_mapper/plugins/modifiers.rb",
      "lib/mongo_mapper/plugins/pagination.rb",
      "lib/mongo_mapper/plugins/pagination/proxy.rb",
      "lib/mongo_mapper/plugins/protected.rb",
      "lib/mongo_mapper/plugins/rails.rb",
      "lib/mongo_mapper/plugins/serialization.rb",
+     "lib/mongo_mapper/plugins/timestamps.rb",
+     "lib/mongo_mapper/plugins/userstamps.rb",
      "lib/mongo_mapper/plugins/validations.rb",
      "lib/mongo_mapper/query.rb",
      "lib/mongo_mapper/support.rb",
      "lib/mongo_mapper/support/descendant_appends.rb",
      "lib/mongo_mapper/support/find.rb",
+     "lib/mongo_mapper/version.rb",
      "mongo_mapper.gemspec",
      "performance/read_write.rb",
      "specs.watchr",
      "test/NOTE_ON_TESTING",
+     "test/active_model_lint_test.rb",
      "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",
      "test/functional/associations/test_belongs_to_proxy.rb",
      "test/functional/associations/test_in_array_proxy.rb",
@@ -81,11 +85,14 @@ Gem::Specification.new do |s|
      "test/functional/test_document.rb",
      "test/functional/test_embedded_document.rb",
      "test/functional/test_identity_map.rb",
+     "test/functional/test_indexing.rb",
      "test/functional/test_logger.rb",
      "test/functional/test_modifiers.rb",
      "test/functional/test_pagination.rb",
      "test/functional/test_protected.rb",
      "test/functional/test_string_id_compatibility.rb",
+     "test/functional/test_timestamps.rb",
+     "test/functional/test_userstamps.rb",
      "test/functional/test_validations.rb",
      "test/models.rb",
      "test/support/custom_matchers.rb",
@@ -114,9 +121,10 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Awesome gem for modeling your domain and storing it in mongo}
+  s.summary = %q{A Ruby Object Mapper for Mongo}
   s.test_files = [
-    "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",
+    "test/active_model_lint_test.rb",
+     "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",
      "test/functional/associations/test_belongs_to_proxy.rb",
      "test/functional/associations/test_in_array_proxy.rb",
      "test/functional/associations/test_many_documents_as_proxy.rb",
@@ -132,11 +140,14 @@ Gem::Specification.new do |s|
      "test/functional/test_document.rb",
      "test/functional/test_embedded_document.rb",
      "test/functional/test_identity_map.rb",
+     "test/functional/test_indexing.rb",
      "test/functional/test_logger.rb",
      "test/functional/test_modifiers.rb",
      "test/functional/test_pagination.rb",
      "test/functional/test_protected.rb",
      "test/functional/test_string_id_compatibility.rb",
+     "test/functional/test_timestamps.rb",
+     "test/functional/test_userstamps.rb",
      "test/functional/test_validations.rb",
      "test/models.rb",
      "test/support/custom_matchers.rb",
@@ -168,16 +179,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3"])
-      s.add_runtime_dependency(%q<mongo>, ["= 0.18.3"])
-      s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.8.1"])
+      s.add_runtime_dependency(%q<mongo>, ["= 0.19.1"])
+      s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.8.3"])
       s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
       s.add_development_dependency(%q<shoulda>, ["= 2.10.2"])
       s.add_development_dependency(%q<timecop>, ["= 0.3.1"])
       s.add_development_dependency(%q<mocha>, ["= 0.9.8"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3"])
-      s.add_dependency(%q<mongo>, ["= 0.18.3"])
-      s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.1"])
+      s.add_dependency(%q<mongo>, ["= 0.19.1"])
+      s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.3"])
       s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
       s.add_dependency(%q<shoulda>, ["= 2.10.2"])
       s.add_dependency(%q<timecop>, ["= 0.3.1"])
@@ -185,8 +196,8 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3"])
-    s.add_dependency(%q<mongo>, ["= 0.18.3"])
-    s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.1"])
+    s.add_dependency(%q<mongo>, ["= 0.19.1"])
+    s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.3"])
     s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
     s.add_dependency(%q<shoulda>, ["= 2.10.2"])
     s.add_dependency(%q<timecop>, ["= 0.3.1"])

data/test/active_model_lint_test.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+require 'active_model'
+require 'models'
+
+class ActiveModelLintTest < ActiveModel::TestCase
+  include ActiveModel::Lint::Tests
+  
+  def setup
+    @model = Post.new
+  end
+end

data/test/functional/associations/test_in_array_proxy.rb

@@ -80,6 +80,12 @@ class InArrayProxyTest < Test::Unit::TestCase
       should "save doc" do
         @list.should_not be_new
       end
+
+      should "reset cache" do
+        @user.lists.size.should == 1
+        @user.lists.create(:name => 'Moo!')
+        @user.lists.size.should == 2
+      end
     end
 
     context "create!" do
@@ -110,6 +116,12 @@ class InArrayProxyTest < Test::Unit::TestCase
           @user.lists.create!
         end
       end
+
+      should "reset cache" do
+        @user.lists.size.should == 1
+        @user.lists.create!(:name => 'Moo!')
+        @user.lists.size.should == 2
+      end
     end
 
     context "Finding scoped to association" do
@@ -162,6 +174,10 @@ class InArrayProxyTest < Test::Unit::TestCase
           @user.lists.find(@list1.id).should == @list1
         end
 
+        should "work with string ids" do
+          @user.lists.find(@list1.id.to_s).should == @list1
+        end
+
         should "not work for id not in association" do
           @user.lists.find(@list3.id).should be_nil
         end

data/test/functional/associations/test_many_documents_proxy.rb

@@ -54,6 +54,14 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
       status = project.statuses.build(:name => 'Foo')
       status.name.should == 'Foo'
     end
+
+    should "reset cache" do
+      project = Project.create
+      project.statuses.size.should == 0
+      status = project.statuses.build(:name => 'Foo')
+      status.save!
+      project.statuses.size.should == 1
+    end
   end
   
   context "create" do
@@ -75,6 +83,13 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
       status = project.statuses.create(:name => 'Foo!')
       status.name.should == 'Foo!'
     end
+
+    should "reset cache" do
+      project = Project.create
+      project.statuses.size.should == 0
+      project.statuses.create(:name => 'Foo!')
+      project.statuses.size.should == 1
+    end
   end
   
   context "create!" do
@@ -103,6 +118,13 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
         project.statuses.create!(:name => nil)
       }.should raise_error(MongoMapper::DocumentNotValid)
     end
+
+    should "reset cache" do
+      project = Project.create
+      project.statuses.size.should == 0
+      project.statuses.create!(:name => 'Foo!')
+      project.statuses.size.should == 1
+    end
   end
   
   context "count" do

data/test/functional/test_callbacks.rb

@@ -1,60 +1,68 @@
 require 'test_helper'
 
+module CallbacksSupport
+  def self.included base
+    base.key :name, String
+
+    [ :before_validation_on_create, :before_validation_on_update,
+      :before_validation, :after_validation,
+      :before_create,     :after_create,
+      :before_update,     :after_update,
+      :before_save,       :after_save,
+      :before_destroy,    :after_destroy].each do |callback|
+      callback_method = "#{callback}_callback"
+      base.send(callback, callback_method)
+      define_method(callback_method) do
+        history << callback.to_sym
+      end
+    end
+  end
+
+  def history
+    @history ||= []
+  end
+
+  def clear_history
+    embedded_associations.each { |a| self.send(a.name).each(&:clear_history) }
+    @history = nil
+  end
+end
+
 class CallbacksTest < Test::Unit::TestCase
-  context "Defining and running callbacks" do
+  CreateCallbackOrder = [:before_validation, :before_validation_on_create, :after_validation, :before_save, :before_create, :after_create, :after_save]
+  UpdateCallbackOrder = [:before_validation, :before_validation_on_update, :after_validation, :before_save, :before_update, :after_update, :after_save]
+
+  context "Defining and running callbacks on documents" do
     setup do
-      @document = Doc do
-        key :name, String
-        
-        [ :before_validation_on_create, :before_validation_on_update,
-          :before_validation, :after_validation,
-          :before_create,     :after_create, 
-          :before_update,     :after_update,
-          :before_save,       :after_save,
-          :before_destroy,    :after_destroy].each do |callback|
-          callback_method = "#{callback}_callback"
-          send(callback, callback_method)
-          define_method(callback_method) do
-            history << callback.to_sym
-          end
-        end
-        
-        def history
-          @history ||= []
-        end
-        
-        def clear_history
-          @history = nil
-        end
-      end
+      @document = Doc { include CallbacksSupport }
     end
-    
+
     should "get the order right for creating documents" do
       doc = @document.create(:name => 'John Nunemaker')
-      doc.history.should == [:before_validation, :before_validation_on_create, :after_validation, :before_save, :before_create, :after_create, :after_save]
+      doc.history.should == CreateCallbackOrder
     end
-    
+
     should "get the order right for updating documents" do
       doc = @document.create(:name => 'John Nunemaker')
       doc.clear_history
       doc.name = 'John'
       doc.save
-      doc.history.should == [:before_validation, :before_validation_on_update, :after_validation, :before_save, :before_update, :after_update, :after_save]
+      doc.history.should == UpdateCallbackOrder
     end
-    
+
     should "work for before and after validation" do
       doc = @document.new(:name => 'John Nunemaker')
       doc.valid?
       doc.history.should include(:before_validation)
       doc.history.should include(:after_validation)
     end
-    
+
     should "work for before and after create" do
       doc = @document.create(:name => 'John Nunemaker')
       doc.history.should include(:before_create)
       doc.history.should include(:after_create)
     end
-    
+
     should "work for before and after update" do
       doc = @document.create(:name => 'John Nunemaker')
       doc.name = 'John Doe'
@@ -62,7 +70,7 @@ class CallbacksTest < Test::Unit::TestCase
       doc.history.should include(:before_update)
       doc.history.should include(:after_update)
     end
-    
+
     should "work for before and after save" do
       doc = @document.new
       doc.name = 'John Doe'
@@ -70,7 +78,7 @@ class CallbacksTest < Test::Unit::TestCase
       doc.history.should include(:before_save)
       doc.history.should include(:after_save)
     end
-    
+
     should "work for before and after destroy" do
       doc = @document.create(:name => 'John Nunemaker')
       doc.destroy
@@ -78,4 +86,66 @@ class CallbacksTest < Test::Unit::TestCase
       doc.history.should include(:after_destroy)
     end
   end
+
+  context "Defining and running callbacks on many embedded documents" do
+    setup do
+      @root_class        = Doc  { include CallbacksSupport }
+      @child_class       = EDoc { include CallbacksSupport }
+      @grand_child_class = EDoc { include CallbacksSupport }
+
+      @root_class.many :children, :class => @child_class
+      @child_class.many :children, :class => @grand_child_class
+    end
+
+    should "get the order right based on root document creation" do
+      grand = @grand_child_class.new(:name => 'Grand Child')
+      child = @child_class.new(:name => 'Child', :children => [grand])
+      root  = @root_class.create(:name => 'Parent', :children => [child])
+
+      child = root.children.first
+      child.history.should == CreateCallbackOrder
+
+      grand = root.children.first.children.first
+      grand.history.should == CreateCallbackOrder
+    end
+
+    should "get the order right based on root document updating" do
+      grand = @grand_child_class.new(:name => 'Grand Child')
+      child = @child_class.new(:name => 'Child', :children => [grand])
+      root  = @root_class.create(:name => 'Parent', :children => [child])
+      root.clear_history
+      root.update_attributes(:name => 'Updated Parent')
+
+      child = root.children.first
+      child.history.should == UpdateCallbackOrder
+
+      grand = root.children.first.children.first
+      grand.history.should == UpdateCallbackOrder
+    end
+
+    should "work for before and after destroy" do
+      grand = @grand_child_class.new(:name => 'Grand Child')
+      child = @child_class.new(:name => 'Child', :children => [grand])
+      root  = @root_class.create(:name => 'Parent', :children => [child])
+      root.destroy
+      child = root.children.first
+      child.history.should include(:before_destroy)
+      child.history.should include(:after_destroy)
+
+      grand = root.children.first.children.first
+      grand.history.should include(:before_destroy)
+      grand.history.should include(:after_destroy)
+    end
+
+    should "not attempt to run callback defined on root that is not defined on embedded association" do
+      @root_class.define_callbacks :after_publish
+      @root_class.after_save { |d| d.run_callbacks(:after_publish) }
+
+      assert_nothing_raised do
+        child = @child_class.new(:name => 'Child')
+        root  = @root_class.create(:name => 'Parent', :children => [child])
+        child.history.should_not include(:after_publish)
+      end
+    end
+  end
 end

data/test/functional/test_document.rb

@@ -12,7 +12,7 @@ class DocumentTest < Test::Unit::TestCase
       key :date, Date
     end
   end
-  
+
   context "array key" do
     setup do
       @document.key :tags, Array
@@ -115,6 +115,23 @@ class DocumentTest < Test::Unit::TestCase
     end
   end
 
+  context "key with proc default value" do
+    setup do
+      @document.key :proc_default, String, :default => lambda { return 'string' }
+    end
+
+    should "detect and run proc default" do
+      doc = @document.new
+      doc.proc_default.should == 'string'
+    end
+
+    should "save and load from mongo" do
+      doc = @document.create
+      doc = doc.reload
+      doc.proc_default.should == 'string'
+    end
+  end
+
   context "ClassMethods#create (single document)" do
     setup do
       @doc_instance = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
@@ -139,7 +156,7 @@ class DocumentTest < Test::Unit::TestCase
       @doc_instance.last_name.should == 'Nunemaker'
       @doc_instance.age.should == 27
     end
-    
+
     should "not fail if no attributes provided" do
       document = Doc()
       lambda { document.create }.should change { document.count }.by(1)
@@ -183,12 +200,12 @@ class DocumentTest < Test::Unit::TestCase
     should "not create new document" do
       @document.count.should == 1
     end
-    
+
     should "raise error if not provided id" do
       doc = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
       lambda { @document.update }.should raise_error(ArgumentError)
     end
-    
+
     should "raise error if not provided attributes" do
       doc = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
       lambda { @document.update(doc._id) }.should raise_error(ArgumentError)
@@ -221,7 +238,7 @@ class DocumentTest < Test::Unit::TestCase
       @document.find(@doc1._id).age.should == 30
       @document.find(@doc2._id).age.should == 30
     end
-    
+
     should "raise error if not a hash" do
       lambda { @document.update([1, 2]) }.should raise_error(ArgumentError)
     end
@@ -243,7 +260,7 @@ class DocumentTest < Test::Unit::TestCase
         @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) }
@@ -525,7 +542,7 @@ class DocumentTest < Test::Unit::TestCase
       @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.count.should == 1
     end
 
@@ -596,11 +613,11 @@ class DocumentTest < Test::Unit::TestCase
       @document.count(:age => [26, 27]).should == 2
     end
   end
-  
+
   should "have instance method for collection" do
     @document.new.collection.name.should == @document.collection.name
   end
-  
+
   should "have instance method for database" do
     @document.new.database.should == @document.database
   end
@@ -672,7 +689,7 @@ class DocumentTest < Test::Unit::TestCase
       @document.new.update_attributes({}).should be_false
     end
   end
-  
+
   context "#save (new document)" do
     setup do
       @doc = @document.new(:first_name => 'John', :age => '27')
@@ -710,12 +727,12 @@ class DocumentTest < Test::Unit::TestCase
     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'
@@ -723,7 +740,7 @@ class DocumentTest < Test::Unit::TestCase
 
     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 = @document.new(:first_name => 'John', :age => '27', :date => "2009-12-01")
         doc.save
         doc.date.should == Date.new(2009, 12, 1)
       end
@@ -775,7 +792,7 @@ class DocumentTest < Test::Unit::TestCase
       @document.count.should == 1
     end
   end
-  
+
   context "#save (with options)" do
     setup do
       @document = Doc do
@@ -799,7 +816,7 @@ class DocumentTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   context "#save! (with options)" do
     setup do
       @document = Doc do
@@ -840,37 +857,57 @@ class DocumentTest < Test::Unit::TestCase
       @document.count.should == 0
     end
   end
-  
+
   context "#delete" do
     setup do
-      @doc1 = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
-      @doc2 = @document.create({:first_name => 'Steve', :last_name => 'Smith', :age => '28'})
-      
+      @doc1 = @document.create(:first_name => 'John', :last_name => 'Nunemaker', :age => '27')
+      @doc2 = @document.create(:first_name => 'Steve', :last_name => 'Smith', :age => '28')
+
       @document.class_eval do
         before_destroy :before_destroy_callback
         after_destroy :after_destroy_callback
-        
+
         def history; @history ||= [] end
         def before_destroy_callback; history << :after_destroy end
         def after_destroy_callback;  history << :after_destroy end
       end
-      
+
       @doc1.delete
     end
 
     should "remove document from collection" do
       @document.count.should == 1
     end
-    
+
     should "not remove other documents" do
       @document.find(@doc2.id).should_not be(nil)
     end
-    
+
     should "not call before/after destroy callbacks" do
       @doc1.history.should == []
     end
   end
 
+  context "#destroyed?" do
+    setup do
+      @doc1 = @document.create(:first_name => 'John', :last_name => 'Nunemaker', :age => '27')
+    end
+
+    should "be true if deleted" do
+      @doc1.delete
+      assert @doc1.destroyed?
+    end
+
+    should "be true if destroyed" do
+      @doc1.destroy
+      assert @doc1.destroyed?
+    end
+
+    should "be false if not deleted or destroyed" do
+      assert ! @doc1.destroyed?
+    end
+  end
+
   context "Single collection inheritance" do
     setup do
       class ::DocParent
@@ -883,7 +920,7 @@ class DocumentTest < Test::Unit::TestCase
       class ::DocDaughter < ::DocParent; end
       class ::DocSon < ::DocParent; end
       class ::DocGrandSon < ::DocSon; end
-      
+
       DocSon.many :children, :class_name => 'DocGrandSon'
 
       @parent = DocParent.new({:name => "Daddy Warbucks"})
@@ -939,7 +976,7 @@ class DocumentTest < Test::Unit::TestCase
       DocDaughter.all(:order => 'name').should  == [carrie, steph]
       DocParent.all(:order => 'name').should    == [carrie, john, steph, steve]
     end
-    
+
     should "work with nested hash conditions" do
       john = DocSon.create(:name => 'John')
       steve = DocSon.create(:name => 'Steve')
@@ -1023,7 +1060,7 @@ class DocumentTest < Test::Unit::TestCase
         DocParent.delete_all
       }.should change { DocParent.count }.by(-2)
     end
-    
+
     should "be able to reload parent inherited class" do
       brian = DocParent.create(:name => 'Brian')
       brian.name = 'B-Dawg'
@@ -1032,89 +1069,6 @@ class DocumentTest < Test::Unit::TestCase
     end
   end
 
-  context "timestamping" do
-    setup do
-      @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 = @klass.new(:first_name => 'John', :age => 27)
-      doc.created_at.should be(nil)
-      doc.updated_at.should be(nil)
-      doc.save
-      doc.created_at.should_not be(nil)
-      doc.updated_at.should_not be(nil)
-    end
-    
-    should "not overwrite created_at if it already exists" do
-      original_created_at = 1.month.ago
-      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
-      doc.created_at.to_i.should == original_created_at.to_i
-      doc.updated_at.should_not be_nil
-    end
-
-    should "set updated_at on field update but leave created_at alone" do
-      doc = @klass.create(:first_name => 'John', :age => 27)
-      old_created_at = doc.created_at
-      old_updated_at = doc.updated_at
-      doc.first_name = 'Johnny'
-
-      Timecop.freeze(Time.now + 5.seconds) do
-        doc.save
-      end
-
-      doc.created_at.should == old_created_at
-      doc.updated_at.should_not == old_updated_at
-    end
-
-    should "set updated_at on document update but leave created_at alone" do
-      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
-        @klass.update(doc._id, { :first_name => 'Johnny' })
-      end
-
-      doc = doc.reload
-      doc.created_at.should == old_created_at
-      doc.updated_at.should_not == old_updated_at
-    end
-  end
-
-  context "userstamping" do
-    setup do
-      @document.userstamps!
-    end
-    
-    should "add creator_id key" do
-      @document.keys.keys.should include('creator_id')
-    end
-    
-    should "add updater_id key" do
-      @document.keys.keys.should include('updater_id')
-    end
-    
-    should "add belongs_to creator" do
-      @document.associations.keys.should include('creator')
-    end
-    
-    should "add belongs_to updater" do
-      @document.associations.keys.should include('updater')
-    end
-  end
-
   context "#exists?" do
     setup do
       @doc = @document.create(:first_name => "James", :age => 27)
@@ -1143,14 +1097,14 @@ class DocumentTest < Test::Unit::TestCase
       @foo_class = Doc do
         key :name
       end
-      
+
       @bar_class = EDoc do
         key :name
       end
-      
+
       @document.many :foos, :class => @foo_class
       @document.many :bars, :class => @bar_class
-      
+
       @instance = @document.create({
         :age => 39,
         :foos => [@foo_class.new(:name => '1')],
@@ -1164,22 +1118,22 @@ class DocumentTest < Test::Unit::TestCase
       @instance.reload
       @instance.age.should == 39
     end
-    
+
     should "reset all associations" do
       @instance.foos.expects(:reset).at_least_once
       @instance.bars.expects(:reset).at_least_once
       @instance.reload
     end
-    
+
     should "reinstantiate embedded associations" do
       @instance.reload
       @instance.bars.first.name.should == '1'
     end
-    
+
     should "return self" do
       @instance.reload.object_id.should == @instance.object_id
     end
-    
+
     should "raise DocumentNotFound if not found" do
       @instance.destroy
       assert_raises(MongoMapper::DocumentNotFound) { @instance.reload }
@@ -1208,37 +1162,4 @@ class DocumentTest < Test::Unit::TestCase
       doc.skills.should == ['ruby', 'rails', 'javascript', 'xhtml', 'css']
     end
   end
-
-  context "Indexing" do
-    setup do
-      drop_indexes(@document)
-    end
-
-    should "allow creating index for a key" do
-      @document.ensure_index :first_name
-      @document.should have_index('first_name_1')
-    end
-
-    should "allow creating unique index for a key" do
-      @document.ensure_index :first_name, :unique => true
-      @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]]
-      
-      # 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
-      @document.collection.index_information.detect do |index|
-        keys = index[1]
-        keys.include?(['first_name', 1]) && keys.include?(['last_name', -1])
-      end.should_not be_nil
-    end
-
-    should "work with :index shortcut when defining key" do
-      @document.key :father, String, :index => true
-      @document.should have_index('father_1')
-    end
-  end
 end