bson 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2045b9e4dce7563fd9bca4db925085a6e3a2383e
-  data.tar.gz: 40f99133c083d133f9372852d814fb664815e325
+  metadata.gz: 3ae5b69d13047e684f5991540912ef5d979242c8
+  data.tar.gz: fcf64d50369ac6dcb45069092d534a1621ac5d16
 SHA512:
-  metadata.gz: 32a51a23ebb1739fdd77cdbc49eee0129ed510db433fbb9ecd2b8e64050302382267b3ea0d86e506bddb981b088899cce59b57ff78d2ee0f5834c0b2e9ed2ec7
-  data.tar.gz: 6f6c25e3fc1df79ad550699a8b48e77f5831c16d6c1bf1fb9f230d788ef140dcedf8a988e62d6b2eaf241e02d9a0eff42a328764d007921a834a56559f48c710
+  metadata.gz: 503d2ba15b6f649eef90459b92a19c09fd1b0a886a21cbc4b5452a72f566b920d3b2a52d2d70a2aad8251e44541394c3027820e5d1b5c690a52fa19c4f79d28a
+  data.tar.gz: 9cb98e4fd22c31cf810f0f267d7c616d520b95dd7b9636a15953b6f794c3d95c3a9111f2d9f3b9d187cbb1e4534ec788a2cefcf6a993fd9509047066f41529dc

checksums.yaml.gz.sig

@@ -1 +1 @@
-J�6��0��w�Y1�뉎D0�޲F�3��P��c�oнK��s^d9�GC�;�x��T���k��C>�5��`�]T���L��R6�p�L���_��hC�Hi�	cg���!�n��<i{�W�ݒ�_c9ۮ��w.�Q"��#�L��]��J�giX{��2�	��H�w6��<a���v9�n&P�#��0�/S�#���h�YsIo>F���K���1b�B��Gk��F��,�8�}p�Z��_�ad�m̀�g�*_q
+��s]�"{�b)�Иl�

j���ℝ]��ٱ�͕C.amh��]e<��ă�u��*+�Q�j�����o��T<C�F���0ޣ*z��f��(����0yA1�}"��KlK��}E��+���h�7qT���R�@��F�ж��M�Ɵ�IɠKF�U�v>C�q>�<�;׉��`5zW�Z��ӯN���,$\�����یb�S���[�O����O�v0����5B�j�]�n�~��J�E�|

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 BSON Changelog
 ==============
 
