bson 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 248b3e8738a02655d62fc2563e2d5e84afc22df0
-  data.tar.gz: 1dee4f08bd2f3b9790c930b8a9828b0498f6c290
+  metadata.gz: 1d8b033ffe340fc96c7b66aaf19781431ffad898
+  data.tar.gz: 823b569f7937714f262af069499e076a97b5fac2
 SHA512:
-  metadata.gz: 20db768d462ede1beaedd1acbf70b67c42848b9ed7a40c60190d245881002cb0cb41d1e3a02e25c59f8adac1986cc772d92088fc2ff8272a29d3608d77ea20f1
-  data.tar.gz: 495269eca59a05e33af8bcc0907e6d04969eaafea0bb6b5eb68f3323d089df1dac23a31ba9a05da199633dc231624c10466a4e8bf650c662c8e13ddf373fefdd
+  metadata.gz: 8051d1c09e24966136c6c3f58331457cc036b515de444709008592b60a7b4ec1e35d35b97337e9118c8cf2aacd283138ffbd8626eaec868f73b339d90297fe02
+  data.tar.gz: fa54d2417b7ed10d5a266f5cc568fa096e546745e269329a4deb302c89feee49839349c298a983930424c354d26ae5db077cea6a275a779f2a761ca807aa114b

data.tar.gz.sig

