bson 4.0.0.rc0-java → 4.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2540fdae127dd050a3c83fedec8707ed8519defd
-  data.tar.gz: bae6dcf4f6e19199b97617df10034f9630f078aa
+  metadata.gz: ef64079fa7f0ed77c5224cc5a7cd03731a0fb753
+  data.tar.gz: 7274658271159a428734e639bac21973d5e9fbdc
 SHA512:
-  metadata.gz: 80f092ebc7ae36f05f6a337dc00f41f05bb5591e146599226e01979766c021781c8b83c3e911adaf95b5f46e07052da60f31364a3fb208754b1f7cc2789edf2f
-  data.tar.gz: c4b9e796a00b9c275a7d2523984300bc68ac85d5d48370e055cbfcec0e5c0e0e72f77a21edbd8716ae6741ab7bab7cc08cd7d52afd4f25dc074960f8a7153be8
+  metadata.gz: 1444e118cae9f3843009cff4cbb5e972f4691824bdd9cfc32b342076e316ac065fee2177a416d04b92f6e0de8fee788f4ede5b15574a8aad2644abf7ff33204e
+  data.tar.gz: 03e6026a72a239fe037bf4fd715da2513e1bbf51b15f8ae61157ad4c5eb1c6b7e7519fcb16a27e1adedadee2b2bfb2591950a567688e4fb7b1d7dd8dc85ffd31

data/lib/bson/binary.rb

@@ -132,7 +132,7 @@ module BSON
     def to_bson(buffer = ByteBuffer.new)
       position = buffer.length
       buffer.put_int32(0)
-      buffer.put_byte(SUBTYPES.fetch(type))
+      buffer.put_byte(SUBTYPES[type])
       buffer.put_int32(data.bytesize) if type == :old
       buffer.put_bytes(data.force_encoding(BINARY))
       buffer.replace_int32(position, buffer.length - position - 5)

data/lib/bson/hash.rb

@@ -74,7 +74,7 @@ module BSON
       # @since 2.0.0
       def from_bson(buffer)
         hash = Document.allocate
-        buffer.get_int32 # Throw away the size - todo: just move read position?
+        buffer.get_int32 # Throw away the size.
         while (type = buffer.get_byte) != NULL_BYTE
           field = buffer.get_cstring
           hash.store(field, BSON::Registry.get(type).from_bson(buffer))

data/lib/bson/integer.rb

@@ -145,8 +145,8 @@ module BSON
       encoded << ((self >> 56) & 255)
     end
 
-    def to_bson_key(buffer = ByteBuffer.new)
-      buffer.put_cstring(to_s)
+    def to_bson_key
+      to_s
     end
 
     private
@@ -161,7 +161,6 @@ module BSON
     def out_of_range!
       raise RangeError.new("#{self} is not a valid 8 byte integer value.")
     end
-
   end
 
   # Enrich the core Integer class with this module.

data/lib/bson/object_id.rb

@@ -331,7 +331,7 @@ module BSON
       #
       # @since 2.0.0
       def initialize
-        @counter = 0
+        @counter = rand(0x1000000)
         @machine_id = Digest::MD5.digest(Socket.gethostname).unpack("N")[0]
         @mutex = Mutex.new
       end

data/lib/bson/registry.rb

@@ -40,7 +40,7 @@ module BSON
     #
     # @since 2.0.0
     def get(byte)
-      MAPPINGS.fetch(byte)
+      MAPPINGS[byte]
     end
 
     # Register the Ruby type for the corresponding single byte.

data/lib/bson/symbol.rb

@@ -30,6 +30,22 @@ module BSON
     # @since 2.0.0
     BSON_TYPE = 14.chr.force_encoding(BINARY).freeze
 
+    # Symbols are serialized as strings as symbols are now removed from the
+    # BSON specification. Therefore the bson_type when serializing must be a
+    # string.
+    #
+    # @example Get the BSON type for the symbol.
+    #   :test.bson_type
+    #
+    # @return [ String ] The single byte BSON type.
+    #
+    # @see http://bsonspec.org/#/specification
+    #
+    # @since 4.0.0
+    def bson_type
+      String::BSON_TYPE
+    end
+
     # Get the symbol as encoded BSON.
     #
     # @example Get the symbol as encoded BSON.
@@ -89,7 +105,7 @@ module BSON
     # Register this type when the module is loaded.
     #
     # @since 2.0.0
