2004-07-07 09:21:39 -04:00
|
|
|
require 'rexml/validation/validationexception'
|
|
|
|
|
|
|
|
module REXML
|
|
|
|
module Validation
|
|
|
|
module Validator
|
|
|
|
NILEVENT = [ nil ]
|
|
|
|
def reset
|
|
|
|
@current = @root
|
|
|
|
@root.reset
|
|
|
|
@root.previous = true
|
|
|
|
@attr_stack = []
|
|
|
|
self
|
|
|
|
end
|
|
|
|
def dump
|
|
|
|
puts @root.inspect
|
|
|
|
end
|
|
|
|
def validate( event )
|
|
|
|
#puts "Current: #@current"
|
|
|
|
#puts "Event: #{event.inspect}"
|
|
|
|
@attr_stack = [] unless defined? @attr_stack
|
|
|
|
match = @current.next(event)
|
|
|
|
raise ValidationException.new( "Validation error. Expected: "+
|
|
|
|
@current.expected.join( " or " )+" from #{@current.inspect} "+
|
|
|
|
" but got #{Event.new( event[0], event[1] ).inspect}" ) unless match
|
|
|
|
@current = match
|
|
|
|
|
|
|
|
# Check for attributes
|
|
|
|
case event[0]
|
|
|
|
when :start_element
|
|
|
|
#puts "Checking attributes"
|
|
|
|
@attr_stack << event[2]
|
|
|
|
begin
|
|
|
|
sattr = [:start_attribute, nil]
|
|
|
|
eattr = [:end_attribute]
|
|
|
|
text = [:text, nil]
|
|
|
|
k,v = event[2].find { |k,v|
|
|
|
|
sattr[1] = k
|
|
|
|
#puts "Looking for #{sattr.inspect}"
|
|
|
|
m = @current.next( sattr )
|
|
|
|
#puts "Got #{m.inspect}"
|
|
|
|
if m
|
|
|
|
# If the state has text children...
|
|
|
|
#puts "Looking for #{eattr.inspect}"
|
|
|
|
#puts "Expect #{m.expected}"
|
|
|
|
if m.matches?( eattr )
|
|
|
|
#puts "Got end"
|
|
|
|
@current = m
|
|
|
|
else
|
|
|
|
#puts "Didn't get end"
|
|
|
|
text[1] = v
|
|
|
|
#puts "Looking for #{text.inspect}"
|
|
|
|
m = m.next( text )
|
|
|
|
#puts "Got #{m.inspect}"
|
|
|
|
text[1] = nil
|
|
|
|
return false unless m
|
|
|
|
@current = m if m
|
|
|
|
end
|
|
|
|
m = @current.next( eattr )
|
|
|
|
if m
|
|
|
|
@current = m
|
|
|
|
true
|
|
|
|
else
|
|
|
|
false
|
|
|
|
end
|
|
|
|
else
|
|
|
|
false
|
|
|
|
end
|
|
|
|
}
|
|
|
|
event[2].delete(k) if k
|
|
|
|
end while k
|
|
|
|
when :end_element
|
|
|
|
attrs = @attr_stack.pop
|
|
|
|
raise ValidationException.new( "Validation error. Illegal "+
|
|
|
|
" attributes: #{attrs.inspect}") if attrs.length > 0
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
class Event
|
|
|
|
def initialize(event_type, event_arg=nil )
|
|
|
|
@event_type = event_type
|
|
|
|
@event_arg = event_arg
|
|
|
|
end
|
|
|
|
|
|
|
|
attr_reader :event_type
|
|
|
|
attr_accessor :event_arg
|
|
|
|
|
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
|
|
|
def done?
|
|
|
|
@done
|
|
|
|
end
|
|
|
|
|
2004-07-07 09:21:39 -04:00
|
|
|
def single?
|
|
|
|
return (@event_type != :start_element and @event_type != :start_attribute)
|
|
|
|
end
|
|
|
|
|
|
|
|
def matches?( event )
|
|
|
|
#puts "#@event_type =? #{event[0]} && #@event_arg =? #{event[1]} "
|
|
|
|
return false unless event[0] == @event_type
|
|
|
|
case event[0]
|
|
|
|
when nil
|
|
|
|
return true
|
|
|
|
when :start_element
|
|
|
|
return true if event[1] == @event_arg
|
|
|
|
when :end_element
|
|
|
|
return true
|
|
|
|
when :start_attribute
|
|
|
|
return true if event[1] == @event_arg
|
|
|
|
when :end_attribute
|
|
|
|
return true
|
|
|
|
when :end_document
|
|
|
|
return true
|
|
|
|
when :text
|
|
|
|
return (@event_arg.nil? or @event_arg == event[1])
|
|
|
|
=begin
|
|
|
|
when :processing_instruction
|
|
|
|
false
|
|
|
|
when :xmldecl
|
|
|
|
false
|
|
|
|
when :start_doctype
|
|
|
|
false
|
|
|
|
when :end_doctype
|
|
|
|
false
|
|
|
|
when :externalentity
|
|
|
|
false
|
|
|
|
when :elementdecl
|
|
|
|
false
|
|
|
|
when :entity
|
|
|
|
false
|
|
|
|
when :attlistdecl
|
|
|
|
false
|
|
|
|
when :notationdecl
|
|
|
|
false
|
|
|
|
when :end_doctype
|
|
|
|
false
|
|
|
|
=end
|
|
|
|
else
|
|
|
|
false
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def ==( other )
|
|
|
|
return false unless other.kind_of? Event
|
|
|
|
@event_type == other.event_type and @event_arg == other.event_arg
|
|
|
|
end
|
|
|
|
|
|
|
|
def to_s
|
|
|
|
inspect
|
|
|
|
end
|
|
|
|
|
|
|
|
def inspect
|
|
|
|
"#{@event_type.inspect}( #@event_arg )"
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|