Add the type="array" moniker to has_many / has_and_belongs_to_many associations upon serialization.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7144 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Tobias Lütke 2007-06-27 16:37:40 +00:00
parent 80d539bd4d
commit 817d5d489d
3 changed files with 6 additions and 6 deletions

View File

@ -207,7 +207,7 @@ module ActiveRecord #:nodoc:
tag = association.to_s
tag = tag.dasherize if dasherize?
builder.tag!(tag) do
builder.tag!(tag, :type => :array) do
records.each { |r| r.to_xml(opts.merge(:root=>r.class.to_s.underscore)) }
end
end

View File

@ -1563,13 +1563,13 @@ class BasicsTest < Test::Unit::TestCase
def test_to_xml_including_has_many_association
xml = topics(:first).to_xml(:indent => 0, :skip_instruct => true, :include => :replies, :except => :replies_count)
assert_equal "<topic>", xml.first(7)
assert xml.include?(%(<replies><reply>))
assert xml.include?(%(<replies type="array"><reply>))
assert xml.include?(%(<title>The Second Topic's of the day</title>))
end
def test_array_to_xml_including_has_many_association
xml = [ topics(:first), topics(:second) ].to_xml(:indent => 0, :skip_instruct => true, :include => :replies)
assert xml.include?(%(<replies><reply>))
assert xml.include?(%(<replies type="array"><reply>))
end
def test_array_to_xml_including_methods
@ -1603,7 +1603,7 @@ class BasicsTest < Test::Unit::TestCase
xml = companies(:first_firm).to_xml(:indent => 0, :skip_instruct => true, :include => [ :clients, :account ])
assert_equal "<firm>", xml.first(6)
assert xml.include?(%(<account>))
assert xml.include?(%(<clients><client>))
assert xml.include?(%(<clients type="array"><client>))
end
def test_to_xml_including_multiple_associations_with_options
@ -1614,7 +1614,7 @@ class BasicsTest < Test::Unit::TestCase
assert_equal "<firm>", xml.first(6)
assert xml.include?(%(<client><name>Summit</name></client>))
assert xml.include?(%(<clients><client>))
assert xml.include?(%(<clients type="array"><client>))
end
def test_to_xml_including_methods

View File

@ -146,7 +146,7 @@ class DatabaseConnectedXmlSerializationTest < Test::Unit::TestCase
def test_include_uses_association_name
xml = authors(:david).to_xml :include=>:hello_posts, :indent=>0
assert_match %r{<hello-posts>}, xml
assert_match %r{<hello-posts type="array">}, xml
assert_match %r{<post>}, xml
assert_match %r{<sti-post>}, xml
end