bson 1.0 → 1.0.1

data/lib/bson.rb

@@ -1,7 +1,9 @@
+# encoding: UTF-8
+
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 module BSON
-  VERSION = "1.0"
+  VERSION = "1.0.1"
   def self.serialize(obj, check_keys=false, move_id=false)
     BSON_CODER.serialize(obj, check_keys, move_id)
   end

data/lib/bson/bson_c.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # A thin wrapper for the CBson class
 module BSON
   class BSON_C

data/lib/bson/bson_ruby.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # --
 # Copyright (C) 2008-2010 10gen Inc.
 #
@@ -182,7 +184,7 @@ module BSON
       end
       @buf.rewind
       @buf.get_int                # eat message size
-      doc = OrderedHash.new
+      doc = BSON::OrderedHash.new
       while @buf.more?
         type = @buf.get
         case type
@@ -325,6 +327,16 @@ module BSON
       Regexp.new(str, options)
     end
 
+    def encoded_str(str)
+      if RUBY_VERSION >= '1.9'
+        str.force_encoding("utf-8")
+        if Encoding.default_internal
+          str.encode!(Encoding.default_internal)
+        end
+      end
+      str
+    end
+
     def deserialize_string_data(buf)
       len = buf.get_int
       bytes = buf.get(len)
@@ -332,10 +344,7 @@ module BSON
       if str.respond_to? "pack"
         str = str.pack("C*")
       end
-      if RUBY_VERSION >= '1.9'
-        str.force_encoding("utf-8")
-      end
-      str
+      encoded_str(str)
     end
 
     def deserialize_code_w_scope_data(buf)
@@ -345,15 +354,12 @@ module BSON
       if code.respond_to? "pack"
         code = code.pack("C*")
       end
-      if RUBY_VERSION >= '1.9'
-        code.force_encoding("utf-8")
-      end
 
       scope_size = buf.get_int
       buf.position -= 4
       scope = BSON_CODER.new().deserialize(buf.get(scope_size))
 
-      Code.new(code, scope)
+      Code.new(encoded_str(code), scope)
     end
 
     def deserialize_oid_data(buf)
@@ -383,7 +389,7 @@ module BSON
     end
 
     def serialize_dbref_element(buf, key, val)
-      oh = OrderedHash.new
+      oh = BSON::OrderedHash.new
       oh['$ref'] = val.namespace
       oh['$id'] = val.object_id
       serialize_object_element(buf, key, oh, false)
@@ -450,7 +456,7 @@ module BSON
 
     def serialize_array_element(buf, key, val, check_keys)
       # Turn array into hash with integer indices as keys
-      h = OrderedHash.new
+      h = BSON::OrderedHash.new
       i = 0
       val.each { |v| h[i] = v; i += 1 }
       serialize_object_element(buf, key, h, check_keys, ARRAY)
@@ -536,10 +542,7 @@ module BSON
         break if b == 0
         chars << b.chr
       end
-      if RUBY_VERSION >= '1.9'
-        chars.force_encoding("utf-8") # Mongo stores UTF-8
-      end
-      chars
+      encoded_str(chars)
     end
 
     def bson_type(o)

data/lib/bson/byte_buffer.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # --
 # Copyright (C) 2008-2010 10gen Inc.
 #

data/lib/bson/exceptions.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # --
 # Copyright (C) 2008-2010 10gen Inc.
 #

data/lib/bson/ordered_hash.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # --
 # Copyright (C) 2008-2010 10gen Inc.
 #
@@ -18,123 +20,125 @@
 #
 # Under Ruby 1.9 and greater, this class has no added methods because Ruby's
 # Hash already keeps its keys ordered by order of insertion.
-class OrderedHash < Hash
-
-  def ==(other)
-    begin
-      !other.nil? &&
-        keys == other.keys &&
-        values == other.values
-    rescue
-      false
+module BSON
+  class OrderedHash < Hash
+
+    def ==(other)
+      begin
+        !other.nil? &&
+          keys == other.keys &&
+          values == other.values
+      rescue
+        false
+      end
     end
-  end
 
