Fixed Hash#from_xml with keys that are all caps.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
rails · May 4, 2009 · eb201e6 · eb201e6 · whydealme · Sep 10, 2009
1 parent 8b6d2ef
commit eb201e6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -217,7 +217,7 @@ def unrename_keys(params)
         case params.class.to_s
           when "Hash"
             params.inject({}) do |h,(k,v)|
-              h[k.to_s.underscore.tr("-", "_")] = unrename_keys(v)
+              h[k.to_s.tr("-", "_")] = unrename_keys(v)
               h
             end
           when "Array"

diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb
@@ -646,6 +646,22 @@ def test_single_record_from_xml_with_attributes_other_than_type
     assert_equal expected_topic_hash, Hash.from_xml(topic_xml)["rsp"]["photos"]["photo"]
   end
 
+  def test_all_caps_key_from_xml
+    test_xml = <<-EOT
+      <ABC3XYZ>
+        <TEST>Lorem Ipsum</TEST>
+      </ABC3XYZ>
+    EOT
+
+    expected_hash = {
+      "ABC3XYZ" => {
+        "TEST" => "Lorem Ipsum"
+      }
+    }
+
+    assert_equal expected_hash, Hash.from_xml(test_xml)
+  end
+
   def test_empty_array_from_xml
     blog_xml = <<-XML
       <blog>