aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext/hash/conversions.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-09-20 09:34:29 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-09-20 09:34:29 +0000
commit54c393f5fa2dfd5ff5866cba74e7179f493732df (patch)
tree71f7ad34c813ee02081f4f7b8ab01038d292d03e /activesupport/lib/active_support/core_ext/hash/conversions.rb
parent5ddc82c3a11a71806ea91f66fdb28fbbe30716f7 (diff)
downloadrails-54c393f5fa2dfd5ff5866cba74e7179f493732df.tar.gz
rails-54c393f5fa2dfd5ff5866cba74e7179f493732df.tar.bz2
rails-54c393f5fa2dfd5ff5866cba74e7179f493732df.zip
Hash.create_from_xml has been renamed to Hash.from_xml, alias will exist until Rails 2.0 [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5149 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib/active_support/core_ext/hash/conversions.rb')
-rw-r--r--activesupport/lib/active_support/core_ext/hash/conversions.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb
index fdc5a165b0..de67b0b00d 100644
--- a/activesupport/lib/active_support/core_ext/hash/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -77,14 +77,19 @@ module ActiveSupport #:nodoc:
end
module ClassMethods
- def create_from_xml(xml)
+ def from_xml(xml)
# TODO: Refactor this into something much cleaner that doesn't rely on XmlSimple
undasherize_keys(typecast_xml_value(XmlSimple.xml_in(xml,
'forcearray' => false,
'forcecontent' => true,
'keeproot' => true,
'contentkey' => '__content__')
- ))
+ ))
+ end
+
+ def create_from_xml(xml)
+ ActiveSupport::Deprecation.warn("Hash.create_from_xml has been renamed to Hash.from_xml", caller)
+ from_xml(xml)
end
private