bson 4.10.0 → 4.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a62c9c51fa6fafda7b1e9a084a118fd34e25804fd97ffd504f8d00690d2eb9f0
-  data.tar.gz: 219e45cccac4d1d1b7f7dfad0e6f386538678d632cc9937b9f0f6c06f57e4118
+  metadata.gz: 18f69f1d0f65a2c4883500061a6637f6fb314e7758a15cda3941432a7e6fbd0a
+  data.tar.gz: b26789d1b2da697b6113897040ecd297d88367267fd28411609f23229ec8be2e
 SHA512:
-  metadata.gz: 40cab24a15e3430250426e270e99700ab2527d417ac9a248976afc1e1cee5deb9bd1b7dc07112d1d772cb4e65387a3c6fab00943bc55b9d426bc29fee39aba9e
-  data.tar.gz: 349f013a08fc84afea777262e88f8813586621f4dc4273ebf122fd347d574dc8dee8b102ba901085b373b3479b1172c3c596a8dd3e5086e05d19b109845f6168
+  metadata.gz: 7f90cd2d60cb0904d80ec6a3d75ba7d88af3872b5b1fdd27f9a283026f7c27ffbe84ad5331e571ebe120c7cd8c94d06190da8f1dc9fc783c349667f0ee963de1
+  data.tar.gz: da4c4edb81e99a804789c3914555376db3510a65437cc7b80829ae1f38f3c0f5a45894c8b4d8b24127367d0a9d1f46c9094a7b4f0f18633dbd4c4a8890675b02

data/ext/bson/init.c

@@ -56,6 +56,16 @@ void Init_bson_native()
 
   rb_define_alloc_func(rb_byte_buffer_class, rb_bson_byte_buffer_allocate);
   rb_define_method(rb_byte_buffer_class, "initialize", rb_bson_byte_buffer_initialize, -1);
+
+  /*
+   * call-seq:
+   *   buffer.length -> Fixnum
+   *
+   * Returns the number of bytes available to be read in the buffer.
+   *
+   * When a buffer is being written to, each added byte increases its length.
+   * When a buffer is being read from, each read byte decreases its length.
+   */
   rb_define_method(rb_byte_buffer_class, "length", rb_bson_byte_buffer_length, 0);
 
   /*
@@ -266,7 +276,7 @@ void Init_bson_native()
 
   /*
    * call-seq:
-   *   buffer.put_hash(hash) -> ByteBuffer
+   *   buffer.put_hash(hash, validating_keys) -> ByteBuffer
    *
    * Writes a Hash into the byte buffer.
    *
@@ -319,6 +329,10 @@ void Init_bson_native()
    *
    * Returns the contents of the buffer as a binary string.
    *
+   * If the buffer is used for reading, the returned contents is the data
+   * that was not yet read. If the buffer is used for writing, the returned
+   * contents is the complete data that has been written so far.
+   *
    * Note: this method copies the buffer's contents into a newly allocated
    * +String+ instance. It does not return a reference to the data stored in
    * the buffer itself.

data/ext/bson/read.c

@@ -42,12 +42,12 @@ void pvt_raise_decode_error(volatile VALUE msg) {
 int32_t pvt_validate_length(byte_buffer_t *b)
 {
   int32_t length;
-  
+
   ENSURE_BSON_READ(b, 4);
   memcpy(&length, READ_PTR(b), 4);
   length = BSON_UINT32_TO_LE(length);
 
-  /* minimum valid length is 4 (byte count) + 1 (terminating byte) */ 
+  /* minimum valid length is 4 (byte count) + 1 (terminating byte) */
   if(length >= 5){
     ENSURE_BSON_READ(b, length);
 
@@ -60,7 +60,7 @@ int32_t pvt_validate_length(byte_buffer_t *b)
   else{
     rb_raise(rb_eRangeError, "Buffer contained invalid length %d at %zu", length, b->read_position);
   }
-  
+
   return length;
 }
 
@@ -176,13 +176,13 @@ VALUE pvt_get_string(byte_buffer_t *b, const char *data_type)
   }
   ENSURE_BSON_READ(b, 4 + length);
   str_ptr = READ_PTR(b) + 4;
-  last_byte = *(READ_PTR(b) + 4 + length_le - 1);
+  last_byte = *(READ_PTR(b) + 4 + length - 1);
   if (last_byte != 0) {
     pvt_raise_decode_error(rb_sprintf("Last byte of the string is not null: 0x%x", (int) last_byte));
   }
   rb_bson_utf8_validate(str_ptr, length - 1, true, data_type);
   string = rb_enc_str_new(str_ptr, length - 1, rb_utf8_encoding());
-  b->read_position += 4 + length_le;
+  b->read_position += 4 + length;
   return string;
 }
 
@@ -206,7 +206,7 @@ VALUE pvt_get_symbol(byte_buffer_t *b, VALUE rb_buffer, int argc, VALUE *argv)
     klass = rb_funcall(rb_bson_registry, rb_intern("get"), 1, INT2FIX(BSON_TYPE_SYMBOL));
     value = rb_funcall(klass, rb_intern("from_bson"), 1, rb_buffer);
   }
-  
+
   RB_GC_GUARD(klass);
   return value;
 }
@@ -307,7 +307,7 @@ VALUE pvt_get_int64(byte_buffer_t *b, int argc, VALUE *argv)
   memcpy(&i64, READ_PTR(b), 8);
   b->read_position += 8;
   num = LL2NUM(BSON_UINT64_FROM_LE(i64));
