Changeset 127

Timestamp:

03/30/2007 11:42:29 (20 months ago)

Author:

why

Message:

• lib/hpricot: raw_attributes and attributes, as suggested on the ml.
  

Location:

trunk

Files:

• lib/hpricot/tag.rb (modified) (2 diffs)
• lib/hpricot/traverse.rb (modified) (3 diffs)
• test/test_parser.rb (modified) (1 diff)
• test/test_preserved.rb (modified) (2 diffs)

trunk/lib/hpricot/tag.rb

@@ -50 +50 @@
     end
     def empty?; @children.empty? end
-    [:name, :attributes, :parent, :altered!].each do |m|
+    [:name, :raw_attributes, :parent, :altered!].each do |m|
       [m, "#{m}="].each { |m2| define_method(m2) { |*a| [@etag, @stag].inject { |_,t| t.send(m2, *a) if t and t.respond_to?(m2) } } }
+    end
+    def attributes
+      if raw_attributes
+        raw_attributes.inject({}) do |hsh, (k, v)|
+          hsh[k] = Hpricot.uxs(v)
+          hsh
+        end
+      end
     end
     def to_plain_text
@@ -86 +94 @@
     def initialize(name, attributes=nil)
       @name = name.to_s.downcase
-      @attributes = {}
+      @raw_attributes = {}
       if attributes
-        @attributes = attributes.inject({}) { |hsh,(k,v)| hsh[k.to_s.downcase] = v; hsh }
-      end
-    end
-    alterable :name, :attributes
+        @raw_attributes = attributes.inject({}) { |hsh,(k,v)| hsh[k.to_s.downcase] = v; hsh }
+      end
+    end
+    alterable :name, :raw_attributes
     def attributes_as_html
-      if @attributes
-        @attributes.map do |aname, aval|
+      if @raw_attributes
+        @raw_attributes.map do |aname, aval|
           " #{aname}" +
-            (aval ? "=#{html_quote(aval)}" : "")
+            (aval ? "=\"#{aval}\"" : "")
         end.join
       end

trunk/lib/hpricot/traverse.rb

@@ -774 +774 @@
   module Elem::Trav
     def has_attribute?(name)
-      self.attributes && self.attributes.has_key?(name.to_s)
+      self.raw_attributes && self.raw_attributes.has_key?(name.to_s)
     end
     def get_attribute(name)
-      a = self.attributes && self.attributes[name.to_s]
+      a = self.raw_attributes && self.raw_attributes[name.to_s]
       a = Hpricot.uxs(a) if a
       a
@@ -784 +784 @@
     def set_attribute(name, val)
       altered!
-      self.attributes ||= {}
-      self.attributes[name.to_s] = val
+      self.raw_attributes ||= {}
+      self.raw_attributes[name.to_s] = Hpricot.xs(val)
     end
     alias_method :[]=, :set_attribute
@@ -791 +791 @@
       if has_attribute? name
         altered!
-        self.attributes.delete(name)
+        self.raw_attributes.delete(name)
       end
     end

trunk/test/test_parser.rb

@@ -22 +22 @@
   def test_scan_text
     assert_equal 'FOO', Hpricot.make("FOO").first.content
+  end
+
+  def test_filter_by_attr
+    @boingboing = Hpricot.parse(TestFiles::BOINGBOING)
+
+    # this link is escaped in the doc
+    link = 'http://www.youtube.com/watch?v=TvSNXyNw26g&search=chris%20ware'
+    assert_equal link, @boingboing.at("a[@href='#{link}']")['href']
   end
 

trunk/test/test_preserved.rb

@@ -39 +39 @@
   end
 
+  def test_escaping_of_contents
+    doc = Hpricot(TestFiles::BOINGBOING)
+    assert_equal "Fukuda\342\200\231s Automatic Door opens around your body as you pass through it. The idea is to save energy and keep the room clean.", doc.at("img[@alt='200606131240']").next.to_s.strip
+  end
+
   def test_files
     assert_roundtrip TestFiles::BASIC
@@ -48 +53 @@
     # 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']
+    link = (doc = Hpricot(str)).at(:a)
+    assert_equal "http://google.com/search?q=hpricot&l=en", link['href']
+    assert_equal "http://google.com/search?q=hpricot&l=en", link.attributes['href']
+    assert_equal "http://google.com/search?q=hpricot&l=en", link.get_attribute('href')
+    assert_equal "http://google.com/search?q=hpricot&amp;l=en", link.raw_attributes['href']
     assert_equal str, doc.to_html
+
+    # alter the url
+    link['href'] = "javascript:alert(\"AGGA-KA-BOO!\")"
+    assert_equal %{<a href="javascript:alert(&quot;AGGA-KA-BOO!&quot;)">Google</a>}, doc.to_html
   end
 end