From 1503e45e2e2de8314429d3e3006bd49c0c4a11d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Garn=C3=A6s?= Date: Thu, 2 Sep 2010 12:35:37 +0200 Subject: [PATCH] ActiveModel#to_xml fix (renamed parameter). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Valim --- activemodel/lib/active_model/serializers/xml.rb | 2 +- activeresource/test/cases/base_test.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/activemodel/lib/active_model/serializers/xml.rb b/activemodel/lib/active_model/serializers/xml.rb index 16ab8e7928bde..e89385e7e5bb5 100644 --- a/activemodel/lib/active_model/serializers/xml.rb +++ b/activemodel/lib/active_model/serializers/xml.rb @@ -17,7 +17,7 @@ class Attribute #:nodoc: def initialize(name, serializable, raw_value=nil) @name, @serializable = name, serializable - @value = value || @serializable.send(name) + @value = raw_value || @serializable.send(name) @type = compute_type end diff --git a/activeresource/test/cases/base_test.rb b/activeresource/test/cases/base_test.rb index 91b375681bd9e..77135be146ffa 100644 --- a/activeresource/test/cases/base_test.rb +++ b/activeresource/test/cases/base_test.rb @@ -1041,6 +1041,12 @@ def test_to_xml_with_element_name ensure Person.element_name = old_elem_name end + + def test_to_xml_with_private_method_name_as_attribute + assert_nothing_raised(ArgumentError) { + Customer.new(:test => true).to_xml + } + end def test_to_json Person.include_root_in_json = true