From 049b1440a392ac53a427fecd4500bb839e090be4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20L=C3=BCtke?= Date: Mon, 9 Jul 2007 18:13:24 +0000 Subject: Include empty has_many/has_and_belongs_to_many associations as empty array tags when serializing to XML git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7169 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/xml_serialization.rb | 11 ++++------- activerecord/test/xml_serialization_test.rb | 8 ++++++++ 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/xml_serialization.rb b/activerecord/lib/active_record/xml_serialization.rb index 88ff46a004..5f7a39d73b 100644 --- a/activerecord/lib/active_record/xml_serialization.rb +++ b/activerecord/lib/active_record/xml_serialization.rb @@ -205,13 +205,10 @@ module ActiveRecord #:nodoc: case @record.class.reflect_on_association(association).macro when :has_many, :has_and_belongs_to_many records = @record.send(association).to_a - unless records.empty? - 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)) } - end + 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)) } 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 8c59d5d26b..824f486d2e 100644 --- a/activerecord/test/xml_serialization_test.rb +++ b/activerecord/test/xml_serialization_test.rb @@ -162,4 +162,12 @@ class DatabaseConnectedXmlSerializationTest < Test::Unit::TestCase assert_match %r{^ }, xml assert_no_match %r{^