From 5b2be6293443a4c25aab7cf3e74fc84cb70e2199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20L=C3=BCtke?= <tobias.luetke@gmail.com>
Date: Mon, 9 Jul 2007 19:10:45 +0000
Subject: Make [7169] work as expected with indented XML.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7171 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
activerecord/lib/active_record/xml_serialization.rb | 8 ++++++--
activerecord/test/xml_serialization_test.rb | 5 +++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/activerecord/lib/active_record/xml_serialization.rb b/activerecord/lib/active_record/xml_serialization.rb
index 5f7a39d73b..42fe46bca3 100644
--- a/activerecord/lib/active_record/xml_serialization.rb
+++ b/activerecord/lib/active_record/xml_serialization.rb
@@ -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)
diff --git a/activerecord/test/xml_serialization_test.rb b/activerecord/test/xml_serialization_test.rb
index 824f486d2e..807daddabb 100644
--- a/activerecord/test/xml_serialization_test.rb
+++ b/activerecord/test/xml_serialization_test.rb
@@ -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
\ No newline at end of file
--
cgit v1.2.3