diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index dfe2639526..7a005ce970 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,3 +1,5 @@ +* Added Hash#stringify_keys and Hash#stringify_keys! + * Added IndifferentAccess as a way to wrap a hash by a symbol-based store that also can be accessed by string keys * Added Inflector.humanize to turn attribute names like employee_salary into "Employee salary". Used by automated error reporting in AR. diff --git a/activesupport/lib/core_ext/hash/keys.rb b/activesupport/lib/core_ext/hash/keys.rb index 4dd982337c..3c301c6fa6 100644 --- a/activesupport/lib/core_ext/hash/keys.rb +++ b/activesupport/lib/core_ext/hash/keys.rb @@ -2,6 +2,25 @@ module ActiveSupport #:nodoc: module CoreExtensions #:nodoc: module Hash #:nodoc: module Keys + # Return a new hash with all keys converted to strings. + def stringify_keys + inject({}) do |options, (key, value)| + options[key.to_s] = value + options + end + end + + # Destructively convert all keys to strings. + def stringify_keys! + keys.each do |key| + unless key.is_a?(String) + self[key.to_s] = self[key] + delete(key) + end + end + self + end + # Return a new hash with all keys converted to symbols. def symbolize_keys inject({}) do |options, (key, value)| diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb index de85db2edf..14f2b901b4 100644 --- a/activesupport/test/core_ext/hash_ext_test.rb +++ b/activesupport/test/core_ext/hash_ext_test.rb @@ -12,6 +12,8 @@ class HashExtTest < Test::Unit::TestCase h = {} assert_respond_to h, :symbolize_keys assert_respond_to h, :symbolize_keys! + assert_respond_to h, :stringify_keys + assert_respond_to h, :stringify_keys! assert_respond_to h, :to_options assert_respond_to h, :to_options! end @@ -32,6 +34,18 @@ class HashExtTest < Test::Unit::TestCase assert_raises(NoMethodError) { { [] => 1 }.symbolize_keys! } end + def test_stringify_keys + assert_equal @strings, @symbols.stringify_keys + assert_equal @strings, @strings.stringify_keys + assert_equal @strings, @mixed.stringify_keys + end + + def test_stringify_keys! + assert_equal @strings, @symbols.dup.stringify_keys! + assert_equal @strings, @strings.dup.stringify_keys! + assert_equal @strings, @mixed.dup.stringify_keys! + end + def test_indifferent_access @strings = @strings.with_indifferent_access @symbols = @symbols.with_indifferent_access