bson 2.2.1-java → 2.2.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd3d7afd651d161d6a2de97fe9982b8972faada8
-  data.tar.gz: 9c9578ef230b8b24d6b671704c9926866361b162
+  metadata.gz: e407939a4b8e13a960f15fc9d8910df10fa7f27b
+  data.tar.gz: df201aaf41b3bb467851b7c4c41633371573807b
 SHA512:
-  metadata.gz: 685e4965524a8f83524df4553625e19e4815c501182d759f968ac74f3ab2c65061be290700530d577510f2de714a403899088276d84c7938a26b73b9d133250b
-  data.tar.gz: 91df04208f8f84a5bc8d06f1229bbd5cc0050af98b36f60c110b68c41f4a19477b8c00d08464efbd5ab585ed6a6d964ab23bb1b7f7f584a9403de57b73ed1bed
+  metadata.gz: 8c702264504931eb1845ad07d10a64db8f07bc7a29caa61cc6c64b52bf5f69ce6d1dfb15403aafc684a5f5d1c6e623f2ee51f74db5143122acbe4bdac5368345
+  data.tar.gz: d546e6a01357b0271e598b05f8adc397443734855e74a37cf3bc85a24cf111d09765ab1880d04a1549085e13a217bb31455c1a25096c0e992e35fb063393196e

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/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: java
 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: