Changeset 160

Timestamp:

02/21/2008 13:36:48 (5 months ago)

Author:

why

Message:

• lib/hpricot/elements.rb: a more liberal xpath attr parsing from ticket #115. thanks, wrs!
  

Location:

trunk

Files:

• lib/hpricot/builder.rb (modified) (1 diff)
• lib/hpricot/elements.rb (modified) (1 diff)
• test/test_paths.rb (modified) (1 diff)

trunk/lib/hpricot/builder.rb

@@ -91 +91 @@
       childs = []
       attrs = args.grep(Hash)
-      childs.concat((args - attrs).map do |x|
+      childs.concat((args - attrs).flatten.map do |x|
         if x.respond_to? :to_html
           Hpricot.make(x.to_html)

trunk/lib/hpricot/elements.rb

@@ -262 +262 @@
     end
 
-    ATTR_RE = %r!\[ *(?:(@)([\w\(\)-]+)|([\w\(\)-]+\(\))) *([~\!\|\*$\^=]*) *'?"?([^\]'"]*)'?"? *\]!i
+    ATTR_RE = %r!\[ *(?:(@)([\w\(\)-]+)|([\w\(\)-]+\(\))) *([~\!\|\*$\^=]*) *'?"?([^'"]*)'?"? *\]!i
     BRACK_RE = %r!(\[) *([^\]]*) *\]+!i
     FUNC_RE = %r!(:)?([a-zA-Z0-9\*_-]*)\( *[\"']?([^ \)]*?)['\"]? *\)!

trunk/test/test_paths.rb

@@ -14 +14 @@
     end
   end
+  def test_attr_brackets
+    doc = Hpricot('<input name="vendor[porkpies]"/>')
+    assert_equal 1, (doc/'input[@name^="vendor[porkpies]"]').length
+    assert_equal 1, (doc/'input[@name="vendor[porkpies]"]').length
+    assert_equal 0, (doc/'input[@name$="]]]]]"]').length
+
+    doc = Hpricot('<input name="vendor[porkpies][meaty]"/>')
+    assert_equal 1, (doc/'input[@name^="vendor[porkpies][meaty]"]').length
+  end
 end