Implemented nested to_xml and named elements for array xmling [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3830 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 19 insertions, 13 deletions

diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb
index 6f83231487..59ea7262f1 100644
--- a/activesupport/lib/active_support/core_ext/array/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/array/conversions.rb
@@ -29,13 +29,16 @@ module ActiveSupport #:nodoc:
         def to_xml(options = {})
           raise "Not all elements respond to to_xml" unless all? { |e| e.respond_to? :to_xml }
 
-          options[:root]    ||= all? { |e| e.is_a? first.class } ? first.class.to_s.underscore.pluralize : "records"
-          options[:indent]  ||= 2
-          options[:builder] ||= Builder::XmlMarkup.new(:indent => options[:indent])
+          options[:root]     ||= all? { |e| e.is_a?(first.class) && first.class.to_s != "Hash" } ? first.class.to_s.underscore.pluralize : "records"
+          options[:children] ||= options[:root].singularize
+          options[:indent]   ||= 2
+          options[:builder]  ||= Builder::XmlMarkup.new(:indent => options[:indent])
+
+          root     = options.delete(:root)
+          children = options.delete(:children)
 
           options[:builder].instruct! unless options.delete(:skip_instruct)
-          root = options.delete(:root)
-          options[:builder].__send__(root) { each { |e| e.to_xml(options.merge({ :skip_instruct => true })) } }
+          options[:builder].__send__(root) { each { |e| e.to_xml(options.merge({ :skip_instruct => true, :root => children })) } }
         end
       end
     end
diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb
index 584a7ec7cc..bbbda3698f 100644
--- a/activesupport/lib/active_support/core_ext/hash/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -24,15 +24,18 @@ module ActiveSupport #:nodoc:
             for key in keys
               value = self[key]
 
-              if value.is_a?(self.class)
-                value.to_xml(options.merge({ :root => key, :skip_instruct => true }))
-              else
-                type_name = XML_TYPE_NAMES[value.class.to_s]
+              case value.class.to_s # TODO: Figure out why I have to to_s the class to do comparisons in order for tests to run
+                when "Hash"
+                  value.to_xml(options.merge({ :root => key, :skip_instruct => true }))
+                when "Array"
+                  value.to_xml(options.merge({ :root => key, :children => key.to_s.singularize, :skip_instruct => true}))
+                else
+                  type_name = XML_TYPE_NAMES[value.class.to_s]
 
-                options[:builder].__send__(key.to_s.dasherize, 
-                  XML_FORMATTING[type_name] ? XML_FORMATTING[type_name].call(value) : value,
-                  options[:skip_types] || value.nil? || type_name.nil? ? { } : { :type => type_name }
-                )
+                  options[:builder].__send__(key.to_s.dasherize, 
+                    XML_FORMATTING[type_name] ? XML_FORMATTING[type_name].call(value) : value,
+                    options[:skip_types] || value.nil? || type_name.nil? ? { } : { :type => type_name }
+                  )
               end
             end
           end