From 2c110b825e743f62c84a0c3e247ad524a9ac81c6 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 11 Feb 2005 13:05:38 +0000 Subject: Added IndifferentAccess as a way to wrap a hash by a symbol-based store that also can be accessed by string keys git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@581 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activesupport/lib/core_ext/hash.rb | 2 ++ .../lib/core_ext/hash/indifferent_access.rb | 38 ++++++++++++++++++++++ activesupport/lib/core_ext/hash/keys.rb | 1 - 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 activesupport/lib/core_ext/hash/indifferent_access.rb (limited to 'activesupport/lib') diff --git a/activesupport/lib/core_ext/hash.rb b/activesupport/lib/core_ext/hash.rb index a5c53db1e0..e899d3e1e2 100644 --- a/activesupport/lib/core_ext/hash.rb +++ b/activesupport/lib/core_ext/hash.rb @@ -1,5 +1,7 @@ require File.dirname(__FILE__) + '/hash/keys' +require File.dirname(__FILE__) + '/hash/indifferent_access' class Hash #:nodoc: include ActiveSupport::CoreExtensions::Hash::Keys + include ActiveSupport::CoreExtensions::Hash::IndifferentAccess end diff --git a/activesupport/lib/core_ext/hash/indifferent_access.rb b/activesupport/lib/core_ext/hash/indifferent_access.rb new file mode 100644 index 0000000000..3fe0999866 --- /dev/null +++ b/activesupport/lib/core_ext/hash/indifferent_access.rb @@ -0,0 +1,38 @@ +class HashWithIndifferentAccess < Hash + def initialize(constructor) + if constructor.is_a?(Hash) + super() + update(constructor.symbolize_keys) + else + super(constructor) + end + end + + alias_method :regular_read, :[] + + def [](key) + case key + when Symbol: regular_read(key) || regular_read(key.to_s) + when String: regular_read(key) || regular_read(key.to_sym) + else regular_read(key) + end + end + + alias_method :regular_writer, :[]= + + def []=(key, value) + regular_writer(key.is_a?(String) ? key.to_sym : key, value) + end +end + +module ActiveSupport #:nodoc: + module CoreExtensions #:nodoc: + module Hash #:nodoc: + module IndifferentAccess + def with_indifferent_access + HashWithIndifferentAccess.new(self) + end + end + end + end +end diff --git a/activesupport/lib/core_ext/hash/keys.rb b/activesupport/lib/core_ext/hash/keys.rb index 536995dd71..4dd982337c 100644 --- a/activesupport/lib/core_ext/hash/keys.rb +++ b/activesupport/lib/core_ext/hash/keys.rb @@ -2,7 +2,6 @@ module ActiveSupport #:nodoc: module CoreExtensions #:nodoc: module Hash #:nodoc: module Keys - # Return a new hash with all keys converted to symbols. def symbolize_keys inject({}) do |options, (key, value)| -- cgit v1.2.3