diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2010-05-06 12:35:08 -0300 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-05-12 09:31:36 -0700 |
| commit | bea3c26833ad3e1e94f7331e0553a4e2164e7de5 (patch) | |
| tree | 67feace8da33b390feff26618e7f42826437a7f9 /activemodel | |
| parent | f7862b2c34b5b298bf7b937c55f0637ebfe43a25 (diff) | |
| download | rails-bea3c26833ad3e1e94f7331e0553a4e2164e7de5.tar.gz rails-bea3c26833ad3e1e94f7331e0553a4e2164e7de5.tar.bz2 rails-bea3c26833ad3e1e94f7331e0553a4e2164e7de5.zip | |
Make ActiveResource serialize XML correctly when element_name is set.
[#4529]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'activemodel')
| -rw-r--r-- | activemodel/lib/active_model/serializers/xml.rb | 2 | ||||
| -rw-r--r-- | activemodel/test/cases/serializeration/xml_serialization_test.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activemodel/lib/active_model/serializers/xml.rb b/activemodel/lib/active_model/serializers/xml.rb index df7026b3ec..934af2b8a8 100644 --- a/activemodel/lib/active_model/serializers/xml.rb +++ b/activemodel/lib/active_model/serializers/xml.rb @@ -90,7 +90,7 @@ module ActiveModel @builder = options[:builder] @builder.instruct! unless options[:skip_instruct] - root = (options[:root] || @serializable.class.model_name.singular).to_s + root = (options[:root] || @serializable.class.model_name.element).to_s root = ActiveSupport::XmlMini.rename_key(root, options) args = [root] diff --git a/activemodel/test/cases/serializeration/xml_serialization_test.rb b/activemodel/test/cases/serializeration/xml_serialization_test.rb index 3ba826a8d0..4e8e4efa25 100644 --- a/activemodel/test/cases/serializeration/xml_serialization_test.rb +++ b/activemodel/test/cases/serializeration/xml_serialization_test.rb @@ -37,8 +37,8 @@ class XmlSerializationTest < ActiveModel::TestCase test "should serialize namespaced root" do @xml = Admin::Contact.new(@contact.attributes).to_xml - assert_match %r{^<admin-contact>}, @xml - assert_match %r{</admin-contact>$}, @xml + assert_match %r{^<contact>}, @xml + assert_match %r{</contact>$}, @xml end test "should serialize default root with namespace" do |