bson 4.2.2-java → 4.3.0.beta-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 648a36ae43d7444b7734ae5207f455dc385763ef
-  data.tar.gz: de8db45eca2fc5c599fc43563547f2ebfc3ab324
+  metadata.gz: 6468d11868cf8ba4f947d6f2b6d0405762b22cd3
+  data.tar.gz: 88de4d6bc5e84d4b69a9b2899eaa467b1f18fbf8
 SHA512:
-  metadata.gz: b248993776b32d0f628053b89e474006f6777390ef0329a63fd30665d1240d4bb5b3801bd7873ff1cda33b7c5d66fa2ad6d3102fea9b78f53cb50ed6a9395c28
-  data.tar.gz: ab739128803d604a4eec24ddedd2342d7916966234de8663b49f5174efb119347897472ba0209caf136b659c2fcf54bd80964d624dd2bb83064a77671bd0a15f
+  metadata.gz: 0eaba01e1207c6fc15100a18ba1cd88a67ac976af7d65261d7cc219932dbedede2541a41def203ba3b4153c3acf87c5d51bf0b779fa9372e64743753c231b594
+  data.tar.gz: c29071d4429eb583e57620481eca61efda789dbcd19723fc1bbde761c9bc6b747fe5421aebfa7174e9db7ca231e572f514820c27d7d958af4b79a4a830ee1b5b

data/lib/bson/array.rb

@@ -41,15 +41,19 @@ module BSON
     #
     # @since 2.0.0
     def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
-      position = buffer.length
-      buffer.put_int32(0)
-      each_with_index do |value, index|
-        buffer.put_byte(value.bson_type)
-        buffer.put_cstring(index.to_s)
-        value.to_bson(buffer, validating_keys)
+      if buffer.respond_to?(:put_array)
+        buffer.put_array(self, validating_keys)
+      else
+        position = buffer.length
+        buffer.put_int32(0)
+        each_with_index do |value, index|
+          buffer.put_byte(value.bson_type)
+          buffer.put_cstring(index.to_s)
+          value.to_bson(buffer, validating_keys)
+        end
+        buffer.put_byte(NULL_BYTE)
+        buffer.replace_int32(position, buffer.length - position)
       end
-      buffer.put_byte(NULL_BYTE)
-      buffer.replace_int32(position, buffer.length - position)
     end
 
     # Convert the array to an object id. This will only work for arrays of size
@@ -93,13 +97,17 @@ module BSON
       #
       # @since 2.0.0
       def from_bson(buffer)
-        array = new
-        buffer.get_int32 # throw away the length
-        while (type = buffer.get_byte) != NULL_BYTE
-          buffer.get_cstring
-          array << BSON::Registry.get(type).from_bson(buffer)
+        if buffer.respond_to?(:get_array)
+          buffer.get_array
+        else
+          array = new
+          buffer.get_int32 # throw away the length
+          while (type = buffer.get_byte) != NULL_BYTE
+            buffer.get_cstring
+            array << BSON::Registry.get(type).from_bson(buffer)
+          end
+          array
         end
-        array
       end
     end
 

data/lib/bson/hash.rb

@@ -38,15 +38,19 @@ module BSON
     #
     # @since 2.0.0
     def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
-      position = buffer.length
-      buffer.put_int32(0)
-      each do |field, value|
-        buffer.put_byte(value.bson_type)
-        buffer.put_cstring(field.to_bson_key(validating_keys))
-        value.to_bson(buffer, validating_keys)
+      if buffer.respond_to?(:put_hash)
+        buffer.put_hash(self, validating_keys)
+      else
+        position = buffer.length
+        buffer.put_int32(0)
+        each do |field, value|
+          buffer.put_byte(value.bson_type)
+          buffer.put_cstring(field.to_bson_key(validating_keys))
+          value.to_bson(buffer, validating_keys)
+        end
+        buffer.put_byte(NULL_BYTE)
+        buffer.replace_int32(position, buffer.length - position)
       end
-      buffer.put_byte(NULL_BYTE)
-      buffer.replace_int32(position, buffer.length - position)
     end
 
     # Converts the hash to a normalized value in a BSON document.
