kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/rexml/parsers/sax2parser.rb (REXML::Parsers::SAX2Parser#parse):

Browse source 
Support NDATA in external entity declaration.
* test/rexml/parser/test_sax2.rb: Add tests for the above case.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42516 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kou 2013-08-11 09:09:25 +00:00
parent 3e5f5f5ca4
commit f61f11a936
3 changed files with 36 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sun Aug 11 18:08:40 2013 Kouhei Sutou <kou@cozmixng.org>
* lib/rexml/parsers/sax2parser.rb (REXML::Parsers::SAX2Parser#parse):
Support NDATA in external entity declaration.
* test/rexml/parser/test_sax2.rb: Add tests for the above case.
Sun Aug 11 18:07:39 2013 Kouhei Sutou <kou@cozmixng.org> Sun Aug 11 18:07:39 2013 Kouhei Sutou <kou@cozmixng.org>
* lib/rexml/parsers/baseparser.rb * lib/rexml/parsers/baseparser.rb

6
lib/rexml/parsers/sax2parser.rb
View file

@ -177,6 +177,12 @@ module REXML
handle( :characters, copy ) handle( :characters, copy )
when :entitydecl when :entitydecl
@entities[ event[1] ] = event[2] if event.size == 3 @entities[ event[1] ] = event[2] if event.size == 3
case event[2]
when "SYSTEM"
event[4, 0] = "NDATA" if event.size == 5
when "PUBLIC"
event[5, 0] = "NDATA" if event.size == 6
end
handle( event[0], event[1..-1] ) handle( event[0], event[1..-1] )
when :processing_instruction, :comment, :attlistdecl, when :processing_instruction, :comment, :attlistdecl,
:elementdecl, :cdata, :notationdecl, :xmldecl :elementdecl, :cdata, :notationdecl, :xmldecl

24
test/rexml/parser/test_sax2.rb
View file

@ -54,6 +54,18 @@ class TestSAX2Parser < Test::Unit::TestCase
class TestExternlID < self class TestExternlID < self
class TestSystem < self class TestSystem < self
def test_with_ndata
declaration = [
"name",
"SYSTEM", "system-literal",
"NDATA", "ndata-name",
]
assert_equal([declaration],
parse(<<-INTERNAL_SUBSET))
<!ENTITY name SYSTEM "system-literal" NDATA ndata-name>
INTERNAL_SUBSET
end
def test_without_ndata def test_without_ndata
declaration = [ declaration = [
"name", "name",
@ -67,6 +79,18 @@ class TestSAX2Parser < Test::Unit::TestCase
end end
class TestPublic < self class TestPublic < self
def test_with_ndata
declaration = [
"name",
"PUBLIC", "public-literal", "system-literal",
"NDATA", "ndata-name",
]
assert_equal([declaration],
parse(<<-INTERNAL_SUBSET))
<!ENTITY name PUBLIC "public-literal" "system-literal" NDATA ndata-name>
INTERNAL_SUBSET
end
def test_without_ndata def test_without_ndata
declaration = [ declaration = [
"name", "name",