bson 1.8.3.rc0-java → 1.8.3.rc1-java

data/VERSION

@@ -1 +1 @@
-1.8.3.rc0
+1.8.3.rc1

data/lib/bson/bson_ruby.rb

@@ -132,7 +132,7 @@ module BSON
 
     # Returns the array stored in the buffer.
     # Implemented to ensure an API compatible with BSON extension.
-    def unpack(arg)
+    def unpack
       @buf.to_a
     end
 
@@ -398,7 +398,7 @@ module BSON
       self.class.serialize_key(buf, key)
     end
 
-    def serialize_dbref_element(buf, key, val)
+    def serialize_dbref_element(buf, key, val) # this does NOT use the BSON "\x0C" DBPointer type
       oh = BSON::OrderedHash.new
       oh['$ref'] = val.namespace
       oh['$id'] = val.object_id

data/test/bson/bson_test.rb

@@ -58,6 +58,68 @@ class BSONTest < Test::Unit::TestCase
     assert_equal doc, @encoder.deserialize(bson)
   end
 
+  def test_interface
+    doc = { 'a' => 1 }
+    bson = BSON.serialize(doc)
+    assert_equal doc, BSON.deserialize(bson)
+  end
+
+  def test_read_bson_document
+    bson_file_data_h_star = ["21000000075f6964005115883c3d75c94d3aa18b63016100000000000000f03f00"]
+    strio = StringIO.new(bson_file_data_h_star.pack('H*'))
+    bson = BSON.read_bson_document(strio)
+    doc = {"_id"=>BSON::ObjectId('5115883c3d75c94d3aa18b63'), "a"=>1.0}
+    assert_equal doc, bson
+  end
+
+  def test_bson_ruby_interface
+    doc = { 'a' => 1 }
+    buf = BSON_RUBY.serialize(doc)
+    bson = BSON::BSON_RUBY.new
+    bson.instance_variable_set(:@buf, buf)
+    assert_equal [12, 0, 0, 0, 16, 97, 0, 1, 0, 0, 0, 0], bson.to_a
+    assert_equal "\f\x00\x00\x00\x10a\x00\x01\x00\x00\x00\x00", bson.to_s
+    assert_equal [12, 0, 0, 0, 16, 97, 0, 1, 0, 0, 0, 0], bson.unpack
+  end
+
+  def test_bson_ruby_hex_dump
+    doc = { 'a' => 1 }
+    buf = BSON_RUBY.serialize(doc)
+    bson = BSON_RUBY.new
+    bson.instance_variable_set(:@buf, buf)
+    doc_hex_dump = "   0:  0C 00 00 00 10 61 00 01\n   8:  00 00 00 00"
+    assert_equal doc_hex_dump, bson.hex_dump
+  end
+
+  def test_bson_ruby_dbref_not_used
+    buf = BSON::ByteBuffer.new
+    val = ns = 'namespace'
+
+    # Make a hole for the length
+    len_pos = buf.position
+    buf.put_int(0)
+
+    # Save the string
+    start_pos = buf.position
+    BSON::BSON_RUBY.serialize_cstr(buf, val)
+    end_pos = buf.position
+
+    # Put the string size in front
+    buf.put_int(end_pos - start_pos, len_pos)
+
+    # Go back to where we were
+    buf.position = end_pos
+
+    oid = ObjectId.new
+    buf.put_array(oid.to_a)
+    buf.rewind
+
+    bson = BSON::BSON_RUBY.new
+    bson.instance_variable_set(:@buf, buf)
+
+    assert_equal DBRef.new(ns, oid).to_s, bson.deserialize_dbref_data(buf).to_s
+  end
+
   def test_require_hash
     assert_raise_error InvalidDocument, "takes a Hash" do
       BSON.serialize('foo')
@@ -191,8 +253,14 @@ class BSONTest < Test::Unit::TestCase
   end
 
   def test_code
-    doc = {'$where' => Code.new('this.a.b < this.b')}
+    code = Code.new('this.a.b < this.b')
+    assert_equal 17, code.length
+    assert_match /<BSON::Code:.*@data="this.a.b < this.b".*>/, code.inspect
+    doc = {'$where' => code}
     assert_doc_pass(doc)
+    code = 'this.c.d < this.e'.to_bson_code # core_ext.rb
+    assert_equal BSON::Code, code.class
+    assert_equal code, code.to_bson_code
   end
 
   def test_code_with_symbol
@@ -343,8 +411,11 @@ class BSONTest < Test::Unit::TestCase
 
   def test_dbref
     oid = ObjectId.new
+    ns = 'namespace'
     doc = {}
-    doc['dbref'] = DBRef.new('namespace', oid)
+    dbref = DBRef.new(ns, oid)
+    assert_equal({"$id"=>oid, "$ns"=>ns}, dbref.to_hash)
+    doc['dbref'] = dbref
     bson = @encoder.serialize(doc)
     doc2 = @encoder.deserialize(bson)
 

data/test/bson/byte_buffer_test.rb

@@ -15,6 +15,16 @@ class ByteBufferTest < Test::Unit::TestCase
     assert_equal 0, @buf.length
   end
 
+  def test_initialize_with_string_and_clear
+    @buf = ByteBuffer.new("a")
+    assert_equal 1, @buf.size
+    assert_equal 1, @buf.position
+    @buf.clear
+    assert_equal 0, @buf.position
+    assert_equal "", @buf.to_s
+    assert_equal 0, @buf.size
+  end
+
   def test_nil_get_returns_one_byte
     @buf.put_array([1, 2, 3, 4])
     @buf.rewind
@@ -202,5 +212,4 @@ class ByteBufferTest < Test::Unit::TestCase
     assert_not_equal @buf, 123
     assert_not_equal @buf, nil
   end
-
 end

data/test/bson/timestamp_test.rb

@@ -2,6 +2,11 @@ require 'test_helper'
 
 class TimestampTest < Test::Unit::TestCase
 
+  def test_timestamp_to_s
+    t1 = Timestamp.new(5000, 200)
+    assert_equal "seconds: 5000, increment: 200", t1.to_s
+  end
+
   def test_timestamp_equality
     t1 = Timestamp.new(5000, 200)
     t2 = Timestamp.new(5000, 200)

metadata

@@ -1,116 +1,110 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bson
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
   prerelease: 6
-  version: 1.8.3.rc0
+  version: 1.8.3.rc1
 platform: java
-authors: 
-  - Tyler Brock
-  - Gary Murakami
-  - Emily Stolfo
-  - Brandon Black
-  - Durran Jordan
-autorequire: 
+authors:
+- Tyler Brock
+- Gary Murakami
+- Emily Stolfo
+- Brandon Black
+- Durran Jordan
+autorequire:
 bindir: bin
