mongodb-mongo 0.2.5 → 0.2.6

data/lib/mongo/db.rb

@@ -254,8 +254,8 @@ module XGen
           doc['err']
         end
 
-        # Returns +true+ if there is was an error caused by the most recently
-        # executed database operation.
+        # Returns +true+ if an error was caused by the most recently executed
+        # database operation.
         #
         # Note: as of this writing, errors are only detected on the db server
         # for certain kinds of operations (writes). The plan is to change this

data/lib/mongo/util/bson.rb

@@ -333,7 +333,20 @@ class BSON
   def serialize_object_element(buf, key, val, opcode=OBJECT)
     buf.put(opcode)
     self.class.serialize_cstr(buf, key)
-    buf.put_array(BSON.new.serialize(val).to_a)
+    buf.put_array(BSON.new.serialize(put_id_first(val)).to_a)
+  end
+
+  # For internal use only. Looks for '_id' or :_id key of val. If there is
+  # one, returns an OrderedHash where '_id' is first. If not, returns val.
+  def put_id_first(val)
+    oid = val.delete('_id') || val.delete(:_id)
+    if oid
+      h = OrderedHash.new
+      h['_id'] = oid
+      val.each { |k, v| h[k] = v }
+      val = h
+    end
+    val
   end
 
   def serialize_array_element(buf, key, val)

data/mongo-ruby-driver.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'mongo'
-  s.version = '0.2.5'
+  s.version = '0.2.6'
   s.platform = Gem::Platform::RUBY
   s.summary = 'Simple pure-Ruby driver for the 10gen Mongo DB'
   s.description = 'A pure-Ruby driver for the 10gen Mongo DB. For more information about Mongo, see http://www.mongodb.org.'

data/tests/test_bson.rb

@@ -132,4 +132,20 @@ class BSONTest < Test::Unit::TestCase
     assert_kind_of Undefined, doc2['undef']
   end
 
+  def test_put_id_first
+    val = {'a' => 'foo'}
+    assert_same val, @b.put_id_first(val)
+
+    val = OrderedHash.new
+    val['not_id'] = 1
+    val['_id'] = 2
+    id_first = @b.put_id_first(val)
+    assert_equal ['_id', 'not_id'], id_first.keys
+
+    val = {'a' => 'foo', 'b' => 'bar', :_id => 42, 'z' => 'hello'}
+    id_first = @b.put_id_first(val)
+    assert id_first.keys.include?('_id')
+    assert !id_first.keys.include?(:_id)
+  end
+
 end

data/tests/test_db_api.rb

@@ -286,6 +286,16 @@ class DBAPITest < Test::Unit::TestCase
     assert_equal regex, rows[0]['b']
   end
 
+  def test_non_oid_id
+    # Note: can't use Time.new because that will include fractional seconds,
+    # which Mongo does not store.
+    t = Time.at(1234567890)
+    @coll << {'_id' => t}
+    rows = @coll.find({'_id' => t}).to_a
+    assert_equal 1, rows.length
+    assert_equal t, rows[0]['_id']
+  end
+
   def test_strict
     assert !@db.strict?
     @db.strict = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongodb-mongo
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Jim Menard