Changeset 166

Timestamp:

08/26/2008 21:06:37 (3 months ago)

Author:

alexpooley

Message:

Fixed xpath search when getting attribute value

Location:

trunk

Files:

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

trunk/lib/hpricot/traverse.rb

@@ -285 +285 @@
               nodes = [self]
           else
-              m = expr.match(%r!^([#.]?)([a-z0-9\\*_-]*)!i).to_a
+              m = expr.match(%r!^([#\@.]?)([a-z0-9\\*_-]*)!i).to_a
               after = $'
               mt = after[%r!:[a-z0-9\\*_-]+!i, 0]
@@ -297 +297 @@
                   oid = get_element_by_id(m[2])
                   nodes = oid ? [oid] : []
+                  expr = after
+              elsif m[1] == '@'
+                  ret = []
+                  nodes.each do |node|
+                      ret << node.parent.get_attribute(m[2])
+                  end
+                  nodes = ret
                   expr = after
               else

trunk/test/test_parser.rb

@@ -74 +74 @@
     assert_equal 'link1', (doc/:p/:a).first['id']
     assert_equal 'link1', doc.search('p').at('a').get_attribute('id')
+    assert_equal 'link1', doc.at("//a/@id")
     assert_equal 'link2', (doc/'p').filter('.ohmy').search('a').first.get_attribute('id')
     assert_equal (doc/'p')[2], (doc/'p').filter(':nth(2)')[0]