bson 2.0.0.rc1-java → 2.0.0.rc2-java

data/Rakefile

@@ -81,8 +81,13 @@ end
 task :release => :build do
   system "git tag -a v#{BSON::VERSION} -m 'Tagging release: #{BSON::VERSION}'"
   system "git push --tags"
-  system "gem push bson-#{BSON::VERSION}.gem"
-  system "rm bson-#{BSON::VERSION}.gem"
+  if jruby?
+    system "gem push bson-#{BSON::VERSION}-java.gem"
+    system "rm bson-#{BSON::VERSION}-java.gem"
+  else
+    system "gem push bson-#{BSON::VERSION}.gem"
+    system "rm bson-#{BSON::VERSION}.gem"
+  end
 end
 
 namespace :benchmark do

data/lib/bson/code_with_scope.rb

@@ -89,10 +89,13 @@ module BSON
     #
     # @since 2.0.0
     def to_bson(encoded = ''.force_encoding(BINARY))
-      encode_with_placeholder_and_null(BSON_ADJUST, encoded) do |encoded|
+      # -1 because we are removing an extra byte
+      out = encode_with_placeholder_and_null(BSON_ADJUST - 1, encoded) do |encoded|
         javascript.to_bson(encoded)
         scope.to_bson(encoded)
       end
+      # an extra null byte has been added; we must remove it
+      out.chop!
     end
 
     # Deserialize a code with scope from BSON.
@@ -105,9 +108,8 @@ module BSON
     #
     # @since 2.0.0
     def self.from_bson(bson)
-      code_with_scope = StringIO.new(bson.read(Int32.from_bson(bson)))
-      length = code_with_scope.read(4).unpack(Int32::PACK).first
-      new(code_with_scope.read(length).from_bson_string.chop!)
+      bson.read(4) # Throw away the total length.
+      new(bson.read(Int32.from_bson(bson)).from_bson_string.chop!, ::Hash.from_bson(bson))
     end
 
     # Register this type when the module is loaded.

data/lib/bson/hash.rb

@@ -31,7 +31,7 @@ module BSON
     # Get the hash as encoded BSON.
     #
     # @example Get the hash as encoded BSON.
-    #   { field: "value" }.to_bson
+    #   { "field" => "value" }.to_bson
     #
     # @return [ String ] The encoded string.
     #
@@ -52,7 +52,7 @@ module BSON
 
       # Deserialize the hash from BSON.
       #
-      # @param [ String ] bson The bson representing a hash.
+      # @param [ IO ] bson The bson representing a hash.
       #
       # @return [ Array ] The decoded hash.
       #

data/lib/bson/object_id.rb

@@ -115,6 +115,44 @@ module BSON
       to_bson.hash
     end
 
+    # Get a nice string for use with object inspection.
+    #
+    # @example Inspect the object id.
+    #   obhect_id.inspect
+    #
+    # @return [ String ] The object id in form BSON::ObjectId('id')
+    #
+    # @since 2.0.0
+    def inspect
+      "BSON::ObjectId('#{to_s}')"
+    end
+
+    # Dump the raw bson when calling Marshal.dump.
+    #
+    # @example Dump the raw bson.
+    #   Marshal.dump(object_id)
+    #
+    # @return [ String ] The raw bson bytes.
+    #
+    # @since 2.0.0
+    def marshal_dump
+      to_bson
+    end
+
+    # Unmarshal the data into an object id.
+    #
+    # @example Unmarshal the data.
+    #   Marshal.load(data)
+    #
+    # @param [ String ] data The raw bson bytes.
+    #
+    # @return [ String ] The raw bson bytes.
+    #
+    # @since 2.0.0
+    def marshal_load(data)
+      @raw_data = data
+    end
+
     # Get the object id as it's raw BSON data.
     #
     # @example Get the raw bson bytes.

data/lib/bson/string.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright (C) 2013 10gen Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -59,7 +60,6 @@ module BSON
     #
     # @since 2.0.0
     def to_bson_key(encoded = ''.force_encoding(BINARY))
-      check_for_illegal_characters!
       to_bson_cstring(encoded)
     end
 
@@ -168,7 +168,7 @@ module BSON
 
     def check_for_illegal_characters!
       if include?(NULL_BYTE)
-        raise RuntimeError.new("Illegal C-String '#{self}' contains a null byte.")
+        raise(ArgumentError, "Illegal C-String '#{self}' contains a null byte.")
       end
     end
 

