mongo_mapper-unstable 2009.11.8 → 2009.11.18

data/test/functional/test_embedded_document.rb

@@ -28,9 +28,28 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       @doc.foo.city.should == 'South Bend'
       @doc.foo.state.should == 'IN'
 
-      from_db = @document.find(@doc.id)
-      from_db.foo.city.should == 'South Bend'
-      from_db.foo.state.should == 'IN'
+      doc = @doc.reload
+      doc.foo.city.should == 'South Bend'
+      doc.foo.state.should == 'IN'
+    end
+  end
+  
+  context "Instantiating single collection inherited embedded documents" do
+    setup do
+      @document = Class.new do
+        include MongoMapper::Document
+        key :message, Message
+      end
+    end
+
+    should "work" do
+      doc1 = @document.create(:message => Enter.new)
+      doc2 = @document.create(:message => Exit.new)
+      doc3 = @document.create(:message => Chat.new)
+
+      doc1.reload.message.class.should be(Enter)
+      doc2.reload.message.class.should be(Exit)
+      doc3.reload.message.class.should be(Chat)
     end
   end
   
@@ -58,8 +77,9 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       address = Address.new(:city => 'South Bend', :state => 'IN')
       doc = @document.new(:foo => address)
       doc.save
-      read_doc = @document.find(doc.id)
-      read_doc.foo.new?.should == false
+      
+      doc = doc.reload
+      doc.foo.new?.should == false
     end
   end
   
@@ -71,15 +91,16 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       person.pets << pet
       pet.save
 
-      doc = RealPerson.find(person.id)
-      doc.pets.first.should == pet
+      person = person.reload
+      person.pets.first.should == pet
     end
     
     should "save new keys" do
       person = RealPerson.new
       person[:new_attribute] = 'foobar'
       person.save
-      from_db = RealPerson.find(person.id)
+      
+      person = person.reload
       person.new_attribute.should == 'foobar'
     end
   end
@@ -92,14 +113,13 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       person.pets << pet
       pet.save
 
-      doc = RealPerson.find(person.id)
-      pet = doc.pets.first
+      person = person.reload
+      pet = person.pets.first
       pet.update_attributes :name => 'koda'
 
-      doc = RealPerson.find(person.id)
-      embedded = doc.pets.first
-      embedded.id.should == pet.id
-      embedded.name.should == 'koda'
+      person = person.reload
+      person.pets.first._id.should == pet._id
+      person.pets.first.name.should == 'koda'
     end
   end  
 end

data/test/functional/test_string_id_compatibility.rb

@@ -0,0 +1,72 @@
+require 'test_helper'
+
+class StringIdCompatibilityTest < Test::Unit::TestCase
+  def setup
+    @note_class = Class.new do
+      include MongoMapper::EmbeddedDocument
+      key :_id, String
+    end
+    
+    @task_class = Class.new do
+      include MongoMapper::Document
+      key :_id, String
+      key :project_id, String
+      belongs_to :project
+    end
+    
+    @project_class = Class.new do
+      include MongoMapper::Document
+      key :_id, String
+    end
+    
+    @task_class.belongs_to :project, :class => @project_class
+    @project_class.many :notes, :class => @note_class
+    @project_class.many :tasks, :class => @task_class, :foreign_key => 'project_id'
+    
+    @project_class.collection.remove
+    @task_class.collection.remove
+  end
+  
+  should "assign correct _id for documents" do
+    project = @project_class.create
+    project._id.should == project.id
+    project._id.should be_instance_of(String)
+    project.id.size.should == 24
+    lambda {
+      Mongo::ObjectID.from_string(project.id)
+    }.should_not raise_error
+  end
+  
+  should "assign correct _id for embedded documents" do
+    note = @note_class.new
+    note.id.should == note._id
+    note.id.size.should == 24
+  end
+  
+  should "find records" do
+    project = @project_class.create
+    @project_class.find(project.id).should == project
+  end
+    
+  should "save embedded docs" do
+    n1 = @note_class.new
+    n2 = @note_class.new
+    n3 = @note_class.new
+    project = @project_class.create(:notes => [n1, n2, n3])
+    
+    project = project.reload
+    project.notes.size.should == 3
+    project.notes.should == [n1, n2, n3]
+  end
+  
+  should "be able to associate records" do
+    t1 = @task_class.new(:body => 'First task')
+    t2 = @task_class.new(:body => 'Second task')
+    t3 = @task_class.new(:body => 'Third task')
+    project = @project_class.create(:name => 'MM', :tasks => [t1, t2, t3])
+    
+    project = project.reload
+    project.tasks.count.should == 3
+    project.tasks.should == [t1, t2, t3]
+  end
+end

data/test/functional/test_validations.rb

@@ -93,7 +93,7 @@ class ValidationsTest < Test::Unit::TestCase
     should "not update document" do
       @doc.name = nil
       @doc.save
-      @document.find(@doc.id).name.should == 'John Nunemaker'
+      @doc.reload.name.should == 'John Nunemaker'
     end
     
     should "populate document's errors" do

data/test/models.rb

@@ -23,6 +23,12 @@ class WindowSize
   end
 end
 
+module AccountsExtensions
+  def inactive
+    all(:last_logged_in => nil)
+  end
+end
+
 class Post
   include MongoMapper::Document
 
@@ -40,7 +46,7 @@ class PostComment
   key :username, String, :default => 'Anonymous'
   key :body, String
 
-  key :commentable_id, String
+  key :commentable_id, ObjectId
   key :commentable_type, String
   belongs_to :commentable, :polymorphic => true
 
@@ -62,7 +68,7 @@ class Message
   key :body, String
   key :position, Integer
   key :_type, String
-  key :room_id, String
+  key :room_id, ObjectId
 
   belongs_to :room
 end
@@ -71,17 +77,25 @@ class Enter < Message; end
 class Exit < Message;  end
 class Chat < Message;  end
 
-module AccountsExtensions
-  def inactive
-    all(:last_logged_in => nil)
+class Room
+  include MongoMapper::Document
+
+  key :name, String
+  many :messages, :polymorphic => true, :order => 'position' do
+    def older
+      all(:position => {'$gt' => 5})
+    end
   end
+  many :latest_messages, :class_name => 'Message', :order => 'position desc', :limit => 2
+  
+  many :accounts, :polymorphic => true, :extend => AccountsExtensions
 end
 
 class Account
   include MongoMapper::Document
   
   key :_type, String
-  key :room_id, String
+  key :room_id, ObjectId
   key :last_logged_in, Time
   
   belongs_to :room
@@ -89,20 +103,6 @@ end
 class User < Account; end
 class Bot < Account; end
 
-class Room
-  include MongoMapper::Document
-
-  key :name, String
-  many :messages, :polymorphic => true do
-    def older
-      all(:position => {'$gt' => 5})
-    end
-  end
-  many :latest_messages, :class_name => 'Message', :order => 'position desc', :limit => 2
-  
-  many :accounts, :polymorphic => true, :extend => AccountsExtensions
-end
-
 class Answer
   include MongoMapper::Document
 
@@ -145,7 +145,7 @@ end
 
 class Collaborator
   include MongoMapper::Document
-  key :project_id, String
+  key :project_id, ObjectId
   key :name, String
   belongs_to :project
 end
@@ -153,8 +153,8 @@ end
 class Status
   include MongoMapper::Document
 
-  key :project_id, String
-  key :target_id, String
+  key :project_id, ObjectId
+  key :target_id, ObjectId
   key :target_type, String
   key :name, String, :required => true
   key :position, Integer
@@ -166,7 +166,7 @@ end
 class RealPerson
   include MongoMapper::Document
 
-  key :room_id, String
+  key :room_id, ObjectId
   key :name, String
   
   belongs_to :room

data/test/unit/test_document.rb

@@ -157,6 +157,7 @@ class DocumentTest < Test::Unit::TestCase
       end
       
       should "be true if id but using custom id and not saved yet" do
+        @document.key :_id, String
         doc = @document.new
         doc.id = '1234'
         doc.new?.should be_true
@@ -178,14 +179,16 @@ class DocumentTest < Test::Unit::TestCase
       end
     end
 
-    
     context "equality" do
+      setup do
+        @oid = Mongo::ObjectID.new
+      end
       should "be equal if id and class are the same" do
-        (@document.new('_id' => 1) == @document.new('_id' => 1)).should be(true)
+        (@document.new('_id' => @oid) == @document.new('_id' => @oid)).should be(true)
       end
 
       should "not be equal if class same but id different" do
-        (@document.new('_id' => 1) == @document.new('_id' => 2)).should be(false)
+        (@document.new('_id' => @oid) == @document.new('_id' => Mongo::ObjectID.new)).should be(false)
       end
 
       should "not be equal if id same but class different" do
@@ -194,7 +197,7 @@ class DocumentTest < Test::Unit::TestCase
           set_collection_name 'test'
         end
 
-        (@document.new('_id' => 1) == @another_document.new('_id' => 1)).should be(false)
+        (@document.new('_id' => @oid) == @another_document.new('_id' => @oid)).should be(false)
       end
     end
   end # instance of a document

data/test/unit/test_embedded_document.rb

@@ -49,6 +49,15 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       @klass.keys['_id'].should_not be_nil
     end
     