-cert_chain: 
-  - |
-    -----BEGIN CERTIFICATE-----
-    MIIDODCCAiCgAwIBAgIBADANBgkqhkiG9w0BAQUFADBCMRQwEgYDVQQDDAtkcml2
-    ZXItcnVieTEVMBMGCgmSJomT8ixkARkWBTEwZ2VuMRMwEQYKCZImiZPyLGQBGRYD
-    Y29tMB4XDTEzMDIwMTE0MTEzN1oXDTE0MDIwMTE0MTEzN1owQjEUMBIGA1UEAwwL
-    ZHJpdmVyLXJ1YnkxFTATBgoJkiaJk/IsZAEZFgUxMGdlbjETMBEGCgmSJomT8ixk
-    ARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANFdSAa8fRm1
-    bAM9za6Z0fAH4g02bqM1NGnw8zJQrE/PFrFfY6IFCT2AsLfOwr1maVm7iU1+kdVI
-    IQ+iI/9+E+ArJ+rbGV3dDPQ+SLl3mLT+vXjfjcxMqI2IW6UuVtt2U3Rxd4QU0kdT
-    JxmcPYs5fDN6BgYc6XXgUjy3m+Kwha2pGctdciUOwEfOZ4RmNRlEZKCMLRHdFP8j
-    4WTnJSGfXDiuoXICJb5yOPOZPuaapPSNXp93QkUdsqdKC32I+KMpKKYGBQ6yisfA
-    5MyVPPCzLR1lP5qXVGJPnOqUAkvEUfCahg7EP9tI20qxiXrR6TSEraYhIFXL0EGY
-    u8KAcPHm5KkCAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4EFgQUW3dZsX70mlSM
-    CiPrZxAGA1vwfNcwCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEBBQUAA4IBAQCIa/Y6
-    xS7YWBxkn9WP0EMnJ3pY9vef9DTmLSi/2jz8PzwlKQ89zNTrqSUD8LoQZmBqCJBt
-    dKSQ/RUnaHJuxh8HWvWubP8EBYTuf+I1DFnRv648IF3MR1tCQumVL0XcYMvZcxBj
-    a/p+8DomWTQqUdNbNoGywwjtVBWfDdwFV8Po1XcN/AtpILOJQd9J77INIGGCHxZo
-    6SOHHaNknlE9H0w6q0SVxZKZI8/+2c447V0NrHIw1Qhe0tAGJ9V1u3ky8gyxe0SM
-    8v7zLF2XliYbfurYIwkcXs8yPn8ggApBIy9bX6VJxRs/l2+UvqzaHIFaFy/F8/GP
-    RNTuXsVG5NDACo7Q
-    -----END CERTIFICATE-----
-
-date: 2013-02-14 00:00:00 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDODCCAiCgAwIBAgIBADANBgkqhkiG9w0BAQUFADBCMRQwEgYDVQQDDAtkcml2
+  ZXItcnVieTEVMBMGCgmSJomT8ixkARkWBTEwZ2VuMRMwEQYKCZImiZPyLGQBGRYD
+  Y29tMB4XDTEzMDIwMTE0MTEzN1oXDTE0MDIwMTE0MTEzN1owQjEUMBIGA1UEAwwL
+  ZHJpdmVyLXJ1YnkxFTATBgoJkiaJk/IsZAEZFgUxMGdlbjETMBEGCgmSJomT8ixk
+  ARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANFdSAa8fRm1
+  bAM9za6Z0fAH4g02bqM1NGnw8zJQrE/PFrFfY6IFCT2AsLfOwr1maVm7iU1+kdVI
+  IQ+iI/9+E+ArJ+rbGV3dDPQ+SLl3mLT+vXjfjcxMqI2IW6UuVtt2U3Rxd4QU0kdT
+  JxmcPYs5fDN6BgYc6XXgUjy3m+Kwha2pGctdciUOwEfOZ4RmNRlEZKCMLRHdFP8j
+  4WTnJSGfXDiuoXICJb5yOPOZPuaapPSNXp93QkUdsqdKC32I+KMpKKYGBQ6yisfA
+  5MyVPPCzLR1lP5qXVGJPnOqUAkvEUfCahg7EP9tI20qxiXrR6TSEraYhIFXL0EGY
+  u8KAcPHm5KkCAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4EFgQUW3dZsX70mlSM
+  CiPrZxAGA1vwfNcwCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEBBQUAA4IBAQCIa/Y6
+  xS7YWBxkn9WP0EMnJ3pY9vef9DTmLSi/2jz8PzwlKQ89zNTrqSUD8LoQZmBqCJBt
+  dKSQ/RUnaHJuxh8HWvWubP8EBYTuf+I1DFnRv648IF3MR1tCQumVL0XcYMvZcxBj
+  a/p+8DomWTQqUdNbNoGywwjtVBWfDdwFV8Po1XcN/AtpILOJQd9J77INIGGCHxZo
+  6SOHHaNknlE9H0w6q0SVxZKZI8/+2c447V0NrHIw1Qhe0tAGJ9V1u3ky8gyxe0SM
+  8v7zLF2XliYbfurYIwkcXs8yPn8ggApBIy9bX6VJxRs/l2+UvqzaHIFaFy/F8/GP
+  RNTuXsVG5NDACo7Q
+  -----END CERTIFICATE-----
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies: []
-
 description: A Ruby BSON implementation for MongoDB. For more information about Mongo, see http://www.mongodb.org. For more information on BSON, see http://www.bsonspec.org.
 email: mongodb-dev@googlegroups.com
