bson 4.9.3 → 4.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d24a5aa6f5678defced03d887f8d946a7c03992cff980281138bb5836b83366
-  data.tar.gz: b22e4544322858b2473b83f4842ba7074efd9a2183c181818ffe7120ae85bf1d
+  metadata.gz: 06e075081379ce36a9733b97e65fe9ddedf5c02abbff44f4f80900996f978382
+  data.tar.gz: 291dbafc79f5a81287304b17976baefa9c218ae4a9728535ac045f99f61e9a41
 SHA512:
-  metadata.gz: f54379785c0d7c5dbd9e75919aa8ab5f0b6fa04158a2f4789c47bf763b763901c0a64255f4aadffc62a76cc3068e57d31352a49e5acc7fd5e6766fe7d7a32b3b
-  data.tar.gz: 667307d98f30bfc0ea6a3a15bdfed67fd9a935c4512504bae9a2f545d2e1730f1105facf4acd11d03a315efacb877d531029feec01b77d7a54d1182df297b8ae
+  metadata.gz: 50915432ff0dd69ec3a2be50f718a5dfcdc5bc000d619652be55e3543493b2d5f91074018b96e17dcd4f20efcd56bde31204c4badc24a8f46a99c1effb2f1602
+  data.tar.gz: 897db48b82f0dd8af1a1e3597cb8bcbf3d9d0679211e19407ffcf872db1615594dfce9b18baedfda3e7d299c9519cc63c047e026866f8b767e05dff10b3e7ae9

data/ext/bson/bson-native.h

@@ -76,6 +76,7 @@ VALUE rb_bson_byte_buffer_get_cstring(VALUE self);
 VALUE rb_bson_byte_buffer_get_decimal128_bytes(VALUE self);
 VALUE rb_bson_byte_buffer_get_double(VALUE self);
 VALUE rb_bson_byte_buffer_get_int32(VALUE self);
+VALUE rb_bson_byte_buffer_get_uint32(VALUE self);
 VALUE rb_bson_byte_buffer_get_int64(VALUE self);
 VALUE rb_bson_byte_buffer_get_string(VALUE self);
 VALUE rb_bson_byte_buffer_get_hash(int argc, VALUE *argv, VALUE self);
@@ -86,6 +87,7 @@ VALUE rb_bson_byte_buffer_put_cstring(VALUE self, VALUE string);
 VALUE rb_bson_byte_buffer_put_decimal128(VALUE self, VALUE low, VALUE high);
 VALUE rb_bson_byte_buffer_put_double(VALUE self, VALUE f);
 VALUE rb_bson_byte_buffer_put_int32(VALUE self, VALUE i);
+VALUE rb_bson_byte_buffer_put_uint32(VALUE self, VALUE i);
 VALUE rb_bson_byte_buffer_put_int64(VALUE self, VALUE i);
 VALUE rb_bson_byte_buffer_put_string(VALUE self, VALUE string);
 VALUE rb_bson_byte_buffer_put_symbol(VALUE self, VALUE symbol);

data/ext/bson/init.c

@@ -88,7 +88,7 @@ void Init_bson_native()
    * call-seq:
    *   buffer.get_array(**options) -> Array
    *
-   * Reads an array from the byte buffer..
+   * Reads an array from the byte buffer.
    *
    * @option options [ nil | :bson ] :mode Decoding mode to use.
    *
@@ -97,6 +97,18 @@ void Init_bson_native()
   rb_define_method(rb_byte_buffer_class, "get_array", rb_bson_byte_buffer_get_array, -1);
 
   rb_define_method(rb_byte_buffer_class, "get_int32", rb_bson_byte_buffer_get_int32, 0);
+  
+  /*
+   * call-seq:
+   *   buffer.get_uint32(buffer) -> Fixnum
+   *
+   * Reads an unsigned 32 bit number from the byte buffer.
+   *
+   * @return [ Fixnum ] The unsigned 32 bits integer from the buffer
+   *
+   * @api private
+   */
+  rb_define_method(rb_byte_buffer_class, "get_uint32", rb_bson_byte_buffer_get_uint32, 0);
   rb_define_method(rb_byte_buffer_class, "get_int64", rb_bson_byte_buffer_get_int64, 0);
   rb_define_method(rb_byte_buffer_class, "get_string", rb_bson_byte_buffer_get_string, 0);
 
@@ -202,6 +214,21 @@ void Init_bson_native()
    */
   rb_define_method(rb_byte_buffer_class, "put_int32", rb_bson_byte_buffer_put_int32, 1);
 