+    should "know it is using object id" do
+      @klass.using_object_id?.should be_true
+    end
+    
+    should "know it is not using object id if _id type is changed" do
+      @klass.key :_id, String
+      @klass.using_object_id?.should be_false
+    end
+    
     context "#to_mongo" do
       should "be nil if nil" do
         @klass.to_mongo(nil).should be_nil
@@ -80,6 +89,15 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
     end
   end
   
+  context "looking up type constants" do
+    should "not raise an error" do
+      klass = Class.new do
+        include MongoMapper::EmbeddedDocument
+        key :file, Binary
+      end
+    end
+  end
+  
   context "parent_model" do
     should "be nil if none of parents ancestors include EmbeddedDocument" do
       parent = Class.new
@@ -150,11 +168,11 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       @document.keys['age'].type.should == Integer
     end
     
-    should "not be redefinable" do
+    should "be redefinable" do
       @document.key(:foo, String)
       @document.keys['foo'].type.should == String
       @document.key(:foo, Integer)
-      @document.keys['foo'].type.should == String
+      @document.keys['foo'].type.should == Integer
     end
     
     should "create reader method" do
@@ -292,6 +310,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
     should "have to_param that is id" do
       doc = @document.new
       doc.to_param.should == doc.id
+      doc.to_param.should be_instance_of(String)
     end
     
     should "have access to class logger" do
@@ -308,6 +327,24 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       doc = @document.new
       doc.id.should == doc._id.to_s
     end
+    
+    context "assigning id with _id ObjectId type" do
+      should "not set custom id flag" do
+        doc = @document.new
+        doc.using_custom_id?.should be_false
+        doc.id = Mongo::ObjectID.new
+        doc.using_custom_id?.should be_false
+      end
+      
+      should "convert string object id to mongo object id" do
+        id = Mongo::ObjectID.new
+        doc = @document.new
+        doc.id = id.to_s
+        doc._id.should == id
+        doc.id.should == id.to_s
+        doc.using_custom_id?.should be_false
+      end
+    end
 
     should "have a nil _root_document" do
       @document.new._root_document.should be_nil
@@ -315,11 +352,13 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
 
     context "setting custom id" do
       should "set _id" do
+        @document.key :_id, String
         doc = @document.new(:id => '1234')
         doc._id.should == '1234'
       end
       
       should "know that custom id is set" do
+        @document.key :_id, String
         doc = @document.new
         doc.using_custom_id?.should be_false
         doc.id = '1234'
@@ -656,12 +695,15 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
     end
     
     context "equality" do
+      setup do
+        @oid = Mongo::ObjectID.new
+      end
       should "be equal if id and class are the same" do
-        (@document.new('_id' => 1) == @document.new('_id' => 1)).should be(true)
+        (@document.new('_id' => @oid) == @document.new('_id' => @oid)).should be(true)
       end
 
       should "not be equal if class same but id different" do
-        (@document.new('_id' => 1) == @document.new('_id' => 2)).should be(false)
+        (@document.new('_id' => @oid) == @document.new('_id' => Mongo::ObjectID.new)).should be(false)
       end
 
       should "not be equal if id same but class different" do
@@ -669,7 +711,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
           include MongoMapper::Document
         end
 
-        (@document.new('_id' => 1) == @another_document.new('_id' => 1)).should be(false)
+        (@document.new('_id' => @oid) == @another_document.new('_id' => @oid)).should be(false)
       end
     end
   end # instance of a embedded document

data/test/unit/test_finder_options.rb

@@ -57,9 +57,28 @@ class FinderOptionsTest < Test::Unit::TestCase
     end
     
     should "convert id to _id" do
-      FinderOptions.new(Room, :id => '1').criteria.should == {
-        :_id => '1'
-      }
+      id = Mongo::ObjectID.new
+      FinderOptions.new(Room, :id => id).criteria.should == {:_id => id}
+    end
+    
+    should "make sure that _id's are object ids" do
+      id = Mongo::ObjectID.new
+      FinderOptions.new(Room, :_id => id.to_s).criteria.should == {:_id => id}
+    end
+    
+    should "work fine with _id's that are object ids" do
+      id = Mongo::ObjectID.new
+      FinderOptions.new(Room, :_id => id).criteria.should == {:_id => id}
+    end
+    
+    should "make sure other object id typed keys get converted" do
+      id = Mongo::ObjectID.new
+      FinderOptions.new(Message, :room_id => id.to_s).criteria.should == {:room_id => id}
+    end
+    
+    should "work fine with object ids for object id typed keys" do
+      id = Mongo::ObjectID.new
+      FinderOptions.new(Message, :room_id => id).criteria.should == {:room_id => id}
     end
     
     should "use $in for arrays" do