Changeset 4895

Timestamp:

09/01/06 16:09:18 (2 years ago)

Author:

rick

Message:

Fix cases where empty xml nodes weren't being translated to nil in Hash.create_from_xml [Rick Olson]

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/core_ext/hash/conversions.rb (modified) (1 diff)
• trunk/activesupport/test/core_ext/hash_ext_test.rb (modified) (1 diff)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fix cases where empty xml nodes weren't being translated to nil in Hash.create_from_xml [Rick Olson]
+
+  <written-on type="date"></written-on> # => { :type => 'date' } # WRONG
+  <written-on type="date"></written-on> # => nil # RIGHT
-
-* Tighten rescue clauses.  #5985 [james@grayproductions.net]

trunk/activesupport/lib/active_support/core_ext/hash/conversions.rb

@@ -102 +102 @@
-                    end
-                  else
-value.empty? || value['nil'] == 'true'
+(value.blank? || value['type'] || value['nil'] == 'true')
-                      h[k] = typecast_xml_value(v)
-                      h

trunk/activesupport/test/core_ext/hash_ext_test.rb

@@ -335 +335 @@
-      :author_email_address => "david@loudthinking.com",
-      :parent_id => nil
+    }.stringify_keys
+
+    assert_equal expected_topic_hash, Hash.create_from_xml(topic_xml)["topic"]
+  end
+
+  def test_single_record_from_xml_with_nil_values
+    topic_xml = <<-EOT
+      <topic>
+        <title></title>
+        <id type="integer"></id>
+        <approved type="boolean"></approved>
+        <written-on type="date"></written-on>
+        <viewed-at type="datetime"></viewed-at>
+        <parent-id></parent-id>
+      </topic>
+    EOT
+
+    expected_topic_hash = {
+      :title      => nil, 
+      :id         => nil,
+      :approved   => nil,
+      :written_on => nil,
+      :viewed_at  => nil, 
+      :parent_id  => nil
-    }.stringify_keys
-