mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
1d8c98a486
http://www.germane-software.com/repos/rexml/tags/3.1.7 r1278@bean: ser | 2007-06-07 00:53:06 -0400 Fixed a double-encoding bug. This was a regression, related to ticket:48. r1292@bean: ser | 2007-07-25 08:19:36 -0400 r1279@bean: ser | 2007-06-09 23:19:02 -0400 Fixes ticket:89 -- encoding CP-1252 was broken. ISO-8859-15 had the same problem. Also in this patch is a fix to merge.rb (unused, but it should at least contain no errors), and a unit test for ticket:88. r1293@bean: ser | 2007-07-25 08:19:37 -0400 r1281@bean: ser | 2007-07-24 11:08:48 -0400 Addresses ticket:85 This is a major rewrite of the XML formatting code. The XML writers have all been extracted out of the classes and put into their own class containers. This makes writing parsers easier, and cleaner. There are three formatters, which correspond to the previous three XML writing modes: REXML::Formatters::Default Prints the XML document exactly as it was parsed REXML::Formatters::Pretty Pretty prints the XML document, destroying whitespace in the document REXML::Formatters::Transitive Pretty prints the XML document, preserving whitespace All of the write() functions have been deprecated (some are still used, but these will also go away) except the write() function on Document, which is left for convenience. To pretty print an XML document the canonical way: formatter = REXML::Formatters::Pretty.new( 5 ) # indent by 5 spaces formatter.write( document, output ) r1294@bean: ser | 2007-07-25 08:19:38 -0400 r1283@bean: ser | 2007-07-24 19:53:30 -0400 This goes with the previous commit. r1295@bean: ser | 2007-07-25 08:19:39 -0400 r1285@bean: ser | 2007-07-24 20:02:07 -0400 And THIS goes with the previous two patches. Dammit. r1296@bean: ser | 2007-07-25 08:19:40 -0400 r1287@bean: ser | 2007-07-24 20:12:25 -0400 Applied patch from Jeff Barczewski. Note that this changes what the values of the name and IDs are from the previous behavior -- the values no longer include the quotes. This is the correct behavior, so I'm leaving it in, but it is not backwards compatible. Also fixes the serializer so that it outputs the doctype in a correct format (needed as a result of this change). r1297@bean: ser | 2007-07-25 08:38:38 -0400 Version update git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12844 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
119 lines
2.6 KiB
Ruby
119 lines
2.6 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, :writethis
|
|
|
|
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
|
|
|
|
# indent::
|
|
# Ignored. There must be no whitespace before an XML declaration
|
|
# transitive::
|
|
# Ignored
|
|
# ie_hack::
|
|
# Ignored
|
|
def write(writer, indent=-1, transitive=false, ie_hack=false)
|
|
return nil unless @writethis or writer.kind_of? Output
|
|
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
|
|
|
|
# Only use this if you do not want the XML declaration to be written;
|
|
# this object is ignored by the XML writer. Otherwise, instantiate your
|
|
# own XMLDecl and add it to the document.
|
|
#
|
|
# Note that XML 1.1 documents *must* include an XML declaration
|
|
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
|