aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/store.rb
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2013-01-07 06:00:10 +0900
committerAkira Matsuda <ronnie@dio.jp>2013-01-07 07:37:23 +0900
commitc8e632bd9fe246aab16496e87184ace20ab3ce27 (patch)
tree3b873b2e58f1751b8295493535a7d049facccf98 /activerecord/lib/active_record/store.rb
parent033248b5fbf5fa10e42b3647ea136bec20227a9a (diff)
downloadrails-c8e632bd9fe246aab16496e87184ace20ab3ce27.tar.gz
rails-c8e632bd9fe246aab16496e87184ace20ab3ce27.tar.bz2
rails-c8e632bd9fe246aab16496e87184ace20ab3ce27.zip
Namespace HashWithIndifferentAccess
Diffstat (limited to 'activerecord/lib/active_record/store.rb')
-rw-r--r--activerecord/lib/active_record/store.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/store.rb b/activerecord/lib/active_record/store.rb
index df7f58c81f..cf4cf9e602 100644
--- a/activerecord/lib/active_record/store.rb
+++ b/activerecord/lib/active_record/store.rb
@@ -107,7 +107,7 @@ module ActiveRecord
private
def initialize_store_attribute(store_attribute)
attribute = send(store_attribute)
- unless attribute.is_a?(HashWithIndifferentAccess)
+ unless attribute.is_a?(ActiveSupport::HashWithIndifferentAccess)
attribute = IndifferentCoder.as_indifferent_hash(attribute)
send :"#{store_attribute}=", attribute
end
@@ -134,12 +134,12 @@ module ActiveRecord
def self.as_indifferent_hash(obj)
case obj
- when HashWithIndifferentAccess
+ when ActiveSupport::HashWithIndifferentAccess
obj
when Hash
obj.with_indifferent_access
else
- HashWithIndifferentAccess.new
+ ActiveSupport::HashWithIndifferentAccess.new
end
end
end