-  
+
   if (pvt_get_mode_option(argc, argv) == BSON_MODE_BSON) {
     VALUE klass = rb_funcall(rb_bson_registry,rb_intern("get"),1, INT2FIX(BSON_TYPE_INT64));
     VALUE value = rb_funcall(klass, rb_intern("new"), 1, num);
@@ -316,7 +316,7 @@ VALUE pvt_get_int64(byte_buffer_t *b, int argc, VALUE *argv)
   } else {
     return num;
   }
-  
+
   RB_GC_GUARD(num);
 }
 
@@ -376,11 +376,11 @@ VALUE rb_bson_byte_buffer_get_hash(int argc, VALUE *argv, VALUE self){
     rb_hash_aset(doc, field, pvt_read_field(b, self, type, argc, argv));
     RB_GC_GUARD(field);
   }
-  
+
   if (READ_PTR(b) - start_ptr != length) {
     pvt_raise_decode_error(rb_sprintf("Expected to read %d bytes for the hash but read %ld bytes", length, READ_PTR(b) - start_ptr));
   }
-  
+
   return doc;
 }
 
@@ -402,10 +402,10 @@ VALUE rb_bson_byte_buffer_get_array(int argc, VALUE *argv, VALUE self){
     rb_ary_push(array,  pvt_read_field(b, self, type, argc, argv));
   }
   RB_GC_GUARD(array);
-  
+
   if (READ_PTR(b) - start_ptr != length) {
     pvt_raise_decode_error(rb_sprintf("Expected to read %d bytes for the hash but read %ld bytes", length, READ_PTR(b) - start_ptr));
   }
-  
+
   return array;
 }

data/lib/bson/binary.rb

@@ -207,7 +207,8 @@ module BSON
         if representation && representation != :standard
           raise ArgumentError, "Binary of type :uuid can only be stringified to :standard representation, requested: #{representation.inspect}"
         end
-        data.split('').map { |n| '%02x' % n.ord }.join.sub(/(.{8})(.{4})(.{4})(.{12})/, '\1-\2-\3-\4')
+
+        data.split('').map { |n| '%02x' % n.ord }.join.sub(/\A(.{8})(.{4})(.{4})(.{4})(.{12})\z/, '\1-\2-\3-\4-\5')
       when :uuid_old
         if representation.nil?
           raise ArgumentError, 'Representation must be specified for BSON::Binary objects of type :uuid_old'
@@ -229,7 +230,7 @@ module BSON
           hex
         else
           raise ArgumentError, "Invalid representation: #{representation}"
-        end.sub(/(.{8})(.{4})(.{4})(.{12})/, '\1-\2-\3-\4')
+        end.sub(/\A(.{8})(.{4})(.{4})(.{4})(.{12})\z/, '\1-\2-\3-\4-\5')
       else
         raise TypeError, "The type of Binary must be :uuid or :uuid_old, this object is: #{type.inspect}"
       end

data/lib/bson/document.rb

@@ -269,27 +269,56 @@ module BSON
       end
     end
 
-    if instance_methods.include?(:slice)
-      # Slices a document to include only the given keys.
-      # Will normalize symbol keys into strings.
-      # (this method is backported from ActiveSupport::Hash)
-      #
-      # @example Get a document/hash with only the `name` and `age` fields present
-      #   document # => { _id: <ObjectId>, :name => 'John', :age => 30, :location => 'Earth' }
-      #   document.slice(:name, 'age') # => { name: 'John', age: 30 }
-      #   document.slice('name') # => { name: 'John' }
-      #   document.slice(:foo) # => nil
-      #
-      # @param [ Array<String, Symbol> ] *keys Keys, that will be kept in the resulting document
-      #
-      # @return [ BSON::Document ] The document with only the selected keys
-      #
-      # @since 4.3.1
-      def slice(*keys)
-        super(*keys.map{|key| convert_key(key)})
+    # Slices a document to include only the given keys.
+    # Will normalize symbol keys into strings.
+    # (this method is backported from ActiveSupport::Hash)
+    #
+    # @example Get a document/hash with only the `name` and `age` fields present
+    #   document # => { _id: <ObjectId>, :name => "John", :age => 30, :location => "Earth" }
+    #   document.slice(:name, 'age') # => { "name": "John", "age" => 30 }
+    #   document.slice('name') # => { "name" => "John" }
+    #   document.slice(:foo) # => {}
+    #
+    # @param [ Array<String, Symbol> ] *keys Keys, that will be kept in the resulting document
+    #
+    # @return [ BSON::Document ] The document with only the selected keys
+    #
+    # @since 4.3.1
+    def slice(*keys)
+      keys.each_with_object(self.class.new) do |key, hash|
+        if key?(key)
+          hash[key] = self[key]
+        end
       end
     end
 