-  # We only need the body of this class if the RUBY_VERSION is before 1.9
-  if RUBY_VERSION < '1.9'
-    attr_accessor :ordered_keys
-
-    def self.[] *args
-      oh = OrderedHash.new
-      if Hash === args[0]
-        oh.merge! args[0]
-      elsif (args.size % 2) != 0
-        raise ArgumentError, "odd number of elements for Hash"
-      else
-        0.step(args.size - 1, 2) do |key|
-          value = key + 1
-          oh[args[key]] = args[value]
+    # We only need the body of this class if the RUBY_VERSION is before 1.9
+    if RUBY_VERSION < '1.9'
+      attr_accessor :ordered_keys
+
+      def self.[] *args
+        oh = BSON::OrderedHash.new
+        if Hash === args[0]
+          oh.merge! args[0]
+        elsif (args.size % 2) != 0
+          raise ArgumentError, "odd number of elements for Hash"
+        else
+          0.step(args.size - 1, 2) do |key|
+            value = key + 1
+            oh[args[key]] = args[value]
+          end
         end
+        oh
       end
-      oh
-    end
 
-    def initialize(*a, &b)
-      super
-      @ordered_keys = []
-    end
+      def initialize(*a, &b)
+        super
+        @ordered_keys = []
+      end
 
-    def keys
-      @ordered_keys || []
-    end
+      def keys
+        @ordered_keys || []
+      end
 
-    def []=(key, value)
-      @ordered_keys ||= []
-      @ordered_keys << key unless @ordered_keys.include?(key)
-      super(key, value)
-    end
+      def []=(key, value)
+        @ordered_keys ||= []
+        @ordered_keys << key unless @ordered_keys.include?(key)
+        super(key, value)
+      end
 
-    def each
-      @ordered_keys ||= []
-      @ordered_keys.each { |k| yield k, self[k] }
-      self
-    end
-    alias :each_pair :each
+      def each
+        @ordered_keys ||= []
+        @ordered_keys.each { |k| yield k, self[k] }
+        self
+      end
+      alias :each_pair :each
 
-    def to_a
-      @ordered_keys ||= []
-      @ordered_keys.map { |k| [k, self[k]] }      
-    end
+      def to_a
+        @ordered_keys ||= []
+        @ordered_keys.map { |k| [k, self[k]] }      
+      end
     
-    def values
-      collect { |k, v| v }
-    end
+      def values
+        collect { |k, v| v }
+      end
 
-    def merge(other)
-      oh = self.dup
-      oh.merge!(other)
-      oh
-    end
+      def merge(other)
+        oh = self.dup
+        oh.merge!(other)
+        oh
+      end
 
-    def merge!(other)
-      @ordered_keys ||= []
-      @ordered_keys += other.keys # unordered if not an OrderedHash
-      @ordered_keys.uniq!
-      super(other)
-    end
+      def merge!(other)
+        @ordered_keys ||= []
+        @ordered_keys += other.keys # unordered if not an BSON::OrderedHash
+        @ordered_keys.uniq!
+        super(other)
+      end
 
-    alias :update :merge!
+      alias :update :merge!
 
-    def inspect
-      str = '{'
-      str << (@ordered_keys || []).collect { |k| "\"#{k}\"=>#{self.[](k).inspect}" }.join(", ")
-      str << '}'
-    end
+      def inspect
+        str = '{'
+        str << (@ordered_keys || []).collect { |k| "\"#{k}\"=>#{self.[](k).inspect}" }.join(", ")
+        str << '}'
+      end
 
-    def delete(key, &block)
-      @ordered_keys.delete(key) if @ordered_keys
-      super
-    end
+      def delete(key, &block)
+        @ordered_keys.delete(key) if @ordered_keys
+        super
+      end
 
-    def delete_if(&block)
-      self.each { |k,v|
-        if yield k, v
-          delete(k)
-        end
-      }
-    end
+      def delete_if(&block)
+        self.each { |k,v|
+          if yield k, v
+            delete(k)
+          end
+        }
+      end
 
-    def clear
-      super
-      @ordered_keys = []
-    end
+      def clear
+        super
+        @ordered_keys = []
+      end
 
-    def hash
-      code = 17
-      each_pair do |key, value|
-        code = 37 * code + key.hash
-        code = 37 * code + value.hash
+      def hash
+        code = 17
+        each_pair do |key, value|
+          code = 37 * code + key.hash
+          code = 37 * code + value.hash
+        end
+        code & 0x7fffffff
       end
-      code & 0x7fffffff
-    end
 
-    def eql?(o)
-      if o.instance_of? OrderedHash
-        self.hash == o.hash
-      else
-        false
+      def eql?(o)
+        if o.instance_of? BSON::OrderedHash
+          self.hash == o.hash
+        else
+          false
+        end
       end
