bson 1.3.1 → 1.4.0

data/lib/bson.rb

@@ -18,10 +18,10 @@
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-MINIMUM_BSON_EXT_VERSION = "1.3.1"
+MINIMUM_BSON_EXT_VERSION = "1.4.0"
 
 module BSON
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 
   if defined? Mongo::DEFAULT_MAX_BSON_SIZE
     DEFAULT_MAX_BSON_SIZE = Mongo::DEFAULT_MAX_BSON_SIZE
@@ -56,7 +56,7 @@ end
 
 if RUBY_PLATFORM =~ /java/
   jar_dir = File.join(File.dirname(__FILE__), '..', 'ext', 'java', 'jar')
-  require File.join(jar_dir, 'mongo-2.4.jar')
+  require File.join(jar_dir, 'mongo-2.6.5.jar')
   require File.join(jar_dir, 'jbson.jar')
   require 'bson/bson_java'
   module BSON

data/lib/bson/bson_c.rb

@@ -20,8 +20,8 @@
 module BSON
   class BSON_C
 
-    def self.serialize(obj, check_keys=false, move_id=false)
-      ByteBuffer.new(CBson.serialize(obj, check_keys, move_id))
+    def self.serialize(obj, check_keys=false, move_id=false, max_bson_size=BSON::DEFAULT_MAX_BSON_SIZE)
+      ByteBuffer.new(CBson.serialize(obj, check_keys, move_id, max_bson_size))
     end
 
     def self.deserialize(buf=nil)
@@ -29,10 +29,12 @@ module BSON
     end
 
     def self.max_bson_size
+      warn "BSON::BSON_CODER.max_bson_size is deprecated and will be removed in v2.0."
       CBson.max_bson_size
     end
 
     def self.update_max_bson_size(connection)
+      warn "BSON::BSON_CODER.update_max_bson_size is deprecated and now a no-op. It will be removed in v2.0."
       CBson.update_max_bson_size(connection)
     end
   end

data/lib/bson/bson_java.rb

@@ -4,9 +4,9 @@ module BSON
 
     # TODO: Pool or cache instances of RubyBSONEncoder so that
     # we don't create a new one on each call to #serialize.
-    def self.serialize(obj, check_keys=false, move_id=false)
+    def self.serialize(obj, check_keys=false, move_id=false, max_bson_size=BSON::DEFAULT_MAX_BSON_SIZE)
       raise InvalidDocument, "BSON_JAVA.serialize takes a Hash" unless obj.is_a?(Hash)
-      enc = Java::OrgJbson::RubyBSONEncoder.new(JRuby.runtime, check_keys, move_id)
+      enc = Java::OrgJbson::RubyBSONEncoder.new(JRuby.runtime, check_keys, move_id, max_bson_size)
       ByteBuffer.new(enc.encode(obj))
     end
 
@@ -18,10 +18,12 @@ module BSON
     end
 
     def self.max_bson_size
+      warn "BSON::BSON_CODER.max_bson_size is deprecated and will be removed in v2.0."
       Java::OrgJbson::RubyBSONEncoder.max_bson_size(self)
     end
 
     def self.update_max_bson_size(connection)
+      warn "BSON::BSON_CODER.update_max_bson_size is deprecated and now a no-op. It will be removed in v2.0."
       Java::OrgJbson::RubyBSONEncoder.update_max_bson_size(self, connection)
     end
   end

data/lib/bson/bson_ruby.rb

@@ -46,8 +46,8 @@ module BSON
     NUMBER_LONG = 18
     MAXKEY = 127
 
-    def initialize
-      @buf = ByteBuffer.new
+    def initialize(max_bson_size=BSON::DEFAULT_MAX_BSON_SIZE)
+      @buf = ByteBuffer.new('', max_bson_size)
       @encoder = BSON_RUBY
     end
 
@@ -78,10 +78,12 @@ module BSON
     end
 
     def self.update_max_bson_size(connection)
+      warn "BSON::BSON_CODER.update_max_bson_size is deprecated and now a no-op. It will be removed in v2.0."
       @@max_bson_size = connection.max_bson_size
     end
 
     def self.max_bson_size
+      warn "BSON::BSON_CODER.max_bson_size is deprecated and will be removed in v2.0."
       @@max_bson_size
     end
 
