kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

r1361@bean: ser | 2007-10-01 21:24:28 -0400

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13592 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ser 2007-10-02 01:45:19 +00:00
parent 209b950f3f
commit efe8edf32c
5 changed files with 39 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

87
lib/rexml/document.rb
View file

@ -139,14 +139,18 @@ module REXML
xml_decl().stand_alone? xml_decl().stand_alone?
end end
# Write the XML tree out. This writes the entire XML document, including # Write the XML tree out, optionally with indent. This writes out the
# declarations and processing instructions. # 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 # A controversial point is whether Document should always write the XML
# declaration (<?xml version='1.0'?>) whether or not one is given by the # 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 # user (or source document). REXML does not write one if one was not
# specified, because it adds unneccessary bandwidth to applications such # specified, because it adds unneccessary bandwidth to applications such
# as XML-RPC. # 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_ # _Examples_
# Document.new("<a><b/></a>").serialize # Document.new("<a><b/></a>").serialize
@ -155,58 +159,25 @@ module REXML
# tr = Transitive.new( output_string ) # tr = Transitive.new( output_string )
# Document.new("<a><b/></a>").serialize( tr ) # Document.new("<a><b/></a>").serialize( tr )
# #
# formatter:: # output::
# One of the rexml/formatters classes. If none is given, then the Pretty # output an object which supports '<< string'; this is where the
# formatter will be used to dump the XML to the STDOUT. # document will be written.
def serialize( formatter = nil ) # indent::
if xml_decl.encoding != "UTF-8" && !output.kind_of?(Output) # An integer. If -1, no indenting will be used; otherwise, the
output = Output.new( output, xml_decl.encoding ) # indentation will be twice this number of spaces, and children will be
end # indented an additional amount. For a value of 3, every item will be
formatter = REXML::Pretty.new( $stdout ) if (formatter.nil?)
@children.each { |node|
puts "node = #{node.inspect}"
indent( output, indent ) if node.node_type == :element
if node.write( output, indent, transitive, ie_hack )
output << "\n" unless indent<0 or node == @children[-1]
end
}
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
#
#
# 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 # indented 3 more levels, or 6 more spaces (2 * 3). Defaults to -1
# trans:: # trans::
# If transitive is true and indent is >= 0, then the output will be # 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 # 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 # the absolute *value* of the document -- that is, it leaves the value
# and number of Text nodes in the document unchanged. # and number of Text nodes in the document unchanged.
# ie_hack:: # ie_hack::
# Internet Explorer is the worst piece of crap to have ever been # Internet Explorer is the worst piece of crap to have ever been
# written, with the possible exception of Windows itself. Since IE is # 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 # 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 # that IE's limited abilities can handle. This hack inserts a space
# before the /> on empty tags. Defaults to false # before the /> on empty tags. Defaults to false
def write( output=$stdout, indent=-1, trans=false, ie_hack=false ) def write( output=$stdout, indent=-1, trans=false, ie_hack=false )
if xml_decl.encoding != "UTF-8" && !output.kind_of?(Output) if xml_decl.encoding != "UTF-8" && !output.kind_of?(Output)
output = Output.new( output, xml_decl.encoding ) output = Output.new( output, xml_decl.encoding )

2
lib/rexml/encodings/ISO-8859-15.rb
View file

@ -5,7 +5,7 @@ module REXML
module Encoding module Encoding
register("ISO-8859-15") do |o| register("ISO-8859-15") do |o|
alias encode to_iso_8859_15 alias encode to_iso_8859_15
alias decode from_iso_8859_15 alias decode from_iso_8859_15
end end
# Convert from UTF-8 # Convert from UTF-8

4
lib/rexml/parsers/sax2parser.rb
View file

@ -94,8 +94,8 @@ module REXML
when :end_document when :end_document
handle( :end_document ) handle( :end_document )
break break
when :start_doctype when :start_doctype
handle( :doctype, *event[1..-1]) handle( :doctype, *event[1..-1])
when :end_doctype when :end_doctype
context = context[1] context = context[1]
when :start_element when :start_element

10
lib/rexml/rexml.rb
View file

@ -11,8 +11,8 @@
# #
# Main page:: http://www.germane-software.com/software/rexml # Main page:: http://www.germane-software.com/software/rexml
# Author:: Sean Russell <serATgermaneHYPHENsoftwareDOTcom> # Author:: Sean Russell <serATgermaneHYPHENsoftwareDOTcom>
# Version:: 3.1.7.1 # Version:: 3.1.7.2
# Date:: 2007/209 # Date:: 2007/275
# #
# This API documentation can be downloaded from the REXML home page, or can # This API documentation can be downloaded from the REXML home page, or can
# be accessed online[http://www.germane-software.com/software/rexml_doc] # be accessed online[http://www.germane-software.com/software/rexml_doc]
@ -22,9 +22,9 @@
# online[http://www.germane-software.com/software/rexml/docs/tutorial.html] # online[http://www.germane-software.com/software/rexml/docs/tutorial.html]
module REXML module REXML
COPYRIGHT = "Copyright © 2001-2007 Sean Russell <ser@germane-software.com>" COPYRIGHT = "Copyright © 2001-2007 Sean Russell <ser@germane-software.com>"
DATE = "2007/209" DATE = "2007/275"
VERSION = "3.1.7.1" VERSION = "3.1.7.2"
REVISION = %w"$Revision$"[1] REVISION = "$Revision$".gsub(/\$Revision:|\$/,'').strip
Copyright = COPYRIGHT Copyright = COPYRIGHT
Version = VERSION Version = VERSION

4
lib/rexml/source.rb
View file

@ -17,8 +17,8 @@ module REXML
elsif arg.kind_of? Source elsif arg.kind_of? Source
arg arg
else else
raise "#{source.class} is not a valid input stream. It must walk \n"+ raise "#{arg.class} is not a valid input stream. It must walk \n"+
"like either a String, IO, or Source." "like either a String, an IO, or a Source."
end end
end end
end end