2003-06-09 21:31:01 -04:00
|
|
|
require "rexml/child"
|
|
|
|
require "rexml/source"
|
|
|
|
|
|
|
|
module REXML
|
2008-10-01 09:46:53 -04:00
|
|
|
# Represents an XML Instruction; IE, <? ... ?>
|
|
|
|
# TODO: Add parent arg (3rd arg) to constructor
|
|
|
|
class Instruction < Child
|
|
|
|
START = '<\?'
|
|
|
|
STOP = '\?>'
|
2003-06-09 21:31:01 -04:00
|
|
|
|
2008-10-01 09:46:53 -04:00
|
|
|
# target is the "name" of the Instruction; IE, the "tag" in <?tag ...?>
|
|
|
|
# content is everything else.
|
|
|
|
attr_accessor :target, :content
|
2003-06-09 21:31:01 -04:00
|
|
|
|
2008-10-01 09:46:53 -04:00
|
|
|
# Constructs a new Instruction
|
2009-03-05 22:56:38 -05:00
|
|
|
# @param target can be one of a number of things. If String, then
|
2008-10-01 09:46:53 -04:00
|
|
|
# the target of this instruction is set to this. If an Instruction,
|
|
|
|
# then the Instruction is shallowly cloned (target and content are
|
|
|
|
# copied). If a Source, then the source is scanned and parsed for
|
|
|
|
# an Instruction declaration.
|
|
|
|
# @param content Must be either a String, or a Parent. Can only
|
|
|
|
# be a Parent if the target argument is a Source. Otherwise, this
|
|
|
|
# String is set as the content of this instruction.
|
|
|
|
def initialize(target, content=nil)
|
|
|
|
if target.kind_of? String
|
|
|
|
super()
|
|
|
|
@target = target
|
|
|
|
@content = content
|
|
|
|
elsif target.kind_of? Instruction
|
|
|
|
super(content)
|
|
|
|
@target = target.target
|
|
|
|
@content = target.content
|
|
|
|
end
|
|
|
|
@content.strip! if @content
|
|
|
|
end
|
2003-06-09 21:31:01 -04:00
|
|
|
|
2008-10-01 09:46:53 -04:00
|
|
|
def clone
|
|
|
|
Instruction.new self
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
Merges upstream changes for REXML v3.1.7
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
2007-07-25 08:47:23 -04:00
|
|
|
# == DEPRECATED
|
|
|
|
# See the rexml/formatters package
|
|
|
|
#
|
2008-10-01 09:46:53 -04:00
|
|
|
def write writer, indent=-1, transitive=false, ie_hack=false
|
Merges upstream changes for REXML v3.1.7
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
2007-07-25 08:47:23 -04:00
|
|
|
Kernel.warn( "#{self.class.name}.write is deprecated" )
|
2008-10-01 09:46:53 -04:00
|
|
|
indent(writer, indent)
|
|
|
|
writer << START.sub(/\\/u, '')
|
|
|
|
writer << @target
|
|
|
|
writer << ' '
|
|
|
|
writer << @content
|
|
|
|
writer << STOP.sub(/\\/u, '')
|
|
|
|
end
|
2003-06-09 21:31:01 -04:00
|
|
|
|
2008-10-01 09:46:53 -04:00
|
|
|
# @return true if other is an Instruction, and the content and target
|
|
|
|
# of the other matches the target and content of this object.
|
|
|
|
def ==( other )
|
|
|
|
other.kind_of? Instruction and
|
|
|
|
other.target == @target and
|
|
|
|
other.content == @content
|
|
|
|
end
|
2003-06-09 21:31:01 -04:00
|
|
|
|
|
|
|
def node_type
|
|
|
|
:processing_instruction
|
|
|
|
end
|
Merged in development from the main REXML repository.
* 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
2005-05-18 22:58:11 -04:00
|
|
|
|
|
|
|
def inspect
|
|
|
|
"<?p-i #{target} ...?>"
|
|
|
|
end
|
2008-10-01 09:46:53 -04:00
|
|
|
end
|
2003-06-09 21:31:01 -04:00
|
|
|
end
|