Skip to content
Browse files

Fix that Hash#to_xml and Array#to_xml shouldn't modify their options …

…hashes [#672 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
  • Loading branch information...
1 parent 870750e commit 1382f4de1f9b0e443e7884bd4da53c20f0754568 David Burger committed with lifo May 17, 2009
View
1 activesupport/lib/active_support/core_ext/array/conversions.rb
@@ -159,6 +159,7 @@ def to_xml(options = {})
raise "Not all elements respond to to_xml" unless all? { |e| e.respond_to? :to_xml }
require 'builder' unless defined?(Builder)
+ options = options.dup
options[:root] ||= all? { |e| e.is_a?(first.class) && first.class.to_s != "Hash" } ? ActiveSupport::Inflector.pluralize(ActiveSupport::Inflector.underscore(first.class.name)) : "records"
options[:children] ||= options[:root].singularize
options[:indent] ||= 2
View
1 activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -86,6 +86,7 @@ def to_query(namespace = nil)
def to_xml(options = {})
require 'builder' unless defined?(Builder)
+ options = options.dup
options[:indent] ||= 2
options.reverse_merge!({ :builder => Builder::XmlMarkup.new(:indent => options[:indent]),
:root => "hash" })
View
7 activesupport/test/core_ext/array_ext_test.rb
@@ -302,6 +302,13 @@ def test_to_xml_with_empty
xml = [].to_xml
assert_match(/type="array"\/>/, xml)
end
+
+ def test_to_xml_dups_options
+ options = {:skip_instruct => true}
+ [].to_xml(options)
+ # :builder, etc, shouldn't be added to options
+ assert_equal({:skip_instruct => true}, options)
+ end
end
class ArrayExtractOptionsTests < Test::Unit::TestCase
View
7 activesupport/test/core_ext/hash_ext_test.rb
@@ -880,6 +880,13 @@ def test_datetime_xml_type_with_far_future_date
assert_equal 30, alert_at.min
assert_equal 45, alert_at.sec
end
+
+ def test_to_xml_dups_options
+ options = {:skip_instruct => true}
+ {}.to_xml(options)
+ # :builder, etc, shouldn't be added to options
+ assert_equal({:skip_instruct => true}, options)
+ end
end
class QueryTest < Test::Unit::TestCase

0 comments on commit 1382f4d

Please sign in to comment.
Something went wrong with that request. Please try again.