bson 3.2.7-java → 4.0.0.beta-java

data/spec/bson/symbol_spec.rb

@@ -20,7 +20,7 @@ describe Symbol do
 
     let(:type) { 14.chr }
     let(:obj)  { :test }
-    let(:bson) { "#{5.to_bson}test#{BSON::NULL_BYTE}" }
+    let(:bson) { "#{5.to_bson.to_s}test#{BSON::NULL_BYTE}" }
 
     it_behaves_like "a bson element"
     it_behaves_like "a serializable bson element"
@@ -31,25 +31,10 @@ describe Symbol do
   describe "#to_bson_key" do
 
     let(:symbol) { :test }
-    let(:encoded) { symbol.to_s + BSON::NULL_BYTE }
-    let(:previous_content) { 'previous_content'.force_encoding(BSON::BINARY) }
+    let(:encoded) { symbol.to_s }
 
     it "returns the encoded string" do
       expect(symbol.to_bson_key).to eq(encoded)
     end
-
-    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

data/spec/support/shared_examples.rb

@@ -38,23 +38,15 @@ end
 
 shared_examples_for "a serializable bson element" do
 
-  let(:previous_content) do
-    'previous_content'.force_encoding(BSON::BINARY)
-  end
-
   it "serializes to bson" do
-    expect(obj.to_bson).to eq(bson)
-  end
-
-  it "serializes to bson by appending" do
-    expect(obj.to_bson(previous_content)).to eq(previous_content << bson)
+    expect(obj.to_bson.to_s).to eq(bson)
   end
 end
 
 shared_examples_for "a deserializable bson element" do
 
   let(:io) do
-    StringIO.new(bson)
+    BSON::ByteBuffer.new(bson)
   end
 
   let(:result) do
@@ -64,21 +56,6 @@ shared_examples_for "a deserializable bson element" do
   it "deserializes from bson" do
     expect(result).to eq(obj)
   end
-
-  context 'when io#readbyte returns a String' do
-
-    let(:io) do
-      AlternateIO.new(bson)
-    end
-
-    let(:result) do
-      described_class.from_bson(io)
-    end
-
-    it "deserializes from bson" do
-      expect(result).to eq(obj)
-    end
-  end
 end
 
 shared_examples_for "a JSON serializable object" do
@@ -108,7 +85,7 @@ shared_examples_for "a document able to handle utf-8" do
 
   it "serializes and deserializes properly" do
     expect(
-      BSON::Document.from_bson(StringIO.new(document.to_bson))
+      BSON::Document.from_bson(BSON::ByteBuffer.new(document.to_bson.to_s))
     ).to eq(document)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bson
 version: !ruby/object:Gem::Version
-  version: 3.2.7
+  version: 4.0.0.beta
 platform: java
 authors:
 - Tyler Brock
@@ -16,7 +16,7 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDfDCCAmSgAwIBAgIBATANBgkqhkiG9w0BAQUFADBCMRQwEgYDVQQDDAtkcml2
   ZXItcnVieTEVMBMGCgmSJomT8ixkARkWBTEwZ2VuMRMwEQYKCZImiZPyLGQBGRYD
-  Y29tMB4XDTE3MDcwMzE0NTAxOFoXDTE4MDcwMzE0NTAxOFowQjEUMBIGA1UEAwwL
+  Y29tMB4XDTE1MDMzMTA5NDIzNVoXDTE2MDMzMDA5NDIzNVowQjEUMBIGA1UEAwwL
   ZHJpdmVyLXJ1YnkxFTATBgoJkiaJk/IsZAEZFgUxMGdlbjETMBEGCgmSJomT8ixk
   ARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANFdSAa8fRm1
   bAM9za6Z0fAH4g02bqM1NGnw8zJQrE/PFrFfY6IFCT2AsLfOwr1maVm7iU1+kdVI
@@ -27,14 +27,14 @@ cert_chain:
   u8KAcPHm5KkCAwEAAaN9MHswCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
   BBYEFFt3WbF+9JpUjAoj62cQBgNb8HzXMCAGA1UdEQQZMBeBFWRyaXZlci1ydWJ5
   QDEwZ2VuLmNvbTAgBgNVHRIEGTAXgRVkcml2ZXItcnVieUAxMGdlbi5jb20wDQYJ
