Merge pull request #1346 from arunagw/jdom_file_from_xml_fix

Jdom file from xml fix

2 files changed, 22 insertions, 15 deletions

diff --git a/activesupport/lib/active_support/xml_mini/jdom.rb b/activesupport/lib/active_support/xml_mini/jdom.rb
index 7aefabfdd1..6c222b83ba 100644
--- a/activesupport/lib/active_support/xml_mini/jdom.rb
+++ b/activesupport/lib/active_support/xml_mini/jdom.rb
@@ -41,7 +41,7 @@ module ActiveSupport
         xml_string_reader = StringReader.new(data)
         xml_input_source = InputSource.new(xml_string_reader)
         doc = @dbf.new_document_builder.parse(xml_input_source)
-        merge_element!({}, doc.document_element)
+        merge_element!({CONTENT_KEY => ''}, doc.document_element)
       end
     end
 
@@ -54,9 +54,14 @@ module ActiveSupport
     # element::
     #   XML element to merge into hash
     def merge_element!(hash, element)
+      delete_empty(hash)
       merge!(hash, element.tag_name, collapse(element))
     end
 
+    def delete_empty(hash)
+      hash.delete(CONTENT_KEY) if hash[CONTENT_KEY] == ''
+    end
+
     # Actually converts an XML document element into a data structure.
     #
     # element::
@@ -84,6 +89,7 @@ module ActiveSupport
     # element::
     #   XML element whose texts are to me merged into the hash
     def merge_texts!(hash, element)
+      delete_empty(hash)
       text_children = texts(element)
       if text_children.join.empty?
         hash
@@ -128,6 +134,7 @@ module ActiveSupport
       attribute_hash = {}
       attributes = element.attributes
       for i in 0...attributes.length
+         attribute_hash[CONTENT_KEY] ||= ''
          attribute_hash[attributes.item(i).name] =  attributes.item(i).value
        end
       attribute_hash
diff --git a/activesupport/test/xml_mini/jdom_engine_test.rb b/activesupport/test/xml_mini/jdom_engine_test.rb
index 3fe5e4fd78..7f809e7898 100644
--- a/activesupport/test/xml_mini/jdom_engine_test.rb
+++ b/activesupport/test/xml_mini/jdom_engine_test.rb
@@ -15,20 +15,20 @@ if RUBY_PLATFORM =~ /java/
       XmlMini.backend = @default_backend
     end
 
-    # def test_file_from_xml
-    #   hash = Hash.from_xml(<<-eoxml)
-    #     <blog>
-    #       <logo type="file" name="logo.png" content_type="image/png">
-    #       </logo>
-    #     </blog>
-    #   eoxml
-    #   assert hash.has_key?('blog')
-    #   assert hash['blog'].has_key?('logo')
-    #
-    #   file = hash['blog']['logo']
-    #   assert_equal 'logo.png', file.original_filename
-    #   assert_equal 'image/png', file.content_type
-    # end
+    def test_file_from_xml
+       hash = Hash.from_xml(<<-eoxml)
+         <blog>
+           <logo type="file" name="logo.png" content_type="image/png">
+           </logo>
+         </blog>
+       eoxml
+       assert hash.has_key?('blog')
+       assert hash['blog'].has_key?('logo')
+
+       file = hash['blog']['logo']
+       assert_equal 'logo.png', file.original_filename
+       assert_equal 'image/png', file.content_type
+    end
 
     def test_exception_thrown_on_expansion_attack
       assert_raise NativeException do