Changeset 126

Timestamp:

03/29/2007 18:39:54 (20 months ago)

Author:

why

Message:

• ext/hpricot_scan: working on slash escaping in attributes, for no particular reason.
  
• lib/hpricot/text.rb: a relic from HTree, no longer helpful.
  
• lib/hpricot/tag.rb: cdata to_s returns raw data, text to_s unescapes.
  
• lib/hpricot/builder.rb: escape attributes when building HTML.
  
• lib/hpricot/traverse.rb: when getting attributes, unescape.
  

Location:

trunk

Files:

• ext/hpricot_scan/hpricot_common.rl (modified) (1 diff)
• lib/hpricot/builder.rb (modified) (1 diff)
• lib/hpricot/tag.rb (modified) (1 diff)
• lib/hpricot/text.rb (deleted)
• lib/hpricot/traverse.rb (modified) (1 diff)
• test/test_preserved.rb (modified) (1 diff)

trunk/ext/hpricot_scan/hpricot_common.rl

@@ -17 +17 @@
   NameCap = Name >_tag %tag;
   NameAttr = NameChar+ >_akey %akey ;
-  Q1Attr = [^']* >_aval %aval ;
-  Q2Attr = [^"]* >_aval %aval ;
+  Q1Char = ( "\\\'" | [^'] ) ;
+  Q1Attr = Q1Char* >_aval %aval ;
+  Q2Char = ( "\\\"" | [^"] ) ;
+  Q2Attr = Q2Char* >_aval %aval ;
   UnqAttr = ( space >_aval | [^ \t\r\n<>"'] >_aval [^ \t\r\n<>]* %aunq ) ; 
   Nmtoken = NameChar+ >_akey %akey ;

trunk/lib/hpricot/builder.rb

@@ -74 +74 @@
       attrs = args.grep(Hash)
       childs.concat((args - attrs).map { |x| Text.new(Hpricot.xs(x)) })
-      attrs = attrs.inject({}) { |hsh, hsh2| hsh.merge(hsh2) }
+      attrs = attrs.inject({}) do |hsh, ath|
+        ath.each do |k, v|
+          hsh[k] = Hpricot.xs(v)
+        end
+        hsh
+      end
 
       # create the element itself

trunk/lib/hpricot/tag.rb

@@ -147 +147 @@
 
   class CData < Text
-    alias_method :inner_text, :content
+    alias_method :to_s, :content
     alias_method :to_plain_text, :content
     def output(out, opts = {})

trunk/lib/hpricot/traverse.rb

@@ -777 +777 @@
     end
     def get_attribute(name)
-      self.attributes && self.attributes[name.to_s]
+      a = self.attributes && self.attributes[name.to_s]
+      a = Hpricot.uxs(a) if a
+      a
     end
     alias_method :[], :get_attribute

trunk/test/test_preserved.rb

@@ -44 +44 @@
     assert_roundtrip TestFiles::CY0
   end
+
+  def test_escaping_of_attrs
+    # ampersands in URLs
+    str = %{<a href="http://google.com/search?q=hpricot&amp;l=en">Google</a>}
+    doc = Hpricot(str)
+    assert_equal "http://google.com/search?q=hpricot&l=en", doc.at(:a)['href']
+    assert_equal str, doc.to_html
+  end
 end