@@ -105,8 +107,8 @@ module BSON
 
     # Serializes an object.
     # Implemented to ensure an API compatible with BSON extension.
-    def self.serialize(obj, check_keys=false, move_id=false)
-      new.serialize(obj, check_keys, move_id)
+    def self.serialize(obj, check_keys=false, move_id=false, max_bson_size=BSON::DEFAULT_MAX_BSON_SIZE)
+      new(max_bson_size).serialize(obj, check_keys, move_id)
     end
 
     def self.deserialize(buf=nil)
@@ -137,8 +139,9 @@ module BSON
       end
 
       serialize_eoo_element(@buf)
-      if @buf.size > @@max_bson_size
-        raise InvalidDocument, "Document is too large (#{@buf.size}). BSON documents are limited to #{@@max_bson_size} bytes."
+      if @buf.size > @buf.max_size
+        raise InvalidDocument, "Document is too large (#{@buf.size}). " +
+         "This BSON documents is limited to #{@buf.max_size} bytes."
       end
       @buf.put_int(@buf.size, 0)
       @buf

data/lib/bson/byte_buffer.rb

@@ -20,9 +20,9 @@
 module BSON
   class ByteBuffer
 
-    attr_reader :order
+    attr_reader :order, :max_size
 
-    def initialize(initial_data="")
+    def initialize(initial_data="", max_size=BSON::DEFAULT_MAX_BSON_SIZE)
       @str = case initial_data
         when String then
           if initial_data.respond_to?(:force_encoding)
@@ -40,6 +40,7 @@ module BSON
       @order  = :little_endian
       @int_pack_order    = 'V'
       @double_pack_order = 'E'
+      @max_size = max_size
     end
 
     if RUBY_VERSION >= '1.9'

data/lib/bson/ordered_hash.rb

@@ -67,11 +67,10 @@ module BSON
       end
 
       def keys
-        @ordered_keys# || []
+        @ordered_keys.dup
       end
 
       def []=(key, value)
-        #@ordered_keys ||= []
         unless has_key?(key)
           @ordered_keys << key
         end
@@ -79,14 +78,12 @@ module BSON
       end
 
       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
 
@@ -94,6 +91,11 @@ module BSON
         collect { |k, v| v }
       end
 
+      def replace(other)
+        @ordered_keys.replace(other.keys)
+        super
+      end
+
       def merge(other)
         oh = self.dup
         oh.merge!(other)
@@ -101,17 +103,15 @@ module BSON
       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!
-      
+
       def dup
         result = OrderedHash.new
-        #@ordered_keys ||= []
         @ordered_keys.each do |key|
           result[key] = self[key]
         end
@@ -119,9 +119,9 @@ module BSON
       end
 
       def inspect
-        str = '{'
+        str = "#<BSON::OrderedHash:0x#{self.object_id.to_s(16)} {"
         str << (@ordered_keys || []).collect { |k| "\"#{k}\"=>#{self.[](k).inspect}" }.join(", ")
-        str << '}'
+        str << '}>'
       end
 
       def delete(key, &block)
@@ -159,20 +159,22 @@ module BSON
         @ordered_keys = []
       end
 
-      def hash
-        code = 17
-        each_pair do |key, value|
-          code = 37 * code + key.hash
-          code = 37 * code + value.hash
+      if RUBY_VERSION =~ /1.8.6/
+        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? BSON::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
 

data/lib/bson/types/object_id.rb

@@ -30,9 +30,6 @@ module BSON
   #
   # @core objectids
   class ObjectId
-    @@lock  = Mutex.new
-    @@index = 0
-
     attr_accessor :data
 
     # Create a new object id. If no parameter is given, an id corresponding
@@ -71,7 +68,7 @@ module BSON
     #   succeeding the timestamp will be zeroed; if true, they'll
     #   consist of the standard machine id, pid, and counter.
     #
-    # @return [Mongo::ObjectId]
+    # @return [BSON::ObjectId]
     #
     # @example Return all document created before Jan 1, 2010.
     #   time = Time.utc(2010, 1, 1)
@@ -90,7 +87,7 @@ module BSON
     #
     # @param [Hash] doc a document requiring an _id.
     #
-    # @return [Mongo::ObjectId, Object] returns a newly-created or 
+    # @return [BSON::ObjectId, Object] returns a newly-created or 
     #   current _id for the given document.
     def self.create_pk(doc)
       doc.has_key?(:_id) || doc.has_key?('_id') ? doc : doc.merge!(:_id => self.new)
@@ -124,9 +121,9 @@ module BSON
     #
     # @param [String] str
     #
-    # @return [Mongo::ObjectId]
+    # @return [BSON::ObjectId]
     def self.from_string(str)
-      raise InvalidObjectId, "illegal ObjectId format" unless legal?(str)
+      raise InvalidObjectId, "illegal ObjectId format: #{str}" unless legal?(str)
       data = []
       12.times do |i|
         data[i] = str[i * 2, 2].to_i(16)
@@ -170,35 +167,59 @@ module BSON
       Time.at(@data.pack("C4").unpack("N")[0]).utc
     end
 
+    def self.machine_id
+      @@machine_id
+    end
+
     private
 
-    # This gets overwritten by the C extension if it loads.
-    def generate(oid_time=nil)
-      oid = ''
+    if RUBY_PLATFORM =~ /java/
+      @@generator = Java::OrgBsonTypes::ObjectId
+      @@machine_id = [@@generator.genMachineId].pack("N")[0,3]
 
-      # 4 bytes current time
-      if oid_time
-        t = oid_time.to_i
-      else
-        t = Time.new.to_i
+      def generate(oid_time=nil)
+        data = (oid_time ? @@generator.new(oid_time) : @@generator.new)
+
+        oid = ''
+        oid += [data.timeSecond].pack("N")
+        oid += [data._machine].pack("N")
+        oid += [data._inc].pack("N")
+        oid.unpack("C12")
       end
-      oid += [t].pack("N")
 
-      # 3 bytes machine
-      oid += Digest::MD5.digest(Socket.gethostname)[0, 3]
+    else
+      @@lock  = Mutex.new
+      @@index = 0
+      @@machine_id = Digest::MD5.digest(Socket.gethostname)[0, 3]
 
-      # 2 bytes pid
-      oid += [Process.pid % 0xFFFF].pack("n")
+      # This gets overwritten by the C extension if it loads.
+      def generate(oid_time=nil)
+        oid = ''
 
-      # 3 bytes inc
-      oid += [get_inc].pack("N")[1, 3]
+        # 4 bytes current time
+        if oid_time
+          t = oid_time.to_i
+        else
+          t = Time.new.to_i
+        end
+        oid += [t].pack("N")
 
-      oid.unpack("C12")
-    end
+        # 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/test/bson/binary_test.rb

@@ -1,5 +1,5 @@
 # encoding:utf-8
-require './test/test_helper'
+require './test/bson/test_helper'
 
 class BinaryTest < Test::Unit::TestCase
   context "Inspecting" do

data/test/bson/bson_string_test.rb

@@ -0,0 +1,30 @@
+# encoding:utf-8
+require './test/bson/test_helper'
+require 'complex'
+require 'bigdecimal'
+require 'rational'
+
+class BSONTest < Test::Unit::TestCase
+
+  include BSON
+
+  def setup
+    @encoder = BSON::BSON_CODER
+  end
+
+  def assert_doc_pass(doc, options={})
+    bson = @encoder.serialize(doc)
+    if options[:debug]
+      puts "DEBUGGING DOC:"
+      p bson.to_a
+      puts "DESERIALIZES TO:"
+    end
+    assert_equal @encoder.serialize(doc).to_a, bson.to_a
+    assert_equal doc, @encoder.deserialize(bson)
+  end
+
+  def test_string
+    assert_doc_pass({:a => "hello"})
+  end
+
+end

data/test/bson/bson_test.rb

@@ -1,5 +1,6 @@
 # encoding:utf-8
-require './test/test_helper'
+require './test/bson/test_helper'
+require 'set'
 
 if RUBY_VERSION < '1.9'
   require 'complex'
@@ -436,8 +437,10 @@ class BSONTest < Test::Unit::TestCase
                                      0x00, 0x00, 0x14, 0x00,
                                      0x00, 0x00, 0x00])
 
-      assert_equal 4, result["test"][0]
-      assert_equal 20, result["test"][1]
+      silently do
+        assert_equal 4, result["test"][0]
+        assert_equal 20, result["test"][1]
+      end
     end
   end
 

data/test/bson/byte_buffer_test.rb

@@ -1,5 +1,5 @@
 # encoding: binary
-require './test/test_helper'
+require './test/bson/test_helper'
 
 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/test_helper'
+require './test/bson/test_helper'
 require './test/support/hash_with_indifferent_access'
 
 class HashWithIndifferentAccessTest < Test::Unit::TestCase

data/test/bson/json_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require './test/bson/test_helper'
 require 'rubygems'
 require 'json'
 

data/test/bson/object_id_test.rb

@@ -1,12 +1,9 @@
-require './test/test_helper'
+require './test/bson/test_helper'
 require 'rubygems'
 require 'json'
 
 class ObjectIdTest < Test::Unit::TestCase
 
-  include Mongo
-  include BSON
-
   def setup
     @o = ObjectId.new
   end
@@ -65,18 +62,6 @@ class ObjectIdTest < Test::Unit::TestCase
     assert_equal "BSON::ObjectId('#{@o.to_s}')", @o.inspect
   end
 
-  def test_save_and_restore
-    db = standard_connection.db(MONGO_TEST_DB)
-    coll = db.collection('test')
-
-    coll.remove
-    coll << {'a' => 1, '_id' => @o}
-
-    row = coll.find().collect.first
-    assert_equal 1, row['a']
-    assert_equal @o, row['_id']
-  end
-
   def test_from_string
     hex_str = @o.to_s
     o2 = ObjectId.from_string(hex_str)
@@ -134,8 +119,7 @@ class ObjectIdTest < Test::Unit::TestCase
     time = Time.now.utc
     id   = ObjectId.from_time(time, :unique => true)
 
-    mac_id = Digest::MD5.digest(Socket.gethostname)[0, 3].unpack("C3")
-    assert_equal id.to_a[4, 3], mac_id
+    assert_equal id.to_a[4, 3], ObjectId.machine_id.unpack("C3")
     assert_equal time.to_i, id.generation_time.to_i
 
     id2 = ObjectId.new(nil, time)

data/test/bson/ordered_hash_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require './test/bson/test_helper'
 
 class OrderedHashTest < Test::Unit::TestCase
 
@@ -38,6 +38,7 @@ class OrderedHashTest < Test::Unit::TestCase
     same_doc = BSON::OrderedHash.new
     same_doc['_id']  = 'ab12'
     same_doc['name'] = 'test'
+
     list << doc
     list << same_doc
 
@@ -45,6 +46,23 @@ class OrderedHashTest < Test::Unit::TestCase
     assert_equal 1, list.uniq.size
   end
 
+  if !(RUBY_VERSION =~ /1.8.6/)
+    def test_compatibility_with_hash
+      list = []
+      doc  = BSON::OrderedHash.new
+      doc['_id']  = 'ab12'
+      doc['name'] = 'test'
+
+      doc2 = {}
+      doc2['_id']  = 'ab12'
+      doc2['name'] = 'test'
+      list << doc
+      list << doc2
+
+      assert_equal 1, list.uniq.size
+    end
+  end
+
   def test_equality
     a = BSON::OrderedHash.new
     a['x'] = 1
@@ -76,6 +94,21 @@ class OrderedHashTest < Test::Unit::TestCase
     assert_equal @ordered_keys, @oh.keys
   end
 
+  def test_replace
+    h1 = BSON::OrderedHash.new
+    h1[:a] = 1
+    h1[:b] = 2
+
+    h2 = BSON::OrderedHash.new
+    h2[:c] = 3
+    h2[:d] = 4
+    h1.replace(h2)
+
+    assert_equal [:c, :d], h1.keys
+    assert_equal [3, 4], h1.values
+    assert h1.keys.object_id != h2.keys.object_id
+  end
+
   def test_to_a_order_preserved
     assert_equal @ordered_keys, @oh.to_a.map {|m| m.first}
   end
@@ -158,8 +191,10 @@ class OrderedHashTest < Test::Unit::TestCase
     assert_equal [1, 2, 3, 'foo'], noob.values
   end
 
-  def test_inspect_retains_order
-    assert_equal '{"c"=>1, "a"=>2, "z"=>3}', @oh.inspect
+  if RUBY_VERSION < "1.9.2"
+    def test_inspect_retains_order
+      assert_equal "#<BSON::OrderedHash:0x#{@oh.object_id.to_s(16)} {\"c\"=>1, \"a\"=>2, \"z\"=>3}>", @oh.inspect
+    end
   end
 
   def test_clear

data/test/bson/test_helper.rb

@@ -0,0 +1,46 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'bson')
+require 'rubygems' if RUBY_VERSION < '1.9.0' && ENV['C_EXT']
+require 'test/unit'
+
+def silently
+  warn_level = $VERBOSE
+  $VERBOSE = nil
+  result = yield
+  $VERBOSE = warn_level
+  result
+end
+
+begin
+  require 'rubygems' if RUBY_VERSION < "1.9.0" && !ENV['C_EXT']
+  silently { require 'shoulda' }
+  silently { require 'mocha' }
+rescue LoadError
+  puts <<MSG
+
+This test suite requires shoulda and mocha.
+You can install them as follows:
+  gem install shoulda
+  gem install mocha
+
+MSG
+
+  exit
+end
+
+require 'bson_ext/cbson' if !(RUBY_PLATFORM =~ /java/) && ENV['C_EXT']
+
+class Test::Unit::TestCase
+  include BSON
+
+  def assert_raise_error(klass, message)
+    begin
+      yield
+    rescue => e
+      assert_equal klass, e.class
+      assert e.message.include?(message), "#{e.message} does not include #{message}."
+    else
+      flunk "Expected assertion #{klass} but none was raised."
+    end
+  end
+
+end

data/test/bson/timestamp_test.rb

@@ -1,7 +1,6 @@
-require './test/test_helper'
+require './test/bson/test_helper'
 
-class TiumestampTest < Test::Unit::TestCase
-  include Mongo
+class TimestampTest < Test::Unit::TestCase
 
   def test_timestamp_equality
     t1 = Timestamp.new(5000, 200)
@@ -9,16 +8,39 @@ class TiumestampTest < Test::Unit::TestCase
     assert_equal t2, t1
   end
 
+  def test_timestamp_range
+    t = 1;
+    while(t < 1_000_000_000 ) do
+      ts = Timestamp.new(t, 0)
+      doc = {:ts => ts}
+      bson = BSON::BSON_CODER.serialize(doc)
+      assert_equal doc[:ts], BSON::BSON_CODER.deserialize(bson)['ts']
+      t = t * 10
+    end
+  end
+
+  def test_timestamp_32bit_compatibility
+    max_32bit_fixnum = (1 << 30) - 1
+    test_val = max_32bit_fixnum + 10
+
+    ts = Timestamp.new(test_val, test_val)
+    doc = {:ts => ts}
+    bson = BSON::BSON_CODER.serialize(doc)
+    assert_equal doc[:ts], BSON::BSON_CODER.deserialize(bson)['ts']
+  end
+
   def test_implements_array_for_backward_compatibility
-    ts = Timestamp.new(5000, 200)
-    assert_equal 200, ts[0]
-    assert_equal 5000, ts[1]
+    silently do
+      ts = Timestamp.new(5000, 200)
+      assert_equal 200, ts[0]
+      assert_equal 5000, ts[1]
 
-    array = ts.map {|t| t }
-    assert_equal 2, array.length
+      array = ts.map {|t| t }
+      assert_equal 2, array.length
 
-    assert_equal 200, array[0]
-    assert_equal 5000, array[1]
+      assert_equal 200, array[0]
+      assert_equal 5000, array[1]
+    end
   end
 
 end

data/test/support/hash_with_indifferent_access.rb

