diff options
author | Brian Lopez <seniorlopez@gmail.com> | 2009-06-09 09:01:50 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-06-09 09:01:50 -0500 |
commit | 69bc2043f93890048e415dd7c5f1feba5a20d145 (patch) | |
tree | 619404d1d54a50e44a7b2642ece47e2f2a6c17b5 /activesupport/lib/active_support/xml_mini/nokogiri.rb | |
parent | a94e7d7897a300a95d5d5a00c5efc573b42bcb58 (diff) | |
download | rails-69bc2043f93890048e415dd7c5f1feba5a20d145.tar.gz rails-69bc2043f93890048e415dd7c5f1feba5a20d145.tar.bz2 rails-69bc2043f93890048e415dd7c5f1feba5a20d145.zip |
enable *real* IO parsing for the libxml, nokogiri and rexml backends [#2659 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
Diffstat (limited to 'activesupport/lib/active_support/xml_mini/nokogiri.rb')
-rw-r--r-- | activesupport/lib/active_support/xml_mini/nokogiri.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/xml_mini/nokogiri.rb b/activesupport/lib/active_support/xml_mini/nokogiri.rb index 7337c143c9..622523a1b9 100644 --- a/activesupport/lib/active_support/xml_mini/nokogiri.rb +++ b/activesupport/lib/active_support/xml_mini/nokogiri.rb @@ -9,13 +9,15 @@ module ActiveSupport # data:: # XML Document string or IO to parse def parse(data) - if data.respond_to?(:read) - data = data.read + if !data.respond_to?(:read) + data = StringIO.new(data || '') end - - if data.blank? + + char = data.getc + if char.nil? {} else + data.ungetc(char) doc = Nokogiri::XML(data) raise doc.errors.first if doc.errors.length > 0 doc.to_hash |