bson 1.7.1 → 1.8.0

data/VERSION

@@ -0,0 +1 @@
+1.8.0

data/bson.gemspec

@@ -0,0 +1,29 @@
+Gem::Specification.new do |s|
+  s.name              = 'bson'
+
+  s.version           = File.read(File.join(File.dirname(__FILE__), 'VERSION'))
+  s.authors           = ['Tyler Brock', 'Gary Murakami', 'Emily Stolfo', 'Brandon Black']
+  s.email             = 'mongodb-dev@googlegroups.com'
+  s.homepage          = 'http://www.mongodb.org'
+  s.summary           = 'Ruby implementation of BSON'
+  s.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.'
+  s.rubyforge_project = 'bson'
+
+  s.files             = ['bson.gemspec', 'LICENSE', 'VERSION']
+  s.files             += ['bin/b2json', 'bin/j2bson', 'lib/bson.rb']
+  s.files             += Dir['lib/bson/**/*.rb']
+
+  if RUBY_PLATFORM =~ /java/
+    s.files           += ['ext/java/jar/jbson.jar', 'ext/java/jar/mongo-2.6.5.jar']
+    s.platform        = Gem::Platform::JAVA
+  else
+    s.platform        = Gem::Platform::RUBY
+  end
+
+  s.test_files        = Dir['test/bson/*.rb']
+  s.executables       = ['b2json', 'j2bson']
+  s.require_paths     = ['lib']
+  s.has_rdoc          = 'yard'
+
+  s.add_dependency('activesupport')
+end

data/lib/bson.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 #
 # --
-# Copyright (C) 2008-2011 10gen Inc.
+# Copyright (C) 2008-2012 10gen Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 # limitations under the License.
 # ++
 
-require 'bson/version'
-
 module BSON
   if defined? Mongo::DEFAULT_MAX_BSON_SIZE
     DEFAULT_MAX_BSON_SIZE = Mongo::DEFAULT_MAX_BSON_SIZE
@@ -87,6 +85,9 @@ else
   end
 end
 
+require 'active_support'
+require 'active_support/hash_with_indifferent_access'
+
 require 'bson/types/binary'
 require 'bson/types/code'
 require 'bson/types/dbref'

data/lib/bson/bson_c.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # --
-# Copyright (C) 2008-2011 10gen Inc.
+# Copyright (C) 2008-2012 10gen Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/bson/bson_java.rb

@@ -1,3 +1,5 @@
+require 'jruby'
+
 include Java
 module BSON
   class BSON_JAVA

data/lib/bson/bson_ruby.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # --
-# Copyright (C) 2008-2011 10gen Inc.
+# Copyright (C) 2008-2012 10gen Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -628,7 +628,9 @@ module BSON
         raise InvalidDocument, "#{o.class} is not currently supported; " +
         "use a UTC Time instance instead."
       else
-        if defined?(ActiveSupport::TimeWithZone) && o.is_a?(ActiveSupport::TimeWithZone)
+        if defined?(ActiveSupport::Multibyte::Chars) && o.is_a?(ActiveSupport::Multibyte::Chars)
+          STRING
+        elsif defined?(ActiveSupport::TimeWithZone) && o.is_a?(ActiveSupport::TimeWithZone)
           raise InvalidDocument, "ActiveSupport::TimeWithZone is not currently supported; " +
           "use a UTC Time instance instead."
         else

data/lib/bson/byte_buffer.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # --
-# Copyright (C) 2008-2011 10gen Inc.
+# Copyright (C) 2008-2012 10gen Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/bson/exceptions.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # --
-# Copyright (C) 2008-2011 10gen Inc.
+# Copyright (C) 2008-2012 10gen Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/bson/ordered_hash.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # --
-# Copyright (C) 2008-2011 10gen Inc.
+# Copyright (C) 2008-2012 10gen Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/bson/types/binary.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # --
-# Copyright (C) 2008-2011 10gen Inc.
+# Copyright (C) 2008-2012 10gen Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/bson/types/code.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # --
-# Copyright (C) 2008-2011 10gen Inc.
+# Copyright (C) 2008-2012 10gen Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/bson/types/dbref.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # --
-# Copyright (C) 2008-2011 10gen Inc.
+# Copyright (C) 2008-2012 10gen Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/bson/types/min_max_keys.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # --
-# Copyright (C) 2008-2011 10gen Inc.
+# Copyright (C) 2008-2012 10gen Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/bson/types/object_id.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # --
-# Copyright (C) 2008-2011 10gen Inc.
+# Copyright (C) 2008-2012 10gen Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/bson/types/timestamp.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # --
-# Copyright (C) 2008-2011 10gen Inc.
+# Copyright (C) 2008-2012 10gen Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/test/bson/binary_test.rb

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

data/test/bson/bson_test.rb

@@ -1,5 +1,5 @@
 # encoding:utf-8
-require File.expand_path("../test_helper", __FILE__)
+require 'test_helper'
 require 'set'
 
 if RUBY_VERSION < '1.9'
@@ -27,6 +27,18 @@ rescue LoadError
   Zone = ActiveSupport::TimeWithZone.new(Time.now.utc, 'EST')
 end
 
+begin
+  require 'active_support/multibyte/chars'
+rescue LoadError
+  warn 'Mocking ActiveSupport::Multibyte::Chars'
+  module ActiveSupport
+    module Multibyte
+      class Chars < String
+      end
+    end
+  end
+end
+
 class BSONTest < Test::Unit::TestCase
 
   include BSON
@@ -70,6 +82,17 @@ class BSONTest < Test::Unit::TestCase
     assert_doc_pass(doc)
   end
 
+  def test_valid_active_support_multibyte_chars
+    unless RUBY_PLATFORM =~ /java/
+      doc = {'doc' => ActiveSupport::Multibyte::Chars.new('aé')}
+      assert_doc_pass(doc)
+
+      bson = @encoder.serialize(doc)
+      doc = @encoder.deserialize(bson)
+      assert_equal doc['doc'], 'aé'
+    end
+  end
+
   def test_valid_utf8_key
     doc = {'aé' => 'hello'}
     assert_doc_pass(doc)
@@ -101,12 +124,11 @@ class BSONTest < Test::Unit::TestCase
   # In 1.8 we test that other string encodings raise an exception.
   # In 1.9 we test that they get auto-converted.
   if RUBY_VERSION < '1.9'
-    if ! RUBY_PLATFORM =~ /java/
+    unless RUBY_PLATFORM == 'java'
       require 'iconv'
       def test_non_utf8_string
         string = Iconv.conv('iso-8859-1', 'utf-8', 'aé')
         doc = {'doc' => string}
-        assert_doc_pass(doc)
         assert_raise InvalidStringEncoding do
           @encoder.serialize(doc)
         end
@@ -121,48 +143,50 @@ class BSONTest < Test::Unit::TestCase
       end
     end
   else
-    def test_non_utf8_string
-      assert_raise BSON::InvalidStringEncoding do
-        BSON::BSON_CODER.serialize({'str' => 'aé'.encode('iso-8859-1')})
+    unless RUBY_PLATFORM == 'java'
+      def test_non_utf8_string
+        assert_raise BSON::InvalidStringEncoding do
+          BSON::BSON_CODER.serialize({'str' => 'aé'.encode('iso-8859-1')})
+        end
       end
-    end
 
-    def test_invalid_utf8_string
-      str = "123\xD9"
-      assert !str.valid_encoding?
-      assert_raise BSON::InvalidStringEncoding do
-        BSON::BSON_CODER.serialize({'str' => str})
+      def test_invalid_utf8_string
+        str = "123\xD9"
+        assert !str.valid_encoding?
+        assert_raise BSON::InvalidStringEncoding do
+          BSON::BSON_CODER.serialize({'str' => str})
+        end
       end
-    end
 
-    def test_non_utf8_key
-      assert_raise BSON::InvalidStringEncoding do
-        BSON::BSON_CODER.serialize({'aé'.encode('iso-8859-1') => 'hello'})
+      def test_non_utf8_key
+        assert_raise BSON::InvalidStringEncoding do
+          BSON::BSON_CODER.serialize({'aé'.encode('iso-8859-1') => 'hello'})
+        end
       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
+      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
+      # 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)
+        str = "壁に耳あり、障子に目あり"
+        bson = BSON::BSON_CODER.serialize("x" => str)
 
-      silently { Encoding.default_internal = 'EUC-JP' }
-      out = BSON::BSON_CODER.deserialize(bson)["x"]
+        silently { 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
-      silently { Encoding.default_internal = before_enc }
+        assert_equal Encoding.default_internal, out.encoding
+        assert_equal str.encode('EUC-JP'), out
+        assert_equal str, out.encode(str.encoding)
+      ensure
+        silently { Encoding.default_internal = before_enc }
+      end
     end
   end
 
@@ -287,7 +311,7 @@ class BSONTest < Test::Unit::TestCase
   end
 
   def test_date_before_epoch
-    if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/ then return true end 
+    if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/ then return true end
     begin
       doc = {'date' => Time.utc(1600)}
       bson = @encoder.serialize(doc)

data/test/bson/byte_buffer_test.rb

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

data/test/bson/hash_with_indifferent_access_test.rb

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

data/test/bson/json_test.rb

@@ -1,5 +1,4 @@
-require File.expand_path("../test_helper", __FILE__)
-require 'rubygems'
+require 'test_helper'
 require 'json'
 
 class JSONTest < Test::Unit::TestCase

data/test/bson/object_id_test.rb

@@ -1,5 +1,4 @@
-require File.expand_path("../test_helper", __FILE__)
-require 'rubygems'
+require 'test_helper'
 require 'json'
 
 class ObjectIdTest < Test::Unit::TestCase

data/test/bson/ordered_hash_test.rb

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

data/test/bson/timestamp_test.rb

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

metadata

@@ -1,18 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: bson
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
   prerelease: 
 platform: ruby
 authors:
-- Jim Menard
-- Mike Dirolf
-- Kyle Banker
+- Tyler Brock
+- Gary Murakami
+- Emily Stolfo
+- Brandon Black
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
-dependencies: []
+date: 2012-11-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
@@ -22,33 +39,32 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE.txt
+- bson.gemspec
+- LICENSE
+- VERSION
+- bin/b2json
+- bin/j2bson
 - 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/bson_c.rb
 - lib/bson/types/dbref.rb
 - lib/bson/types/min_max_keys.rb
-- lib/bson/types/object_id.rb
 - lib/bson/types/timestamp.rb
-- lib/bson/version.rb
-- bin/b2json
-- bin/j2bson
-- test/bson/binary_test.rb
-- test/bson/bson_test.rb
-- test/bson/byte_buffer_test.rb
+- lib/bson/types/code.rb
+- lib/bson/types/binary.rb
+- lib/bson/types/object_id.rb
+- lib/bson/bson_java.rb
+- lib/bson/byte_buffer.rb
+- lib/bson/exceptions.rb
+- lib/bson/bson_ruby.rb
 - test/bson/hash_with_indifferent_access_test.rb
-- test/bson/json_test.rb
-- test/bson/object_id_test.rb
+- test/bson/bson_test.rb
+- test/bson/binary_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
+- test/bson/byte_buffer_test.rb
+- test/bson/object_id_test.rb
+- test/bson/json_test.rb
 homepage: http://www.mongodb.org
 licenses: []
 post_install_message: 
@@ -61,9 +77,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -549832473750178804
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -71,20 +84,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project: bson
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby implementation of BSON
 test_files:
-- test/bson/binary_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/bson_test.rb
+- test/bson/binary_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
+- test/bson/byte_buffer_test.rb
+- test/bson/object_id_test.rb
+- test/bson/json_test.rb
+has_rdoc: yard

data/lib/bson/version.rb

@@ -1,3 +0,0 @@
-module BSON
-  VERSION = "1.7.1"
-end

data/test/bson/test_helper.rb

@@ -1,30 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'bson')
-require 'rubygems' if RUBY_VERSION < '1.9.0'
-gem 'test-unit'
-require 'test/unit'
-
-def silently
-  warn_level = $VERBOSE
-  $VERBOSE = nil
-  result = yield
-  $VERBOSE = warn_level
-  result
-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/support/hash_with_indifferent_access.rb

@@ -1,186 +0,0 @@
-# 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