+## 2.2.2
+
+### Bug Fixes
+
+* [#17](http://github.com/mongodb/bson-ruby/pull/17):
+  Fixed `BSON::ObjectId` counter increment on Ruby 2.1.0 since method names
+  can no longer override Ruby keywords.
+
+* [#16](http://github.com/mongodb/bson-ruby/pull/16):
+  Fixed serialization of times when microseconds are causing `to_f` on time to
+  be 1 microsecond inaccurate. (Francois Bernier)
+
 ## 2.2.1
 
 ### Bug Fixes

data/ext/bson/native.c

@@ -492,10 +492,12 @@ static VALUE rb_integer_to_bson_int64(VALUE self, VALUE encoded)
  */
 static VALUE rb_time_to_bson(int argc, VALUE *argv, VALUE self)
 {
-  double t = NUM2DBL(rb_funcall(self, rb_intern("to_f"), 0));
+  int64_t t = NUM2INT64(rb_funcall(self, rb_intern("to_i"), 0));
   int64_t milliseconds = (int64_t)(t * 1000);
+  int32_t micro = NUM2INT(rb_funcall(self, rb_intern("usec"), 0));
+  int64_t time = milliseconds + (micro / 1000);
   VALUE encoded = rb_get_default_encoded(argc, argv);
-  return int64_t_to_bson(milliseconds, encoded);
+  return int64_t_to_bson(time, encoded);
 }
 
 /**
@@ -703,6 +705,6 @@ void Init_native()
   rb_define_private_method(string, "check_for_illegal_characters!", rb_string_check_for_illegal_characters, 0);
 
   // Redefine the next method on the object id generator.
-  rb_undef_method(generator, "next");
-  rb_define_method(generator, "next", rb_object_id_generator_next, -1);
+  rb_undef_method(generator, "next_object_id");
+  rb_define_method(generator, "next_object_id", rb_object_id_generator_next, -1);
 }

data/lib/bson/object_id.rb

@@ -170,7 +170,7 @@ module BSON
     # @since 2.0.0
     def to_bson(encoded = ''.force_encoding(BINARY))
       repair if defined?(@data)
-      @raw_data ||= @@generator.next
+      @raw_data ||= @@generator.next_object_id
       encoded << @raw_data
     end
 
@@ -268,7 +268,7 @@ module BSON
       #
       # @since 2.0.0
       def from_time(time, options = {})
-        from_data(options[:unique] ? @@generator.next(time.to_i) : [ time.to_i ].pack("Nx8"))
+        from_data(options[:unique] ? @@generator.next_object_id(time.to_i) : [ time.to_i ].pack("Nx8"))
       end
 
       # Determine if the provided string is a legal object id.
@@ -337,14 +337,14 @@ module BSON
       # object id counter. Will use the provided time if not nil.
       #
       # @example Get the next object id data.
-      #   generator.next
+      #   generator.next_object_id
       #
       # @param [ Time ] time The optional time to generate with.
       #
       # @return [ String ] The raw object id bytes.
       #
       # @since 2.0.0
-      def next(time = nil)
+      def next_object_id(time = nil)
         @mutex.lock
         begin
           count = @counter = (@counter + 1) % 0xFFFFFF

data/lib/bson/time.rb

@@ -38,7 +38,7 @@ module BSON
     #
     # @since 2.0.0
     def to_bson(encoded = ''.force_encoding(BINARY))
-      encoded << [ (to_f * 1000.0).to_i ].pack(Int64::PACK)
+      encoded << [ (to_i * 1000) + (usec / 1000) ].pack(Int64::PACK)
     end
 
     module ClassMethods

data/lib/bson/version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module BSON
-  VERSION = "2.2.1"
+  VERSION = "2.2.2"
 end

data/spec/bson/time_spec.rb

@@ -24,11 +24,23 @@ describe Time do
 
     context "when the time is post epoch" do
 
-      let(:obj)  { Time.utc(2012, 1, 1, 0, 0, 0) }
-      let(:bson) { [ (obj.to_f * 1000).to_i ].pack(BSON::Int64::PACK) }
+      context "when the time has no microseconds" do
 
-      it_behaves_like "a serializable bson element"
-      it_behaves_like "a deserializable bson element"
+        let(:obj)  { Time.utc(2012, 1, 1, 0, 0, 0) }
+        let(:bson) { [ (obj.to_i * 1000) + (obj.usec / 1000) ].pack(BSON::Int64::PACK) }
+
+        it_behaves_like "a serializable bson element"
+        it_behaves_like "a deserializable bson element"
+      end
+
+      context "when the time has microseconds" do
+
+        let(:obj)  { Time.at(Time.utc(2014, 03, 22, 18, 05, 05).to_i, 505000).utc }
+        let(:bson) { [ (obj.to_i * 1000) + (obj.usec / 1000) ].pack(BSON::Int64::PACK) }
+
+        it_behaves_like "a serializable bson element"
+        it_behaves_like "a deserializable bson element"
+      end
     end
 
     context "when the time is pre epoch" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bson
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Tyler Brock
@@ -34,7 +34,7 @@ cert_chain:
   JrZM8w8wGbIOeLtoQqa7HB/jOYbTahH7KMNh2LHAbOR93hNIJxVRa4iwxiMQ75tN
   9WUIAJ4AEtjwRg1Bz0OwDo3aucPCBpx77+/FWhv7JYY=
   -----END CERTIFICATE-----
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies: []
 description: A full featured BSON specification implementation, in Ruby
 email: