github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-02-03 10:45:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make [7169] work as expected with indented XML.

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7171 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Tobias Lütke
2007-07-09 19:10:45 +00:00
parent 049b1440a3
commit 5b2be62934
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
activerecord/lib/active_record/xml_serialization.rb
View File

@@ -207,8 +207,12 @@ module ActiveRecord #:nodoc:
records = @record.send(association).to_a
tag = association.to_s
tag = tag.dasherize if dasherize?
builder.tag!(tag, :type => :array) do
records.each { |r| r.to_xml(opts.merge(:root=>r.class.to_s.underscore)) }
if records.empty?
builder.tag!(tag, :type => :array)
else
builder.tag!(tag, :type => :array) do
records.each { |r| r.to_xml(opts.merge(:root=>r.class.to_s.underscore)) }
end
end
when :has_one, :belongs_to
if record = @record.send(association)

5
activerecord/test/xml_serialization_test.rb
View File

@@ -165,9 +165,10 @@ class DatabaseConnectedXmlSerializationTest < Test::Unit::TestCase
def test_should_include_empty_has_many_as_empty_array
authors(:david).posts.delete_all
xml = authors(:david).to_xml :include=>:posts, :indent => 0
xml = authors(:david).to_xml :include=>:posts, :indent => 2
assert_match %r{<posts type="array"></posts>}, xml
assert_equal [], Hash.from_xml(xml)['author']['posts']
assert_match %r{^ <posts type="array"/>}, xml
end
end