-  KoZIhvcNAQEFBQADggEBAAf1WueNrStLMBvhVHoXERwehB4y15Duth9WSgLHMv2D
-  xsmGflY0fdykhVTc7GkH2wM2WzLFiPy4SFZlnqgxiuPtpOdVSSjtF0xxCkH7zl0G
-  BANPw/VzoRyeYKiPNTBPxICssceU7MdIeUibjCDQzZE4oNNfWoDn3rpqNgkk6n9H
-  GvK8YqU+WXTfVtb4wKCSUG8S490M1t6ZkSPdHRPLDd3SSLU3VSTfS4eIE9RCZJsr
-  Iar/l8KaXB2Jb5Tx+JzpKjZ9PxbEPbKPLiMvIoL6IzyeZChfwz4SHN/eB8s2nO71
-  7gPoXx2RY+zJKB0K93PwB0c6a4ID4Ok1BvCO2Wnw0T8=
+  KoZIhvcNAQEFBQADggEBAH+jEbhVRjZke7ZgM3EjERSblLM8RtHZBczjQKuG0Eor
+  HUF/hyq7D+mz75Ch7K8m5NRwvppePbBV4lAF+DzuDGjh+V6cz4wNKaWWFIL8eNCY
+  F+0vDVtGok06CXnb2swHEtd1Z8zpQviJ3xpSGAvF88+glzvPQmCyA071kPUAmDvd
+  5og5x3Bv8IxaxmEpFndXhT3NHL/tOBeT9VJuJWMCxOXRCv4y9bBBTrxoRVuos59Z
+  XZOS48LlWh15EG4yZo/gRzqNAW2LUIkYA5eMS2Kp6r+KV8IBUO/LaHdrXbdilpa8
+  BRsuCo7UZDbFVRns04HLyjVvkj+K/ywIcdKdS0csz5M=
   -----END CERTIFICATE-----
-date: 2017-07-03 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies: []
 description: A full featured BSON specification implementation, in Ruby
 email:
@@ -59,7 +59,6 @@ files:
 - lib/bson/date.rb
 - lib/bson/date_time.rb
 - lib/bson/document.rb
-- lib/bson/encodable.rb
 - lib/bson/environment.rb
 - lib/bson/false_class.rb
 - lib/bson/float.rb
@@ -86,6 +85,7 @@ files:
 - spec/bson/array_spec.rb
 - spec/bson/binary_spec.rb
 - spec/bson/boolean_spec.rb
+- spec/bson/byte_buffer_spec.rb
 - spec/bson/code_spec.rb
 - spec/bson/code_with_scope_spec.rb
 - spec/bson/date_spec.rb
@@ -124,17 +124,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: bson
-rubygems_version: 2.6.8
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: Ruby Implementation of the BSON specification
@@ -144,6 +144,7 @@ test_files:
 - spec/bson/array_spec.rb
 - spec/bson/binary_spec.rb
 - spec/bson/boolean_spec.rb
+- spec/bson/byte_buffer_spec.rb
 - spec/bson/code_spec.rb
 - spec/bson/code_with_scope_spec.rb
 - spec/bson/date_spec.rb

data/lib/bson/encodable.rb

@@ -1,86 +0,0 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-module BSON
-
-  # Defines behaviour around objects that can be encoded.
-  #
-  # @since 2.0.0
-  module Encodable
-
-    # A 4 byte placeholder that would be replaced by a length at a later point.
-    #
-    # @since 2.0.0
-    PLACEHOLDER = 0.to_bson.freeze
-
-    # Adjustment value for total number of document bytes.
-    #
-    # @since 2.0.0
-    BSON_ADJUST = 0.freeze
-
-    # Adjustment value for total number of string bytes.
-    #
-    # @since 2.0.0
-    STRING_ADJUST = -4.freeze
-
-    # Encodes BSON to raw bytes, for types that require the length of the
-    # entire bytes to be present as the first word of the encoded string. This
-    # includes Hash, CodeWithScope.
-    #
-    # @example Encode the BSON with placeholder bytes.
-    #   hash.encode_with_placeholder_and_null(BSON_ADJUST, encoded) do |encoded|
-    #     each do |field, value|
-    #       value.to_bson(encoded)
-    #     end
-    #   end
-    #
-    # @param [ Integer ] adjust The number of bytes to adjust with.
-    # @param [ String ] encoded The string to encode.
-    #
-    # @return [ String ] The encoded string.
-    #
-    # @since 2.0.0
-    def encode_with_placeholder_and_null(adjust, encoded = ''.force_encoding(BINARY))
-      pos = encoded.bytesize
-      encoded << PLACEHOLDER
-      yield(encoded)
-      encoded << NULL_BYTE
-      encoded.set_int32(pos, encoded.bytesize - pos + adjust)
-      encoded
-    end
-
-    # Encodes binary data with a generic placeholder value to be written later
-    # once all bytes have been written.
-    #
-    # @example Encode the BSON with placeholder bytes.
-    #   string.encode_binary_data_with_placeholder(encoded) do |encoded|
-    #     each do |field, value|
-    #       value.to_bson(encoded)
-    #     end
-    #   end
-    #
-    # @param [ String ] encoded The string to encode.
-    #
-    # @return [ String ] The encoded string.
-    #
-    # @since 2.0.0
-    def encode_binary_data_with_placeholder(encoded = ''.force_encoding(BINARY))
-      pos = encoded.bytesize
-      encoded << PLACEHOLDER
-      yield(encoded)
-      encoded.set_int32(pos, encoded.bytesize - pos - 5)
-      encoded
-    end
-  end
-end