+    # Returns a new document consisting of the current document minus the
+    # specified keys.
+    #
+    # The keys to be removed can be specified as either strings or symbols.
+    #
+    # @example Get a document/hash with only the `name` and `age` fields removed
+    #   document # => { _id: <ObjectId>, :name => 'John', :age => 30, :location => 'Earth' }
+    #   document.except(:name, 'age') # => { _id: <ObjectId>, location: 'Earth' }
+    #
+    # @param [ Array<String, Symbol> ] *keys Keys, that will be removed in the resulting document
+    #
+    # @return [ BSON::Document ] The document with the specified keys removed.
+    #
+    # @note This method is always defined, even if Hash already contains a
+    #   definition of #except, because ActiveSupport unconditionally defines
+    #   its version of #except which doesn't work for BSON::Document which
+    #   causes problems if ActiveSupport is loaded after bson-ruby is.
+    def except(*keys)
+      copy = dup
+      keys.each {|key| copy.delete(key)}
+      copy
+    end
+
+    def symbolize_keys!
+      raise ArgumentError, 'symbolize_keys! is not supported on BSON::Document instances. Please convert the document to hash first (using #to_h), then call #symbolize_keys! on the Hash instance'
+    end
+
     private
 
     def convert_key(key)

data/lib/bson/ext_json.rb

@@ -219,6 +219,14 @@ module BSON
             raise Error::ExtJSONParseError, "Invalid subType value in $binary: #{value}"
           end
           create_binary(encoded_value, subtype)
+
+        when '$uuid'
+          unless /\A[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}\z/.match(value)
+            raise Error::ExtJSONParseError, "Invalid $uuid value: #{value}"
+          end
+
+          return Binary.from_uuid(value)
+
         when '$code'
           unless value.is_a?(String)
             raise Error::ExtJSONParseError, "Invalid $code value: #{value}"

data/lib/bson/version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module BSON
-  VERSION = "4.10.0".freeze
+  VERSION = "4.12.1".freeze
 end

data/spec/bson/binary_spec.rb

@@ -255,7 +255,7 @@ describe BSON::Binary do
     let(:obj) { described_class.new("\x00" * 16, :uuid) }
 
     it 'accepts symbol representation' do
-      expect(obj.to_uuid(:standard)).to eq('00000000-0000-0000-0000000000000000')
+      expect(obj.to_uuid(:standard)).to eq('00000000-0000-0000-0000-000000000000')
     end
 
     it 'rejects string representation' do

data/spec/bson/binary_uuid_spec.rb

@@ -136,6 +136,10 @@ describe "BSON::Binary - UUID spec tests" do
       it 'decodes as python legacy' do
         expect(binary.to_uuid(:python_legacy).gsub('-', '').upcase).not_to eq("00112233445566778899AABBCCDDEEFF")
       end
+
+      it 'expects four dashes when output as String' do
+        expect(binary.to_uuid(:csharp_legacy)).to eq("00112233-4455-6677-8899-aabbccddeeff")
+      end
     end
 
     context ':uuid_old, java legacy encoded' do
@@ -154,6 +158,10 @@ describe "BSON::Binary - UUID spec tests" do
       it 'decodes as python legacy' do
         expect(binary.to_uuid(:python_legacy).gsub('-', '').upcase).not_to eq("00112233445566778899AABBCCDDEEFF")
       end
+
+      it 'expects four dashes when output as String' do
+        expect(binary.to_uuid(:java_legacy)).to eq("00112233-4455-6677-8899-aabbccddeeff")
+      end
     end
 
     context ':uuid_old, python legacy encoded' do
@@ -172,6 +180,10 @@ describe "BSON::Binary - UUID spec tests" do
       it 'decodes as python legacy' do
         expect(binary.to_uuid(:python_legacy).gsub('-', '').upcase).to eq("00112233445566778899AABBCCDDEEFF")
       end
+
+      it 'expects four dashes when output as String' do
+        expect(binary.to_uuid(:python_legacy)).to eq("00112233-4455-6677-8899-aabbccddeeff")
+      end
     end
   end
 end

data/spec/bson/byte_buffer_spec.rb

@@ -30,8 +30,8 @@ describe BSON::ByteBuffer do
       let(:buffer) do
         described_class.new
       end
-      
-      context '#put_int32' do 
+
+      context '#put_int32' do
         before do
           buffer.put_int32(5)
         end
@@ -42,7 +42,6 @@ describe BSON::ByteBuffer do
       end
     end
 
-
     context 'when the byte buffer is initialized with some bytes' do
 
       let(:buffer) do
@@ -53,6 +52,50 @@ describe BSON::ByteBuffer do
         expect(buffer.length).to eq(2)
       end
     end
+
+    context 'after the byte buffer was read from' do
+
+      let(:buffer) do
+        described_class.new({}.to_bson.to_s)
+      end
+
+      it 'returns the number of bytes remaining in the buffer' do
+        expect(buffer.length).to eq(5)
+        buffer.get_int32
+        expect(buffer.length).to eq(1)
+      end
+    end
+
+    context 'after the byte buffer was converted to string' do
+
+      shared_examples 'returns the total buffer length' do
+        it 'returns the total buffer length' do
+          expect(buffer.length).to eq(5)
+          buffer.to_s.length.should == 5
+          expect(buffer.length).to eq(5)
+        end
+      end
+
+      context 'read buffer' do
+
+        let(:buffer) do
+          described_class.new({}.to_bson.to_s)
+        end
+
+        include_examples 'returns the total buffer length'
+      end
+
+      context 'write buffer' do
+
+        let(:buffer) do
+          described_class.new.tap do |buffer|
+            buffer.put_bytes('hello')
+          end
+        end
+
+        include_examples 'returns the total buffer length'
+      end
+    end
   end
 
   describe '#rewind!' do
@@ -107,4 +150,81 @@ describe BSON::ByteBuffer do
       expect(buffer.write_position).to eq(1)
     end
   end
+
+  describe 'write followed by read' do
+    let(:buffer) do
+      described_class.new
+    end
+
+    context 'one cycle' do
+      it 'returns the written data' do
+        buffer.put_cstring('hello')
+        buffer.get_cstring.should == 'hello'
+      end
+    end
+
+    context 'two cycles' do
+      it 'returns the written data' do
+        buffer.put_cstring('hello')
+        buffer.get_cstring.should == 'hello'
+
+        buffer.put_cstring('world')
+        buffer.get_cstring.should == 'world'
+      end
+    end
+
+    context 'mixed cycles' do
+      it 'returns the written data' do
+        if BSON::Environment.jruby?
+          pending 'RUBY-2334'
+        end
+
+        buffer.put_int32(1)
+        buffer.put_int32(2)
+
+        buffer.get_int32.should == 1
+
+        buffer.put_int32(3)
+
+        buffer.get_int32.should == 2
+        buffer.get_int32.should == 3
+      end
+    end
+  end
+
+  describe '#to_s' do
+    context 'read buffer' do
+      let(:buffer) do
+        described_class.new("\x18\x00\x00\x00*\x00\x00\x00")
+      end
+
+      it 'returns the data' do
+        buffer.to_s.should == "\x18\x00\x00\x00*\x00\x00\x00"
+      end
+
+      it 'returns the remaining buffer contents after a read' do
+        buffer.to_s.should == "\x18\x00\x00\x00*\x00\x00\x00"
+        buffer.get_int32.should == 24
+        buffer.to_s.should == "*\x00\x00\x00"
+      end
+    end
+
+    context 'write buffer' do
+      let(:buffer) do
+        described_class.new.tap do |buffer|
+          buffer.put_int32(24)
+        end
+      end
+
+      it 'returns the data' do
+        buffer.to_s.should == "\x18\x00\x00\x00".force_encoding('binary')
+      end
+
+      it 'returns the complete buffer contents after a write' do
+        buffer.to_s.should == "\x18\x00\x00\x00".force_encoding('binary')
+        buffer.put_int32(42)
+        buffer.to_s.should == "\x18\x00\x00\x00*\x00\x00\x00".force_encoding('binary')
+      end
+    end
+  end
 end

data/spec/bson/document_as_spec.rb

@@ -0,0 +1,46 @@
+# Copyright (C) 2021 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.
+
+require "spec_helper"
+
+# BSON::Document ActiveSupport extensions
+describe BSON::Document do
+  require_active_support
+
+  describe '#symbolize_keys' do
+    context 'string keys' do
+      let(:doc) do
+        described_class.new('foo' => 'bar')
+      end
+
+      it 'works correctly' do
+        doc.symbolize_keys.should == {foo: 'bar'}
+      end
+    end
+  end
+
+  describe '#symbolize_keys!' do
+    context 'string keys' do
+      let(:doc) do
+        described_class.new('foo' => 'bar')
+      end
+
+      it 'raises ArgumentError' do
+        lambda do
+          doc.symbolize_keys!
+        end.should raise_error(ArgumentError, /symbolize_keys! is not supported on BSON::Document instances/)
+      end
+    end
+  end
+end

data/spec/bson/document_spec.rb

@@ -215,6 +215,10 @@ describe BSON::Document do
 
       context "when provided string keys" do
 
+        it "is a BSON Document" do
+          expect(document.slice("key1")).to be_a(BSON::Document)
+        end
+
         it "returns the partial document" do
           expect(document.slice("key1")).to contain_exactly(['key1', 'value1'])
         end
@@ -222,13 +226,45 @@ describe BSON::Document do
 
       context "when provided symbol keys" do
 
+        it "is a BSON Document" do
+          expect(document.slice(:key1)).to be_a(BSON::Document)
+        end
+
         it "returns the partial document" do
           expect(document.slice(:key1)).to contain_exactly(['key1', 'value1'])
         end
       end
+
+      context "when provided keys that do not exist in the document" do
+
+        it "returns only the keys that exist in the document" do
+          expect(document.slice(:key1, :key3)).to contain_exactly(['key1', 'value1'])
+        end
+      end
     end
   end
 
+  describe "#except" do
+    let(:document) do
+      described_class.new("key1" => "value1", key2: "value2")
+    end
+
+    context "when provided string keys" do
+
+      it "returns the partial document" do
+        expect(document.except("key1")).to contain_exactly(['key2', 'value2'])
+      end
+    end
+
+    context "when provided symbol keys" do
+
+      it "returns the partial document" do
+        expect(document.except(:key1)).to contain_exactly(['key2', 'value2'])
+      end
+    end
+  end
+
+
   describe "#delete" do
 
     shared_examples_for "a document with deletable pairs" do

data/spec/bson/hash_as_spec.rb

@@ -0,0 +1,57 @@
+# Copyright (C) 2021 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.
+
+require "spec_helper"
+
+describe 'Hash ActiveSupport extensions' do
+  require_active_support
+
+  describe '#symbolize_keys' do
+    let(:symbolized) { hash.symbolize_keys }
+
+    shared_examples 'works correctly' do
+      it 'returns a hash' do
+        symbolized.class.should be Hash
+      end
+
+      it 'works correctly' do
+        hash.symbolize_keys.should == {foo: 'bar'}
+      end
+    end
+
+    context 'string keys' do
+      let(:hash) do
+        {'foo' => 'bar'}
+      end
+
+      include_examples 'works correctly'
+    end
+
+    context 'symbol keys' do
+      let(:hash) do
+        {foo: 'bar'}
+      end
+
+      include_examples 'works correctly'
+    end
+
+    context 'both string and symbol keys' do
+      let(:hash) do
+        {'foo' => 42, foo: 'bar'}
+      end
+
+      include_examples 'works correctly'
+    end
+  end
+end