@@ -0,0 +1,186 @@
+# Note: HashWithIndifferentAccess is so commonly used
+# that we always need to make sure that the driver works
+# with it.
+#require File.join(File.dirname(__FILE__), 'keys.rb')
+
+# This class has dubious semantics and we only have it so that
+# people can write params[:key] instead of params['key']
+# and they get the same value for both keys.
+
+class Hash
+  # Return a new hash with all keys converted to strings.
+  def stringify_keys
+    dup.stringify_keys!
+  end
+
+  # Destructively convert all keys to strings.
+  def stringify_keys!
+    keys.each do |key|
+      self[key.to_s] = delete(key)
+    end
+    self
+  end
+
+  # Return a new hash with all keys converted to symbols, as long as
+  # they respond to +to_sym+.
+  def symbolize_keys
+    dup.symbolize_keys!
+  end
+
+  # Destructively convert all keys to symbols, as long as they respond
+  # to +to_sym+.
+  def symbolize_keys!
+    keys.each do |key|
+      self[(key.to_sym rescue key) || key] = delete(key)
+    end
+    self
+  end
+
+  alias_method :to_options,  :symbolize_keys
+  #alias_method :to_options!, :symbolize_keys!
+end
+
+module ActiveSupport
+  class HashWithIndifferentAccess < Hash
+    def extractable_options?
+      true
+    end
+
+    def initialize(constructor = {})
+      if constructor.is_a?(Hash)
+        super()
+        update(constructor)
+      else
+        super(constructor)
+      end
+    end
+
+    def default(key = nil)
+      if key.is_a?(Symbol) && include?(key = key.to_s)
+        self[key]
+      else
+        super
+      end
+    end
+
+    def self.new_from_hash_copying_default(hash)
+      ActiveSupport::HashWithIndifferentAccess.new(hash).tap do |new_hash|
+        new_hash.default = hash.default
+      end
+    end
+
+    alias_method :regular_writer, :[]= unless method_defined?(:regular_writer)
+    alias_method :regular_update, :update unless method_defined?(:regular_update)
+
+    # Assigns a new value to the hash:
+    #
+    #   hash = HashWithIndifferentAccess.new
+    #   hash[:key] = "value"
+    #
+    def []=(key, value)
+      regular_writer(convert_key(key), convert_value(value))
+    end
+
+    # Updates the instantized hash with values from the second:
+    #
+    #   hash_1 = HashWithIndifferentAccess.new
+    #   hash_1[:key] = "value"
+    #
+    #   hash_2 = HashWithIndifferentAccess.new
+    #   hash_2[:key] = "New Value!"
+    #
+    #   hash_1.update(hash_2) # => {"key"=>"New Value!"}
+    #
+    def update(other_hash)
+      other_hash.each_pair { |key, value| regular_writer(convert_key(key), convert_value(value)) }
+      self
+    end
+
+    alias_method :merge!, :update
+
+    # Checks the hash for a key matching the argument passed in:
+    #
+    #   hash = HashWithIndifferentAccess.new
+    #   hash["key"] = "value"
+    #   hash.key? :key  # => true
+    #   hash.key? "key" # => true
+    #
+    def key?(key)
+      super(convert_key(key))
+    end
+
+    alias_method :include?, :key?
+    alias_method :has_key?, :key?
+    alias_method :member?, :key?
+
+    # Fetches the value for the specified key, same as doing hash[key]
+    def fetch(key, *extras)
+      super(convert_key(key), *extras)
+    end
+
+    # Returns an array of the values at the specified indices:
+    #
+    #   hash = HashWithIndifferentAccess.new
+    #   hash[:a] = "x"
+    #   hash[:b] = "y"
+    #   hash.values_at("a", "b") # => ["x", "y"]
+    #
+    def values_at(*indices)
+      indices.collect {|key| self[convert_key(key)]}
+    end
+
+    # Returns an exact copy of the hash.
+    def dup
+      HashWithIndifferentAccess.new(self)
+    end
+
+    # Merges the instantized and the specified hashes together, giving precedence to the values from the second hash
+    # Does not overwrite the existing hash.
+    def merge(hash)
+      self.dup.update(hash)
+    end
+
+    # Performs the opposite of merge, with the keys and values from the first hash taking precedence over the second.
+    # This overloaded definition prevents returning a regular hash, if reverse_merge is called on a HashWithDifferentAccess.
+    def reverse_merge(other_hash)
+      super self.class.new_from_hash_copying_default(other_hash)
+    end
+
+    def reverse_merge!(other_hash)
+      replace(reverse_merge( other_hash ))
+    end
+
+    # Removes a specified key from the hash.
+    def delete(key)
+      super(convert_key(key))
+    end
+
+    def stringify_keys!; self end
+    def stringify_keys; dup end
+    def symbolize_keys; to_hash.symbolize_keys end
+    def to_options!; self end
+
+    # Convert to a Hash with String keys.
+    def to_hash
+      Hash.new(default).merge!(self)
+    end
+
+    protected
+      def convert_key(key)
+        key.kind_of?(Symbol) ? key.to_s : key
+      end
+
+      def convert_value(value)
+        case value
+        when Hash
+          self.class.new_from_hash_copying_default(value)
+        when Array
+          value.collect { |e| e.is_a?(Hash) ? self.class.new_from_hash_copying_default(e) : e }
+        else
+          value
+        end
+      end
+  end
+end
+
+HashWithIndifferentAccess = ActiveSupport::HashWithIndifferentAccess

