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
109 lines
2.7 KiB
Ruby
109 lines
2.7 KiB
Ruby
module REXML
|
|
module Formatters
|
|
class Default
|
|
# Prints out the XML document with no formatting -- except if id_hack is
|
|
# set.
|
|
#
|
|
# ie_hack::
|
|
# If set to true, then inserts whitespace before the close of an empty
|
|
# tag, so that IE's bad XML parser doesn't choke.
|
|
def initialize( ie_hack=false )
|
|
@ie_hack = ie_hack
|
|
end
|
|
|
|
# Writes the node to some output.
|
|
#
|
|
# node::
|
|
# The node to write
|
|
# output::
|
|
# A class implementing <TT><<</TT>. Pass in an Output object to
|
|
# change the output encoding.
|
|
def write( node, output )
|
|
case node
|
|
|
|
when Document
|
|
if node.xml_decl.encoding != "UTF-8" && !output.kind_of?(Output)
|
|
output = Output.new( output, node.xml_decl.encoding )
|
|
end
|
|
write_document( node, output )
|
|
|
|
when Element
|
|
write_element( node, output )
|
|
|
|
when Declaration, ElementDecl, NotationDecl, ExternalEntity, Entity,
|
|
Attribute, AttlistDecl
|
|
node.write( output,-1 )
|
|
|
|
when Instruction
|
|
write_instruction( node, output )
|
|
|
|
when DocType, XMLDecl
|
|
node.write( output )
|
|
|
|
when Comment
|
|
write_comment( node, output )
|
|
|
|
when CData
|
|
write_cdata( node, output )
|
|
|
|
when Text
|
|
write_text( node, output )
|
|
|
|
else
|
|
raise Exception.new("XML FORMATTING ERROR")
|
|
|
|
end
|
|
end
|
|
|
|
protected
|
|
def write_document( node, output )
|
|
node.children.each { |child| write( child, output ) }
|
|
end
|
|
|
|
def write_element( node, output )
|
|
output << "<#{node.expanded_name}"
|
|
|
|
node.attributes.each_attribute do |attr|
|
|
output << " "
|
|
attr.write( output )
|
|
end unless node.attributes.empty?
|
|
|
|
if node.children.empty?
|
|
output << " " if @ie_hack
|
|
output << "/"
|
|
else
|
|
output << ">"
|
|
node.children.each { |child|
|
|
write( child, output )
|
|
}
|
|
output << "</#{node.expanded_name}"
|
|
end
|
|
output << ">"
|
|
end
|
|
|
|
def write_text( node, output )
|
|
output << node.to_s()
|
|
end
|
|
|
|
def write_comment( node, output )
|
|
output << Comment::START
|
|
output << node.to_s
|
|
output << Comment::STOP
|
|
end
|
|
|
|
def write_cdata( node, output )
|
|
output << CData::START
|
|
output << node.to_s
|
|
output << CData::STOP
|
|
end
|
|
|
|
def write_instruction( node, output )
|
|
output << Instruction::START.sub(/\\/u, '')
|
|
output << node.target
|
|
output << ' '
|
|
output << node.content
|
|
output << Instruction::STOP.sub(/\\/u, '')
|
|
end
|
|
end
|
|
end
|
|
end
|