-    end
 
+    end
   end
 end

data/lib/bson/types/binary.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # --
 # Copyright (C) 2008-2010 10gen Inc.
 #

data/lib/bson/types/code.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # --
 # Copyright (C) 2008-2010 10gen Inc.
 #

data/lib/bson/types/dbref.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # --
 # Copyright (C) 2008-2010 10gen Inc.
 #

data/lib/bson/types/min_max_keys.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # --
 # Copyright (C) 2008-2010 10gen Inc.
 #

data/lib/bson/types/objectid.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # --
 # Copyright (C) 2008-2010 10gen Inc.
 #

data/test/mongo_bson/bson_test.rb

@@ -90,6 +90,23 @@ class BSONTest < Test::Unit::TestCase
       bson = BSON::BSON_CODER.serialize({'aé'.encode('iso-8859-1') => 'hello'})
       assert_equal 'hello', BSON::BSON_CODER.deserialize(bson)['aé']
     end
+
+    # Based on a test from sqlite3-ruby
+    def test_default_internal_is_honored
+      before_enc = Encoding.default_internal
+
+      str = "壁に耳あり、障子に目あり"
+      bson = BSON::BSON_CODER.serialize("x" => str)
+
+      Encoding.default_internal = 'EUC-JP'
+      out = BSON::BSON_CODER.deserialize(bson)["x"]
+
+      assert_equal Encoding.default_internal, out.encoding
+      assert_equal str.encode('EUC-JP'), out
+      assert_equal str, out.encode(str.encoding)
+    ensure
+      Encoding.default_internal = before_enc
+    end
   end
 
   def test_code
@@ -98,6 +115,12 @@ class BSONTest < Test::Unit::TestCase
     assert_equal doc, BSON::BSON_CODER.deserialize(bson)
   end
 
+  def test_code_with_scope
+    doc = {'$where' => Code.new('this.a.b < this.b', {'foo' => 1})}
+    bson = BSON::BSON_CODER.serialize(doc)
+    assert_equal doc, BSON::BSON_CODER.deserialize(bson)
+  end
+
   def test_number
     doc = {'doc' => 41.99}
     bson = BSON::BSON_CODER.serialize(doc)
@@ -123,7 +146,7 @@ class BSONTest < Test::Unit::TestCase
   end
 
   def test_ordered_hash
-    doc = OrderedHash.new
+    doc = BSON::OrderedHash.new
     doc["b"] = 1
     doc["a"] = 2
     doc["c"] = 3
@@ -284,16 +307,16 @@ class BSONTest < Test::Unit::TestCase
   end
 
   def test_put_id_first
-    val = OrderedHash.new
+    val = BSON::OrderedHash.new
     val['not_id'] = 1
     val['_id'] = 2
     roundtrip = BSON::BSON_CODER.deserialize(BSON::BSON_CODER.serialize(val, false, true).to_a)
-    assert_kind_of OrderedHash, roundtrip
+    assert_kind_of BSON::OrderedHash, roundtrip
     assert_equal '_id', roundtrip.keys.first
 
     val = {'a' => 'foo', 'b' => 'bar', :_id => 42, 'z' => 'hello'}
     roundtrip = BSON::BSON_CODER.deserialize(BSON::BSON_CODER.serialize(val, false, true).to_a)
-    assert_kind_of OrderedHash, roundtrip
+    assert_kind_of BSON::OrderedHash, roundtrip
     assert_equal '_id', roundtrip.keys.first
   end
 
@@ -354,7 +377,7 @@ class BSONTest < Test::Unit::TestCase
   end
 
   def test_do_not_change_original_object
-    val = OrderedHash.new
+    val = BSON::OrderedHash.new
     val['not_id'] = 1
     val['_id'] = 2
     assert val.keys.include?('_id')
@@ -369,7 +392,7 @@ class BSONTest < Test::Unit::TestCase
 
   # note we only test for _id here because in the general case we will
   # write duplicates for :key and "key". _id is a special case because
-  # we call has_key? to check for it's existance rather than just iterating
+  # we call has_key? to check for it's existence rather than just iterating
   # over it like we do for the rest of the keys. thus, things like
   # HashWithIndifferentAccess can cause problems for _id but not for other
   # keys. rather than require rails to test with HWIA directly, we do this
@@ -426,7 +449,7 @@ class BSONTest < Test::Unit::TestCase
   end
 
   def test_move_id