-    Registry.register(BSON_TYPE, ::Symbol)
+    Registry::MAPPINGS.store(BSON_TYPE, ::Symbol)
   end
 
   # Enrich the core Symbol class with this module.

data/lib/bson/version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module BSON
-  VERSION = "4.0.0.rc0"
+  VERSION = "4.0.1"
 end

data/spec/bson/byte_buffer_spec.rb

@@ -442,4 +442,28 @@ describe BSON::ByteBuffer do
       expect(modified.to_s).to eq("#{exp_first}#{exp_second}")
     end
   end
+
+  describe '#rewind!' do
+
+    let(:string) do
+      "#{BSON::Int32::BSON_TYPE}#{BSON::Int32::BSON_TYPE}"
+    end
+
+    let(:buffer) do
+      described_class.new(string)
+    end
+
+    before do
+      buffer.get_bytes(1)
+      buffer.rewind!
+    end
+
+    it 'resets the read position to 0' do
+      expect(buffer.read_position).to eq(0)
+    end
+
+    it 'starts subsequent reads at position 0' do
+      expect(buffer.get_bytes(2)).to eq(string)
+    end
+  end
 end

data/spec/bson/document_spec.rb

@@ -840,15 +840,6 @@ describe BSON::Document do
       end
     end
 
-    context "when the symbols are utf-8" do
-
-      let(:document) do
-        described_class["type", "gültig".to_sym]
-      end
-
-      it_behaves_like "a document able to handle utf-8"
-    end
-
     context "when utf-8 string values are in an array" do
 
       let(:document) do
@@ -896,7 +887,7 @@ describe BSON::Document do
       end
     end
 
-    context "when binary strings with utf-8 values exist", if: BSON::Environment.jruby? && !(ENV['RUBY_VERSION'] =~ /jruby-9/) do
+    context "when binary strings with utf-8 values exist", if: BSON::Environment.jruby? && (JRUBY_VERSION !~ /9.0/) do
 
       let(:string) { "europäisch" }
       let(:document) do

data/spec/bson/hash_spec.rb

@@ -37,6 +37,21 @@ describe Hash do
       it_behaves_like "a deserializable bson element"
     end
 
+    context "when the hash has non-string keys" do
+
+      let(:obj) do
+        { 1 => "value" }
+      end
+
+      let(:expected) do
+        { "1" => "value" }
+      end
+
+      it "properly converts to bson" do
+        expect(BSON::Document.from_bson(BSON::ByteBuffer.new(obj.to_bson.to_s))).to eq(expected)
+      end
+    end
+
     context "when the hash is embedded" do
 
       let(:obj) do

data/spec/bson/integer_spec.rb

@@ -62,10 +62,10 @@ describe Integer do
   describe "#to_bson_key" do
 
     let(:obj)  { Integer::MAX_32BIT - 1 }
-    let(:encoded) { obj.to_s + BSON::NULL_BYTE }
+    let(:encoded) { obj.to_s }
 
-    it "returns the encoded string" do
-      expect(obj.to_bson_key.to_s).to eq(encoded)
+    it "returns the key as a string" do
+      expect(obj.to_bson_key).to eq(encoded)
     end
   end
 end

data/spec/bson/registry_spec.rb

@@ -35,10 +35,8 @@ describe BSON::Registry do
 
     context "when the type has no corresponding class" do
 
-      it "raises an error" do
-        expect {
-          described_class.get("test")
-        }.to raise_error(KeyError)
+      it "returns nil" do
+        expect(described_class.get("test")).to be_nil
       end
     end
   end

data/spec/bson/symbol_spec.rb

@@ -16,16 +16,22 @@ require "spec_helper"
 
 describe Symbol do
 
+  describe "#bson_type" do
+
+    it "returns the type for a string" do
+      expect(:type.bson_type).to eq("type".bson_type)
+    end
+  end
+
   describe "#to_bson/#from_bson" do
 
-    let(:type) { 14.chr }
+    let(:type) { 2.chr }
     let(:obj)  { :test }
     let(:bson) { "#{5.to_bson.to_s}test#{BSON::NULL_BYTE}" }
 
     it_behaves_like "a bson element"
     it_behaves_like "a serializable bson element"
     it_behaves_like "a deserializable bson element"
-
   end
 
   describe "#to_bson_key" do