@@ -73,13 +77,17 @@ module BSON
       #
       # @since 2.0.0
       def from_bson(buffer)
-        hash = Document.allocate
-        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, field).from_bson(buffer))
+        if buffer.respond_to?(:get_hash)
+          buffer.get_hash
+        else
+          hash = Document.allocate
+          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, field).from_bson(buffer))
+          end
+          hash
         end
-        hash
       end
     end
 

data/lib/bson/registry.rb

@@ -40,7 +40,7 @@ module BSON
     #
     # @since 2.0.0
     def get(byte, field = nil)
-      if type = MAPPINGS[byte]
+      if type = MAPPINGS[byte] || (byte.is_a?(String) && type = MAPPINGS[byte.ord])
         type
       else
         handle_unsupported_type!(byte, field)
@@ -59,7 +59,7 @@ module BSON
     #
     # @since 2.0.0
     def register(byte, type)
-      MAPPINGS.store(byte, type)
+      MAPPINGS[byte.ord] = type
       define_type_reader(type)
     end
 

data/lib/bson/symbol.rb

@@ -105,7 +105,7 @@ module BSON
     # Register this type when the module is loaded.
     #
     # @since 2.0.0
-    Registry::MAPPINGS.store(BSON_TYPE, ::Symbol)
+    Registry::MAPPINGS[BSON_TYPE.ord] = ::Symbol
   end
 
   # Enrich the core Symbol class with this module.

data/lib/bson/timestamp.rb

@@ -21,12 +21,18 @@ module BSON
   # @since 2.0.0
   class Timestamp
     include JSON
+    include Comparable
 
     # A timestamp is type 0x11 in the BSON spec.
     #
     # @since 2.0.0
     BSON_TYPE = 17.chr.force_encoding(BINARY).freeze
 
+    # Error message if an object other than a Timestamp is compared with this object.
+    #
+    # @since 4.3.0
+    COMPARISON_ERROR_MESSAGE = 'comparison of %s with Timestamp failed'.freeze
+
     # @!attribute seconds
     #   @return [ Integer ] The number of seconds.
     #   @since 2.0.0
@@ -52,6 +58,24 @@ module BSON
       seconds == other.seconds && increment == other.increment
     end
 
+    # Determine if this timestamp is greater or less than another object.
+    #
+    # @example Compare the timestamp.
+    #   timestamp < other
+    #
+    # @param [ Object ] other The object to compare against.
+    #
+    # @return [ true, false ] The result of the comparison.
+    #
+    # @since 4.3.0
+    def <=>(other)
+      raise ArgumentError.new(COMPARISON_ERROR_MESSAGE % other.class) unless other.is_a?(Timestamp)
+      return 0 if self == other
+      a = [ seconds, increment ]
+      b = [ other.seconds, other.increment ]
+      [ a, b ].sort[0] == a ? -1 : 1
+    end
+
     # Get the timestamp as JSON hash data.
     #
     # @example Get the timestamp as a JSON hash.

data/lib/bson/version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module BSON
-  VERSION = "4.2.2".freeze
+  VERSION = "4.3.0.beta".freeze
 end

data/spec/bson/byte_buffer_spec.rb

@@ -152,16 +152,30 @@ describe BSON::ByteBuffer do
 
   describe '#length' do
 
-    let(:buffer) do
-      described_class.new
-    end
+    context 'when the byte buffer is initialized with no bytes' do
+
+      let(:buffer) do
+        described_class.new
+      end
+
+      before do
+        buffer.put_int32(5)
+      end
 
-    before do
-      buffer.put_int32(5)
+      it 'returns the length of the buffer' do
+        expect(buffer.length).to eq(4)
+      end
     end
 
-    it 'returns the length of the buffer' do
-      expect(buffer.length).to eq(4)
+    context 'when the byte buffer is initialized with some bytes' do
+
+      let(:buffer) do
+        described_class.new("#{BSON::Int32::BSON_TYPE}#{BSON::Int32::BSON_TYPE}")
+      end
+
+      it 'returns the length' do
+        expect(buffer.length).to eq(2)
+      end
     end
   end
 

