mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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 )
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
r1298@bean: ser | 2007-07-25 08:40:30 -0400
r1291@bean (orig r12517): ryan | 2007-06-11 20:38:57 -0400
Fixed typo in code. Fixes bug #10420
r1304@bean: ser | 2007-07-27 22:34:18 -0400
Whitespace changes only
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@12852 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
207 lines
6.8 KiB
Ruby
207 lines
6.8 KiB
Ruby
require "rexml/element"
|
|
require "rexml/xmldecl"
|
|
require "rexml/source"
|
|
require "rexml/comment"
|
|
require "rexml/doctype"
|
|
require "rexml/instruction"
|
|
require "rexml/rexml"
|
|
require "rexml/parseexception"
|
|
require "rexml/output"
|
|
require "rexml/parsers/baseparser"
|
|
require "rexml/parsers/streamparser"
|
|
require "rexml/parsers/treeparser"
|
|
|
|
module REXML
|
|
# Represents a full XML document, including PIs, a doctype, etc. A
|
|
# Document has a single child that can be accessed by root().
|
|
# Note that if you want to have an XML declaration written for a document
|
|
# you create, you must add one; REXML documents do not write a default
|
|
# declaration for you. See |DECLARATION| and |write|.
|
|
class Document < Element
|
|
# A convenient default XML declaration. If you want an XML declaration,
|
|
# the easiest way to add one is mydoc << Document::DECLARATION
|
|
# +DEPRECATED+
|
|
# Use: mydoc << XMLDecl.default
|
|
DECLARATION = XMLDecl.default
|
|
|
|
# Constructor
|
|
# @param source if supplied, must be a Document, String, or IO.
|
|
# Documents have their context and Element attributes cloned.
|
|
# Strings are expected to be valid XML documents. IOs are expected
|
|
# to be sources of valid XML documents.
|
|
# @param context if supplied, contains the context of the document;
|
|
# this should be a Hash.
|
|
def initialize( source = nil, context = {} )
|
|
super()
|
|
@context = context
|
|
return if source.nil?
|
|
if source.kind_of? Document
|
|
@context = source.context
|
|
super source
|
|
else
|
|
build( source )
|
|
end
|
|
end
|
|
|
|
def node_type
|
|
:document
|
|
end
|
|
|
|
# Should be obvious
|
|
def clone
|
|
Document.new self
|
|
end
|
|
|
|
# According to the XML spec, a root node has no expanded name
|
|
def expanded_name
|
|
''
|
|
#d = doc_type
|
|
#d ? d.name : "UNDEFINED"
|
|
end
|
|
|
|
alias :name :expanded_name
|
|
|
|
# We override this, because XMLDecls and DocTypes must go at the start
|
|
# of the document
|
|
def add( child )
|
|
if child.kind_of? XMLDecl
|
|
@children.unshift child
|
|
elsif child.kind_of? DocType
|
|
# Find first Element or DocType node and insert the decl right
|
|
# before it. If there is no such node, just insert the child at the
|
|
# end. If there is a child and it is an DocType, then replace it.
|
|
insert_before_index = 0
|
|
@children.find { |x|
|
|
insert_before_index += 1
|
|
x.kind_of?(Element) || x.kind_of?(DocType)
|
|
}
|
|
if @children[ insert_before_index ] # Not null = not end of list
|
|
if @children[ insert_before_index ].kind_of DocType
|
|
@children[ insert_before_index ] = child
|
|
else
|
|
@children[ index_before_index-1, 0 ] = child
|
|
end
|
|
else # Insert at end of list
|
|
@children[insert_before_index] = child
|
|
end
|
|
child.parent = self
|
|
else
|
|
rv = super
|
|
raise "attempted adding second root element to document" if @elements.size > 1
|
|
rv
|
|
end
|
|
end
|
|
alias :<< :add
|
|
|
|
def add_element(arg=nil, arg2=nil)
|
|
rv = super
|
|
raise "attempted adding second root element to document" if @elements.size > 1
|
|
rv
|
|
end
|
|
|
|
# @return the root Element of the document, or nil if this document
|
|
# has no children.
|
|
def root
|
|
elements[1]
|
|
#self
|
|
#@children.find { |item| item.kind_of? Element }
|
|
end
|
|
|
|
# @return the DocType child of the document, if one exists,
|
|
# and nil otherwise.
|
|
def doctype
|
|
@children.find { |item| item.kind_of? DocType }
|
|
end
|
|
|
|
# @return the XMLDecl of this document; if no XMLDecl has been
|
|
# set, the default declaration is returned.
|
|
def xml_decl
|
|
rv = @children[0]
|
|
return rv if rv.kind_of? XMLDecl
|
|
rv = @children.unshift(XMLDecl.default)[0]
|
|
end
|
|
|
|
# @return the XMLDecl version of this document as a String.
|
|
# If no XMLDecl has been set, returns the default version.
|
|
def version
|
|
xml_decl().version
|
|
end
|
|
|
|
# @return the XMLDecl encoding of this document as a String.
|
|
# If no XMLDecl has been set, returns the default encoding.
|
|
def encoding
|
|
xml_decl().encoding
|
|
end
|
|
|
|
# @return the XMLDecl standalone value of this document as a String.
|
|
# If no XMLDecl has been set, returns the default setting.
|
|
def stand_alone?
|
|
xml_decl().stand_alone?
|
|
end
|
|
|
|
# Write the XML tree out, optionally with indent. This writes out the
|
|
# entire XML document, including XML declarations, doctype declarations,
|
|
# and processing instructions (if any are given).
|
|
#
|
|
# A controversial point is whether Document should always write the XML
|
|
# declaration (<?xml version='1.0'?>) whether or not one is given by the
|
|
# user (or source document). REXML does not write one if one was not
|
|
# specified, because it adds unneccessary bandwidth to applications such
|
|
# as XML-RPC.
|
|
#
|
|
# See also the classes in the rexml/formatters package for the proper way
|
|
# to change the default formatting of XML output
|
|
#
|
|
# _Examples_
|
|
# Document.new("<a><b/></a>").serialize
|
|
#
|
|
# output_string = ""
|
|
# tr = Transitive.new( output_string )
|
|
# Document.new("<a><b/></a>").serialize( tr )
|
|
#
|
|
# output::
|
|
# output an object which supports '<< string'; this is where the
|
|
# document will be written.
|
|
# indent::
|
|
# An integer. If -1, no indenting will be used; otherwise, the
|
|
# indentation will be twice this number of spaces, and children will be
|
|
# indented an additional amount. For a value of 3, every item will be
|
|
# indented 3 more levels, or 6 more spaces (2 * 3). Defaults to -1
|
|
# trans::
|
|
# If transitive is true and indent is >= 0, then the output will be
|
|
# pretty-printed in such a way that the added whitespace does not affect
|
|
# the absolute *value* of the document -- that is, it leaves the value
|
|
# and number of Text nodes in the document unchanged.
|
|
# ie_hack::
|
|
# Internet Explorer is the worst piece of crap to have ever been
|
|
# written, with the possible exception of Windows itself. Since IE is
|
|
# unable to parse proper XML, we have to provide a hack to generate XML
|
|
# that IE's limited abilities can handle. This hack inserts a space
|
|
# before the /> on empty tags. Defaults to false
|
|
def write( output=$stdout, indent=-1, trans=false, ie_hack=false )
|
|
if xml_decl.encoding != "UTF-8" && !output.kind_of?(Output)
|
|
output = Output.new( output, xml_decl.encoding )
|
|
end
|
|
formatter = if indent > -1
|
|
if transitive
|
|
REXML::Formatters::Transitive.new( indent, ie_hack )
|
|
else
|
|
REXML::Formatters::Pretty.new( indent, ie_hack )
|
|
end
|
|
else
|
|
REXML::Formatters::Default.new( ie_hack )
|
|
end
|
|
formatter.write( self, output )
|
|
end
|
|
|
|
|
|
def Document::parse_stream( source, listener )
|
|
Parsers::StreamParser.new( source, listener ).parse
|
|
end
|
|
|
|
private
|
|
def build( source )
|
|
Parsers::TreeParser.new( source, self ).parse
|
|
end
|
|
end
|
|
end
|