-    a = OrderedHash.new
+    a = BSON::OrderedHash.new
     a['text'] = 'abc'
     a['key'] = 'abc'
     a['_id']  = 1
@@ -441,10 +464,10 @@ class BSONTest < Test::Unit::TestCase
   end
 
   def test_move_id_with_nested_doc
-    b = OrderedHash.new
+    b = BSON::OrderedHash.new
     b['text'] = 'abc'
     b['_id']   = 2
-    c = OrderedHash.new
+    c = BSON::OrderedHash.new
     c['text'] = 'abc'
     c['hash'] = b
     c['_id']  = 3

data/test/mongo_bson/ordered_hash_test.rb

@@ -3,7 +3,7 @@ require 'test/test_helper'
 class OrderedHashTest < Test::Unit::TestCase
 
   def setup
-    @oh = OrderedHash.new
+    @oh = BSON::OrderedHash.new
     @oh['c'] = 1
     @oh['a'] = 2
     @oh['z'] = 3
@@ -11,31 +11,31 @@ class OrderedHashTest < Test::Unit::TestCase
   end
 
   def test_initialize
-    a = OrderedHash.new
+    a = BSON::OrderedHash.new
     a['x'] = 1
     a['y'] = 2
 
-    b = OrderedHash['x' => 1, 'y' => 2]
+    b = BSON::OrderedHash['x' => 1, 'y' => 2]
     assert_equal a, b
   end
 
   def test_hash_code
-    o = OrderedHash.new
+    o = BSON::OrderedHash.new
     o['number'] = 50
     assert o.hash
   end
 
   def test_empty
-    assert_equal [], OrderedHash.new.keys
+    assert_equal [], BSON::OrderedHash.new.keys
   end
 
   def test_uniq
     list = []
-    doc  = OrderedHash.new
+    doc  = BSON::OrderedHash.new
     doc['_id']  = 'ab12'
     doc['name'] = 'test'
 
-    same_doc = OrderedHash.new
+    same_doc = BSON::OrderedHash.new
     same_doc['_id']  = 'ab12'
     same_doc['name'] = 'test'
     list << doc
@@ -46,23 +46,23 @@ class OrderedHashTest < Test::Unit::TestCase
   end
 
   def test_equality
-    a = OrderedHash.new
+    a = BSON::OrderedHash.new
     a['x'] = 1
     a['y'] = 2
 
-    b = OrderedHash.new
+    b = BSON::OrderedHash.new
     b['y'] = 2
     b['x'] = 1
 
-    c = OrderedHash.new
+    c = BSON::OrderedHash.new
     c['x'] = 1
     c['y'] = 2
 
-    d = OrderedHash.new
+    d = BSON::OrderedHash.new
     d['x'] = 2
     d['y'] = 3
 
-    e = OrderedHash.new
+    e = BSON::OrderedHash.new
     e['z'] = 1
     e['y'] = 2
 
@@ -105,7 +105,7 @@ class OrderedHashTest < Test::Unit::TestCase
   end
 
   def test_merge
-    other = OrderedHash.new
+    other = BSON::OrderedHash.new
     other['f'] = 'foo'
     noob = @oh.merge(other)
     assert_equal @ordered_keys + ['f'], noob.keys
@@ -113,7 +113,7 @@ class OrderedHashTest < Test::Unit::TestCase
   end
 
   def test_merge_bang
-    other = OrderedHash.new
+    other = BSON::OrderedHash.new
     other['f'] = 'foo'
     @oh.merge!(other)
     assert_equal @ordered_keys + ['f'], @oh.keys
@@ -121,7 +121,7 @@ class OrderedHashTest < Test::Unit::TestCase
   end
 
   def test_merge_bang_with_overlap
-    other = OrderedHash.new
+    other = BSON::OrderedHash.new
     other['a'] = 'apple'
     other['c'] = 'crab'
     other['f'] = 'foo'
@@ -141,7 +141,7 @@ class OrderedHashTest < Test::Unit::TestCase
   end
 
   def test_update
-    other = OrderedHash.new
+    other = BSON::OrderedHash.new
     other['f'] = 'foo'
     noob = @oh.update(other)
     assert_equal @ordered_keys + ['f'], noob.keys

metadata

@@ -1,11 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bson
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  version: "1.0"
+  version: 1.0.1
 platform: ruby
 authors: 
 - Jim Menard
@@ -15,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-29 00:00:00 -04:00
+date: 2010-05-07 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -55,20 +51,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Ruby implementation of BSON