bson 1.6.2-jruby → 1.6.4-jruby

data/bin/b2json

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 # encoding: UTF-8
 
 # --

data/bin/j2bson

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 # encoding: UTF-8
 
 # --

data/lib/bson/bson_ruby.rb

@@ -62,7 +62,7 @@ module BSON
         rescue
           raise InvalidStringEncoding, "String not valid utf-8: #{str.inspect}"
         end
-        str.encode(UTF8_ENCODING).force_encoding(BINARY_ENCODING)
+        str.dup.force_encoding(BINARY_ENCODING)
       end
     else
       NULL_BYTE = "\0"

data/lib/bson/version.rb

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

data/test/bson/binary_test.rb

@@ -1,5 +1,5 @@
 # encoding:utf-8
-require './test/bson/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class BinaryTest < Test::Unit::TestCase
   def setup

data/test/bson/bson_test.rb

@@ -1,5 +1,5 @@
 # encoding:utf-8
-require './test/bson/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'set'
 
 if RUBY_VERSION < '1.9'
@@ -141,6 +141,13 @@ class BSONTest < Test::Unit::TestCase
       end
     end
 
+    def test_forced_encoding_with_valid_utf8
+      doc = {'doc' => "\xC3\xB6".force_encoding("ISO-8859-1")}
+      serialized = @encoder.serialize(doc)
+      deserialized = @encoder.deserialize(serialized)
+      assert_equal(doc['doc'], deserialized['doc'].force_encoding("ISO-8859-1"))
+    end
+
     # Based on a test from sqlite3-ruby
     def test_default_internal_is_honored
       before_enc = Encoding.default_internal

data/test/bson/byte_buffer_test.rb

@@ -1,5 +1,5 @@
 # encoding: binary
-require './test/bson/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class ByteBufferTest < Test::Unit::TestCase
   include BSON

data/test/bson/hash_with_indifferent_access_test.rb

@@ -1,5 +1,5 @@
 # encoding:utf-8
-require './test/bson/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require './test/support/hash_with_indifferent_access'
 
 class HashWithIndifferentAccessTest < Test::Unit::TestCase

data/test/bson/json_test.rb

@@ -1,4 +1,4 @@
-require './test/bson/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'rubygems'
 require 'json'
 

data/test/bson/object_id_test.rb

@@ -1,4 +1,4 @@
-require './test/bson/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'rubygems'
 require 'json'
 
@@ -135,4 +135,14 @@ class ObjectIdTest < Test::Unit::TestCase
     id = ObjectId.new
     assert_equal({"$oid" => id.to_s}, id.as_json)
   end
+
+  def test_object_id_array_flatten
+    id = ObjectId.new
+    assert_equal [ id ], [[ id ]].flatten
+  end
+
+  def test_object_id_array_flatten_bang
+    id = ObjectId.new
+    assert_equal [ id ], [[ id ]].flatten!
+  end
 end

data/test/bson/ordered_hash_test.rb

@@ -1,4 +1,4 @@
-require './test/bson/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class OrderedHashTest < Test::Unit::TestCase
 

data/test/bson/timestamp_test.rb

@@ -1,4 +1,4 @@
-require './test/bson/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class TimestampTest < Test::Unit::TestCase
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bson
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.4
   prerelease: 
 platform: jruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000 Z
+date: 2012-06-06 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.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby implementation of BSON