Move several configuration values from Hash to ActiveSupport::XmlMini, which both Hash and Array depends on.

Also, refactored ActiveModel serializers to just use ActiveSupport::XmlMini.to_tag. As consequence, if a serialized attribute is an array or a hash, it's not encoded as yaml, but as a hash or array.

1 files changed, 16 insertions, 100 deletions

diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb
index 1b2f69f573..14e5d2f8ac 100644
--- a/activesupport/lib/active_support/core_ext/hash/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -1,88 +1,11 @@
+require 'active_support/xml_mini'
 require 'active_support/time'
 require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/hash/reverse_merge'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string/inflections'
-require 'active_support/core_ext/hash/conversions_xml_value'
 
 class Hash
-  # This module exists to decorate files deserialized using Hash.from_xml with
-  # the <tt>original_filename</tt> and <tt>content_type</tt> methods.
-  module FileLike #:nodoc:
-    attr_writer :original_filename, :content_type
-
-    def original_filename
-      @original_filename || 'untitled'
-    end
-
-    def content_type
-      @content_type || 'application/octet-stream'
-    end
-  end
-
-  include XmlValue
-
-  XML_TYPE_NAMES = {
-    "Symbol"     => "symbol",
-    "Fixnum"     => "integer",
-    "Bignum"     => "integer",
-    "BigDecimal" => "decimal",
-    "Float"      => "float",
-    "TrueClass"  => "boolean",
-    "FalseClass" => "boolean",
-    "Date"       => "date",
-    "DateTime"   => "datetime",
-    "Time"       => "datetime",
-    "Array"      => "array",
-    "Hash"       => "hash"
-  } unless defined?(XML_TYPE_NAMES)
-
-  XML_FORMATTING = {
-    "symbol"   => Proc.new { |symbol| symbol.to_s },
-    "date"     => Proc.new { |date| date.to_s(:db) },
-    "datetime" => Proc.new { |time| time.xmlschema },
-    "binary"   => Proc.new { |binary| ActiveSupport::Base64.encode64(binary) },
-    "yaml"     => Proc.new { |yaml| yaml.to_yaml }
-  } unless defined?(XML_FORMATTING)
-
-  # TODO: use Time.xmlschema instead of Time.parse;
-  #       use regexp instead of Date.parse
-  unless defined?(XML_PARSING)
-    XML_PARSING = {
-      "symbol"       => Proc.new  { |symbol|  symbol.to_sym },
-      "date"         => Proc.new  { |date|    ::Date.parse(date) },
-      "datetime"     => Proc.new  { |time|    ::Time.parse(time).utc rescue ::DateTime.parse(time).utc },
-      "integer"      => Proc.new  { |integer| integer.to_i },
-      "float"        => Proc.new  { |float|   float.to_f },
-      "decimal"      => Proc.new  { |number|  BigDecimal(number) },
-      "boolean"      => Proc.new  { |boolean| %w(1 true).include?(boolean.strip) },
-      "string"       => Proc.new  { |string|  string.to_s },
-      "yaml"         => Proc.new  { |yaml|    YAML::load(yaml) rescue yaml },
-      "base64Binary" => Proc.new  { |bin|     ActiveSupport::Base64.decode64(bin) },
-      "binary"       => Proc.new do |bin, entity|
-        case entity['encoding']
-	  when 'base64'
-	    ActiveSupport::Base64.decode64(bin)
-	  # TODO: Add support for other encodings
-	  else
-	    bin
-	end
-      end,
-      "file"         => Proc.new do |file, entity|
-        f = StringIO.new(ActiveSupport::Base64.decode64(file))
-        f.extend(FileLike)
-        f.original_filename = entity['name']
-        f.content_type = entity['content_type']
-        f
-      end
-    }
-
-    XML_PARSING.update(
-      "double"   => XML_PARSING["float"],
-      "dateTime" => XML_PARSING["datetime"]
-    )
-  end
-
   # Returns a string containing an XML representation of its receiver:
   # 
   #   {"foo" => 1, "bar" => 2}.to_xml
@@ -135,17 +58,18 @@ class Hash
     require 'builder' unless defined?(Builder)
 
     options = options.dup
-    options[:indent] ||= 2
-    options.reverse_merge!({ :builder => Builder::XmlMarkup.new(:indent => options[:indent]),
-                             :root => "hash" })
-    options[:builder].instruct! unless options.delete(:skip_instruct)
-    root = rename_key(options[:root].to_s, options)
-    # common upto this point
-    options[:builder].__send__(:method_missing, root) do
-      each do |key, value|
-        xml_value(key, value, options)
-      end
-      yield options[:builder] if block_given?
+    options[:indent]  ||= 2
+    options[:root]    ||= "hash"
+    options[:builder] ||= Builder::XmlMarkup.new(:indent => options[:indent])
+
+    builder = options[:builder]
+    builder.instruct! unless options.delete(:skip_instruct)
+
+    root = ActiveSupport::XmlMini.rename_key(options[:root].to_s, options)
+
+    builder.__send__(:method_missing, root) do
+      each { |key, value| ActiveSupport::XmlMini.to_tag(key, value, options) }
+      yield builder if block_given?
     end
   end
 
@@ -174,12 +98,8 @@ class Hash
               end
             elsif value.has_key?("__content__")
               content = value["__content__"]
-              if parser = XML_PARSING[value["type"]]
-                if parser.arity == 2
-                  XML_PARSING[value["type"]].call(content, value)
-                else
-                  XML_PARSING[value["type"]].call(content)
-                end
+              if parser = ActiveSupport::XmlMini::PARSING[value["type"]]
+                parser.arity == 1 ? parser.call(content) : parser.call(content, value)
               else
                 content
               end
@@ -205,11 +125,7 @@ class Hash
             end
           when 'Array'
             value.map! { |i| typecast_xml_value(i) }
-            case value.length
-              when 0 then nil
-              when 1 then value.first
-              else value
-            end
+            value.length > 1 ? value : value.first
           when 'String'
             value
           else