mongodb-mongo 0.6.7 → 0.7

data/lib/mongo/util/bson.rb

@@ -86,13 +86,11 @@ class BSON
 
       # Write key/value pairs. Always write _id first if it exists.
       if obj.has_key? '_id'
-        oid = obj['_id']
+        serialize_key_value('_id', obj['_id'])
       elsif obj.has_key? :_id
-        oid = obj[:_id]
-      else
-        oid = false
+        serialize_key_value('_id', obj[:_id])
       end
-      serialize_key_value('_id', oid) if oid
+
       obj.each {|k, v| serialize_key_value(k, v) unless k == '_id' || k == :_id }
 
       serialize_eoo_element(@buf)
@@ -250,7 +248,10 @@ class BSON
   end
 
   def deserialize_number_int_data(buf)
-    buf.get_int
+    # sometimes ruby makes me angry... why would the same code pack as signed
+    # but unpack as unsigned
+    unsigned = buf.get_int
+    unsigned >= 2**32 / 2 ? unsigned - 2**32 : unsigned
   end
 
   def deserialize_object_data(buf)
@@ -389,6 +390,9 @@ class BSON
     if type == NUMBER
       buf.put_double(val)
     else
+      if val > 2**32 / 2 - 1 or val < -2**32 / 2
+        raise RangeError.new "MongoDB can only handle 4-byte ints - try converting to a double before saving"
+      end
       buf.put_int(val)
     end
   end

data/mongo-ruby-driver.gemspec

@@ -79,7 +79,7 @@ TEST_FILES = ['tests/mongo-qa/_common.rb',
 
 Gem::Specification.new do |s|
   s.name = 'mongo'
-  s.version = '0.6.7'
+  s.version = '0.7'
   s.platform = Gem::Platform::RUBY
   s.summary = 'Ruby driver for the 10gen Mongo DB'
   s.description = 'A Ruby driver for the 10gen Mongo DB. For more information about Mongo, see http://www.mongodb.org.'

data/tests/test_bson.rb

@@ -36,6 +36,18 @@ class BSONTest < Test::Unit::TestCase
     doc = {'doc' => 42}
     @b.serialize(doc)
     assert_equal doc, @b.deserialize
+
+    doc = {"doc" => -5600}
+    @b.serialize(doc)
+    assert_equal doc, @b.deserialize
+
+    doc = {"doc" => 2147483647}
+    @b.serialize(doc)
+    assert_equal doc, @b.deserialize
+
+    doc = {"doc" => -2147483648}
+    @b.serialize(doc)
+    assert_equal doc, @b.deserialize
   end
 
   def test_ordered_hash
@@ -181,6 +193,11 @@ class BSONTest < Test::Unit::TestCase
     assert_equal '_id', roundtrip.keys.first
   end
 
+  def test_nil_id
+    doc = {"_id" => nil}
+    assert_equal doc, @b.deserialize(@b.serialize(doc).to_a)
+  end
+
   def test_timestamp
     val = {"test" => [4, 20]}
     assert_equal val, @b.deserialize([0x13, 0x00, 0x00, 0x00,
@@ -190,6 +207,21 @@ class BSONTest < Test::Unit::TestCase
                                       0x00, 0x00, 0x00])
   end
 
+  def test_overflow
+    doc = {"x" => 2**45}
+    assert_raise RangeError do
+      @b.serialize(doc)
+    end
+
+    doc = {"x" => 2147483647}
+    assert_equal doc, @b.deserialize(@b.serialize(doc).to_a)
+
+    doc["x"] = doc["x"] + 1
+    assert_raise RangeError do
+      @b.serialize(doc)
+    end
+  end
+
   def test_do_not_change_original_object
     val = OrderedHash.new
     val['not_id'] = 1

data/tests/test_db_api.rb

@@ -485,7 +485,6 @@ class DBAPITest < Test::Unit::TestCase
     assert_equal 5, @@db.eval("2 + 3;")
 
     assert_equal 5, @@db.eval(Code.new("2 + 3;"))
-    assert_equal nil, @@db.eval(Code.new("return i;"))
     assert_equal 2, @@db.eval(Code.new("return i;", {"i" => 2}))
     assert_equal 5, @@db.eval(Code.new("i + 3;", {"i" => 2}))
 
@@ -548,14 +547,18 @@ class DBAPITest < Test::Unit::TestCase
     @@coll.clear
 
     assert_equal nil, @@db.dereference(DBRef.new("test", ObjectID.new))
-    obj = {"x" => true}
-    key = @@coll.insert(obj)["_id"]
-    assert_equal true, @@db.dereference(DBRef.new("test", key))["x"]
+    @@coll.insert({"x" => "hello"})
+    key = @@coll.find_first()["_id"]
+    assert_equal "hello", @@db.dereference(DBRef.new("test", key))["x"]
 
     assert_equal nil, @@db.dereference(DBRef.new("test", 4))
     obj = {"_id" => 4}
     @@coll.insert(obj)
     assert_equal obj, @@db.dereference(DBRef.new("test", 4))
+
+    @@coll.clear
+    @@coll.insert({"x" => "hello"})
+    assert_equal nil, @@db.dereference(DBRef.new("test", nil))
   end
 
 # TODO this test fails with error message "Undefed Before end of object"

metadata

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