mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
21e8df5c10
* 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
109 lines
2.4 KiB
Ruby
109 lines
2.4 KiB
Ruby
require 'rexml/encoding'
|
|
require 'rexml/source'
|
|
|
|
module REXML
|
|
# NEEDS DOCUMENTATION
|
|
class XMLDecl < Child
|
|
include Encoding
|
|
|
|
DEFAULT_VERSION = "1.0";
|
|
DEFAULT_ENCODING = "UTF-8";
|
|
DEFAULT_STANDALONE = "no";
|
|
START = '<\?xml';
|
|
STOP = '\?>';
|
|
|
|
attr_accessor :version, :standalone
|
|
attr_reader :writeencoding
|
|
|
|
def initialize(version=DEFAULT_VERSION, encoding=nil, standalone=nil)
|
|
@writethis = true
|
|
@writeencoding = !encoding.nil?
|
|
if version.kind_of? XMLDecl
|
|
super()
|
|
@version = version.version
|
|
self.encoding = version.encoding
|
|
@writeencoding = version.writeencoding
|
|
@standalone = version.standalone
|
|
else
|
|
super()
|
|
@version = version
|
|
self.encoding = encoding
|
|
@standalone = standalone
|
|
end
|
|
@version = DEFAULT_VERSION if @version.nil?
|
|
end
|
|
|
|
def clone
|
|
XMLDecl.new(self)
|
|
end
|
|
|
|
def write writer, indent_level=-1, transitive=false, ie_hack=false
|
|
return nil unless @writethis or writer.kind_of? Output
|
|
indent( writer, indent_level )
|
|
writer << START.sub(/\\/u, '')
|
|
if writer.kind_of? Output
|
|
writer << " #{content writer.encoding}"
|
|
else
|
|
writer << " #{content encoding}"
|
|
end
|
|
writer << STOP.sub(/\\/u, '')
|
|
end
|
|
|
|
def ==( other )
|
|
other.kind_of?(XMLDecl) and
|
|
other.version == @version and
|
|
other.encoding == self.encoding and
|
|
other.standalone == @standalone
|
|
end
|
|
|
|
def xmldecl version, encoding, standalone
|
|
@version = version
|
|
self.encoding = encoding
|
|
@standalone = standalone
|
|
end
|
|
|
|
def node_type
|
|
:xmldecl
|
|
end
|
|
|
|
alias :stand_alone? :standalone
|
|
alias :old_enc= :encoding=
|
|
|
|
def encoding=( enc )
|
|
if enc.nil?
|
|
self.old_enc = "UTF-8"
|
|
@writeencoding = false
|
|
else
|
|
self.old_enc = enc
|
|
@writeencoding = true
|
|
end
|
|
self.dowrite
|
|
end
|
|
|
|
def XMLDecl.default
|
|
rv = XMLDecl.new( "1.0" )
|
|
rv.nowrite
|
|
rv
|
|
end
|
|
|
|
def nowrite
|
|
@writethis = false
|
|
end
|
|
|
|
def dowrite
|
|
@writethis = true
|
|
end
|
|
|
|
def inspect
|
|
START.sub(/\\/u, '') + " ... " + STOP.sub(/\\/u, '')
|
|
end
|
|
|
|
private
|
|
def content(enc)
|
|
rv = "version='#@version'"
|
|
rv << " encoding='#{enc}'" if @writeencoding || enc !~ /utf-8/i
|
|
rv << " standalone='#@standalone'" if @standalone
|
|
rv
|
|
end
|
|
end
|
|
end
|