diff options
author | ser <ser@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-07-25 12:47:23 +0000 |
---|---|---|
committer | ser <ser@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-07-25 12:47:23 +0000 |
commit | 1d8c98a486a81bc5cd6957b5eba4a118eda2a46f (patch) | |
tree | 9b6659d612b1047fe609b548acc271d85c7da359 /lib/rexml/attribute.rb | |
parent | fead3c93e744f45ff8e7d4bac550bbd0cd79994f (diff) | |
download | ruby-1d8c98a486a81bc5cd6957b5eba4a118eda2a46f.tar.gz |
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
Diffstat (limited to 'lib/rexml/attribute.rb')
-rw-r--r-- | lib/rexml/attribute.rb | 36 |
1 files changed, 29 insertions, 7 deletions
diff --git a/lib/rexml/attribute.rb b/lib/rexml/attribute.rb index a169148f32..029035d675 100644 --- a/lib/rexml/attribute.rb +++ b/lib/rexml/attribute.rb @@ -18,16 +18,32 @@ module REXML PATTERN = /\s*(#{NAME_STR})\s*=\s*(["'])(.*?)\2/um # Constructor. + # FIXME: The parser doesn't catch illegal characters in attributes + # + # first:: + # Either: an Attribute, which this new attribute will become a + # clone of; or a String, which is the name of this attribute + # second:: + # If +first+ is an Attribute, then this may be an Element, or nil. + # If nil, then the Element parent of this attribute is the parent + # of the +first+ Attribute. If the first argument is a String, + # then this must also be a String, and is the content of the attribute. + # If this is the content, it must be fully normalized (contain no + # illegal characters). + # parent:: + # Ignored unless +first+ is a String; otherwise, may be the Element + # parent of this attribute, or nil. + # # # Attribute.new( attribute_to_clone ) - # Attribute.new( source ) + # Attribute.new( attribute_to_clone, parent_element ) # 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 + @unnormalized = first.value if second.kind_of? Element @element = second else @@ -36,7 +52,7 @@ module REXML elsif first.kind_of? String @element = parent if parent.kind_of? Element self.name = first - @value = second.to_s + @normalized = second.to_s else raise "illegal argument #{first.class.name} to Attribute constructor" end @@ -72,7 +88,7 @@ module REXML # 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 + other.kind_of?(Attribute) and other.name==name and other.value==value end # Creates (and returns) a hash from both the name and value @@ -87,7 +103,11 @@ module REXML # b = Attribute.new( "ns:x", "y" ) # b.to_string # -> "ns:x='y'" def to_string - "#@expanded_name='#{to_s().gsub(/'/, ''')}'" + if @element and @element.context and @element.context[:attribute_quote] == :quote + %Q^#@expanded_name="#{to_s().gsub(/"/, '"e;')}"^ + else + "#@expanded_name='#{to_s().gsub(/'/, ''')}'" + end end # Returns the attribute value, with entities replaced @@ -100,8 +120,9 @@ module REXML doctype = doc.doctype if doc end + @normalized = Text::normalize( @unnormalized, doctype ) @unnormalized = nil - @normalized = Text::normalize( @value, doctype ) + @normalized end # Returns the UNNORMALIZED value of this attribute. That is, entities @@ -113,8 +134,9 @@ module REXML doc = @element.document doctype = doc.doctype if doc end + @unnormalized = Text::unnormalize( @normalized, doctype ) @normalized = nil - @unnormalized = Text::unnormalize( @value, doctype ) + @unnormalized end # Returns a copy of this attribute |