metadata

@@ -1,51 +1,63 @@
 --- !ruby/object:Gem::Specification 
 name: bson
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
-    - 1
-    - 3
-    - 1
-  version: 1.3.1
+  - 1
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
-  - Jim Menard
-  - Mike Dirolf
-  - Kyle Banker
+- Jim Menard
+- Mike Dirolf
+- Kyle Banker
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 -04:00
+date: 2011-09-20 00:00:00 -04:00
 default_executable: 
 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.
 email: mongodb-dev@googlegroups.com
 executables: 
-  - b2json
-  - j2bson
+- b2json
+- j2bson
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
-  - LICENSE.txt
-  - lib/bson.rb
-  - lib/bson/bson_ruby.rb
-  - lib/bson/bson_c.rb
-  - lib/bson/exceptions.rb
-  - lib/bson/ordered_hash.rb
-  - lib/bson/byte_buffer.rb
-  - lib/bson/bson_java.rb
-  - lib/bson/types/dbref.rb
-  - lib/bson/types/code.rb
-  - lib/bson/types/object_id.rb
-  - lib/bson/types/binary.rb
-  - lib/bson/types/timestamp.rb
-  - lib/bson/types/min_max_keys.rb
-  - bin/b2json
-  - bin/j2bson
+- LICENSE.txt
+- lib/bson.rb
+- lib/bson/bson_c.rb
+- lib/bson/bson_java.rb
+- lib/bson/bson_ruby.rb
+- lib/bson/byte_buffer.rb
+- lib/bson/exceptions.rb
+- lib/bson/ordered_hash.rb
+- lib/bson/types/binary.rb
+- lib/bson/types/code.rb
+- lib/bson/types/dbref.rb
+- lib/bson/types/min_max_keys.rb
+- lib/bson/types/object_id.rb
+- lib/bson/types/timestamp.rb
+- bin/b2json
+- bin/j2bson
+- test/bson/binary_test.rb
+- test/bson/bson_string_test.rb
+- test/bson/bson_test.rb
+- test/bson/byte_buffer_test.rb
+- test/bson/hash_with_indifferent_access_test.rb
+- test/bson/json_test.rb
+- test/bson/object_id_test.rb
+- test/bson/ordered_hash_test.rb
+- test/bson/test_helper.rb
+- test/bson/timestamp_test.rb
+- test/support/hash_with_indifferent_access.rb
 has_rdoc: true
 homepage: http://www.mongodb.org
 licenses: []
@@ -54,34 +66,41 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Ruby implementation of BSON
 test_files: 
-  - test/bson/byte_buffer_test.rb
-  - test/bson/binary_test.rb
-  - test/bson/object_id_test.rb
-  - test/bson/json_test.rb
-  - test/bson/timestamp_test.rb
-  - test/bson/bson_test.rb
-  - test/bson/ordered_hash_test.rb
-  - test/bson/hash_with_indifferent_access_test.rb
+- test/bson/binary_test.rb
+- test/bson/bson_string_test.rb
+- test/bson/bson_test.rb
+- test/bson/byte_buffer_test.rb
+- test/bson/hash_with_indifferent_access_test.rb
+- test/bson/json_test.rb
+- test/bson/object_id_test.rb
+- test/bson/ordered_hash_test.rb
+- test/bson/test_helper.rb
+- test/bson/timestamp_test.rb
+- test/support/hash_with_indifferent_access.rb