aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/xml_mini
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/lib/active_support/xml_mini')
-rw-r--r--activesupport/lib/active_support/xml_mini/libxml.rb8
-rw-r--r--activesupport/lib/active_support/xml_mini/nokogiri.rb6
-rw-r--r--activesupport/lib/active_support/xml_mini/rexml.rb4
3 files changed, 10 insertions, 8 deletions
diff --git a/activesupport/lib/active_support/xml_mini/libxml.rb b/activesupport/lib/active_support/xml_mini/libxml.rb
index 3586b24a6b..370205409a 100644
--- a/activesupport/lib/active_support/xml_mini/libxml.rb
+++ b/activesupport/lib/active_support/xml_mini/libxml.rb
@@ -21,15 +21,15 @@ module ActiveSupport
end
end
-module LibXML
- module Conversions
- module Document
+module LibXML #:nodoc:
+ module Conversions #:nodoc:
+ module Document #:nodoc:
def to_hash
root.to_hash
end
end
- module Node
+ module Node #:nodoc:
CONTENT_ROOT = '__content__'
LIB_XML_LIMIT = 30000000 # Hardcoded LibXML limit
diff --git a/activesupport/lib/active_support/xml_mini/nokogiri.rb b/activesupport/lib/active_support/xml_mini/nokogiri.rb
index 10281584fc..8f9676e4f6 100644
--- a/activesupport/lib/active_support/xml_mini/nokogiri.rb
+++ b/activesupport/lib/active_support/xml_mini/nokogiri.rb
@@ -18,14 +18,14 @@ module ActiveSupport
end
end
- module Conversions
- module Document
+ module Conversions #:nodoc:
+ module Document #:nodoc:
def to_hash
root.to_hash
end
end
- module Node
+ module Node #:nodoc:
CONTENT_ROOT = '__content__'
# Convert XML document to hash
diff --git a/activesupport/lib/active_support/xml_mini/rexml.rb b/activesupport/lib/active_support/xml_mini/rexml.rb
index a8fdeca967..771109514c 100644
--- a/activesupport/lib/active_support/xml_mini/rexml.rb
+++ b/activesupport/lib/active_support/xml_mini/rexml.rb
@@ -56,7 +56,9 @@ module ActiveSupport
hash
else
# must use value to prevent double-escaping
- merge!(hash, CONTENT_KEY, element.texts.sum(&:value))
+ texts = ''
+ element.texts.each { |t| texts << t.value }
+ merge!(hash, CONTENT_KEY, texts)
end
end