-executables: 
-  - b2json
-  - j2bson
+executables:
+- b2json
+- j2bson
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-  - bson.gemspec
-  - LICENSE
-  - VERSION
-  - bin/b2json
-  - bin/j2bson
-  - lib/bson.rb
-  - lib/bson/bson_c.rb
-  - lib/bson/bson_java.rb
-  - lib/bson/bson_ruby.rb
-  - lib/bson/byte_buffer.rb
-  - lib/bson/exceptions.rb
-  - lib/bson/ordered_hash.rb
-  - lib/bson/support/hash_with_indifferent_access.rb
-  - lib/bson/types/binary.rb
-  - lib/bson/types/code.rb
-  - lib/bson/types/dbref.rb
-  - lib/bson/types/min_max_keys.rb
-  - lib/bson/types/object_id.rb
-  - lib/bson/types/timestamp.rb
-  - ext/jbson/target/jbson.jar
-  - ext/jbson/lib/java-bson.jar
-  - test/bson/binary_test.rb
-  - test/bson/bson_test.rb
-  - test/bson/byte_buffer_test.rb
-  - test/bson/hash_with_indifferent_access_test.rb
-  - test/bson/json_test.rb
-  - test/bson/object_id_test.rb
-  - test/bson/ordered_hash_test.rb
-  - test/bson/timestamp_test.rb
+files:
+- bson.gemspec
+- LICENSE
+- VERSION
+- bin/b2json
+- bin/j2bson
+- lib/bson.rb
+- lib/bson/bson_c.rb
+- lib/bson/bson_java.rb
+- lib/bson/bson_ruby.rb
+- lib/bson/byte_buffer.rb
+- lib/bson/exceptions.rb
+- lib/bson/ordered_hash.rb
+- lib/bson/support/hash_with_indifferent_access.rb
+- lib/bson/types/binary.rb
+- lib/bson/types/code.rb
+- lib/bson/types/dbref.rb
+- lib/bson/types/min_max_keys.rb
+- lib/bson/types/object_id.rb
+- lib/bson/types/timestamp.rb
+- ext/jbson/target/jbson.jar
+- ext/jbson/lib/java-bson.jar
+- test/bson/binary_test.rb
+- test/bson/bson_test.rb
+- test/bson/byte_buffer_test.rb
+- test/bson/hash_with_indifferent_access_test.rb
+- test/bson/json_test.rb
+- test/bson/object_id_test.rb
+- test/bson/ordered_hash_test.rb
+- test/bson/timestamp_test.rb
 homepage: http://www.mongodb.org
 licenses: []
-
-post_install_message: 
+post_install_message:
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - !binary |-
+      Pg==
+    - !ruby/object:Gem::Version
+      version: 1.3.1
   none: false
-  requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 1.3.1
 requirements: []
-
 rubyforge_project: bson
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: Ruby implementation of BSON
-test_files: 
-  - test/bson/binary_test.rb
-  - test/bson/bson_test.rb
-  - test/bson/byte_buffer_test.rb
-  - test/bson/hash_with_indifferent_access_test.rb
-  - test/bson/json_test.rb
-  - test/bson/object_id_test.rb
-  - test/bson/ordered_hash_test.rb
-  - test/bson/timestamp_test.rb
-has_rdoc: yard
+test_files:
+- test/bson/binary_test.rb
+- test/bson/bson_test.rb
+- test/bson/byte_buffer_test.rb
+- test/bson/hash_with_indifferent_access_test.rb
+- test/bson/json_test.rb
+- test/bson/object_id_test.rb
+- test/bson/ordered_hash_test.rb
+- test/bson/timestamp_test.rb