@@ -1,3 +1,2 @@
-���O��k�U�ok�^ŗ�mϞ&�(��}|�/�Μ�a&��%��:��̠�Qy��[r4��(��;5��E��7�{�$W? ]�ݔ��oGIXK�L��L
-�/�
-��ɯ�s�c��،�"��c�%	Mc��N)4ӨZ��|�O�`m��ϫ�܅��	M��*�#:�o�ޱ�ڢVW�(���c��"p����&7�g��v^n
�rM�	��r���>��-��]b�$c�u\mp�=iW�*�=C�?.����5��K
+��99��{
+������}��0����z��4t%�/����	�QE��Zt`R�����L�wzl��bk<M��n�
���ª�6�pH�D�[A�Ϋ�iV2_K��̎3PXNn%�f��GB0�Ih�W	���U���I�H=�,�좲յG{m�c���%��5A��"9�dpe�fȭ���2n9ڷ�^EN�4�������7�����z9n�pW����c2��В'��O��ٔt��ߌ��?��4������*Fh

data/ext/bson/native-endian.h

@@ -44,10 +44,14 @@
 #endif
 
 #if defined(__sun)
+# define BSON_UINT16_SWAP_LE_BE(v) __bson_uint16_swap_slow((uint16_t)v)
 # define BSON_UINT32_SWAP_LE_BE(v) __bson_uint32_swap_slow((uint32_t)v)
 # define BSON_UINT64_SWAP_LE_BE(v) __bson_uint64_swap_slow((uint64_t)v)
 #elif defined(__clang__) && defined(__clang_major__) && defined(__clang_minor__) && \
   (__clang_major__ >= 3) && (__clang_minor__ >= 1)
+# if __has_builtin(__builtin_bswap16)
+#  define BSON_UINT16_SWAP_LE_BE(v) __builtin_bswap16(v)
+# endif
 # if __has_builtin(__builtin_bswap32)
 #  define BSON_UINT32_SWAP_LE_BE(v) __builtin_bswap32(v)
 # endif
@@ -61,6 +65,10 @@
 # endif
 #endif
 
+#ifndef BSON_UINT16_SWAP_LE_BE
+# define BSON_UINT16_SWAP_LE_BE(v) __bson_uint16_swap_slow((uint16_t)v)
+#endif
+
 #ifndef BSON_UINT32_SWAP_LE_BE
 # define BSON_UINT32_SWAP_LE_BE(v) __bson_uint32_swap_slow((uint32_t)v)
 #endif
@@ -70,6 +78,7 @@
 #endif
 
 #if BSON_BYTE_ORDER == BSON_LITTLE_ENDIAN
+# define BSON_UINT16_TO_BE(v)    BSON_UINT16_SWAP_LE_BE(v)
 # define BSON_UINT32_FROM_LE(v)  ((uint32_t)v)
 # define BSON_UINT32_TO_LE(v)    ((uint32_t)v)
 # define BSON_UINT32_FROM_BE(v)  BSON_UINT32_SWAP_LE_BE(v)
@@ -81,6 +90,7 @@
 # define BSON_DOUBLE_FROM_LE(v)  ((double)v)
 # define BSON_DOUBLE_TO_LE(v)    ((double)v)
 #elif BSON_BYTE_ORDER == BSON_BIG_ENDIAN
+# define BSON_UINT16_TO_BE(v)    ((uint16_t)v)
 # define BSON_UINT32_FROM_LE(v)  BSON_UINT32_SWAP_LE_BE(v)
 # define BSON_UINT32_TO_LE(v)    BSON_UINT32_SWAP_LE_BE(v)
 # define BSON_UINT32_FROM_BE(v)  ((uint32_t)v)
@@ -95,6 +105,27 @@
 # error "The endianness of target architecture is unknown."
 #endif
 
+/*
+ *--------------------------------------------------------------------------
+ *
+ * __bson_uint16_swap_slow --
+ *
+ *       Fallback endianness conversion for 16-bit integers.
+ *
+ * Returns:
+ *       The endian swapped version.
+ *
+ * Side effects:
+ *       None.
+ *
+ *--------------------------------------------------------------------------
+ */
+static uint16_t __bson_uint16_swap_slow(uint16_t v)
+{
+   return ((v & 0x00FF) << 8) |
+          ((v & 0xFF00) >> 8);
+}
+
 /*
  *--------------------------------------------------------------------------
  *

data/ext/bson/native.c

@@ -93,7 +93,7 @@ static char rb_bson_machine_id_hash[HOST_NAME_HASH_MAX];
 /**
  * The counter for incrementing object ids.
  */
-static unsigned int rb_bson_object_id_counter;
+static uint32_t rb_bson_object_id_counter;
 
 /**
  * Initialize the native extension.
@@ -536,28 +536,21 @@ VALUE rb_bson_object_id_generator_next(int argc, VALUE* args, VALUE self)
   char bytes[12];
   uint32_t t;
   uint32_t c;
-  unsigned short pid = htons(getpid());
+  uint16_t pid = BSON_UINT16_TO_BE(getpid());
 
   if (argc == 0 || (argc == 1 && *args == Qnil)) {
-    t = htonl((int) time(NULL));
+    t = BSON_UINT32_TO_BE((int) time(NULL));
   }
   else {
-    t = htonl(NUM2ULONG(rb_funcall(*args, rb_intern("to_i"), 0)));
+    t = BSON_UINT32_TO_BE(NUM2ULONG(rb_funcall(*args, rb_intern("to_i"), 0)));
   }
 
-  c = htonl(rb_bson_object_id_counter << 8);
+  c = BSON_UINT32_TO_BE(rb_bson_object_id_counter << 8);
 
-# if BSON_BYTE_ORDER == BSON_LITTLE_ENDIAN
   memcpy(&bytes, &t, 4);
   memcpy(&bytes[4], rb_bson_machine_id_hash, 3);
   memcpy(&bytes[7], &pid, 2);
   memcpy(&bytes[9], (unsigned char*) &c, 3);
-#elif BSON_BYTE_ORDER == BSON_BIG_ENDIAN
-  memcpy(&bytes, ((unsigned char*) &t) + 4, 4);
-  memcpy(&bytes[4], rb_bson_machine_id_hash, 3);
-  memcpy(&bytes[7], &pid, 2);
-  memcpy(&bytes[9], ((unsigned char*) &c) + 4, 3);
-#endif
   rb_bson_object_id_counter++;
   return rb_str_new(bytes, 12);
 }

data/lib/bson/version.rb

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

data/spec/bson/object_id_spec.rb

@@ -383,6 +383,15 @@ describe BSON::ObjectId do
     end
   end
 
+  describe "#initialize" do
+
+    it "does not generate duplicate ids" do
+      100000.times do
+        expect(BSON::ObjectId.new).to_not eq(BSON::ObjectId.new)
+      end
+    end
+  end
+
   describe "#inspect" do
 
     let(:object_id) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bson
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Tyler Brock
@@ -34,7 +34,7 @@ cert_chain:
   XZOS48LlWh15EG4yZo/gRzqNAW2LUIkYA5eMS2Kp6r+KV8IBUO/LaHdrXbdilpa8
   BRsuCo7UZDbFVRns04HLyjVvkj+K/ywIcdKdS0csz5M=
   -----END CERTIFICATE-----
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-02-28 00:00:00.000000000 Z
 dependencies: []
 description: A full featured BSON specification implementation, in Ruby
 email: