mongo_mapper 0.6.2 → 0.6.3

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/lib/mongo_mapper/associations/many_embedded_proxy.rb

@@ -16,7 +16,7 @@ module MongoMapper
       # TODO: test that both string and oid version work
       def find(id)
         load_target
-        @target.detect { |item| item.id == id || item._id == id }
+        @target.detect { |item| item.id.to_s == id || item.id == id }
       end
 
       def <<(*docs)

data/lib/mongo_mapper/embedded_document.rb

@@ -219,7 +219,7 @@ module MongoMapper
       end
       
       def to_param
-        id
+        id.to_s
       end
 
       def attributes=(attrs)
@@ -292,7 +292,7 @@ module MongoMapper
       end
 
       def id
-        read_attribute(:_id).to_s
+        read_attribute(:_id)
       end
 
       def id=(value)

data/lib/mongo_mapper/support.rb

@@ -183,4 +183,11 @@ class Time
       value
     end
   end
+end
+
+# TODO: Remove when patch accepted into driver
+class Mongo::ObjectID
+  def to_json(options = nil)
+    to_s
+  end
 end

data/mongo_mapper.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_mapper}
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]

data/test/functional/associations/test_many_embedded_proxy.rb

@@ -138,8 +138,10 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
   
   should "allow finding by id" do
     sparky = Pet.new(:name => "Sparky", :species => "Dog")
-    meg = Person.new(:name => "Meg", :pets => [sparky])
-    meg.pets.find(sparky._id).should == sparky
+    meg    = Person.new(:name => "Meg", :pets => [sparky])
+    
+    meg.pets.find(sparky._id).should     == sparky  # oid
+    meg.pets.find(sparky.id.to_s).should == sparky  # string
   end
   
   context "extending the association" do

data/test/functional/associations/test_many_proxy.rb

@@ -365,7 +365,11 @@ class ManyProxyTest < Test::Unit::TestCase
       status3 = Status.new(:name => "Closed")
       project.statuses = [status1, status2, status3]
       project.save
-      project.statuses.open.should == [status1, status2]
+      
+      open_statuses = project.statuses.open
+      open_statuses.should include(status1)
+      open_statuses.should include(status2)
+      open_statuses.should_not include(status3)
     end
   
     should "work using many's :extend option" do

data/test/functional/test_document.rb

@@ -172,9 +172,7 @@ class DocumentTest < Test::Unit::TestCase
       end
 
       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)
         @doc_instance._id.should be_instance_of(Mongo::ObjectID)
       end
 
@@ -777,8 +775,7 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "assign an id for the document" do
-      @doc.id.should_not be(nil)
-      @doc.id.size.should == 24
+      @doc.id.should be_instance_of(Mongo::ObjectID)
     end
 
     should "save attributes" do
@@ -858,8 +855,7 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "assign an id for the document" do
-      @doc.id.should_not be(nil)
-      @doc.id.size.should == 24
+      @doc.id.should be_instance_of(Mongo::ObjectID)
     end
 
     should "save attributes" do

data/test/unit/test_embedded_document.rb

@@ -307,9 +307,9 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       end
     end
     
-    should "have to_param that is id" do
+    should "have to_param that is string representation of id" do
       doc = @document.new
-      doc.to_param.should == doc.id
+      doc.to_param.should == doc.id.to_s
       doc.to_param.should be_instance_of(String)
     end
     
@@ -323,9 +323,10 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       @document.keys.keys.should include('_id')
     end
     
-    should "have id method that sets _id" do
-      doc = @document.new
-      doc.id.should == doc._id.to_s
+    should "have id method returns _id" do
+      id = Mongo::ObjectID.new
+      doc = @document.new(:_id => id)
+      doc.id.should == id
     end
     
     context "assigning id with _id ObjectId type" do
@@ -338,18 +339,13 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       
       should "convert string object id to mongo object id" do
         id = Mongo::ObjectID.new
-        doc = @document.new
-        doc.id = id.to_s
+        doc = @document.new(:id => id.to_s)
         doc._id.should == id
-        doc.id.should == id.to_s
+        doc.id.should == id
         doc.using_custom_id?.should be_false
       end
     end
 
-    should "have a nil _root_document" do
-      @document.new._root_document.should be_nil
-    end
-
     context "setting custom id" do
       should "set _id" do
         @document.key :_id, String
@@ -366,6 +362,10 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       end
     end
 
+    should "have a nil _root_document" do
+      @document.new._root_document.should be_nil
+    end
+
     context "being initialized" do
       should "accept a hash that sets keys and values" do
         doc = @document.new(:name => 'John', :age => 23)

data/test/unit/test_support.rb

@@ -331,4 +331,12 @@ class SupportTest < Test::Unit::TestCase
       Time.zone = nil
     end
   end
+  
+  context "Mongo::ObjectID.to_json" do
+    should "convert object id to string" do
+      id = Mongo::ObjectID.new
+      id.to_json.should == id.to_s
+    end
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - John Nunemaker