Changeset 7087

Timestamp:

06/23/07 00:43:11 (3 years ago)

Author:

bitsweat

Message:

Merge [7086] to stable: demote Hash#to_xml to use XmlSimple#xml_in_string so it can't read files or stdin. References #8453.

Files:

• branches/1-2-stable/activesupport/CHANGELOG (modified) (1 diff)
• branches/1-2-stable/activesupport/lib/active_support/core_ext/hash/conversions.rb (modified) (2 diffs)

branches/1-2-stable/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Demote Hash#to_xml to use XmlSimple#xml_in_string so it can't read files or stdin.  #8453 [candlerb, Jeremy Kemper]
-
-* Document Object#blank?.  #6491 [Chris Mear]

branches/1-2-stable/activesupport/lib/active_support/core_ext/hash/conversions.rb

@@ -1 +1 @@
-require 'date'
-require 'xml_simple'
+
+# Locked down XmlSimple#xml_in_string
+class XmlSimple
+  # Same as xml_in but doesn't try to smartly shoot itself in the foot.
+  def xml_in_string(string, options = nil)
+    handle_options('in', options)
+
+    @doc = parse(string)
+    result = collapse(@doc.root)
+
+    if @options['keeproot']
+      merge({}, @doc.root.name, result)
+    else
+      result
+    end
+  end
+
+  def self.xml_in_string(string, options = nil)
+    new.xml_in_string(string, options)
+  end
+end
-
-module ActiveSupport #:nodoc:
@@ -82 +103 @@
-          def from_xml(xml)
-            # TODO: Refactor this into something much cleaner that doesn't rely on XmlSimple
-
+_string
-              '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)