mirror of
https://github.com/github/rails.git
synced 2026-04-04 03:00:58 -04:00
Add a :namespace option to AR::Base#to_xml [Koz]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5130 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
*SVN*
|
||||
|
||||
* Add a :namespace option to AR::Base#to_xml [Koz]
|
||||
|
||||
* Deprecation tests. Remove warnings for dynamic finders and for the foo_count method if it's also an attribute. [Jeremy Kemper]
|
||||
|
||||
* Mock Time.now for more accurate Touch mixin tests. #6213 [Dan Peterson]
|
||||
|
||||
@@ -222,12 +222,17 @@ module ActiveRecord #:nodoc:
|
||||
end
|
||||
|
||||
def serialize
|
||||
builder.tag!(root) do
|
||||
args = [root]
|
||||
if options[:namespace]
|
||||
args << {:xmlns=>options[:namespace]}
|
||||
end
|
||||
|
||||
builder.tag!(*args) do
|
||||
add_attributes
|
||||
add_includes
|
||||
add_procs
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
alias_method :to_s, :serialize
|
||||
|
||||
|
||||
@@ -20,7 +20,13 @@ class XmlSerializationTest < Test::Unit::TestCase
|
||||
assert_match %r{^<contact>}, @xml
|
||||
assert_match %r{</contact>$}, @xml
|
||||
end
|
||||
|
||||
|
||||
def test_should_serialize_default_root_with_namespace
|
||||
@xml = Contact.new.to_xml :namespace=>"http://xml.rubyonrails.org/contact"
|
||||
assert_match %r{^<contact xmlns="http://xml.rubyonrails.org/contact">}, @xml
|
||||
assert_match %r{</contact>$}, @xml
|
||||
end
|
||||
|
||||
def test_should_serialize_custom_root
|
||||
@xml = Contact.new.to_xml :root => 'xml_contact'
|
||||
assert_match %r{^<xml-contact>}, @xml
|
||||
|
||||
Reference in New Issue
Block a user