From 187e1f85d0c871ba61e5bc3651a7ec2f657db8f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20L=C3=BCtke?= <tobias.luetke@gmail.com>
Date: Mon, 9 Jul 2007 22:07:39 +0000
Subject: Support for non heterogeneous arrays when serializing to xml. Unless
 guessable from array name the type name will be included as attribute

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7173 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 .../active_support/core_ext/hash/conversions.rb    | 23 ++++++++++++----------
 activesupport/test/core_ext/hash_ext_test.rb       | 17 ++++++++++++++++
 2 files changed, 30 insertions(+), 10 deletions(-)

(limited to 'activesupport')

diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb
index 929dd45e98..d8c6852e25 100644
--- a/activesupport/lib/active_support/core_ext/hash/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -167,7 +167,7 @@ module ActiveSupport #:nodoc:
           private
             def typecast_xml_value(value)
               case value.class.to_s
-                when "Hash"
+                when 'Hash'
                   if value.has_key?("__content__")
                     content = translate_xml_entities(value["__content__"])
                     if parser = XML_PARSING[value["type"]]
@@ -195,31 +195,34 @@ module ActiveSupport #:nodoc:
                     end
                   elsif value['type'] == 'string' && value['nil'] != 'true'
                     ""
+                  # blank or nil parsed values are represented by nil
+                  elsif value.blank? || value['nil'] == 'true'
+                    nil
+                  # If the type is the only element which makes it then 
+                  # this still makes the value nil
+                  elsif value['type'] && value.size == 1
+                    nil
                   else
-                    xml_value = (value.blank? || value['type'] || value['nil'] == 'true') ? nil : value.inject({}) do |h,(k,v)|
+                    xml_value = value.inject({}) do |h,(k,v)|
                       h[k] = typecast_xml_value(v)
                       h
                     end
                     
                     # Turn { :files => { :file => #<StringIO> } into { :files => #<StringIO> } so it is compatible with
                     # how multipart uploaded files from HTML appear
-                    if xml_value.is_a?(Hash) && xml_value["file"].is_a?(StringIO)
-                      xml_value["file"]
-                    else
-                      xml_value
-                    end
+                    xml_value["file"].is_a?(StringIO) ? xml_value["file"] : xml_value
                   end
-                when "Array"
+                when 'Array'
                   value.map! { |i| typecast_xml_value(i) }
                   case value.length
                     when 0 then nil
                     when 1 then value.first
                     else value
                   end
-                when "String"
+                when 'String'
                   value
                 else
-                  raise "can't typecast #{value.inspect}"
+                  raise "can't typecast #{value.class.name} - #{value.inspect}"
               end
             end
 
diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb
index c2b7a7f1eb..17bfb3a92c 100644
--- a/activesupport/test/core_ext/hash_ext_test.rb
+++ b/activesupport/test/core_ext/hash_ext_test.rb
@@ -588,6 +588,23 @@ class HashToXmlTest < Test::Unit::TestCase
 
     assert_equal expected_bacon_hash, Hash.from_xml(bacon_xml)["bacon"]
   end
+  
+  def test_type_trickles_through_when_unknown
+    product_xml = <<-EOT
+    <product>
+      <weight type="double">0.5</weight>
+      <image type="ProductImage"><filename>image.gif</filename></image>
+      
+    </product>
+    EOT
+
+    expected_product_hash = {
+      :weight => 0.5,
+      :image => {'type' => 'ProductImage', 'filename' => 'image.gif' },
+    }.stringify_keys
+
+    assert_equal expected_product_hash, Hash.from_xml(product_xml)["product"]    
+  end
 
   def test_should_use_default_value_for_unknown_key
     hash_wia = HashWithIndifferentAccess.new(3)
-- 
cgit v1.2.3