mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
78d9dd71a6
This is a version bump to REXML 3.1.4 for Ruby HEAD. This change log is identical to the log for the 1.8 branch. It includes numerous bug fixes and is a pretty big patch, but is nonetheless a minor revision bump, since the API hasn't changed. For more information, see: http:/www.germane-software.com/projects/rexml/milestone/3.1.4 For all tickets, see: http://www.germane-software.com/projects/rexml/ticket/# Where '#' is replaced with the ticket number. Changelog: * Fixed the documentation WRT the raw mode of text nodes (ticket #4) * Fixes roundup ticket #43: substring-after bug. * Fixed ticket #44, Element#xpath * Patch submitted by an anonymous doner to allow parsing of Tempfiles. I was hoping that, by now, that whole Source thing would have been changed to use duck typing and avoid this sort of ticket... but in the meantime, the patch has been applied. * Fixes ticket:30, XPath default namespace bug. The fix was provided by Lucas Nussbaum. * Aliases #size to #length, as per zdennis's request. * Fixes typo from previous commit * Fixes ticket #32, preceding-sibling fails attempting delete_if on nil nodeset * Merges a user-contributed patch for ticket #40 * Adds a forgotten-to-commit unit test for ticket #32 * Changes Date, Version, and Copyright to upper case, to avoid conflicts with the Date class. All of the other changes in the altered files are because Subversion doesn't allow block-level commits, like it should. English cased Version and Copyright are aliased to the upper case versions, for partial backward compatability. * Resolves ticket #34, SAX parser change makes it impossible to parse IO feeds. * Moves parser.source.position() to parser.position() * Fixes ticket:48, repeated writes munging text content * Fixes ticket:46, adding methods for accessing notation DTD information. * Encodes some characters and removes a brokes link in the documentation * Deals with carriage returns after XML declarations * Improved doctype handling * Whitespace handling changes * Applies a patch by David Tardon, which (incidentally) fixes ticket:50 * Closes #26, allowing anything that walks like an IO to be a source. * Ticket #31 - One unescape too many This wasn't really a bug, per se... "value" always returns a normalized string, and "value" is the method used to get the text() of an element. However, entities have no meaning in CDATA sections, so there's no justification for value to be normalizing the content of CData objects. This behavior has therefore been changed. * Ticket #45 -- Now parses notation declarations in DTDs properly. * Resolves ticket #49, Document.parse_stream returns ArgumentError * Adds documentation to clarify how XMLDecl works, to avoid invalid bug reports. * Addresses ticket #10, fixing the StreamParser API for DTDs. * Fixes ticket #42, XPath node-set function 'name' fails with relative node set parameter * Good patch by Aaron to fix ticket #53: REXML ignoring unbalanced tags at the end of a document. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10092 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
163 lines
4 KiB
Ruby
163 lines
4 KiB
Ruby
require "rexml/namespace"
|
|
require 'rexml/text'
|
|
|
|
module REXML
|
|
# Defines an Element Attribute; IE, a attribute=value pair, as in:
|
|
# <element attribute="value"/>. Attributes can be in their own
|
|
# namespaces. General users of REXML will not interact with the
|
|
# Attribute class much.
|
|
class Attribute
|
|
include Node
|
|
include Namespace
|
|
|
|
# The element to which this attribute belongs
|
|
attr_reader :element
|
|
# The normalized value of this attribute. That is, the attribute with
|
|
# entities intact.
|
|
attr_writer :normalized
|
|
PATTERN = /\s*(#{NAME_STR})\s*=\s*(["'])(.*?)\2/um
|
|
|
|
# Constructor.
|
|
#
|
|
# Attribute.new( attribute_to_clone )
|
|
# Attribute.new( source )
|
|
# Attribute.new( "attr", "attr_value" )
|
|
# Attribute.new( "attr", "attr_value", parent_element )
|
|
def initialize( first, second=nil, parent=nil )
|
|
@normalized = @unnormalized = @element = nil
|
|
if first.kind_of? Attribute
|
|
self.name = first.expanded_name
|
|
@value = first.value
|
|
if second.kind_of? Element
|
|
@element = second
|
|
else
|
|
@element = first.element
|
|
end
|
|
elsif first.kind_of? String
|
|
@element = parent if parent.kind_of? Element
|
|
self.name = first
|
|
@value = second.to_s
|
|
else
|
|
raise "illegal argument #{first.class.name} to Attribute constructor"
|
|
end
|
|
end
|
|
|
|
# Returns the namespace of the attribute.
|
|
#
|
|
# e = Element.new( "elns:myelement" )
|
|
# e.add_attribute( "nsa:a", "aval" )
|
|
# e.add_attribute( "b", "bval" )
|
|
# e.attributes.get_attribute( "a" ).prefix # -> "nsa"
|
|
# e.attributes.get_attribute( "b" ).prefix # -> "elns"
|
|
# a = Attribute.new( "x", "y" )
|
|
# a.prefix # -> ""
|
|
def prefix
|
|
pf = super
|
|
if pf == ""
|
|
pf = @element.prefix if @element
|
|
end
|
|
pf
|
|
end
|
|
|
|
# Returns the namespace URL, if defined, or nil otherwise
|
|
#
|
|
# e = Element.new("el")
|
|
# e.add_attributes({"xmlns:ns", "http://url"})
|
|
# e.namespace( "ns" ) # -> "http://url"
|
|
def namespace arg=nil
|
|
arg = prefix if arg.nil?
|
|
@element.namespace arg
|
|
end
|
|
|
|
# Returns true if other is an Attribute and has the same name and value,
|
|
# false otherwise.
|
|
def ==( other )
|
|
other.kind_of?(Attribute) and other.name==name and other.value==@value
|
|
end
|
|
|
|
# Creates (and returns) a hash from both the name and value
|
|
def hash
|
|
name.hash + value.hash
|
|
end
|
|
|
|
# Returns this attribute out as XML source, expanding the name
|
|
#
|
|
# a = Attribute.new( "x", "y" )
|
|
# a.to_string # -> "x='y'"
|
|
# b = Attribute.new( "ns:x", "y" )
|
|
# b.to_string # -> "ns:x='y'"
|
|
def to_string
|
|
"#@expanded_name='#{to_s().gsub(/'/, ''')}'"
|
|
end
|
|
|
|
# Returns the attribute value, with entities replaced
|
|
def to_s
|
|
return @normalized if @normalized
|
|
|
|
doctype = nil
|
|
if @element
|
|
doc = @element.document
|
|
doctype = doc.doctype if doc
|
|
end
|
|
|
|
@unnormalized = nil
|
|
@normalized = Text::normalize( @value, doctype )
|
|
end
|
|
|
|
# Returns the UNNORMALIZED value of this attribute. That is, entities
|
|
# have been expanded to their values
|
|
def value
|
|
return @unnormalized if @unnormalized
|
|
doctype = nil
|
|
if @element
|
|
doc = @element.document
|
|
doctype = doc.doctype if doc
|
|
end
|
|
@normalized = nil
|
|
@unnormalized = Text::unnormalize( @value, doctype )
|
|
end
|
|
|
|
# Returns a copy of this attribute
|
|
def clone
|
|
Attribute.new self
|
|
end
|
|
|
|
# Sets the element of which this object is an attribute. Normally, this
|
|
# is not directly called.
|
|
#
|
|
# Returns this attribute
|
|
def element=( element )
|
|
@element = element
|
|
self
|
|
end
|
|
|
|
# Removes this Attribute from the tree, and returns true if successfull
|
|
#
|
|
# This method is usually not called directly.
|
|
def remove
|
|
@element.attributes.delete self.name unless @element.nil?
|
|
end
|
|
|
|
# Writes this attribute (EG, puts 'key="value"' to the output)
|
|
def write( output, indent=-1 )
|
|
output << to_string
|
|
end
|
|
|
|
def node_type
|
|
:attribute
|
|
end
|
|
|
|
def inspect
|
|
rv = ""
|
|
write( rv )
|
|
rv
|
|
end
|
|
|
|
def xpath
|
|
path = @element.xpath
|
|
path += "/@#{self.expanded_name}"
|
|
return path
|
|
end
|
|
end
|
|
end
|
|
#vim:ts=2 sw=2 noexpandtab:
|