data/spec/bson/document_spec.rb

@@ -756,6 +756,24 @@ describe BSON::Document do
       end
     end
 
+    context "when the hash contains an array of hashes" do
+      let(:obj) do
+        described_class["key",[{"a" => 1}, {"b" => 2}]]
+      end
+
+      let(:bson) do
+        "#{45.to_bson}#{Array::BSON_TYPE}key#{BSON::NULL_BYTE}" +
+        "#{35.to_bson}"+
+        "#{BSON::Document::BSON_TYPE}0#{BSON::NULL_BYTE}#{12.to_bson}#{BSON::Int32::BSON_TYPE}a#{BSON::NULL_BYTE}#{1.to_bson}#{BSON::NULL_BYTE}" +
+        "#{BSON::Document::BSON_TYPE}1#{BSON::NULL_BYTE}#{12.to_bson}#{BSON::Int32::BSON_TYPE}b#{BSON::NULL_BYTE}#{2.to_bson}#{BSON::NULL_BYTE}" +
+        "#{BSON::NULL_BYTE}" + 
+        "#{BSON::NULL_BYTE}"
+      end
+
+      it_behaves_like "a serializable bson element"
+      it_behaves_like "a deserializable bson element"
+    end
+
     context "when the hash is a single level" do
 
       let(:obj) do

data/spec/bson/timestamp_spec.rb

@@ -48,6 +48,61 @@ describe BSON::Timestamp do
     end
   end
 
+  describe "#<=>" do
+
+    let(:timestamp) do
+      described_class.new(1, 10)
+    end
+
+    context "when the objects are equal" do
+
+      let(:other) { described_class.new(1, 10) }
+
+      it "returns 0" do
+        expect(timestamp).to eq(other)
+        expect(timestamp < other).to be(false)
+        expect(timestamp > other).to be(false)
+        expect(timestamp >= other).to be(true)
+        expect(timestamp <= other).to be(true)
+      end
+    end
+
+    context "when the first object is less than the second" do
+
+      let(:other) { described_class.new(1, 15) }
+
+      it "returns -1" do
+        expect(timestamp <=> other).to be(-1)
+        expect(timestamp < other).to be(true)
+        expect(timestamp > other).to be(false)
+        expect(timestamp >= other).to be(false)
+        expect(timestamp <= other).to be(true)
+      end
+    end
+
+    context "when the first object is greater than the second" do
+
+      let(:other) { described_class.new(1, 5) }
+
+      it "returns 1" do
+        expect(timestamp <=> other).to be(1)
+        expect(timestamp < other).to be(false)
+        expect(timestamp > other).to be(true)
+        expect(timestamp >= other).to be(true)
+        expect(timestamp <= other).to be(false)
+      end
+    end
+
+    context "when the other object is not a timestamp" do
+
+      it "raises an ArgumentError" do
+        expect {
+          timestamp < 1
+        }.to raise_exception(ArgumentError)
+      end
+    end
+  end
+
   describe "#as_json" do
 
     let(:object) do

data/spec/spec_helper.rb

@@ -24,6 +24,7 @@ require "bson"
 require "json"
 require "rspec"
 require "yaml"
+require "pry-nav"
 
 Dir["./spec/support/**/*.rb"].each { |file| require file }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bson
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.3.0.beta
 platform: java
 authors:
 - Tyler Brock
@@ -34,7 +34,7 @@ cert_chain:
   UgLdYyyGANc+TOKLFmx0eAJlCljAurbX7ctO2XI0f1AUdEYSqGzut+datXK/9nwQ
   FACf8zd11PEds/Opai2Qp4aOBgaxXhhFG357umy1vRs=
   -----END CERTIFICATE-----
-date: 2017-07-03 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies: []
 description: A full featured BSON specification implementation, in Ruby
 email:
@@ -86,6 +86,7 @@ files:
 - lib/bson/true_class.rb
 - lib/bson/undefined.rb
 - lib/bson/version.rb
+- lib/bson_native.bundle
 - spec/bson/array_spec.rb
 - spec/bson/binary_spec.rb
 - spec/bson/boolean_spec.rb