bson 1.6.1-jruby → 1.6.2-jruby

data/lib/bson/bson_ruby.rb

@@ -59,7 +59,7 @@ module BSON
       def self.to_utf8_binary(str)
         begin
           str.unpack("U*")
-        rescue => ex
+        rescue
           raise InvalidStringEncoding, "String not valid utf-8: #{str.inspect}"
         end
         str.encode(UTF8_ENCODING).force_encoding(BINARY_ENCODING)
@@ -70,7 +70,7 @@ module BSON
       def self.to_utf8_binary(str)
         begin
           str.unpack("U*")
-        rescue => ex
+        rescue
           raise InvalidStringEncoding, "String not valid utf-8: #{str.inspect}"
         end
         str

data/lib/bson/byte_buffer.rb

@@ -57,7 +57,7 @@ module BSON
       def self.to_utf8_binary(str)
         begin
         str.unpack("U*")
-        rescue => ex
+        rescue
           raise InvalidStringEncoding, "String not valid utf-8: #{str.inspect}"
         end
         str

data/lib/bson/types/object_id.rb

@@ -192,33 +192,37 @@ module BSON
       @@index = 0
       @@machine_id = Digest::MD5.digest(Socket.gethostname)[0, 3]
 
-      # This gets overwritten by the C extension if it loads.
-      def generate(oid_time=nil)
-        oid = ''
-
-        # 4 bytes current time
-        if oid_time
-          t = oid_time.to_i
-        else
-          t = Time.new.to_i
+      # We need to check whether BSON_CODER is defined because it's required by
+      # the BSON C extensions.
+      if defined?(BSON::BSON_CODER) && BSON::BSON_CODER == BSON::BSON_RUBY
+        # This gets overwritten by the C extension if it loads.
+        def generate(oid_time=nil)
+          oid = ''
+
+          # 4 bytes current time
+          if oid_time
+            t = oid_time.to_i
+          else
+            t = Time.new.to_i
+          end
+          oid += [t].pack("N")
+
+          # 3 bytes machine
+          oid += @@machine_id
+
+          # 2 bytes pid
+          oid += [Process.pid % 0xFFFF].pack("n")
+
+          # 3 bytes inc
+          oid += [get_inc].pack("N")[1, 3]
+
+          oid.unpack("C12")
         end
-        oid += [t].pack("N")
-
-        # 3 bytes machine
-        oid += @@machine_id
-
-        # 2 bytes pid
-        oid += [Process.pid % 0xFFFF].pack("n")
-
-        # 3 bytes inc
-        oid += [get_inc].pack("N")[1, 3]
-
-        oid.unpack("C12")
-      end
 
-      def get_inc
-        @@lock.synchronize do
-          @@index = (@@index + 1) % 0xFFFFFF
+        def get_inc
+          @@lock.synchronize do
+            @@index = (@@index + 1) % 0xFFFFFF
+          end
         end
       end
     end

data/lib/bson/version.rb

@@ -1,3 +1,3 @@
 module BSON
-  VERSION = "1.6.1"
+  VERSION = "1.6.2"
 end

data/test/bson/bson_test.rb

@@ -3,19 +3,21 @@ require './test/bson/test_helper'
 require 'set'
 
 if RUBY_VERSION < '1.9'
-  require 'complex'
-  require 'rational'
+  silently do
+    require 'complex'
+    require 'rational'
+  end
 end
 require 'bigdecimal'
 
 begin
   require 'date'
   require 'tzinfo'
-  require 'active_support/core_ext'
+  require 'active_support/timezone'
   Time.zone = "Pacific Time (US & Canada)"
   Zone = Time.zone.now
 rescue LoadError
-  warn 'Mocking time with zone'
+  #warn 'Mocking time with zone'
   module ActiveSupport
     class TimeWithZone
       def initialize(utc_time, zone)
@@ -74,23 +76,21 @@ class BSONTest < Test::Unit::TestCase
   end
 
   def test_limit_max_bson_size
-    doc = {'name' => 'a' * BSON_CODER.max_bson_size}
+    doc = {'name' => 'a' * BSON::DEFAULT_MAX_BSON_SIZE}
     assert_raise InvalidDocument do
       assert @encoder.serialize(doc)
     end
   end
 
-  def test_max_bson_size
-    assert BSON_CODER.max_bson_size >= BSON::DEFAULT_MAX_BSON_SIZE
-  end
-
   def test_update_max_bson_size
     require 'ostruct'
     mock_conn = OpenStruct.new
     size      = 7 * 1024 * 1024
     mock_conn.max_bson_size = size
