Permalink
Browse files

Fixing XMLMini_JDOM #3-0-stable

  • Loading branch information...
1 parent c3cbd2c commit 64310879e934250ab8711101821c194a52e99644 @arunagw arunagw committed May 28, 2011
Showing with 10 additions and 3 deletions.
  1. +10 −3 activesupport/lib/active_support/xml_mini/jdom.rb
@@ -41,7 +41,7 @@ def parse(data)
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 @@ def parse(data)
# 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 @@ def collapse(element)
# 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,8 +134,9 @@ def get_attributes(element)
attribute_hash = {}
attributes = element.attributes
for i in 0...attributes.length
- attribute_hash[attributes.item(i).name] = attributes.item(i).value
- end
+ attribute_hash[CONTENT_KEY] ||= ''
+ attribute_hash[attributes.item(i).name] = attributes.item(i).value
+ end
attribute_hash
end

0 comments on commit 6431087

Please sign in to comment.