Converting ids to strings

lib/mongoid/document.rb

@@ -222,7 +222,7 @@ def read_attribute(name)
 
     # Reloads the +Document+ attributes from the database.
     def reload
-      @attributes = HashWithIndifferentAccess.new(collection.find_one(id))
+      @attributes = HashWithIndifferentAccess.new(collection.find_one(:_id => id))
     end
 
     # Returns the id of the Document
@@ -257,7 +257,7 @@ def generate_key
         values = primary_key.collect { |key| @attributes[key] }
         @attributes[:_id] = values.join(" ").parameterize.to_s
       else
-        @attributes[:_id] = Mongo::ObjectID.new unless id
+        @attributes[:_id] = Mongo::ObjectID.new.to_s unless id
       end
     end
   end

spec/integration/mongoid/document_spec.rb

@@ -62,7 +62,7 @@ class Comment < Mongoid::Document
 
     it "persists a new record to the database" do
       person = Person.create(:test => "Test")
-      person.id.should be_a_kind_of(Mongo::ObjectID)
+      person.id.should be_a_kind_of(String)
       person.attributes[:test].should == "Test"
     end
 

spec/unit/mongoid/associations/belongs_to_association_spec.rb

@@ -23,7 +23,7 @@ class Name < Mongoid::Document
     context "when finding by id" do
 
       it "returns the document in the array with that id" do
-        name = @association.find(Mongo::ObjectID.new)
+        name = @association.find(Mongo::ObjectID.new.to_s)
         name.should == @parent
       end
 

spec/unit/mongoid/criteria_spec.rb

@@ -195,13 +195,13 @@ class Person < Mongoid::Document
   describe "#id" do
 
     it "adds the _id query to the selector" do
-      id = Mongo::ObjectID.new
+      id = Mongo::ObjectID.new.to_s
       @criteria.id(id)
       @criteria.selector.should == { :_id => id }
     end
 
     it "returns self" do
-      id = Mongo::ObjectID.new
+      id = Mongo::ObjectID.new.to_s
       @criteria.id(id.to_s).should == @criteria
     end
 
@@ -413,7 +413,7 @@ class Person < Mongoid::Document
     context "with a single argument" do
 
       it "creates a criteria for an object id" do
-        id = Mongo::ObjectID.new
+        id = Mongo::ObjectID.new.to_s
         criteria = Mongoid::Criteria.translate(id)
         criteria.selector.should == { :_id => id }
       end

spec/unit/mongoid/document_spec.rb

@@ -208,7 +208,7 @@ class Address < Mongoid::Document
     context "when an id is passed in" do
 
       before do
-        @id = Mongo::ObjectID.new
+        @id = Mongo::ObjectID.new.to_s
       end
 
       it "delegates to criteria" do
@@ -526,8 +526,8 @@ class Address < Mongoid::Document
 
     before do
       @attributes = { "title" => "Herr" }
-      @person = Person.new(:_id => Mongo::ObjectID.new)
-      @collection.expects(:find_one).with(@person.id).returns(@attributes)
+      @person = Person.new(:_id => Mongo::ObjectID.new.to_s)
+      @collection.expects(:find_one).with(:_id => @person.id).returns(@attributes)
     end
 
     it "reloads the object attribtues from the database" do
@@ -549,7 +549,7 @@ class Address < Mongoid::Document
   describe "#to_param" do
 
     it "returns the id" do
-      id = Mongo::ObjectID.new
+      id = Mongo::ObjectID.new.to_s
       Person.new(:_id => id).to_param.should == id.to_s
     end
 

spec/unit/mongoid/extensions/object/conversions_spec.rb

@@ -30,18 +30,6 @@ class Person < Mongoid::Document
 
   describe "#set" do
 
-    context "when object does not have attributes" do
-
-      before do
-        @id = Mongo::ObjectID.new
-      end
-
-      it "returns the object" do
-        Mongo::ObjectID.set(@id).should == @id
-      end
-
-    end
-
     context "when object has attributes" do
 
       before do