data/spec/bson/hash_spec.rb

@@ -244,6 +244,16 @@ describe Hash do
           /(Hash value for key 'foo'|Value) does not define its BSON serialized type:.*HashSpecUnserializableClass/)
       end
     end
+
+    context 'when reading from a byte buffer that was previously written to' do
+      let(:buffer) do
+        {foo: 42}.to_bson
+      end
+
+      it 'returns the original hash' do
+        expect(Hash.from_bson(buffer)).to eq('foo' => 42)
+      end
+    end
   end
 
   describe '#to_bson' do
@@ -310,4 +320,50 @@ describe Hash do
       end
     end
   end
+
+  describe '#from_bson' do
+    context 'when bson document has duplicate keys' do
+      let(:buf) do
+        buf = BSON::ByteBuffer.new
+        buf.put_int32(37)
+        buf.put_byte("\x02")
+        buf.put_cstring('foo')
+        buf.put_string('bar')
+        buf.put_byte("\x02")
+        buf.put_cstring('foo')
+        buf.put_string('overwrite')
+        buf.put_byte("\x00")
+
+        BSON::ByteBuffer.new(buf.to_s)
+      end
+
+      let(:doc) { Hash.from_bson(buf) }
+
+      it 'overwrites first value with second value' do
+        doc.should == {'foo' => 'overwrite'}
+      end
+    end
+
+    context 'when bson document has string and symbol keys of the same name' do
+      let(:buf) do
+        buf = BSON::ByteBuffer.new
+        buf.put_int32(31)
+        buf.put_byte("\x02")
+        buf.put_cstring('foo')
+        buf.put_string('bar')
+        buf.put_byte("\x0e")
+        buf.put_cstring('foo')
+        buf.put_string('bar')
+        buf.put_byte("\x00")
+
+        BSON::ByteBuffer.new(buf.to_s)
+      end
+
+      let(:doc) { Hash.from_bson(buf) }
+
+      it 'overwrites first value with second value' do
+        doc.should == {'foo' => :bar}
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -17,6 +17,7 @@ DRIVER_COMMON_BSON_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/decimal128/
 BSON_CORPUS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/corpus/*.json").sort
 BSON_CORPUS_LEGACY_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/corpus_legacy/*.json").sort
 
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "shared", "lib"))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
@@ -40,6 +41,8 @@ unless ENV['CI'] || BSON::Environment.jruby?
   end
 end
 
+require 'mrss/lite_constraints'
+
 Dir["./spec/support/**/*.rb"].each { |file| require file }
 
 # Alternate IO class that returns a String from #readbyte.
@@ -71,4 +74,6 @@ RSpec.configure do |config|
       end
     end
   end
+
+  config.extend Mrss::LiteConstraints
 end

data/spec/spec_tests/data/corpus/binary.json

@@ -39,6 +39,12 @@
             "canonical_bson": "1D000000057800100000000473FFD26444B34C6990E8E7D1DFC035D400",
             "canonical_extjson": "{\"x\" : { \"$binary\" : {\"base64\" : \"c//SZESzTGmQ6OfR38A11A==\", \"subType\" : \"04\"}}}"
         },
+        {
+            "description": "subtype 0x04 UUID",
+            "canonical_bson": "1D000000057800100000000473FFD26444B34C6990E8E7D1DFC035D400",
+            "canonical_extjson": "{\"x\" : { \"$binary\" : {\"base64\" : \"c//SZESzTGmQ6OfR38A11A==\", \"subType\" : \"04\"}}}",
+            "degenerate_extjson": "{\"x\" : { \"$uuid\" : \"73ffd264-44b3-4c69-90e8-e7d1dfc035d4\"}}"
+        },
         {
             "description": "subtype 0x05",
             "canonical_bson": "1D000000057800100000000573FFD26444B34C6990E8E7D1DFC035D400",
@@ -81,5 +87,27 @@
             "description": "subtype 0x02 length negative one",
             "bson": "130000000578000600000002FFFFFFFFFFFF00"
         }
+    ],
+    "parseErrors": [
+        {
+            "description": "$uuid wrong type",
+            "string": "{\"x\" : { \"$uuid\" : { \"data\" : \"73ffd264-44b3-4c69-90e8-e7d1dfc035d4\"}}}"
+        },
+        {
+            "description": "$uuid invalid value--too short",
+            "string": "{\"x\" : { \"$uuid\" : \"73ffd264-44b3-90e8-e7d1dfc035d4\"}}"
+        },
+        {
+            "description": "$uuid invalid value--too long",
+            "string": "{\"x\" : { \"$uuid\" : \"73ffd264-44b3-4c69-90e8-e7d1dfc035d4-789e4\"}}"
+        },
+        {
+            "description": "$uuid invalid value--misplaced hyphens",
+            "string": "{\"x\" : { \"$uuid\" : \"73ff-d26444b-34c6-990e8e-7d1dfc035d4\"}}"
+        },
+        {
+            "description": "$uuid invalid value--too many hyphens",
+            "string": "{\"x\" : { \"$uuid\" : \"----d264-44b3-4--9-90e8-e7d1dfc0----\"}}"
+        }
     ]
 }

data/spec/support/spec_config.rb

@@ -6,7 +6,8 @@ class SpecConfig
   COMPACTION_CHANCE = 0.001
 
   def active_support?
-    %w(1 true yes).include?(ENV['WITH_ACTIVE_SUPPORT'])
+    %w(1 true yes).include?(ENV['WITH_ACTIVE_SUPPORT']) ||
+      ENV['WITH_ACTIVE_SUPPORT'] =~ /[0-9]/ && ENV['WITH_ACTIVE_SUPPORT'] != '0'
   end
 
   def compact?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bson
 version: !ruby/object:Gem::Version
-  version: 4.10.0
+  version: 4.12.1
 platform: ruby
 authors:
 - Tyler Brock
@@ -15,8 +15,8 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIDRDCCAiygAwIBAgIBATANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBtkcml2
-  ZXItcnVieS9EQz0xMGdlbi9EQz1jb20wHhcNMjAwMTIzMTkzNjAxWhcNMjEwMTIy
-  MTkzNjAxWjAmMSQwIgYDVQQDDBtkcml2ZXItcnVieS9EQz0xMGdlbi9EQz1jb20w
+  ZXItcnVieS9EQz0xMGdlbi9EQz1jb20wHhcNMjEwMjA5MTQxOTU3WhcNMjIwMjA5
+  MTQxOTU3WjAmMSQwIgYDVQQDDBtkcml2ZXItcnVieS9EQz0xMGdlbi9EQz1jb20w
   ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRXUgGvH0ZtWwDPc2umdHw
   B+INNm6jNTRp8PMyUKxPzxaxX2OiBQk9gLC3zsK9ZmlZu4lNfpHVSCEPoiP/fhPg
   Kyfq2xld3Qz0Pki5d5i0/r14343MTKiNiFulLlbbdlN0cXeEFNJHUycZnD2LOXwz
@@ -26,14 +26,14 @@ cert_chain:
   AgMBAAGjfTB7MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBRbd1mx
   fvSaVIwKI+tnEAYDW/B81zAgBgNVHREEGTAXgRVkcml2ZXItcnVieUAxMGdlbi5j
   b20wIAYDVR0SBBkwF4EVZHJpdmVyLXJ1YnlAMTBnZW4uY29tMA0GCSqGSIb3DQEB
-  CwUAA4IBAQBfX4dwxG5PhtxES/LDEOaZIZXyaX6CKe367zhW+HxWbSOXMQJFkIQj
-  m7tzT+sDFJXyiOv5cPtfpUam5pTiryzRw5HD6oxlPIt5vO15EJ69v++3m7shMLbw
-  amZOajKXmu2ZGZfhOtj7bOTwmOj1AnWLKeOQIR3STvvfZCD+6dt1XenW7CdjCsxE
-  ifervPjLFqFPsMOgaxikhgPK6bRtszrQhJSYlifKKzxbX1hYAsmGL7IxjubFSV5r
-  gpvfPNWMwyBDlHaNS3GfO6cRRxBOvEG05GUCsvtTY4Bpe8yjE64wg1ymb47LMOnv
-  Qb1lGORmf/opg45mluKUYl7pQNZHD0d3
+  CwUAA4IBAQCYGRgQbtk+g+Nuwg15p8jb+8bJlwHFHkb8rkLn00OPXLk3uBhImOKZ
+  mhwwr/8ZBkeE/PBDxkQjeua+NpqSaPr1lvXQaGpHxJzpR/BmSteeoF49jBu0dHaz
+  MRghinst6ROS1qVRae0z+wkbnufpH/NxdCUufb639nAlZguT2rGqvM6VZCC8eSO9
+  KfJA7/MEE+qQtiQgJaAUVRaGC8fLtmS555BPjNVITJs+BcGDYWh2clWuqlzjHOp3
+  YoFhlyUEi7VLlqNH0H/JFttVZK6+qmLelkVNcIYVLeWOB4Lf4VxEiYGEK1ORxsrY
+  iyYKJJALWY1FAInGRIlvkN+B8o3yIhq1
   -----END CERTIFICATE-----
-date: 2020-07-17 00:00:00.000000000 Z
+date: 2021-05-28 00:00:00.000000000 Z
 dependencies: []
 description: A fully featured BSON specification implementation in Ruby
 email: 
@@ -112,10 +112,12 @@ files:
 - spec/bson/date_spec.rb
 - spec/bson/date_time_spec.rb
 - spec/bson/decimal128_spec.rb
+- spec/bson/document_as_spec.rb
 - spec/bson/document_spec.rb
 - spec/bson/ext_json_parse_spec.rb
 - spec/bson/false_class_spec.rb
 - spec/bson/float_spec.rb
+- spec/bson/hash_as_spec.rb
 - spec/bson/hash_spec.rb
 - spec/bson/int32_spec.rb
 - spec/bson/int64_spec.rb
@@ -239,113 +241,115 @@ signing_key:
 specification_version: 4
 summary: Ruby implementation of the BSON specification
 test_files:
+- spec/bson/true_class_spec.rb
+- spec/bson/false_class_spec.rb
+- spec/bson/object_spec.rb
+- spec/bson/json_spec.rb
+- spec/bson/undefined_spec.rb
+- spec/bson/time_with_zone_spec.rb
+- spec/bson/max_key_spec.rb
+- spec/bson/float_spec.rb
+- spec/bson/int32_spec.rb
+- spec/bson/boolean_spec.rb
+- spec/bson/int64_spec.rb
+- spec/bson/min_key_spec.rb
+- spec/bson/date_time_spec.rb
+- spec/bson/date_spec.rb
+- spec/bson/registry_spec.rb
+- spec/bson/hash_as_spec.rb
+- spec/bson/regexp_spec.rb
+- spec/bson/timestamp_spec.rb
+- spec/bson/decimal128_spec.rb
+- spec/bson/binary_uuid_spec.rb
+- spec/bson/binary_spec.rb
+- spec/bson/document_as_spec.rb
+- spec/bson/code_spec.rb
+- spec/bson/array_spec.rb
+- spec/bson/time_spec.rb
+- spec/bson/raw_spec.rb
+- spec/bson/string_spec.rb
+- spec/bson/hash_spec.rb
+- spec/bson/object_id_spec.rb
+- spec/bson/ext_json_parse_spec.rb
+- spec/bson/document_spec.rb
+- spec/bson/symbol_spec.rb
+- spec/bson/open_struct_spec.rb
+- spec/bson/code_with_scope_spec.rb
+- spec/bson/symbol_raw_spec.rb
+- spec/bson/byte_buffer_write_spec.rb
+- spec/bson/byte_buffer_spec.rb
+- spec/bson/nil_class_spec.rb
+- spec/bson/byte_buffer_read_spec.rb
+- spec/bson/config_spec.rb
+- spec/bson/integer_spec.rb
+- spec/support/shared_examples.rb
+- spec/support/utils.rb
+- spec/support/spec_config.rb
 - spec/spec_helper.rb
-- spec/spec_tests/corpus_spec.rb
-- spec/spec_tests/common_driver_spec.rb
-- spec/spec_tests/data/corpus/decimal128-7.json
-- spec/spec_tests/data/corpus/top.json
-- spec/spec_tests/data/corpus/array.json
-- spec/spec_tests/data/corpus/null.json
-- spec/spec_tests/data/corpus/document.json
-- spec/spec_tests/data/corpus/decimal128-2.json
-- spec/spec_tests/data/corpus/decimal128-6.json
-- spec/spec_tests/data/corpus/boolean.json
-- spec/spec_tests/data/corpus/README.md
-- spec/spec_tests/data/corpus/maxkey.json
-- spec/spec_tests/data/corpus/binary.json
-- spec/spec_tests/data/corpus/multi-type.json
-- spec/spec_tests/data/corpus/timestamp.json
-- spec/spec_tests/data/corpus/multi-type-deprecated.json
-- spec/spec_tests/data/corpus/dbpointer.json
-- spec/spec_tests/data/corpus/oid.json
-- spec/spec_tests/data/corpus/regex.json
-- spec/spec_tests/data/corpus/minkey.json
-- spec/spec_tests/data/corpus/symbol.json
-- spec/spec_tests/data/corpus/dbref.json
-- spec/spec_tests/data/corpus/decimal128-1.json
-- spec/spec_tests/data/corpus/undefined.json
-- spec/spec_tests/data/corpus/double.json
-- spec/spec_tests/data/corpus/decimal128-4.json
-- spec/spec_tests/data/corpus/decimal128-3.json
-- spec/spec_tests/data/corpus/decimal128-5.json
-- spec/spec_tests/data/corpus/int32.json
-- spec/spec_tests/data/corpus/string.json
-- spec/spec_tests/data/corpus/code.json
-- spec/spec_tests/data/corpus/code_w_scope.json
-- spec/spec_tests/data/corpus/int64.json
-- spec/spec_tests/data/corpus/datetime.json
-- spec/spec_tests/data/corpus_legacy/top.json
-- spec/spec_tests/data/corpus_legacy/array.json
-- spec/spec_tests/data/corpus_legacy/null.json
-- spec/spec_tests/data/corpus_legacy/document.json
-- spec/spec_tests/data/corpus_legacy/boolean.json
-- spec/spec_tests/data/corpus_legacy/maxkey.json
-- spec/spec_tests/data/corpus_legacy/binary.json
-- spec/spec_tests/data/corpus_legacy/timestamp.json
 - spec/spec_tests/data/corpus_legacy/failures/dbpointer.json
 - spec/spec_tests/data/corpus_legacy/failures/symbol.json
 - spec/spec_tests/data/corpus_legacy/failures/int64.json
 - spec/spec_tests/data/corpus_legacy/failures/datetime.json
-- spec/spec_tests/data/corpus_legacy/oid.json
-- spec/spec_tests/data/corpus_legacy/regex.json
-- spec/spec_tests/data/corpus_legacy/minkey.json
+- spec/spec_tests/data/corpus_legacy/timestamp.json
+- spec/spec_tests/data/corpus_legacy/top.json
+- spec/spec_tests/data/corpus_legacy/maxkey.json
 - spec/spec_tests/data/corpus_legacy/undefined.json
-- spec/spec_tests/data/corpus_legacy/double.json
+- spec/spec_tests/data/corpus_legacy/array.json
 - spec/spec_tests/data/corpus_legacy/int32.json
+- spec/spec_tests/data/corpus_legacy/oid.json
+- spec/spec_tests/data/corpus_legacy/regex.json
+- spec/spec_tests/data/corpus_legacy/binary.json
+- spec/spec_tests/data/corpus_legacy/null.json
 - spec/spec_tests/data/corpus_legacy/string.json
+- spec/spec_tests/data/corpus_legacy/document.json
+- spec/spec_tests/data/corpus_legacy/minkey.json
+- spec/spec_tests/data/corpus_legacy/boolean.json
 - spec/spec_tests/data/corpus_legacy/code.json
+- spec/spec_tests/data/corpus_legacy/double.json
 - spec/spec_tests/data/corpus_legacy/code_w_scope.json
-- spec/spec_tests/data/decimal128/decimal128-7.json
-- spec/spec_tests/data/decimal128/decimal128-2.json
+- spec/spec_tests/data/decimal128/decimal128-4.json
 - spec/spec_tests/data/decimal128/decimal128-6.json
+- spec/spec_tests/data/decimal128/decimal128-2.json
 - spec/spec_tests/data/decimal128/decimal128-1.json
-- spec/spec_tests/data/decimal128/decimal128-4.json
+- spec/spec_tests/data/decimal128/decimal128-7.json
 - spec/spec_tests/data/decimal128/decimal128-3.json
 - spec/spec_tests/data/decimal128/decimal128-5.json
+- spec/spec_tests/data/corpus/timestamp.json
+- spec/spec_tests/data/corpus/top.json
+- spec/spec_tests/data/corpus/maxkey.json
+- spec/spec_tests/data/corpus/decimal128-4.json
+- spec/spec_tests/data/corpus/dbpointer.json
+- spec/spec_tests/data/corpus/undefined.json
+- spec/spec_tests/data/corpus/array.json
+- spec/spec_tests/data/corpus/decimal128-6.json
+- spec/spec_tests/data/corpus/README.md
+- spec/spec_tests/data/corpus/int32.json
+- spec/spec_tests/data/corpus/oid.json
+- spec/spec_tests/data/corpus/regex.json
+- spec/spec_tests/data/corpus/binary.json
+- spec/spec_tests/data/corpus/symbol.json
+- spec/spec_tests/data/corpus/null.json
+- spec/spec_tests/data/corpus/decimal128-2.json
+- spec/spec_tests/data/corpus/string.json
+- spec/spec_tests/data/corpus/document.json
+- spec/spec_tests/data/corpus/dbref.json
+- spec/spec_tests/data/corpus/decimal128-1.json
+- spec/spec_tests/data/corpus/minkey.json
+- spec/spec_tests/data/corpus/boolean.json
+- spec/spec_tests/data/corpus/int64.json
+- spec/spec_tests/data/corpus/code.json
+- spec/spec_tests/data/corpus/decimal128-7.json
+- spec/spec_tests/data/corpus/decimal128-3.json
+- spec/spec_tests/data/corpus/decimal128-5.json
+- spec/spec_tests/data/corpus/double.json
+- spec/spec_tests/data/corpus/multi-type.json
+- spec/spec_tests/data/corpus/multi-type-deprecated.json
+- spec/spec_tests/data/corpus/datetime.json
+- spec/spec_tests/data/corpus/code_w_scope.json
+- spec/spec_tests/corpus_spec.rb
 - spec/spec_tests/corpus_legacy_spec.rb
-- spec/support/utils.rb
-- spec/support/shared_examples.rb
-- spec/support/spec_config.rb
-- spec/runners/common_driver.rb
+- spec/spec_tests/common_driver_spec.rb
 - spec/runners/corpus_legacy.rb
 - spec/runners/corpus.rb
-- spec/bson/code_spec.rb
-- spec/bson/byte_buffer_read_spec.rb
-- spec/bson/int32_spec.rb
-- spec/bson/max_key_spec.rb
-- spec/bson/time_spec.rb
-- spec/bson/array_spec.rb
-- spec/bson/date_time_spec.rb
-- spec/bson/document_spec.rb
-- spec/bson/float_spec.rb
-- spec/bson/nil_class_spec.rb
-- spec/bson/time_with_zone_spec.rb
-- spec/bson/ext_json_parse_spec.rb
-- spec/bson/string_spec.rb
-- spec/bson/open_struct_spec.rb
-- spec/bson/config_spec.rb
-- spec/bson/false_class_spec.rb
-- spec/bson/raw_spec.rb
-- spec/bson/regexp_spec.rb
-- spec/bson/binary_spec.rb
-- spec/bson/object_spec.rb
-- spec/bson/decimal128_spec.rb
-- spec/bson/binary_uuid_spec.rb
-- spec/bson/boolean_spec.rb
-- spec/bson/byte_buffer_spec.rb
-- spec/bson/json_spec.rb
-- spec/bson/symbol_spec.rb
-- spec/bson/integer_spec.rb
-- spec/bson/byte_buffer_write_spec.rb
-- spec/bson/registry_spec.rb
-- spec/bson/code_with_scope_spec.rb
-- spec/bson/true_class_spec.rb
-- spec/bson/undefined_spec.rb
-- spec/bson/object_id_spec.rb
-- spec/bson/timestamp_spec.rb
-- spec/bson/hash_spec.rb
-- spec/bson/symbol_raw_spec.rb
-- spec/bson/min_key_spec.rb
-- spec/bson/int64_spec.rb
-- spec/bson/date_spec.rb
+- spec/runners/common_driver.rb
 - spec/bson_spec.rb