2015-12-16 00:07:31 -05:00
|
|
|
# frozen_string_literal: false
|
2018-11-02 13:52:33 -04:00
|
|
|
require_relative 'baseparser'
|
|
|
|
require_relative '../parseexception'
|
|
|
|
require_relative '../namespace'
|
|
|
|
require_relative '../text'
|
2003-12-08 21:41:33 -05:00
|
|
|
|
2003-06-09 21:31:01 -04:00
|
|
|
module REXML
|
2008-10-01 09:46:53 -04:00
|
|
|
module Parsers
|
Short summary:
This is a version bump to REXML 3.1.4 for Ruby HEAD. This change log is
identical to the log for the 1.8 branch.
It includes numerous bug fixes and is a pretty big patch, but is nonetheless
a minor revision bump, since the API hasn't changed.
For more information, see:
http:/www.germane-software.com/projects/rexml/milestone/3.1.4
For all tickets, see:
http://www.germane-software.com/projects/rexml/ticket/#
Where '#' is replaced with the ticket number.
Changelog:
* Fixed the documentation WRT the raw mode of text nodes (ticket #4)
* Fixes roundup ticket #43: substring-after bug.
* Fixed ticket #44, Element#xpath
* Patch submitted by an anonymous doner to allow parsing of Tempfiles. I was
hoping that, by now, that whole Source thing would have been changed to use
duck typing and avoid this sort of ticket... but in the meantime, the patch
has been applied.
* Fixes ticket:30, XPath default namespace bug. The fix was provided
by Lucas Nussbaum.
* Aliases #size to #length, as per zdennis's request.
* Fixes typo from previous commit
* Fixes ticket #32, preceding-sibling fails attempting delete_if on nil nodeset
* Merges a user-contributed patch for ticket #40
* Adds a forgotten-to-commit unit test for ticket #32
* Changes Date, Version, and Copyright to upper case, to avoid conflicts with
the Date class. All of the other changes in the altered files are because
Subversion doesn't allow block-level commits, like it should. English cased
Version and Copyright are aliased to the upper case versions, for partial
backward compatability.
* Resolves ticket #34, SAX parser change makes it impossible to parse IO feeds.
* Moves parser.source.position() to parser.position()
* Fixes ticket:48, repeated writes munging text content
* Fixes ticket:46, adding methods for accessing notation DTD information.
* Encodes some characters and removes a brokes link in the documentation
* Deals with carriage returns after XML declarations
* Improved doctype handling
* Whitespace handling changes
* Applies a patch by David Tardon, which (incidentally) fixes ticket:50
* Closes #26, allowing anything that walks like an IO to be a source.
* Ticket #31 - One unescape too many
This wasn't really a bug, per se... "value" always returns
a normalized string, and "value" is the method used to get
the text() of an element. However, entities have no meaning
in CDATA sections, so there's no justification for value
to be normalizing the content of CData objects. This behavior
has therefore been changed.
* Ticket #45 -- Now parses notation declarations in DTDs properly.
* Resolves ticket #49, Document.parse_stream returns ArgumentError
* Adds documentation to clarify how XMLDecl works, to avoid invalid bug reports.
* Addresses ticket #10, fixing the StreamParser API for DTDs.
* Fixes ticket #42, XPath node-set function 'name' fails with relative node
set parameter
* Good patch by Aaron to fix ticket #53: REXML ignoring unbalanced tags
at the end of a document.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10092 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-04-15 00:11:04 -04:00
|
|
|
# SAX2Parser
|
2008-10-01 09:46:53 -04:00
|
|
|
class SAX2Parser
|
|
|
|
def initialize source
|
|
|
|
@parser = BaseParser.new(source)
|
|
|
|
@listeners = []
|
|
|
|
@procs = []
|
|
|
|
@namespace_stack = []
|
|
|
|
@has_listeners = false
|
|
|
|
@tag_stack = []
|
Merged in development from the main REXML repository.
* Fixed bug #34, typo in xpath_parser.
* Previous fix, (include? -> includes?) was incorrect.
* Added another test for encoding
* Started AnyName support in RelaxNG
* Added Element#Attributes#to_a, so that it does something intelligent.
This was needed by XPath, for '@*'
* Fixed XPath so that @* works.
* Added xmlgrep to the bin/ directory. A little tool allowing you to grep
for XPaths in an XML document.
* Fixed a CDATA pretty-printing bug. (#39)
* Fixed a buffering bug in Source.rb that affected the SAX parser
This bug was related to how REXML determines the encoding of a file, and
evinced itself by hanging on input when using the SAX parser.
* The unit test for the previous patch. Forgot to commit it.
* Minor pretty printing fix.
* Applied Curt Sampson's optimization improvements
* Issue #9; 3.1.3: The SAX parser was not denormalizing entity references
in incoming text. All declared internal entities, as well as numeric
entities, should now be denormalized. There was a related bug in that the
SAX parser was actually double-encoding entities; this is also fixed.
* bin/* programs should now be executable. Setting bin apps to executable
* Issue 14; 3.1.3: DTD events are now all being passed by StreamParser
Some of the DTD events were not being passed through by the stream parser.
* #26: Element#add_element(nil) now raises an error Changed XPath searches so
that if a non-Hash is passed, an error is raised Fixed a spurrious undefined
method error in encoding. #29: XPath ordering bug fixed by Mark Williams.
Incidentally, Mark supplied a superlative bug report, including a full unit
test. Then he went ahead and fixed the bug. It doesn't get any better than
this, folks.
* Fixed a broken link. Thanks to Dick Davies for pointing it out. Added
functions courtesy of Michael Neumann <mneumann@xxxx.de>.
Example code to follow.
* Added Michael's sample code. Merged the changes in from branches/xpath_V
* Fixed preceding:: and following:: axis Fixed the ordering bug that Martin
Fowler reported.
* Uncommented some code commented for testing Applied Nobu's changes to the
Encoding infrastructure, which should fix potential threading issues.
* Added more tests, and the missing syncenumerator class. Fixed the
inheritance bug in the pull parser that James Britt found. Indentation
changes, and changed some exceptions to runtime
exceptions.
* Changes by Matz, mostly of indent -> indent_level, to avoid
function/variable naming conflicts
* Tabs -> spaces (whitespace)
Note the addition of syncenumerator.rb. This is a stopgap, until I can work on
the class enough to get it accepted as a replacement for the SyncEnumerator
that comes with the Generator class. My version is orders of magnitude faster
than the Generator SyncEnumerator, but is currently missing a couple of
features of the original. Eventually, I expect this class to migrate to
another part of the source tree.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8483 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-05-18 22:58:11 -04:00
|
|
|
@entities = {}
|
2008-10-01 09:46:53 -04:00
|
|
|
end
|
Merged from REXML main repository:
Fixes ticket:68.
NOTE that this involves an API change! Entity declarations in the doctype
now generate events that carry two, not one, arguments.
Implements ticket:15, using gwrite's suggestion. This allows Element to be
subclassed.
Two unrelated changes, because subversion is retarded and doesn't do
block-level commits:
1) Fixed a typo bug in previous change for ticket:15
2) Fixed namespaces handling in XPath and element.
***** Note that this is an API change!!! *****
Element.namespaces() now returns a hash of namespace mappings which are
relevant for that node.
Fixes a bug in multiple decodings
The changeset 1230:1231 was bad. The default behavior is *not* to use the
native REXML encodings by default, but rather to use ICONV by default. I know
that this will piss some people off, but defaulting to the pure Ruby version
isn't the correct solution, and it breaks other encodings, so I've reverted it.
* Fixes ticket:61 (xpath_parser)
* Fixes ticket:63 (UTF-16; UNILE decoding was bad)
* Cleans up some tests, removing opportunities for test corruption
* Improves parsing error messages a little
* Adds the ability to override the encoding detection in Source construction
* Fixes an edge case in Functions::string, where document nodes weren't
correctly converted
* Fixes Functions::string() for Element and Document nodes
* Fixes some problems in entity handling
Addresses ticket:66
Fixes ticket:71
Addresses ticket:78
NOTE: that this also fixes what is technically another bug in REXML. REXML's
XPath parser used to allow exponential notation in numbers. The XPath spec
is specific about what a number is, and scientific notation is not included.
Therefore, this has been fixed.
Cross-ported a fix for ticket:88 from CVS.
Fixes ticket:80
Documentation cleanup. Ticket:84
Applied Kou's fix for an un-trac'ed bug.
------------------------------------------------------------------------
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11548 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-01-19 22:56:02 -05:00
|
|
|
|
|
|
|
def source
|
|
|
|
@parser.source
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2004-06-09 22:01:04 -04:00
|
|
|
def add_listener( listener )
|
|
|
|
@parser.add_listener( listener )
|
|
|
|
end
|
|
|
|
|
2008-10-01 09:46:53 -04:00
|
|
|
# Listen arguments:
|
|
|
|
#
|
|
|
|
# Symbol, Array, Block
|
2011-05-18 20:07:25 -04:00
|
|
|
# Listen to Symbol events on Array elements
|
2008-10-01 09:46:53 -04:00
|
|
|
# Symbol, Block
|
|
|
|
# Listen to Symbol events
|
|
|
|
# Array, Listener
|
2011-05-18 20:07:25 -04:00
|
|
|
# Listen to all events on Array elements
|
2008-10-01 09:46:53 -04:00
|
|
|
# Array, Block
|
2011-05-18 20:07:25 -04:00
|
|
|
# Listen to :start_element events on Array elements
|
2008-10-01 09:46:53 -04:00
|
|
|
# Listener
|
2011-05-18 20:07:25 -04:00
|
|
|
# Listen to All events
|
2008-10-01 09:46:53 -04:00
|
|
|
#
|
|
|
|
# Symbol can be one of: :start_element, :end_element,
|
|
|
|
# :start_prefix_mapping, :end_prefix_mapping, :characters,
|
|
|
|
# :processing_instruction, :doctype, :attlistdecl, :elementdecl,
|
|
|
|
# :entitydecl, :notationdecl, :cdata, :xmldecl, :comment
|
Short summary:
This is a version bump to REXML 3.1.4 for Ruby HEAD. This change log is
identical to the log for the 1.8 branch.
It includes numerous bug fixes and is a pretty big patch, but is nonetheless
a minor revision bump, since the API hasn't changed.
For more information, see:
http:/www.germane-software.com/projects/rexml/milestone/3.1.4
For all tickets, see:
http://www.germane-software.com/projects/rexml/ticket/#
Where '#' is replaced with the ticket number.
Changelog:
* Fixed the documentation WRT the raw mode of text nodes (ticket #4)
* Fixes roundup ticket #43: substring-after bug.
* Fixed ticket #44, Element#xpath
* Patch submitted by an anonymous doner to allow parsing of Tempfiles. I was
hoping that, by now, that whole Source thing would have been changed to use
duck typing and avoid this sort of ticket... but in the meantime, the patch
has been applied.
* Fixes ticket:30, XPath default namespace bug. The fix was provided
by Lucas Nussbaum.
* Aliases #size to #length, as per zdennis's request.
* Fixes typo from previous commit
* Fixes ticket #32, preceding-sibling fails attempting delete_if on nil nodeset
* Merges a user-contributed patch for ticket #40
* Adds a forgotten-to-commit unit test for ticket #32
* Changes Date, Version, and Copyright to upper case, to avoid conflicts with
the Date class. All of the other changes in the altered files are because
Subversion doesn't allow block-level commits, like it should. English cased
Version and Copyright are aliased to the upper case versions, for partial
backward compatability.
* Resolves ticket #34, SAX parser change makes it impossible to parse IO feeds.
* Moves parser.source.position() to parser.position()
* Fixes ticket:48, repeated writes munging text content
* Fixes ticket:46, adding methods for accessing notation DTD information.
* Encodes some characters and removes a brokes link in the documentation
* Deals with carriage returns after XML declarations
* Improved doctype handling
* Whitespace handling changes
* Applies a patch by David Tardon, which (incidentally) fixes ticket:50
* Closes #26, allowing anything that walks like an IO to be a source.
* Ticket #31 - One unescape too many
This wasn't really a bug, per se... "value" always returns
a normalized string, and "value" is the method used to get
the text() of an element. However, entities have no meaning
in CDATA sections, so there's no justification for value
to be normalizing the content of CData objects. This behavior
has therefore been changed.
* Ticket #45 -- Now parses notation declarations in DTDs properly.
* Resolves ticket #49, Document.parse_stream returns ArgumentError
* Adds documentation to clarify how XMLDecl works, to avoid invalid bug reports.
* Addresses ticket #10, fixing the StreamParser API for DTDs.
* Fixes ticket #42, XPath node-set function 'name' fails with relative node
set parameter
* Good patch by Aaron to fix ticket #53: REXML ignoring unbalanced tags
at the end of a document.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10092 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-04-15 00:11:04 -04:00
|
|
|
#
|
|
|
|
# There is an additional symbol that can be listened for: :progress.
|
2009-03-05 22:56:38 -05:00
|
|
|
# This will be called for every event generated, passing in the current
|
Short summary:
This is a version bump to REXML 3.1.4 for Ruby HEAD. This change log is
identical to the log for the 1.8 branch.
It includes numerous bug fixes and is a pretty big patch, but is nonetheless
a minor revision bump, since the API hasn't changed.
For more information, see:
http:/www.germane-software.com/projects/rexml/milestone/3.1.4
For all tickets, see:
http://www.germane-software.com/projects/rexml/ticket/#
Where '#' is replaced with the ticket number.
Changelog:
* Fixed the documentation WRT the raw mode of text nodes (ticket #4)
* Fixes roundup ticket #43: substring-after bug.
* Fixed ticket #44, Element#xpath
* Patch submitted by an anonymous doner to allow parsing of Tempfiles. I was
hoping that, by now, that whole Source thing would have been changed to use
duck typing and avoid this sort of ticket... but in the meantime, the patch
has been applied.
* Fixes ticket:30, XPath default namespace bug. The fix was provided
by Lucas Nussbaum.
* Aliases #size to #length, as per zdennis's request.
* Fixes typo from previous commit
* Fixes ticket #32, preceding-sibling fails attempting delete_if on nil nodeset
* Merges a user-contributed patch for ticket #40
* Adds a forgotten-to-commit unit test for ticket #32
* Changes Date, Version, and Copyright to upper case, to avoid conflicts with
the Date class. All of the other changes in the altered files are because
Subversion doesn't allow block-level commits, like it should. English cased
Version and Copyright are aliased to the upper case versions, for partial
backward compatability.
* Resolves ticket #34, SAX parser change makes it impossible to parse IO feeds.
* Moves parser.source.position() to parser.position()
* Fixes ticket:48, repeated writes munging text content
* Fixes ticket:46, adding methods for accessing notation DTD information.
* Encodes some characters and removes a brokes link in the documentation
* Deals with carriage returns after XML declarations
* Improved doctype handling
* Whitespace handling changes
* Applies a patch by David Tardon, which (incidentally) fixes ticket:50
* Closes #26, allowing anything that walks like an IO to be a source.
* Ticket #31 - One unescape too many
This wasn't really a bug, per se... "value" always returns
a normalized string, and "value" is the method used to get
the text() of an element. However, entities have no meaning
in CDATA sections, so there's no justification for value
to be normalizing the content of CData objects. This behavior
has therefore been changed.
* Ticket #45 -- Now parses notation declarations in DTDs properly.
* Resolves ticket #49, Document.parse_stream returns ArgumentError
* Adds documentation to clarify how XMLDecl works, to avoid invalid bug reports.
* Addresses ticket #10, fixing the StreamParser API for DTDs.
* Fixes ticket #42, XPath node-set function 'name' fails with relative node
set parameter
* Good patch by Aaron to fix ticket #53: REXML ignoring unbalanced tags
at the end of a document.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10092 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-04-15 00:11:04 -04:00
|
|
|
# stream position.
|
2008-10-01 09:46:53 -04:00
|
|
|
#
|
|
|
|
# Array contains regular expressions or strings which will be matched
|
|
|
|
# against fully qualified element names.
|
|
|
|
#
|
|
|
|
# Listener must implement the methods in SAX2Listener
|
|
|
|
#
|
|
|
|
# Block will be passed the same arguments as a SAX2Listener method would
|
|
|
|
# be, where the method name is the same as the matched Symbol.
|
|
|
|
# See the SAX2Listener for more information.
|
|
|
|
def listen( *args, &blok )
|
|
|
|
if args[0].kind_of? Symbol
|
|
|
|
if args.size == 2
|
|
|
|
args[1].each { |match| @procs << [args[0], match, blok] }
|
|
|
|
else
|
|
|
|
add( [args[0], nil, blok] )
|
|
|
|
end
|
|
|
|
elsif args[0].kind_of? Array
|
|
|
|
if args.size == 2
|
|
|
|
args[0].each { |match| add( [nil, match, args[1]] ) }
|
|
|
|
else
|
|
|
|
args[0].each { |match| add( [ :start_element, match, blok ] ) }
|
|
|
|
end
|
|
|
|
else
|
|
|
|
add([nil, nil, args[0]])
|
|
|
|
end
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2008-10-01 09:46:53 -04:00
|
|
|
def deafen( listener=nil, &blok )
|
|
|
|
if listener
|
|
|
|
@listeners.delete_if {|item| item[-1] == listener }
|
|
|
|
@has_listeners = false if @listeners.size == 0
|
|
|
|
else
|
|
|
|
@procs.delete_if {|item| item[-1] == blok }
|
|
|
|
end
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2008-10-01 09:46:53 -04:00
|
|
|
def parse
|
|
|
|
@procs.each { |sym,match,block| block.call if sym == :start_document }
|
2009-03-05 22:56:38 -05:00
|
|
|
@listeners.each { |sym,match,block|
|
2008-10-01 09:46:53 -04:00
|
|
|
block.start_document if sym == :start_document or sym.nil?
|
|
|
|
}
|
2010-11-08 15:59:01 -05:00
|
|
|
context = []
|
2008-10-01 09:46:53 -04:00
|
|
|
while true
|
|
|
|
event = @parser.pull
|
|
|
|
case event[0]
|
|
|
|
when :end_document
|
|
|
|
handle( :end_document )
|
|
|
|
break
|
2007-10-01 21:45:19 -04:00
|
|
|
when :start_doctype
|
|
|
|
handle( :doctype, *event[1..-1])
|
2008-10-01 09:46:53 -04:00
|
|
|
when :end_doctype
|
|
|
|
context = context[1]
|
|
|
|
when :start_element
|
|
|
|
@tag_stack.push(event[1])
|
|
|
|
# find the observers for namespaces
|
|
|
|
procs = get_procs( :start_prefix_mapping, event[1] )
|
|
|
|
listeners = get_listeners( :start_prefix_mapping, event[1] )
|
|
|
|
if procs or listeners
|
|
|
|
# break out the namespace declarations
|
|
|
|
# The attributes live in event[2]
|
|
|
|
event[2].each {|n, v| event[2][n] = @parser.normalize(v)}
|
|
|
|
nsdecl = event[2].find_all { |n, value| n =~ /^xmlns(:|$)/ }
|
|
|
|
nsdecl.collect! { |n, value| [ n[6..-1], value ] }
|
|
|
|
@namespace_stack.push({})
|
|
|
|
nsdecl.each do |n,v|
|
|
|
|
@namespace_stack[-1][n] = v
|
|
|
|
# notify observers of namespaces
|
|
|
|
procs.each { |ob| ob.call( n, v ) } if procs
|
|
|
|
listeners.each { |ob| ob.start_prefix_mapping(n, v) } if listeners
|
|
|
|
end
|
|
|
|
end
|
|
|
|
event[1] =~ Namespace::NAMESPLIT
|
|
|
|
prefix = $1
|
|
|
|
local = $2
|
|
|
|
uri = get_namespace(prefix)
|
|
|
|
# find the observers for start_element
|
|
|
|
procs = get_procs( :start_element, event[1] )
|
|
|
|
listeners = get_listeners( :start_element, event[1] )
|
|
|
|
# notify observers
|
|
|
|
procs.each { |ob| ob.call( uri, local, event[1], event[2] ) } if procs
|
2009-03-05 22:56:38 -05:00
|
|
|
listeners.each { |ob|
|
|
|
|
ob.start_element( uri, local, event[1], event[2] )
|
2008-10-01 09:46:53 -04:00
|
|
|
} if listeners
|
|
|
|
when :end_element
|
|
|
|
@tag_stack.pop
|
|
|
|
event[1] =~ Namespace::NAMESPLIT
|
|
|
|
prefix = $1
|
|
|
|
local = $2
|
|
|
|
uri = get_namespace(prefix)
|
|
|
|
# find the observers for start_element
|
|
|
|
procs = get_procs( :end_element, event[1] )
|
|
|
|
listeners = get_listeners( :end_element, event[1] )
|
|
|
|
# notify observers
|
|
|
|
procs.each { |ob| ob.call( uri, local, event[1] ) } if procs
|
2009-03-05 22:56:38 -05:00
|
|
|
listeners.each { |ob|
|
|
|
|
ob.end_element( uri, local, event[1] )
|
2008-10-01 09:46:53 -04:00
|
|
|
} if listeners
|
2003-06-09 21:31:01 -04:00
|
|
|
|
2008-10-01 09:46:53 -04:00
|
|
|
namespace_mapping = @namespace_stack.pop
|
|
|
|
# find the observers for namespaces
|
|
|
|
procs = get_procs( :end_prefix_mapping, event[1] )
|
|
|
|
listeners = get_listeners( :end_prefix_mapping, event[1] )
|
|
|
|
if procs or listeners
|
|
|
|
namespace_mapping.each do |ns_prefix, ns_uri|
|
|
|
|
# notify observers of namespaces
|
|
|
|
procs.each { |ob| ob.call( ns_prefix ) } if procs
|
|
|
|
listeners.each { |ob| ob.end_prefix_mapping(ns_prefix) } if listeners
|
|
|
|
end
|
|
|
|
end
|
|
|
|
when :text
|
Merged in development from the main REXML repository.
* Fixed bug #34, typo in xpath_parser.
* Previous fix, (include? -> includes?) was incorrect.
* Added another test for encoding
* Started AnyName support in RelaxNG
* Added Element#Attributes#to_a, so that it does something intelligent.
This was needed by XPath, for '@*'
* Fixed XPath so that @* works.
* Added xmlgrep to the bin/ directory. A little tool allowing you to grep
for XPaths in an XML document.
* Fixed a CDATA pretty-printing bug. (#39)
* Fixed a buffering bug in Source.rb that affected the SAX parser
This bug was related to how REXML determines the encoding of a file, and
evinced itself by hanging on input when using the SAX parser.
* The unit test for the previous patch. Forgot to commit it.
* Minor pretty printing fix.
* Applied Curt Sampson's optimization improvements
* Issue #9; 3.1.3: The SAX parser was not denormalizing entity references
in incoming text. All declared internal entities, as well as numeric
entities, should now be denormalized. There was a related bug in that the
SAX parser was actually double-encoding entities; this is also fixed.
* bin/* programs should now be executable. Setting bin apps to executable
* Issue 14; 3.1.3: DTD events are now all being passed by StreamParser
Some of the DTD events were not being passed through by the stream parser.
* #26: Element#add_element(nil) now raises an error Changed XPath searches so
that if a non-Hash is passed, an error is raised Fixed a spurrious undefined
method error in encoding. #29: XPath ordering bug fixed by Mark Williams.
Incidentally, Mark supplied a superlative bug report, including a full unit
test. Then he went ahead and fixed the bug. It doesn't get any better than
this, folks.
* Fixed a broken link. Thanks to Dick Davies for pointing it out. Added
functions courtesy of Michael Neumann <mneumann@xxxx.de>.
Example code to follow.
* Added Michael's sample code. Merged the changes in from branches/xpath_V
* Fixed preceding:: and following:: axis Fixed the ordering bug that Martin
Fowler reported.
* Uncommented some code commented for testing Applied Nobu's changes to the
Encoding infrastructure, which should fix potential threading issues.
* Added more tests, and the missing syncenumerator class. Fixed the
inheritance bug in the pull parser that James Britt found. Indentation
changes, and changed some exceptions to runtime
exceptions.
* Changes by Matz, mostly of indent -> indent_level, to avoid
function/variable naming conflicts
* Tabs -> spaces (whitespace)
Note the addition of syncenumerator.rb. This is a stopgap, until I can work on
the class enough to get it accepted as a replacement for the SyncEnumerator
that comes with the Generator class. My version is orders of magnitude faster
than the Generator SyncEnumerator, but is currently missing a couple of
features of the original. Eventually, I expect this class to migrate to
another part of the source tree.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8483 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-05-18 22:58:11 -04:00
|
|
|
#normalized = @parser.normalize( event[1] )
|
|
|
|
#handle( :characters, normalized )
|
|
|
|
copy = event[1].clone
|
2008-01-01 00:43:50 -05:00
|
|
|
|
2009-03-05 22:56:38 -05:00
|
|
|
esub = proc { |match|
|
2008-01-01 00:43:50 -05:00
|
|
|
if @entities.has_key?($1)
|
|
|
|
@entities[$1].gsub(Text::REFERENCE, &esub)
|
|
|
|
else
|
|
|
|
match
|
|
|
|
end
|
|
|
|
}
|
|
|
|
|
|
|
|
copy.gsub!( Text::REFERENCE, &esub )
|
Merged in development from the main REXML repository.
* Fixed bug #34, typo in xpath_parser.
* Previous fix, (include? -> includes?) was incorrect.
* Added another test for encoding
* Started AnyName support in RelaxNG
* Added Element#Attributes#to_a, so that it does something intelligent.
This was needed by XPath, for '@*'
* Fixed XPath so that @* works.
* Added xmlgrep to the bin/ directory. A little tool allowing you to grep
for XPaths in an XML document.
* Fixed a CDATA pretty-printing bug. (#39)
* Fixed a buffering bug in Source.rb that affected the SAX parser
This bug was related to how REXML determines the encoding of a file, and
evinced itself by hanging on input when using the SAX parser.
* The unit test for the previous patch. Forgot to commit it.
* Minor pretty printing fix.
* Applied Curt Sampson's optimization improvements
* Issue #9; 3.1.3: The SAX parser was not denormalizing entity references
in incoming text. All declared internal entities, as well as numeric
entities, should now be denormalized. There was a related bug in that the
SAX parser was actually double-encoding entities; this is also fixed.
* bin/* programs should now be executable. Setting bin apps to executable
* Issue 14; 3.1.3: DTD events are now all being passed by StreamParser
Some of the DTD events were not being passed through by the stream parser.
* #26: Element#add_element(nil) now raises an error Changed XPath searches so
that if a non-Hash is passed, an error is raised Fixed a spurrious undefined
method error in encoding. #29: XPath ordering bug fixed by Mark Williams.
Incidentally, Mark supplied a superlative bug report, including a full unit
test. Then he went ahead and fixed the bug. It doesn't get any better than
this, folks.
* Fixed a broken link. Thanks to Dick Davies for pointing it out. Added
functions courtesy of Michael Neumann <mneumann@xxxx.de>.
Example code to follow.
* Added Michael's sample code. Merged the changes in from branches/xpath_V
* Fixed preceding:: and following:: axis Fixed the ordering bug that Martin
Fowler reported.
* Uncommented some code commented for testing Applied Nobu's changes to the
Encoding infrastructure, which should fix potential threading issues.
* Added more tests, and the missing syncenumerator class. Fixed the
inheritance bug in the pull parser that James Britt found. Indentation
changes, and changed some exceptions to runtime
exceptions.
* Changes by Matz, mostly of indent -> indent_level, to avoid
function/variable naming conflicts
* Tabs -> spaces (whitespace)
Note the addition of syncenumerator.rb. This is a stopgap, until I can work on
the class enough to get it accepted as a replacement for the SyncEnumerator
that comes with the Generator class. My version is orders of magnitude faster
than the Generator SyncEnumerator, but is currently missing a couple of
features of the original. Eventually, I expect this class to migrate to
another part of the source tree.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8483 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-05-18 22:58:11 -04:00
|
|
|
copy.gsub!( Text::NUMERICENTITY ) {|m|
|
|
|
|
m=$1
|
|
|
|
m = "0#{m}" if m[0] == ?x
|
|
|
|
[Integer(m)].pack('U*')
|
|
|
|
}
|
|
|
|
handle( :characters, copy )
|
|
|
|
when :entitydecl
|
2013-08-11 05:42:37 -04:00
|
|
|
handle_entitydecl( event )
|
2009-03-05 22:56:38 -05:00
|
|
|
when :processing_instruction, :comment, :attlistdecl,
|
2008-10-01 09:46:53 -04:00
|
|
|
:elementdecl, :cdata, :notationdecl, :xmldecl
|
|
|
|
handle( *event )
|
|
|
|
end
|
Short summary:
This is a version bump to REXML 3.1.4 for Ruby HEAD. This change log is
identical to the log for the 1.8 branch.
It includes numerous bug fixes and is a pretty big patch, but is nonetheless
a minor revision bump, since the API hasn't changed.
For more information, see:
http:/www.germane-software.com/projects/rexml/milestone/3.1.4
For all tickets, see:
http://www.germane-software.com/projects/rexml/ticket/#
Where '#' is replaced with the ticket number.
Changelog:
* Fixed the documentation WRT the raw mode of text nodes (ticket #4)
* Fixes roundup ticket #43: substring-after bug.
* Fixed ticket #44, Element#xpath
* Patch submitted by an anonymous doner to allow parsing of Tempfiles. I was
hoping that, by now, that whole Source thing would have been changed to use
duck typing and avoid this sort of ticket... but in the meantime, the patch
has been applied.
* Fixes ticket:30, XPath default namespace bug. The fix was provided
by Lucas Nussbaum.
* Aliases #size to #length, as per zdennis's request.
* Fixes typo from previous commit
* Fixes ticket #32, preceding-sibling fails attempting delete_if on nil nodeset
* Merges a user-contributed patch for ticket #40
* Adds a forgotten-to-commit unit test for ticket #32
* Changes Date, Version, and Copyright to upper case, to avoid conflicts with
the Date class. All of the other changes in the altered files are because
Subversion doesn't allow block-level commits, like it should. English cased
Version and Copyright are aliased to the upper case versions, for partial
backward compatability.
* Resolves ticket #34, SAX parser change makes it impossible to parse IO feeds.
* Moves parser.source.position() to parser.position()
* Fixes ticket:48, repeated writes munging text content
* Fixes ticket:46, adding methods for accessing notation DTD information.
* Encodes some characters and removes a brokes link in the documentation
* Deals with carriage returns after XML declarations
* Improved doctype handling
* Whitespace handling changes
* Applies a patch by David Tardon, which (incidentally) fixes ticket:50
* Closes #26, allowing anything that walks like an IO to be a source.
* Ticket #31 - One unescape too many
This wasn't really a bug, per se... "value" always returns
a normalized string, and "value" is the method used to get
the text() of an element. However, entities have no meaning
in CDATA sections, so there's no justification for value
to be normalizing the content of CData objects. This behavior
has therefore been changed.
* Ticket #45 -- Now parses notation declarations in DTDs properly.
* Resolves ticket #49, Document.parse_stream returns ArgumentError
* Adds documentation to clarify how XMLDecl works, to avoid invalid bug reports.
* Addresses ticket #10, fixing the StreamParser API for DTDs.
* Fixes ticket #42, XPath node-set function 'name' fails with relative node
set parameter
* Good patch by Aaron to fix ticket #53: REXML ignoring unbalanced tags
at the end of a document.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10092 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-04-15 00:11:04 -04:00
|
|
|
handle( :progress, @parser.position )
|
2008-10-01 09:46:53 -04:00
|
|
|
end
|
|
|
|
end
|
2003-06-09 21:31:01 -04:00
|
|
|
|
2008-10-01 09:46:53 -04:00
|
|
|
private
|
|
|
|
def handle( symbol, *arguments )
|
|
|
|
tag = @tag_stack[-1]
|
|
|
|
procs = get_procs( symbol, tag )
|
|
|
|
listeners = get_listeners( symbol, tag )
|
|
|
|
# notify observers
|
|
|
|
procs.each { |ob| ob.call( *arguments ) } if procs
|
2009-03-05 22:56:38 -05:00
|
|
|
listeners.each { |l|
|
|
|
|
l.send( symbol.to_s, *arguments )
|
2008-10-01 09:46:53 -04:00
|
|
|
} if listeners
|
|
|
|
end
|
2003-06-09 21:31:01 -04:00
|
|
|
|
2013-08-11 05:42:37 -04:00
|
|
|
def handle_entitydecl( event )
|
|
|
|
@entities[ event[1] ] = event[2] if event.size == 3
|
|
|
|
parameter_reference_p = false
|
|
|
|
case event[2]
|
|
|
|
when "SYSTEM"
|
|
|
|
if event.size == 5
|
|
|
|
if event.last == "%"
|
|
|
|
parameter_reference_p = true
|
|
|
|
else
|
|
|
|
event[4, 0] = "NDATA"
|
|
|
|
end
|
|
|
|
end
|
|
|
|
when "PUBLIC"
|
|
|
|
if event.size == 6
|
|
|
|
if event.last == "%"
|
|
|
|
parameter_reference_p = true
|
|
|
|
else
|
|
|
|
event[5, 0] = "NDATA"
|
|
|
|
end
|
|
|
|
end
|
|
|
|
else
|
|
|
|
parameter_reference_p = (event.size == 4)
|
|
|
|
end
|
|
|
|
event[1, 0] = event.pop if parameter_reference_p
|
|
|
|
handle( event[0], event[1..-1] )
|
|
|
|
end
|
|
|
|
|
2008-10-01 09:46:53 -04:00
|
|
|
# The following methods are duplicates, but it is faster than using
|
|
|
|
# a helper
|
|
|
|
def get_procs( symbol, name )
|
|
|
|
return nil if @procs.size == 0
|
|
|
|
@procs.find_all do |sym, match, block|
|
|
|
|
(
|
2009-03-05 22:56:38 -05:00
|
|
|
(sym.nil? or symbol == sym) and
|
2008-10-01 09:46:53 -04:00
|
|
|
((name.nil? and match.nil?) or match.nil? or (
|
|
|
|
(name == match) or
|
|
|
|
(match.kind_of? Regexp and name =~ match)
|
2011-05-18 20:07:25 -04:00
|
|
|
)
|
2008-10-01 09:46:53 -04:00
|
|
|
)
|
|
|
|
)
|
|
|
|
end.collect{|x| x[-1]}
|
|
|
|
end
|
|
|
|
def get_listeners( symbol, name )
|
|
|
|
return nil if @listeners.size == 0
|
|
|
|
@listeners.find_all do |sym, match, block|
|
|
|
|
(
|
2009-03-05 22:56:38 -05:00
|
|
|
(sym.nil? or symbol == sym) and
|
2008-10-01 09:46:53 -04:00
|
|
|
((name.nil? and match.nil?) or match.nil? or (
|
|
|
|
(name == match) or
|
|
|
|
(match.kind_of? Regexp and name =~ match)
|
2011-05-18 20:07:25 -04:00
|
|
|
)
|
2008-10-01 09:46:53 -04:00
|
|
|
)
|
|
|
|
)
|
|
|
|
end.collect{|x| x[-1]}
|
|
|
|
end
|
2003-06-09 21:31:01 -04:00
|
|
|
|
2008-10-01 09:46:53 -04:00
|
|
|
def add( pair )
|
|
|
|
if pair[-1].respond_to? :call
|
|
|
|
@procs << pair unless @procs.include? pair
|
|
|
|
else
|
|
|
|
@listeners << pair unless @listeners.include? pair
|
|
|
|
@has_listeners = true
|
|
|
|
end
|
|
|
|
end
|
2003-06-09 21:31:01 -04:00
|
|
|
|
2009-03-05 22:56:38 -05:00
|
|
|
def get_namespace( prefix )
|
2003-12-08 21:41:33 -05:00
|
|
|
uris = (@namespace_stack.find_all { |ns| not ns[prefix].nil? }) ||
|
2008-10-01 09:46:53 -04:00
|
|
|
(@namespace_stack.find { |ns| not ns[nil].nil? })
|
|
|
|
uris[-1][prefix] unless uris.nil? or 0 == uris.size
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2003-06-09 21:31:01 -04:00
|
|
|
end
|