github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some bugs and fixed some tests in new SAX-based XmlMini backends.

Browse Source 
[#3636 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
This commit is contained in:
Willem van Bergen
2010-01-01 13:44:42 +01:00
committed by Jeremy Kemper
parent 96a2b3905c
commit 689984ddd3
5 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
activesupport/lib/active_support/xml_mini/libxmlsax.rb
View File

@@ -21,16 +21,13 @@ module ActiveSupport
end
def on_start_document
@hash = {}
@hash = { CONTENT_KEY => '' }
@hash_stack = [@hash]
end
def on_end_document
raise "Parse stack not empty!" if @hash_stack.size > 1
end
def on_error(error_message)
raise LibXML::XML::Error, error_message
@hash = @hash_stack.pop
@hash.delete(CONTENT_KEY)
end
def on_start_element(name, attrs = {})
@@ -73,8 +70,11 @@ module ActiveSupport
{}
else
data.ungetc(char)
document = self.document_class.new
LibXML::XML::Error.set_handler(&LibXML::XML::Error::QUIET_HANDLER)
parser = LibXML::XML::SaxParser.io(data)
document = self.document_class.new
parser.callbacks = document
parser.parse
document.hash

2
activesupport/lib/active_support/xml_mini/nokogirisax.rb
View File

@@ -28,7 +28,7 @@ module ActiveSupport
end
def error(error_message)
raise Nokogiri::XML::SyntaxError, error_message
raise error_message
end
def start_element(name, attrs = [])

8
activesupport/test/core_ext/hash_ext_test.rb
View File

@@ -902,9 +902,11 @@ class HashToXmlTest < Test::Unit::TestCase
def test_expansion_count_is_limited
expected = {
'ActiveSupport::XmlMini_REXML' => 'RuntimeError',
'ActiveSupport::XmlMini_Nokogiri' => 'Nokogiri::XML::SyntaxError',
'ActiveSupport::XmlMini_LibXML' => 'LibXML::XML::Error',
'ActiveSupport::XmlMini_REXML' => 'RuntimeError',
'ActiveSupport::XmlMini_Nokogiri' => 'Nokogiri::XML::SyntaxError',
'ActiveSupport::XmlMini_NokogiriSAX' => 'RuntimeError',
'ActiveSupport::XmlMini_LibXML' => 'LibXML::XML::Error',
'ActiveSupport::XmlMini_LibXMLSAX' => 'LibXML::XML::Error',
}[ActiveSupport::XmlMini.backend.name].constantize
assert_raise expected do

8
activesupport/test/xml_mini/libxmlsax_engine_test.rb
View File

@@ -14,8 +14,6 @@ class LibXMLSAXEngineTest < Test::Unit::TestCase
def setup
@default_backend = XmlMini.backend
XmlMini.backend = 'LibXMLSAX'
LibXML::XML::Error.set_handler(&lambda { |error| }) #silence libxml, exceptions will do
end
def teardown
@@ -24,7 +22,8 @@ class LibXMLSAXEngineTest < Test::Unit::TestCase
def test_exception_thrown_on_expansion_attack
assert_raise LibXML::XML::Error do
attack_xml = %{<?xml version="1.0" encoding="UTF-8"?>
attack_xml = <<-EOT
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE member [
<!ENTITY a "&b;&b;&b;&b;&b;&b;&b;&b;&b;&b;">
<!ENTITY b "&c;&c;&c;&c;&c;&c;&c;&c;&c;&c;">
@@ -37,7 +36,8 @@ class LibXMLSAXEngineTest < Test::Unit::TestCase
<member>
&a;
</member>
}
EOT
Hash.from_xml(attack_xml)
end
end

5
activesupport/test/xml_mini/nokogirisax_engine_test.rb
View File

@@ -8,7 +8,7 @@ rescue LoadError
# Skip nokogiri tests
else
class NokogiriEngineTest < Test::Unit::TestCase
class NokogiriSAXEngineTest < Test::Unit::TestCase
include ActiveSupport
def setup
@@ -36,7 +36,7 @@ class NokogiriEngineTest < Test::Unit::TestCase
end
def test_exception_thrown_on_expansion_attack
assert_raise Nokogiri::XML::SyntaxError do
assert_raise RuntimeError do
attack_xml = <<-EOT
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE member [
@@ -52,6 +52,7 @@ class NokogiriEngineTest < Test::Unit::TestCase
&a;
</member>
EOT
Hash.from_xml(attack_xml)
end
end