Changeset 5522

Timestamp:

11/14/06 09:23:17 (3 years ago)

Author:

bitsweat

Message:

Merge [5521] from trunk.

Files:

• branches/1-2-pre-release/activesupport/CHANGELOG (modified) (1 diff)
• branches/1-2-pre-release/activesupport/lib/active_support/core_ext/hash/conversions.rb (modified) (1 diff)
• branches/1-2-pre-release/activesupport/test/core_ext/hash_ext_test.rb (modified) (1 diff)

branches/1-2-pre-release/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Hash#to_xml handles keys with the same name as Kernel methods.  #6613 [Catfish]
-
-* Don't quote hash keys in Hash#to_json if they're valid JavaScript identifiers.  Disable this with ActiveSupport::JSON.unquote_hash_key_identifiers = false if you need strict JSON compliance. [Sam Stephenson]

branches/1-2-pre-release/activesupport/lib/active_support/core_ext/hash/conversions.rb

@@ -36 +36 @@
-          root = dasherize ? options[:root].to_s.dasherize : options[:root].to_s
-
-
+:method_missing, 
-            each do |key, value|
-              case value

branches/1-2-pre-release/activesupport/test/core_ext/hash_ext_test.rb

@@ -459 +459 @@
-    assert_equal 3, hash_wia.default
-  end
+
+  # The XML builder seems to fail miserably when trying to tag something
+  # with the same name as a Kernel method (throw, test, loop, select ...)
+  def test_kernel_method_names_to_xml
+    hash     = { :throw => { :ball => 'red' } }
+    expected = '<person><throw><ball>red</ball></throw></person>'
+
+    assert_nothing_raised do
+      assert_equal expected, hash.to_xml(@xml_options)
+    end
+  end
-end