mongo_mapper-unstable 2010.2.28 → 2010.3.3

data/test/functional/test_document.rb

@@ -1069,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)
@@ -1245,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

data/test/functional/test_embedded_document.rb

@@ -3,18 +3,17 @@ require 'models'
 
 class EmbeddedDocumentTest < Test::Unit::TestCase
   def setup
-    @klass = Doc do
-      key :first_name, String
-      key :last_name, String
+    @klass = Doc('Person') do
+      key :name, String
     end
 
-    @pet_klass = EDoc do
+    @pet_klass = EDoc('Pet') do
       key :name, String
     end
 
     @klass.many :pets, :class => @pet_klass
 
-    @address_class = EDoc do
+    @address_class = EDoc('Address') do
       key :city, String
       key :state, String
     end
@@ -23,20 +22,26 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
   context "Saving a document with a key that is an embedded document" do
     setup do
       @klass.key :foo, @address_class
-
-      @address = @address_class.new(:city => 'South Bend', :state => 'IN')
-      @doc = @klass.new(:foo => @address)
     end
 
     should "embed embedded document" do
-      @doc.save
-      @doc.foo.city.should == 'South Bend'
-      @doc.foo.state.should == 'IN'
+      address = @address_class.new(:city => 'South Bend', :state => 'IN')
+      doc = @klass.create(:foo => address)
+      doc.foo.city.should == 'South Bend'
+      doc.foo.state.should == 'IN'
 
-      doc = @doc.reload
+      doc = doc.reload
       doc.foo.city.should == 'South Bend'
       doc.foo.state.should == 'IN'
     end
+
+    should "assign _parent_document and _root_document" do
+      address = @address_class.new(:city => 'South Bend', :state => 'IN')
+      address._parent_document.should be_nil
+      doc = @klass.create(:foo => address)
+      address._parent_document.should be(doc)
+      address._root_document.should be(doc)
+    end
   end
 
   should "correctly instantiate single collection inherited embedded documents" do

data/test/functional/test_indexing.rb

@@ -0,0 +1,44 @@
+require 'test_helper'
+
+class IndexingTest < Test::Unit::TestCase
+  context "Indexing" do
+    setup do
+      @document = Doc do
+        set_collection_name 'users'
+
+        key :first_name, String
+        key :last_name, String
+        key :age, Integer
+        key :date, Date
+      end
+      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