data/spec/spec_helper.rb

@@ -15,15 +15,6 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
-if ENV["CI"] && !ENV["WITH_EXT"]
-  require "simplecov"
-  require "coveralls"
-  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-  SimpleCov.start do
-    add_filter "spec"
-  end
-end
-
 require "bson"
 require "json"
 require "rspec"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bson
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc0
+  version: 4.0.1
 platform: java
 authors:
 - Tyler Brock
@@ -11,30 +11,8 @@ authors:
 - Gary Murakami
 autorequire:
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDfDCCAmSgAwIBAgIBATANBgkqhkiG9w0BAQUFADBCMRQwEgYDVQQDDAtkcml2
-  ZXItcnVieTEVMBMGCgmSJomT8ixkARkWBTEwZ2VuMRMwEQYKCZImiZPyLGQBGRYD
-  Y29tMB4XDTE1MDMzMTA5NDIzNVoXDTE2MDMzMDA5NDIzNVowQjEUMBIGA1UEAwwL
-  ZHJpdmVyLXJ1YnkxFTATBgoJkiaJk/IsZAEZFgUxMGdlbjETMBEGCgmSJomT8ixk
-  ARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANFdSAa8fRm1
-  bAM9za6Z0fAH4g02bqM1NGnw8zJQrE/PFrFfY6IFCT2AsLfOwr1maVm7iU1+kdVI
-  IQ+iI/9+E+ArJ+rbGV3dDPQ+SLl3mLT+vXjfjcxMqI2IW6UuVtt2U3Rxd4QU0kdT
-  JxmcPYs5fDN6BgYc6XXgUjy3m+Kwha2pGctdciUOwEfOZ4RmNRlEZKCMLRHdFP8j
-  4WTnJSGfXDiuoXICJb5yOPOZPuaapPSNXp93QkUdsqdKC32I+KMpKKYGBQ6yisfA
-  5MyVPPCzLR1lP5qXVGJPnOqUAkvEUfCahg7EP9tI20qxiXrR6TSEraYhIFXL0EGY
-  u8KAcPHm5KkCAwEAAaN9MHswCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
-  BBYEFFt3WbF+9JpUjAoj62cQBgNb8HzXMCAGA1UdEQQZMBeBFWRyaXZlci1ydWJ5
-  QDEwZ2VuLmNvbTAgBgNVHRIEGTAXgRVkcml2ZXItcnVieUAxMGdlbi5jb20wDQYJ
-  KoZIhvcNAQEFBQADggEBAH+jEbhVRjZke7ZgM3EjERSblLM8RtHZBczjQKuG0Eor
-  HUF/hyq7D+mz75Ch7K8m5NRwvppePbBV4lAF+DzuDGjh+V6cz4wNKaWWFIL8eNCY
-  F+0vDVtGok06CXnb2swHEtd1Z8zpQviJ3xpSGAvF88+glzvPQmCyA071kPUAmDvd
-  5og5x3Bv8IxaxmEpFndXhT3NHL/tOBeT9VJuJWMCxOXRCv4y9bBBTrxoRVuos59Z
-  XZOS48LlWh15EG4yZo/gRzqNAW2LUIkYA5eMS2Kp6r+KV8IBUO/LaHdrXbdilpa8
-  BRsuCo7UZDbFVRns04HLyjVvkj+K/ywIcdKdS0csz5M=
-  -----END CERTIFICATE-----
-date: 2015-11-10 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies: []
 description: A full featured BSON specification implementation, in Ruby
 email:
@@ -134,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: bson
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Ruby Implementation of the BSON specification

checksums.yaml.gz.sig

@@ -1,2 +0,0 @@
-�\�~cỳ���2���k{5�B��bB�
-��X^C X��%��ЭT݂i�SpR�vrGS%Ž�:�I���RL

metadata.gz.sig

@@ -1,2 +0,0 @@
-uP1<���߫#U��¦`b���X�q%����`q6�jJ�����XX�3!xa#��*>��`{��]-�;7�/��:�y����Ԑ����S2�]u췛�|�H],�zpٗo@���s���R���Tp�G)�r流#p�?��}:��{M����o�d;�`�F�9���TJ2qw#K�[��ri�<Jp	�g�9�ȌG���V!p�ۥWwÕ��u�Mb��UKDa�%�@
-�2��Rb�cJ�F��4���դ
$j�:>K