kbaum-mongo 0.18.3.2 → 0.19

data/lib/mongo.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 module Mongo
-  VERSION = "0.18.3.2"
+  VERSION = "0.19"
 end
 
 begin

data/lib/mongo/collection.rb

@@ -261,7 +261,7 @@ module Mongo
       message = ByteBuffer.new([0, 0, 0, 0])
       BSON_RUBY.serialize_cstr(message, "#{@db.name}.#{@name}")
       message.put_int(0)
-      message.put_array(BSON.serialize(selector, false).to_a)
+      message.put_array(BSON.serialize(selector, false, true).to_a)
 
       if opts[:safe]
         @connection.send_message_with_safe_check(Mongo::Constants::OP_DELETE, message, @db.name,
@@ -303,7 +303,7 @@ module Mongo
       update_options += 1 if options[:upsert]
       update_options += 2 if options[:multi]
       message.put_int(update_options)
-      message.put_array(BSON.serialize(selector, false).to_a)
+      message.put_array(BSON.serialize(selector, false, true).to_a)
       message.put_array(BSON.serialize(document, false, true).to_a)
       if options[:safe]
         @connection.send_message_with_safe_check(Mongo::Constants::OP_UPDATE, message, @db.name,

data/lib/mongo/util/bson_ruby.rb

@@ -105,14 +105,14 @@ class BSON_RUBY
     # Write key/value pairs. Always write _id first if it exists.
     if move_id
       if obj.has_key? '_id'
-        serialize_key_value('_id', obj['_id'], check_keys)
+        serialize_key_value('_id', obj['_id'], false)
       elsif obj.has_key? :_id
-        serialize_key_value('_id', obj[:_id], check_keys)
+        serialize_key_value('_id', obj[:_id], false)
       end
       obj.each {|k, v| serialize_key_value(k, v, check_keys) unless k == '_id' || k == :_id }
     else
       if obj.has_key?('_id') && obj.has_key?(:_id)
-        obj.delete(:_id)
+        obj['_id'] = obj.delete(:_id)
       end
       obj.each {|k, v| serialize_key_value(k, v, check_keys) }
     end

data/test/bson_test.rb

@@ -356,6 +356,13 @@ class BSONTest < Test::Unit::TestCase
     assert_equal BSON.serialize(one).to_a, BSON.serialize(dup).to_a
   end
 
+  def test_no_duplicate_id_when_moving_id
+    dup = {"_id" => "foo", :_id => "foo"}
+    one = {:_id => "foo"}
+
+    assert_equal BSON.serialize(one, false, true).to_s, BSON.serialize(dup, false, true).to_s
+  end
+
   def test_null_character
     doc = {"a" => "\x00"}
 
@@ -399,6 +406,7 @@ class BSONTest < Test::Unit::TestCase
     a['key'] = 'abc'
     a['_id']  = 1
 
+
     assert_equal ")\000\000\000\020_id\000\001\000\000\000\002text" +
                  "\000\004\000\000\000abc\000\002key\000\004\000\000\000abc\000\000",
                  BSON.serialize(a, false, true).to_s
@@ -424,4 +432,23 @@ class BSONTest < Test::Unit::TestCase
                  "\000\002\000\000\000\000\020_id\000\003\000\000\000\000",
                  BSON.serialize(c, false, false).to_s
   end
+
+  begin
+  require 'active_support'
+  rescue LoadError
+    warn 'Could not test BSON with HashWithIndifferentAccess.'
+  end
+
+  if defined?(HashWithIndifferentAccess)
+    def test_keep_id_with_hash_with_indifferent_access
+      doc = HashWithIndifferentAccess.new
+      doc[:_id] = ObjectID.new
+      BSON.serialize(doc, false, false).to_a
+      assert doc.has_key?("_id")
+
+      doc['_id'] = ObjectID.new
+      BSON.serialize(doc, false, false).to_a
+      assert doc.has_key?("_id")
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kbaum-mongo
 version: !ruby/object:Gem::Version 
-  version: 0.18.3.2
+  version: "0.19"
 platform: ruby
 authors: 
 - Jim Menard
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-26 00:00:00 -05:00
+date: 2010-03-01 00:00:00 -05:00
 default_executable: 
 dependencies: []