-    assert_equal size, BSON_CODER.update_max_bson_size(mock_conn)
-    assert_equal size, BSON_CODER.max_bson_size
+    silently do
+      assert_equal size, BSON_CODER.update_max_bson_size(mock_conn)
+      assert_equal size, BSON_CODER.max_bson_size
+    end
   end
 
   def test_round_trip
@@ -217,10 +217,10 @@ class BSONTest < Test::Unit::TestCase
     doc = {'doc' => {'age' => 42, 'date' => Time.now.utc, 'shoe_size' => 9.5}}
     bson = @encoder.serialize(doc)
     doc2 = @encoder.deserialize(bson)
-    assert doc['doc']
-    assert_equal 42,  doc['doc']['age']
-    assert_equal 9.5, doc['doc']['shoe_size']
-    assert_in_delta Time.now, doc['doc']['date'], 1
+    assert doc2['doc']
+    assert_equal 42,  doc2['doc']['age']
+    assert_equal 9.5, doc2['doc']['shoe_size']
+    assert_in_delta Time.now, doc2['doc']['date'], 1
   end
 
   def test_oid
@@ -269,6 +269,7 @@ class BSONTest < Test::Unit::TestCase
     doc = {'date' => [Time.now.utc]}
     bson = @encoder.serialize(doc)
     doc2 = @encoder.deserialize(bson)
+    assert doc2
   end
 
   def test_date_returns_as_utc
@@ -279,6 +280,7 @@ class BSONTest < Test::Unit::TestCase
   end
 
   def test_date_before_epoch
+    if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/ then return true end 
     begin
       doc = {'date' => Time.utc(1600)}
       bson = @encoder.serialize(doc)
@@ -297,7 +299,7 @@ class BSONTest < Test::Unit::TestCase
     [DateTime.now, Date.today, Zone].each do |invalid_date|
       doc = {:date => invalid_date}
       begin
-      bson = BSON::BSON_CODER.serialize(doc)
+      BSON::BSON_CODER.serialize(doc)
       rescue => e
       ensure
         if !invalid_date.is_a? Time
@@ -431,7 +433,7 @@ class BSONTest < Test::Unit::TestCase
 
   if !(RUBY_PLATFORM =~ /java/)
     def test_timestamp
-      val = {"test" => [4, 20]}
+      # val = {"test" => [4, 20]}
       result = @encoder.deserialize([0x13, 0x00, 0x00, 0x00,
                                      0x11, 0x74, 0x65, 0x73,
                                      0x74, 0x00, 0x04, 0x00,
@@ -455,7 +457,7 @@ class BSONTest < Test::Unit::TestCase
   def test_overflow
     doc = {"x" => 2**75}
     assert_raise RangeError do
-      bson = @encoder.serialize(doc)
+      @encoder.serialize(doc)
     end
 
     doc = {"x" => 9223372036854775}
@@ -466,7 +468,7 @@ class BSONTest < Test::Unit::TestCase
 
     doc["x"] = doc["x"] + 1
     assert_raise RangeError do
-      bson = @encoder.serialize(doc)
+      @encoder.serialize(doc)
     end
 
     doc = {"x" => -9223372036854775}
@@ -477,7 +479,7 @@ class BSONTest < Test::Unit::TestCase
 
     doc["x"] = doc["x"] - 1
     assert_raise RangeError do
-      bson = BSON::BSON_CODER.serialize(doc)
+      BSON::BSON_CODER.serialize(doc)
     end
   end
 
@@ -529,7 +531,7 @@ class BSONTest < Test::Unit::TestCase
     #one = {"_foo" => "foo"}
 
     #assert_equal @encoder.serialize(one).to_a, @encoder.serialize(dup).to_a
-    warn "Pending test for duplicate keys"
+    #warn "Pending test for duplicate keys"
   end
 
   def test_no_duplicate_id_when_moving_id

data/test/bson/json_test.rb

@@ -7,7 +7,7 @@ class JSONTest < Test::Unit::TestCase
   # This test passes when run by itself but fails
   # when run as part of the whole test suite.
   def test_object_id_as_json
-    warn "Pending test object id as json"
+    #warn "Pending test object id as json"
     #id = BSON::ObjectId.new
 
     #obj = {'_id' => id}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bson
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
   prerelease: 
 platform: jruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2012-04-05 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby BSON implementation for MongoDB. For more information about Mongo,
   see http://www.mongodb.org. For more information on BSON, see http://www.bsonspec.org.
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Ruby implementation of BSON