+  /*
+   * call-seq:
+   *   buffer.put_uint32(fixnum) -> ByteBuffer
+   *
+   * Writes an unsigned 32-bit integer value to the buffer.
+   *
+   * If the argument cannot be represented in 32 bits, raises RangeError.
+   *
+   * Returns the modified +self+.
+   *
+   * @api private
+   *
+   */
+  rb_define_method(rb_byte_buffer_class, "put_uint32", rb_bson_byte_buffer_put_uint32, 1);
+
   /*
    * call-seq:
    *   buffer.put_int64(fixnum) -> ByteBuffer

data/ext/bson/read.c

@@ -21,6 +21,7 @@ static void pvt_raise_decode_error(volatile VALUE msg);
 static int32_t pvt_validate_length(byte_buffer_t *b);
 static uint8_t pvt_get_type_byte(byte_buffer_t *b);
 static VALUE pvt_get_int32(byte_buffer_t *b);
+static VALUE pvt_get_uint32(byte_buffer_t *b);
 static VALUE pvt_get_int64(byte_buffer_t *b, int argc, VALUE *argv);
 static VALUE pvt_get_double(byte_buffer_t *b);
 static VALUE pvt_get_string(byte_buffer_t *b, const char *data_type);
@@ -41,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);
 
@@ -59,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;
 }
 
@@ -175,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;
 }
 
@@ -205,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;
 }
@@ -259,6 +260,28 @@ VALUE pvt_get_int32(byte_buffer_t *b)
   return INT2NUM(BSON_UINT32_FROM_LE(i32));
 }
 
+/**
+ * Get an unsigned int32 from the buffer.
+ */
+VALUE rb_bson_byte_buffer_get_uint32(VALUE self)
+{
+  byte_buffer_t *b;
+
+  TypedData_Get_Struct(self, byte_buffer_t, &rb_byte_buffer_data_type, b);
+  return pvt_get_uint32(b);
+}
+
+VALUE pvt_get_uint32(byte_buffer_t *b)
+{
+  uint32_t i32;
+
+  ENSURE_BSON_READ(b, 4);
+  memcpy(&i32, READ_PTR(b), 4);
+  b->read_position += 4;
+  return UINT2NUM(BSON_UINT32_FROM_LE(i32));
+}
+
+
 /**
  * Get a int64 from the buffer.
  */
@@ -284,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);
@@ -293,7 +316,7 @@ VALUE pvt_get_int64(byte_buffer_t *b, int argc, VALUE *argv)
   } else {
     return num;
   }
-  
+
   RB_GC_GUARD(num);
 }
 
@@ -353,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;
 }
 
@@ -379,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/ext/bson/write.c

@@ -27,6 +27,7 @@ static void pvt_replace_int32(byte_buffer_t *b, int32_t position, int32_t newval
 static void pvt_put_field(byte_buffer_t *b, VALUE rb_buffer, VALUE val, VALUE validating_keys);
 static void pvt_put_byte(byte_buffer_t *b, const char byte);
 static void pvt_put_int32(byte_buffer_t *b, const int32_t i32);
+static void pvt_put_uint32(byte_buffer_t *b, const uint32_t i32);
 static void pvt_put_int64(byte_buffer_t *b, const int64_t i);
 static void pvt_put_double(byte_buffer_t *b, double f);
 static void pvt_put_cstring(byte_buffer_t *b, const char *str, int32_t length, const char *data_type);
@@ -154,8 +155,15 @@ void pvt_put_type_byte(byte_buffer_t *b, VALUE val){
     case T_FLOAT:
       type_byte = BSON_TYPE_DOUBLE;
       break;
-    default:{
-      VALUE type = rb_funcall(val, rb_intern("bson_type"), 0);
+    default: {
+      VALUE type;
+      VALUE responds = rb_funcall(val, rb_intern("respond_to?"), 1, ID2SYM(rb_intern("bson_type")));
+      if (!RTEST(responds)) {
+        VALUE klass = pvt_const_get_3("BSON", "Error", "UnserializableClass");
+        VALUE val_str = rb_funcall(val, rb_intern("to_s"), 0);
+        rb_raise(klass, "Value does not define its BSON serialized type: %s", RSTRING_PTR(val_str));
+      }
+      type = rb_funcall(val, rb_intern("bson_type"), 0);
       type_byte = *RSTRING_PTR(type);
       RB_GC_GUARD(type);
       break;
@@ -383,6 +391,37 @@ void pvt_put_int32(byte_buffer_t *b, const int32_t i)
   b->write_position += 4;
 }
 
+/* The docstring is in init.c. */
+VALUE rb_bson_byte_buffer_put_uint32(VALUE self, VALUE i)
+{
+  byte_buffer_t *b;
+  int64_t temp;
+  uint32_t i32;
+
+  if (RB_TYPE_P(i, T_FLOAT)) {
+    rb_raise(rb_eArgError, "put_uint32: incorrect type: float, expected: integer");
+  }
+
+  temp = NUM2LL(i);
+  if (temp < 0 || temp > UINT32_MAX) {
+    rb_raise(rb_eRangeError, "Number %lld is out of range [0, 2^32)", (long long)temp);
+  }
+
+  i32 = NUM2UINT(i);
+
+  TypedData_Get_Struct(self, byte_buffer_t, &rb_byte_buffer_data_type, b);
+  pvt_put_uint32(b, i32);
+  return self;
+}
+
+void pvt_put_uint32(byte_buffer_t *b, const uint32_t i)
+{
+  const uint32_t i32 = BSON_UINT32_TO_LE(i);
+  ENSURE_BSON_WRITE(b, 4);
+  memcpy(WRITE_PTR(b), &i32, 4);
+  b->write_position += 4;
+}
+
 /* The docstring is in init.c. */
 VALUE rb_bson_byte_buffer_put_int64(VALUE self, VALUE i)
 {
@@ -627,7 +666,7 @@ VALUE rb_bson_byte_buffer_put_array(VALUE self, VALUE array, VALUE validating_ke
 
   for(int32_t index=0; index < RARRAY_LEN(array); index++, array_element++){
     pvt_put_type_byte(b, *array_element);
-    pvt_put_array_index(b,index);
+    pvt_put_array_index(b, index);
     pvt_put_field(b, self, *array_element, validating_keys);
   }
   pvt_put_byte(b, 0);

data/lib/bson/array.rb

@@ -47,6 +47,9 @@ module BSON
         position = buffer.length
         buffer.put_int32(0)
         each_with_index do |value, index|
+          unless value.respond_to?(:bson_type)
+            raise Error::UnserializableClass, "Array element at position #{index} does not define its BSON serialized type: #{value}"
+          end
           buffer.put_byte(value.bson_type)
           buffer.put_cstring(index.to_s)
           value.to_bson(buffer, validating_keys)

data/lib/bson/date_time.rb

@@ -35,7 +35,7 @@ module BSON
     #
     # @since 2.1.0
     def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
-      to_time.to_bson(buffer)
+      gregorian.to_time.to_bson(buffer)
     end
   end
 

data/lib/bson/error.rb

@@ -17,5 +17,11 @@ module BSON
     # Exception raised when BSON decoding fails.
     class BSONDecodeError < Error
     end
+
+    # Exception raised when serializing an Array or Hash to BSON and an
+    # array or hash element is of a class that does not define how to serialize
+    # itself to BSON.
+    class UnserializableClass < Error
+    end
   end
 end

data/lib/bson/hash.rb

@@ -44,6 +44,9 @@ module BSON
         position = buffer.length
         buffer.put_int32(0)
         each do |field, value|
+          unless value.respond_to?(:bson_type)
+            raise Error::UnserializableClass, "Hash value for key '#{field}' does not define its BSON serialized type: #{value}"
+          end
           buffer.put_byte(value.bson_type)
           key = field.to_bson_key(validating_keys)
           begin

data/lib/bson/timestamp.rb

@@ -124,8 +124,8 @@ module BSON
     #
     # @since 2.0.0
     def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
-      buffer.put_int32(increment)
-      buffer.put_int32(seconds)
+      buffer.put_uint32(increment)
+      buffer.put_uint32(seconds)
     end
 
     # Deserialize timestamp from BSON.
@@ -140,8 +140,8 @@ module BSON
     #
     # @since 2.0.0
     def self.from_bson(buffer, **options)
-      increment = buffer.get_int32
-      seconds = buffer.get_int32
+      increment = buffer.get_uint32
+      seconds = buffer.get_uint32
       new(seconds, increment)
     end
 

data/lib/bson/version.rb

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

data/spec/bson/array_spec.rb

@@ -132,6 +132,23 @@ describe Array do
         end
       end
     end
+
+    context 'when array contains value of an unserializable class' do
+      class ArraySpecUnserializableClass
+      end
+
+      let(:obj) do
+        [ArraySpecUnserializableClass.new]
+      end
+
+      it 'raises UnserializableClass' do
+        lambda do
+          obj.to_bson
+        end.should raise_error(BSON::Error::UnserializableClass,
+          # C extension does not provide element position in the exception message.
+          /(Array element at position 0|Value) does not define its BSON serialized type:.*ArraySpecUnserializableClass/)
+      end
+    end
   end
 
   describe "#to_bson_normalized_value" do

data/spec/bson/byte_buffer_read_spec.rb

@@ -66,7 +66,7 @@ describe BSON::ByteBuffer do
   describe '#get_double' do
 
     let(:buffer) do
-      described_class.new("#{12.5.to_bson.to_s}")
+      described_class.new(12.5.to_bson.to_s)
     end
 
     let!(:double) do
@@ -85,7 +85,7 @@ describe BSON::ByteBuffer do
   describe '#get_int32' do
 
     let(:buffer) do
-      described_class.new("#{12.to_bson.to_s}")
+      described_class.new(12.to_bson.to_s)
     end
 
     let!(:int32) do
@@ -101,10 +101,66 @@ describe BSON::ByteBuffer do
     end
   end
 
+  describe '#get_uint32' do
+    context 'when using 2^32-1' do
+      let(:buffer) do
+        described_class.new(4294967295.to_bson.to_s)
+      end
+
+      let!(:int32) do
+        buffer.get_uint32
+      end
+
+      it 'gets the uint32 from the buffer' do
+        expect(int32).to eq(4294967295)
+      end
+
+      it 'increments the position by 4' do
+        expect(buffer.read_position).to eq(4)
+      end
+    end
+    
+    context 'when using 2^32-2' do
+      let(:buffer) do
+        described_class.new(4294967294.to_bson.to_s)
+      end
+
+      let!(:int32) do
+        buffer.get_uint32
+      end
+
+      it 'gets the uint32 from the buffer' do
+        expect(int32).to eq(4294967294)
+      end
+
+      it 'increments the position by 4' do
+        expect(buffer.read_position).to eq(4)
+      end
+    end
+
+    context 'when using 0' do
+      let(:buffer) do
+        described_class.new(0.to_bson.to_s)
+      end
+
+      let!(:int32) do
+        buffer.get_uint32
+      end
+
+      it 'gets the uint32 from the buffer' do
+        expect(int32).to eq(0)
+      end
+
+      it 'increments the position by 4' do
+        expect(buffer.read_position).to eq(4)
+      end
+    end
+  end
+
   describe '#get_int64' do
 
     let(:buffer) do
-      described_class.new("#{(Integer::MAX_64BIT - 1).to_bson.to_s}")
+      described_class.new((Integer::MAX_64BIT - 1).to_bson.to_s)
     end
 
     let!(:int64) do

data/spec/bson/byte_buffer_spec.rb

@@ -31,15 +31,18 @@ describe BSON::ByteBuffer do
         described_class.new
       end
 
-      before do
-        buffer.put_int32(5)
-      end
-
-      it 'returns the length of the buffer' do
-        expect(buffer.length).to eq(4)
+      context '#put_int32' do
+        before do
+          buffer.put_int32(5)
+        end
+
+        it 'returns the length of the buffer' do
+          expect(buffer.length).to eq(4)
+        end
       end
     end
 
+
     context 'when the byte buffer is initialized with some bytes' do
 
       let(:buffer) do
@@ -104,4 +107,45 @@ 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
 end

data/spec/bson/byte_buffer_write_spec.rb

@@ -585,6 +585,102 @@ describe BSON::ByteBuffer do
     end
   end
 
+  describe '#put_uint32' do
+    context 'when argument is a float' do
+      it 'raises an Argument Error' do
+        expect{ buffer.put_uint32(4.934) }.to raise_error(ArgumentError, "put_uint32: incorrect type: float, expected: integer")
+      end
+    end
+    
+    context 'when number is in range' do 
+      let(:modified) do
+        buffer.put_uint32(5)
+      end
+
+      it 'returns gets the correct number from the buffer' do
+        expect(modified.get_uint32).to eq(5)
+      end
+
+      it 'returns the length of the buffer' do
+        expect(modified.length).to eq(4)
+      end
+    end
+
+    context 'when number is 0' do 
+      let(:modified) do
+        buffer.put_uint32(0)
+      end
+
+      it 'returns gets the correct number from the buffer' do
+        expect(modified.get_uint32).to eq(0)
+      end
+
+      it 'returns the length of the buffer' do
+        expect(modified.length).to eq(4)
+      end
+    end
+
+    context 'when number doesn\'t fit in signed int32' do 
+      let(:modified) do
+        buffer.put_uint32(4294967295)
+      end
+
+      let(:expected) do
+        [ 4294967295 ].pack(BSON::Int32::PACK)
+      end
+
+      it 'appends the int32 to the byte buffer' do
+        expect(modified.to_s).to eq(expected)
+      end
+
+      it 'get returns correct number' do
+        expect(modified.get_uint32).to eq(4294967295)
+      end
+
+      it 'returns the length of the buffer' do
+        expect(modified.length).to eq(4)
+      end
+    end
+
+    context 'when number is 2^31' do 
+      let(:modified) do
+        buffer.put_uint32(2147483648)
+      end
+
+      it 'returns gets the correct number from the buffer' do
+        expect(modified.get_uint32).to eq(2147483648)
+      end
+
+      it 'returns the length of the buffer' do
+        expect(modified.length).to eq(4)
+      end
+    end
+
+    context 'when number is 2^31-1' do 
+      let(:modified) do
+        buffer.put_uint32(2147483647)
+      end
+
+      it 'returns gets the correct number from the buffer' do
+        expect(modified.get_uint32).to eq(2147483647)
+      end
+
+      it 'returns the length of the buffer' do
+        expect(modified.length).to eq(4)
+      end
+    end
+
+    context 'when number is not in range' do 
+      it 'raises error on out of top range' do
+        expect{ buffer.put_uint32(4294967296) }.to raise_error(RangeError, "Number 4294967296 is out of range [0, 2^32)")
+      end
+
+      it 'raises error on out of bottom range' do
+        expect{ buffer.put_uint32(-1) }.to raise_error(RangeError, "Number -1 is out of range [0, 2^32)")
+      end
+    end
+  end
+
   describe '#put_int64' do
 
     context 'when the integer is 64 bit' do

data/spec/bson/date_time_spec.rb

@@ -35,5 +35,58 @@ describe DateTime do
 
       it_behaves_like "a serializable bson element"
     end
+
+    context "when the dates don't both use Gregorian" do
+      
+      let(:shakespeare_datetime) do 
+        DateTime.iso8601('1616-04-23', Date::ENGLAND)
+      end
+
+      let(:gregorian_datetime) do
+        DateTime.iso8601('1616-04-23', Date::GREGORIAN)
+      end
+
+      context "when putting to bson" do 
+        
+        let(:shakespeare) do
+          { a: shakespeare_datetime }.to_bson
+        end
+
+        let(:gregorian) do
+          { a: gregorian_datetime }.to_bson
+        end
+
+        it "does not equal each other" do 
+          expect(shakespeare.to_s).to_not eq(gregorian.to_s)
+        end
+
+        it "the english date is 10 days later" do 
+          expect(shakespeare.to_s).to eq({ a: DateTime.iso8601('1616-05-03', Date::GREGORIAN) }.to_bson.to_s)
+        end
+      end
+
+      context "when putting and receiving from bson" do 
+
+        let(:shakespeare) do
+          Hash.from_bson(BSON::ByteBuffer.new({ a: shakespeare_datetime }.to_bson.to_s))
+        end
+
+        let(:gregorian) do
+          Hash.from_bson(BSON::ByteBuffer.new({ a: gregorian_datetime }.to_bson.to_s))
+        end
+
+        it "does not equal each other" do
+          expect(shakespeare).to_not eq(gregorian)
+        end
+
+        it "the english date is 10 days later" do
+          expect(shakespeare[:a]).to eq(DateTime.iso8601('1616-05-03', Date::GREGORIAN).to_time)
+        end
+
+        it "the gregorian date is the same" do
+          expect(gregorian[:a]).to eq(DateTime.iso8601('1616-04-23', Date::GREGORIAN).to_time)
+        end
+      end
+    end
   end
 end

data/spec/bson/hash_spec.rb

@@ -227,6 +227,33 @@ describe Hash do
         end
       end
     end
+
+    context 'when hash contains value of an unserializable class' do
+      class HashSpecUnserializableClass
+      end
+
+      let(:obj) do
+        {foo: HashSpecUnserializableClass.new}
+      end
+
+      it 'raises UnserializableClass' do
+        lambda do
+          obj.to_bson
+        end.should raise_error(BSON::Error::UnserializableClass,
+          # C extension does not provide hash key in the exception message.
+          /(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
@@ -293,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_tests/data/corpus/timestamp.json

@@ -13,6 +13,16 @@
             "canonical_bson": "100000001161002A00000015CD5B0700",
             "canonical_extjson": "{\"a\" : {\"$timestamp\" : {\"t\" : 123456789, \"i\" : 42} } }",
             "degenerate_extjson": "{\"a\" : {\"$timestamp\" : {\"i\" : 42, \"t\" : 123456789} } }"
+        },
+        {
+            "description": "Timestamp with high-order bit set on both seconds and increment",
+            "canonical_bson": "10000000116100FFFFFFFFFFFFFFFF00",
+            "canonical_extjson": "{\"a\" : {\"$timestamp\" : {\"t\" : 4294967295, \"i\" :  4294967295} } }"
+        },
+        {
+            "description": "Timestamp with high-order bit set on both seconds and increment (not UINT32_MAX)",
+            "canonical_bson": "1000000011610000286BEE00286BEE00", 
+            "canonical_extjson": "{\"a\" : {\"$timestamp\" : {\"t\" : 4000000000, \"i\" :  4000000000} } }"
         }
     ],
     "decodeErrors": [

data/spec/spec_tests/data/corpus/top.json

@@ -65,11 +65,11 @@
     "parseErrors": [
         {
             "description" : "Bad $regularExpression (extra field)",
-            "string" : "{\"a\" : \"$regularExpression\": {\"pattern\": \"abc\", \"options\": \"\", \"unrelated\": true}}}"
+            "string" : "{\"a\" : {\"$regularExpression\": {\"pattern\": \"abc\", \"options\": \"\", \"unrelated\": true}}}"
         },
         {
             "description" : "Bad $regularExpression (missing options field)",
-            "string" : "{\"a\" : \"$regularExpression\": {\"pattern\": \"abc\"}}}"
+            "string" : "{\"a\" : {\"$regularExpression\": {\"pattern\": \"abc\"}}}"
         },
         {
             "description": "Bad $regularExpression (pattern is number, not string)",
@@ -81,7 +81,7 @@
         },
         {
             "description" : "Bad $regularExpression (missing pattern field)",
-            "string" : "{\"a\" : \"$regularExpression\": {\"options\":\"ix\"}}}"
+            "string" : "{\"a\" : {\"$regularExpression\": {\"options\":\"ix\"}}}"
         },
         {
             "description": "Bad $oid (number, not string)",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bson
 version: !ruby/object:Gem::Version
-  version: 4.9.3
+  version: 4.11.0
 platform: ruby
 authors:
 - Tyler Brock
@@ -33,7 +33,7 @@ cert_chain:
   gpvfPNWMwyBDlHaNS3GfO6cRRxBOvEG05GUCsvtTY4Bpe8yjE64wg1ymb47LMOnv
   Qb1lGORmf/opg45mluKUYl7pQNZHD0d3
   -----END CERTIFICATE-----
-date: 2020-06-24 00:00:00.000000000 Z
+date: 2020-10-21 00:00:00.000000000 Z
 dependencies: []
 description: A fully featured BSON specification implementation in Ruby
 email: 
@@ -99,6 +99,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/binary_uuid_spec.rb
@@ -233,118 +234,119 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.1.2
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Ruby implementation of the BSON specification
 test_files:
-- spec/bson/regexp_spec.rb
-- spec/bson/min_key_spec.rb
-- spec/bson/time_spec.rb
-- spec/bson/int32_spec.rb
-- spec/bson/code_spec.rb
-- spec/bson/config_spec.rb
-- spec/bson/undefined_spec.rb
-- spec/bson/boolean_spec.rb
-- spec/bson/object_spec.rb
-- spec/bson/array_spec.rb
-- spec/bson/hash_spec.rb
-- spec/bson/date_spec.rb
-- spec/bson/json_spec.rb
-- spec/bson/time_with_zone_spec.rb
-- spec/bson/int64_spec.rb
-- spec/bson/registry_spec.rb
-- spec/bson/binary_uuid_spec.rb
-- spec/bson/byte_buffer_read_spec.rb
-- spec/bson/raw_spec.rb
-- spec/bson/binary_spec.rb
-- spec/bson/max_key_spec.rb
-- spec/bson/symbol_raw_spec.rb
-- spec/bson/code_with_scope_spec.rb
-- spec/bson/byte_buffer_write_spec.rb
-- spec/bson/date_time_spec.rb
-- spec/bson/false_class_spec.rb
-- spec/bson/byte_buffer_spec.rb
-- spec/bson/string_spec.rb
-- spec/bson/open_struct_spec.rb
-- spec/bson/timestamp_spec.rb
-- spec/bson/ext_json_parse_spec.rb
-- spec/bson/symbol_spec.rb
-- spec/bson/decimal128_spec.rb
-- spec/bson/integer_spec.rb
-- spec/bson/document_spec.rb
-- spec/bson/float_spec.rb
-- spec/bson/nil_class_spec.rb
-- spec/bson/true_class_spec.rb
-- spec/bson/object_id_spec.rb
-- spec/spec_helper.rb
-- spec/bson_spec.rb
-- spec/support/utils.rb
-- spec/support/spec_config.rb
-- spec/support/shared_examples.rb
-- spec/runners/corpus.rb
-- spec/runners/corpus_legacy.rb
-- spec/runners/common_driver.rb
-- spec/spec_tests/corpus_spec.rb
 - spec/spec_tests/common_driver_spec.rb
-- spec/spec_tests/data/corpus/multi-type.json
-- spec/spec_tests/data/corpus/decimal128-1.json
-- spec/spec_tests/data/corpus/dbref.json
-- spec/spec_tests/data/corpus/multi-type-deprecated.json
-- spec/spec_tests/data/corpus/maxkey.json
-- spec/spec_tests/data/corpus/boolean.json
-- spec/spec_tests/data/corpus/datetime.json
-- spec/spec_tests/data/corpus/oid.json
-- spec/spec_tests/data/corpus/code.json
+- spec/spec_tests/corpus_legacy_spec.rb
 - spec/spec_tests/data/corpus/array.json
+- spec/spec_tests/data/corpus/document.json
 - spec/spec_tests/data/corpus/decimal128-7.json
-- spec/spec_tests/data/corpus/symbol.json
-- spec/spec_tests/data/corpus/double.json
-- spec/spec_tests/data/corpus/decimal128-6.json
-- spec/spec_tests/data/corpus/code_w_scope.json
-- spec/spec_tests/data/corpus/int64.json
+- spec/spec_tests/data/corpus/decimal128-3.json
+- spec/spec_tests/data/corpus/maxkey.json
+- spec/spec_tests/data/corpus/code.json
+- spec/spec_tests/data/corpus/dbpointer.json
+- spec/spec_tests/data/corpus/int32.json
 - spec/spec_tests/data/corpus/README.md
-- spec/spec_tests/data/corpus/string.json
-- spec/spec_tests/data/corpus/document.json
 - spec/spec_tests/data/corpus/decimal128-5.json
-- spec/spec_tests/data/corpus/top.json
 - spec/spec_tests/data/corpus/decimal128-4.json
+- spec/spec_tests/data/corpus/decimal128-2.json
+- spec/spec_tests/data/corpus/double.json
+- spec/spec_tests/data/corpus/code_w_scope.json
+- spec/spec_tests/data/corpus/binary.json
+- spec/spec_tests/data/corpus/oid.json
 - spec/spec_tests/data/corpus/null.json
-- spec/spec_tests/data/corpus/int32.json
-- spec/spec_tests/data/corpus/dbpointer.json
+- spec/spec_tests/data/corpus/decimal128-6.json
+- spec/spec_tests/data/corpus/int64.json
+- spec/spec_tests/data/corpus/dbref.json
+- spec/spec_tests/data/corpus/regex.json
+- spec/spec_tests/data/corpus/minkey.json
+- spec/spec_tests/data/corpus/multi-type.json
+- spec/spec_tests/data/corpus/top.json
+- spec/spec_tests/data/corpus/symbol.json
+- spec/spec_tests/data/corpus/multi-type-deprecated.json
 - spec/spec_tests/data/corpus/undefined.json
+- spec/spec_tests/data/corpus/datetime.json
+- spec/spec_tests/data/corpus/string.json
+- spec/spec_tests/data/corpus/boolean.json
 - spec/spec_tests/data/corpus/timestamp.json
-- spec/spec_tests/data/corpus/decimal128-3.json
-- spec/spec_tests/data/corpus/binary.json
-- spec/spec_tests/data/corpus/minkey.json
-- spec/spec_tests/data/corpus/regex.json
-- spec/spec_tests/data/corpus/decimal128-2.json
-- spec/spec_tests/data/corpus_legacy/failures/datetime.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/dbpointer.json
+- spec/spec_tests/data/corpus/decimal128-1.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/decimal128/decimal128-4.json
+- spec/spec_tests/data/decimal128/decimal128-2.json
+- spec/spec_tests/data/decimal128/decimal128-6.json
+- spec/spec_tests/data/decimal128/decimal128-1.json
+- spec/spec_tests/data/corpus_legacy/array.json
+- spec/spec_tests/data/corpus_legacy/document.json
 - spec/spec_tests/data/corpus_legacy/maxkey.json
-- spec/spec_tests/data/corpus_legacy/boolean.json
-- spec/spec_tests/data/corpus_legacy/oid.json
 - spec/spec_tests/data/corpus_legacy/code.json
-- spec/spec_tests/data/corpus_legacy/array.json
+- spec/spec_tests/data/corpus_legacy/int32.json
 - spec/spec_tests/data/corpus_legacy/double.json
 - spec/spec_tests/data/corpus_legacy/code_w_scope.json
-- spec/spec_tests/data/corpus_legacy/string.json
-- spec/spec_tests/data/corpus_legacy/document.json
-- spec/spec_tests/data/corpus_legacy/top.json
+- spec/spec_tests/data/corpus_legacy/binary.json
+- spec/spec_tests/data/corpus_legacy/oid.json
 - spec/spec_tests/data/corpus_legacy/null.json
-- spec/spec_tests/data/corpus_legacy/int32.json
+- spec/spec_tests/data/corpus_legacy/regex.json
+- spec/spec_tests/data/corpus_legacy/minkey.json
+- spec/spec_tests/data/corpus_legacy/top.json
+- spec/spec_tests/data/corpus_legacy/failures/dbpointer.json
+- spec/spec_tests/data/corpus_legacy/failures/int64.json
+- spec/spec_tests/data/corpus_legacy/failures/symbol.json
+- spec/spec_tests/data/corpus_legacy/failures/datetime.json
 - spec/spec_tests/data/corpus_legacy/undefined.json
+- spec/spec_tests/data/corpus_legacy/string.json
+- spec/spec_tests/data/corpus_legacy/boolean.json
 - spec/spec_tests/data/corpus_legacy/timestamp.json
-- spec/spec_tests/data/corpus_legacy/binary.json
-- spec/spec_tests/data/corpus_legacy/minkey.json
-- spec/spec_tests/data/corpus_legacy/regex.json
-- spec/spec_tests/data/decimal128/decimal128-1.json
-- spec/spec_tests/data/decimal128/decimal128-7.json
-- spec/spec_tests/data/decimal128/decimal128-6.json
-- spec/spec_tests/data/decimal128/decimal128-5.json
-- spec/spec_tests/data/decimal128/decimal128-4.json
-- spec/spec_tests/data/decimal128/decimal128-3.json
-- spec/spec_tests/data/decimal128/decimal128-2.json
-- spec/spec_tests/corpus_legacy_spec.rb
+- spec/spec_tests/corpus_spec.rb
+- spec/runners/corpus.rb
+- spec/runners/corpus_legacy.rb
+- spec/runners/common_driver.rb
+- spec/spec_helper.rb
+- spec/support/spec_config.rb
+- spec/support/shared_examples.rb
+- spec/support/utils.rb
+- spec/bson/ext_json_parse_spec.rb
+- spec/bson/object_spec.rb
+- spec/bson/json_spec.rb
+- spec/bson/true_class_spec.rb
+- spec/bson/byte_buffer_read_spec.rb
+- spec/bson/config_spec.rb
+- spec/bson/int32_spec.rb
+- spec/bson/regexp_spec.rb
+- spec/bson/symbol_raw_spec.rb
+- spec/bson/open_struct_spec.rb
+- spec/bson/document_spec.rb
+- spec/bson/min_key_spec.rb
+- spec/bson/false_class_spec.rb
+- spec/bson/code_spec.rb
+- spec/bson/symbol_spec.rb
+- spec/bson/object_id_spec.rb
+- spec/bson/decimal128_spec.rb
+- spec/bson/registry_spec.rb
+- spec/bson/time_spec.rb
+- spec/bson/boolean_spec.rb
+- spec/bson/byte_buffer_spec.rb
+- spec/bson/hash_spec.rb
+- spec/bson/undefined_spec.rb
+- spec/bson/raw_spec.rb
+- spec/bson/string_spec.rb
+- spec/bson/timestamp_spec.rb
+- spec/bson/date_time_spec.rb
+- spec/bson/max_key_spec.rb
+- spec/bson/int64_spec.rb
+- spec/bson/byte_buffer_write_spec.rb
+- spec/bson/date_spec.rb
+- spec/bson/binary_spec.rb
+- spec/bson/code_with_scope_spec.rb
+- spec/bson/integer_spec.rb
+- spec/bson/binary_uuid_spec.rb
+- spec/bson/nil_class_spec.rb
+- spec/bson/array_spec.rb
+- spec/bson/time_with_zone_spec.rb
+- spec/bson/float_spec.rb
+- spec/bson_spec.rb