diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | lib/rexml/parsers/baseparser.rb | 2 | ||||
| -rw-r--r-- | test/rexml/parse/test_notation_declaration.rb | 11 |
3 files changed, 21 insertions, 1 deletions
@@ -1,3 +1,12 @@ +Sat Aug 10 11:31:35 2013 Kouhei Sutou <kou@cozmixng.org> + + * lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser::PUBLIC): + Fix loose "head" match regular expression. + [Bug #8701] [ruby-dev:47551] + Patch by Ippei Obayashi. Thanks!!! + * test/rexml/parse/test_notation_declaration.rb (#test_system_public): + Add a test for the above case. + Sat Aug 10 09:20:21 2013 Zachary Scott <e@zzak.io> * NEWS: [DOC] typo in example reported by @moretea diff --git a/lib/rexml/parsers/baseparser.rb b/lib/rexml/parsers/baseparser.rb index a88896c5db..d6ea4f7e23 100644 --- a/lib/rexml/parsers/baseparser.rb +++ b/lib/rexml/parsers/baseparser.rb @@ -77,7 +77,7 @@ module REXML ATTLISTDECL_START = /^\s*<!ATTLIST/um ATTLISTDECL_PATTERN = /^\s*<!ATTLIST\s+#{NAME}(?:#{ATTDEF})*\s*>/um NOTATIONDECL_START = /^\s*<!NOTATION/um - PUBLIC = /^\s*<!NOTATION\s+(\w[\-\w]*)\s+(PUBLIC)\s+(["'])(.*?)\3(?:\s+(["'])(.*?)\5)?\s*>/um + PUBLIC = /\A\s*<!NOTATION\s+(\w[\-\w]*)\s+(PUBLIC)\s+(["'])(.*?)\3(?:\s+(["'])(.*?)\5)?\s*>/um SYSTEM = /^\s*<!NOTATION\s+(\w[\-\w]*)\s+(SYSTEM)\s+(["'])(.*?)\3\s*>/um TEXT_PATTERN = /\A([^<]*)/um diff --git a/test/rexml/parse/test_notation_declaration.rb b/test/rexml/parse/test_notation_declaration.rb index 5111fe483d..af070dd060 100644 --- a/test/rexml/parse/test_notation_declaration.rb +++ b/test/rexml/parse/test_notation_declaration.rb @@ -73,5 +73,16 @@ class TestParseNotationDeclaration < Test::Unit::TestCase end end end + + class TestMixed < self + def test_system_public + doctype = parse(<<-INTERNAL_SUBSET) +<!NOTATION system-name SYSTEM "system-literal"> +<!NOTATION public-name PUBLIC "public-id-literal" 'system-literal'> + INTERNAL_SUBSET + assert_equal(["system-name", "public-name"], + doctype.notations.collect(&:name)) + end + end end end |