data/lib/bson/symbol.rb

@@ -55,7 +55,7 @@ module BSON
     #
     # @since 2.0.0
     def to_bson_key(encoded = ''.force_encoding(BINARY))
-      to_s.to_bson_cstring(encoded)
+      to_s.to_bson_key(encoded)
     end
 
     module ClassMethods

data/lib/bson/version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module BSON
-  VERSION = "2.0.0.rc1"
+  VERSION = "2.0.0.rc2"
 end

data/spec/bson/code_with_scope_spec.rb

@@ -40,8 +40,8 @@ describe BSON::CodeWithScope do
     end
     let(:obj) { described_class.new(code, scope) }
     let(:bson) do
-      "#{48.to_bson}#{(code.length + 1).to_bson}#{code}#{BSON::NULL_BYTE}" +
-      "#{scope.to_bson}#{BSON::NULL_BYTE}"
+      "#{47.to_bson}#{(code.length + 1).to_bson}#{code}#{BSON::NULL_BYTE}" +
+      "#{scope.to_bson}"
     end
 
     it_behaves_like "a bson element"
@@ -53,18 +53,22 @@ describe BSON::CodeWithScope do
     let(:type) { 15.chr }
     let(:code) { "this.value == name" }
     let(:scope) do
-      { :name => "test" }
+      { "name" => "test" }
     end
     let(:obj) { described_class.new(code, scope) }
     let(:bson) { StringIO.new(obj.to_bson) }
-    let(:deserialized) { described_class.from_bson(bson) }
+    let!(:deserialized) { described_class.from_bson(bson) }
 
     it "deserializes the javascript" do
       expect(deserialized.javascript).to eq(code)
     end
 
-    it "does not deserialize a scope" do
-      expect(deserialized.scope).to be_empty
+    it "deserializes the scope" do
+      expect(deserialized.scope).to eq(scope)
+    end
+
+    it "does not leave any extra bytes" do
+      expect(bson.read(1)).to be_nil
     end
   end
 end

data/spec/bson/object_id_spec.rb

@@ -383,6 +383,17 @@ describe BSON::ObjectId do
     end
   end
 
+  describe "#inspect" do
+
+    let(:object_id) do
+      described_class.new
+    end
+
+    it "returns the inspection with the object id to_s" do
+      expect(object_id.inspect).to eq("BSON::ObjectId('#{object_id.to_s}')")
+    end
+  end
+
   describe ".legal?" do
 
     context "when the string is too short to be an object id" do
@@ -418,6 +429,21 @@ describe BSON::ObjectId do
     end
   end
 
+  describe "#marshal_dump" do
+
+    let(:object_id) do
+      described_class.new
+    end
+
+    let(:dumped) do
+      Marshal.dump(object_id)
+    end
+
+    it "dumps the raw bytes data" do
+      expect(Marshal.load(dumped)).to eq(object_id)
+    end
+  end
+
   describe "#to_bson/#from_bson" do
 
     let(:time) { Time.utc(2013, 1, 1) }

data/spec/bson/string_spec.rb

@@ -65,7 +65,7 @@ describe String do
       it "raises an error" do
         expect {
           string.to_bson_cstring
-        }.to raise_error(RuntimeError)
+        }.to raise_error(ArgumentError)
       end
     end
 

data/spec/bson/symbol_spec.rb

@@ -41,5 +41,15 @@ describe Symbol do
     it "appends to optional previous content" do
       expect(symbol.to_bson_key(previous_content)).to eq(previous_content << encoded)
     end
+
+    context 'when the symbol contains a null byte' do
+      let(:symbol) { :"test#{BSON::NULL_BYTE}ing" }
+
+      it 'raises an error' do
+        expect {
+          symbol.to_bson_key
+        }.to raise_error(ArgumentError)
+      end
+    end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: bson
 version: !ruby/object:Gem::Version
   prerelease: 6
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: java
 authors:
 - Tyler Brock
@@ -34,7 +34,7 @@ cert_chain:
   8v7zLF2XliYbfurYIwkcXs8yPn8ggApBIy9bX6VJxRs/l2+UvqzaHIFaFy/F8/GP
   RNTuXsVG5NDACo7Q
   -----END CERTIFICATE-----
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies: []
 description: A full featured BSON specification implementation, in Ruby
 email:
@@ -117,13 +117,13 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
   none: false