to_xml fixes, features, and speedup. Closes #4989.

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

2 files changed, 53 insertions, 16 deletions

diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb
index 35d010b164..2b42a55ab1 100644
--- a/activesupport/lib/active_support/core_ext/array/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/array/conversions.rb
@@ -52,12 +52,20 @@ module ActiveSupport #:nodoc:
           options[:indent]   ||= 2
           options[:builder]  ||= Builder::XmlMarkup.new(:indent => options[:indent])
 
-          root     = options.delete(:root)
+          root     = options.delete(:root).to_s
           children = options.delete(:children)
 
+          if !options.has_key?(:dasherize) || options[:dasherize]
+            root = root.dasherize
+          end
+
           options[:builder].instruct! unless options.delete(:skip_instruct)
-          options[:builder].tag!(root.to_s.dasherize) { each { |e| e.to_xml(options.merge({ :skip_instruct => true, :root => children })) } }
+
+          opts = options.merge({ :skip_instruct => true, :root => children })
+
+          options[:builder].tag!(root) { each { |e| e.to_xml(opts) } }
         end
+
       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 d556bab09b..be0012ad45 100644
--- a/activesupport/lib/active_support/core_ext/hash/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -3,40 +3,69 @@ module ActiveSupport #:nodoc:
     module Hash #:nodoc:
       module Conversions
         XML_TYPE_NAMES = {
-          "Fixnum"     => "integer",
-          "Date"       => "date",
-          "Time"       => "datetime",
-          "TrueClass"  => "boolean",
-          "FalseClass" => "boolean"
+          ::Fixnum     => "integer",
+          ::Float      => "float",
+          ::Date       => "date",
+          ::DateTime   => "datetime",
+          ::Time       => "datetime",
+          ::TrueClass  => "boolean",
+          ::FalseClass => "boolean"
         }
-        
+
         XML_FORMATTING = {
           "date"     => Proc.new { |date| date.to_s(:db) },
           "datetime" => Proc.new { |time| time.xmlschema }
         }
-        
+
         def to_xml(options = {})
           options[:indent] ||= 2
-          options.reverse_merge!({ :builder => Builder::XmlMarkup.new(:indent => options[:indent]), :root => "hash" })
+          options.reverse_merge!({ :builder => Builder::XmlMarkup.new(:indent => options[:indent]),
+                                   :root => "hash" })
           options[:builder].instruct! unless options.delete(:skip_instruct)
+          dasherize = !options.has_key?(:dasherize) || options[:dasherize]
+          root = dasherize ? options[:root].to_s.dasherize : options[:root].to_s
 
-          options[:builder].__send__(options[:root].to_s.dasherize) do
+          options[:builder].__send__(root) do
             each do |key, value|
               case value
                 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}))
+                when ::Method, ::Proc
+                  # If the Method or Proc takes two arguments, then
+                  # pass the suggested child element name.  This is
+                  # used if the Method or Proc will be operating over
+                  # multiple records and needs to create an containing
+                  # element that will contain the objects being
+                  # serialized.
+                  if 1 == value.arity
+                    value.call(options.merge({ :root => key, :skip_instruct => true }))
+                  else
+                    value.call(options.merge({ :root => key, :skip_instruct => true }), key.to_s.singularize)
+                  end
                 else
-                  type_name = XML_TYPE_NAMES[value.class.to_s]
+                  if value.respond_to?(:to_xml)
+                    value.to_xml(options.merge({ :root => key, :skip_instruct => true }))
+                  else
+                    type_name = XML_TYPE_NAMES[value.class]
+
+                    key = dasherize ? key.to_s.dasherize : key.to_s
 
-                  options[:builder].tag!(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 }
-                  )
+                    attributes = options[:skip_types] || value.nil? || type_name.nil? ? { } : { :type => type_name }
+                    if value.nil?
+                      attributes[:nil] = true
+                    end
+
+                    options[:builder].tag!(key,
+                      XML_FORMATTING[type_name] ? XML_FORMATTING[type_name].call(value) : value,
+                      attributes
+                    )
+                end
               end
             end
           end
+
         end
       end
     end