Fixed Array#to_xml when it contains a series of hashes (each piece would get its own XML declaration) (closes #6610) [thkarcher/cyu]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5668 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
7611fa6d46
commit
0297b31b82
@ -1,5 +1,7 @@
|
||||
*SVN*
|
||||
|
||||
* Fixed Array#to_xml when it contains a series of hashes (each piece would get its own XML declaration) #6610 [thkarcher/cyu]
|
||||
|
||||
* Added Time#to_s(:time) which will just return H:M, like 17:44 [DHH]
|
||||
|
||||
* Add Module#attr_accessor_with_default to initialize value of attribute before setting it. Closes #6538. [Stuart Halloway, Marcel Molina Jr.]
|
||||
|
@ -61,9 +61,9 @@ def to_xml(options = {})
|
||||
|
||||
options[:builder].instruct! unless options.delete(:skip_instruct)
|
||||
|
||||
opts = options.merge({ :skip_instruct => true, :root => children })
|
||||
opts = options.merge({ :root => children })
|
||||
|
||||
options[:builder].tag!(root) { each { |e| e.to_xml(opts) } }
|
||||
options[:builder].tag!(root) { each { |e| e.to_xml(opts.merge!({ :skip_instruct => true })) } }
|
||||
end
|
||||
|
||||
end
|
||||
|
@ -169,4 +169,14 @@ def test_to_xml_with_dasherize_true
|
||||
assert xml.include?(%(<street-address>Paulina</street-address>))
|
||||
assert xml.include?(%(<street-address>Evergreen</street-address>))
|
||||
end
|
||||
|
||||
def test_to_with_instruct
|
||||
xml = [
|
||||
{ :name => "David", :age => 26, :age_in_millis => 820497600000 },
|
||||
{ :name => "Jason", :age => 31, :age_in_millis => BigDecimal.new('1.0') }
|
||||
].to_xml(:skip_instruct => false, :indent => 0)
|
||||
|
||||
assert /^<\?xml [^>]*/.match(xml)
|
||||
assert xml.rindex(/<\?xml /) == 0
|
||||
end
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user