Changeset 144

Timestamp:

05/27/2007 23:39:50 (18 months ago)

Author:

lwu

Message:

wycats's selector patches for jQuery compatibility (see ticket #85 for details)

Location:

trunk

Files:

• lib/hpricot.rb (modified) (1 diff)
• lib/hpricot/elements.rb (modified) (5 diffs)
• test/test_alter.rb (modified) (3 diffs)
• test/test_parser.rb (modified) (1 diff)

trunk/lib/hpricot.rb

@@ -25 +25 @@
 require 'hpricot/parse'
 require 'hpricot/builder'
+require 'hpricot/hpricot_functions'

trunk/lib/hpricot/elements.rb

@@ -51 +51 @@
 # and Hpricot::Container::Trav.
   class Elements < Array
+  
     # Searches this list for any elements (or children of these elements) matching
     # the CSS or XPath expression +expr+.  Root is assumed to be the element scanned.
@@ -203 +204 @@
     BRACK_RE = %r!(\[) *([^\]]*) *\]+!i
     FUNC_RE = %r!(:)?([a-zA-Z0-9\*_-]*)\( *[\"']?([^ \)]*?)['\"]? *\)!
+    CUST_RE = %r!(:)([a-zA-Z0-9\*_-]*)()!
     CATCH_RE = %r!([:\.#]*)([a-zA-Z0-9\*_-]+)!
 
     def self.filter(nodes, expr, truth = true)
         until expr.empty?
-            _, *m = *expr.match(/^(?:#{ATTR_RE}|#{BRACK_RE}|#{FUNC_RE}|#{CATCH_RE})/)
+            _, *m = *expr.match(/^(?:#{ATTR_RE}|#{BRACK_RE}|#{FUNC_RE}|#{CUST_RE}|#{CATCH_RE})/)
             break unless _
 
@@ -222 +224 @@
             if m[0] == ":" && m[1] == "not"
                 nodes, = Elements.filter(nodes, m[2], false)
+            elsif "#{m[0]}#{m[1]}" =~ /^(:even|:odd)$/
+                new_nodes = []
+                nodes.each_with_index {|n,i| new_nodes.push(n) if (i % 2 == (m[1] == "even" ? 0 : 1)) }
+                nodes = new_nodes
+            elsif "#{m[0]}#{m[1]}" =~ /^(:first|:last)$/
+                nodes = [nodes.send(m[1])]
             else
                 meth = "filter[#{m[0]}#{m[1]}]" unless m[0].empty?
@@ -352 +360 @@
     filter ':nth-child' do |arg,i|
       case arg 
-      when 'even'; parent.containers.index(self) % 2 == 0
-      when 'odd';  parent.containers.index(self) % 2 == 1
-      else         self == parent.containers[arg.to_i]
+      when 'even'; (parent.containers.index(self) + 1) % 2 == 0
+      when 'odd';  (parent.containers.index(self) + 1) % 2 == 1
+      else         self == (parent.containers[arg.to_i + 1])
       end
     end
@@ -401 +409 @@
       html.include? arg
     end
+    
+    
 
     pred_procs =

trunk/test/test_alter.rb

@@ -6 +6 @@
 
 class TestAlter < Test::Unit::TestCase
+  def setup
+    @basic = Hpricot.parse(TestFiles::BASIC)
+  end
+  
   def test_before
-    @basic = Hpricot.parse(TestFiles::BASIC)
     test0 = "<link rel='stylesheet' href='test0.css' />"
     @basic.at("link").before(test0)
@@ -14 +17 @@
 
   def test_after
-    @basic = Hpricot.parse(TestFiles::BASIC)
     test_inf = "<link rel='stylesheet' href='test_inf.css' />"
     @basic.search("link")[-1].after(test_inf)
@@ -21 +23 @@
 
   def test_wrap
-    @basic = Hpricot.parse(TestFiles::BASIC)
     ohmy = (@basic/"p.ohmy").wrap("<div id='wrapper'></div>")
     assert_equal 'wrapper', ohmy[0].parent['id']
     assert_equal 'ohmy', Hpricot(@basic.to_html).at("#wrapper").children[0]['class']
   end
+  
+  def test_add_class
+    first_p = @basic["p:first"].add_class("testing123")
+    assert first_p[0].attributes["class"].split(" ").include?("testing123")
+    assert Hpricot(@basic.to_html)["p:first"][0].attributes["class"].split(" ").include?("testing123")
+    assert !Hpricot(@basic.to_html)["p:gt(0)"][0].attributes["class"].split(" ").include?("testing123")
+  end
+  
+  def test_change_attributes
+    all_ps = @basic["p"].attr("title", "Some Title")
+    all_as = @basic["a"].attr("href", "http://my_new_href.com")
+    assert_changed(@basic, "p", all_ps) {|p| p.attributes["title"] == "Some Title"}
+    assert_changed(@basic, "a", all_as) {|a| a.attributes["href"] == "http://my_new_href.com"}
+  end
+  
+  def assert_changed original, selector, set, &block
+    assert set.all? &block
+    assert Hpricot(original.to_html)[selector].all? &block
+  end
 end

trunk/test/test_parser.rb

@@ -177 +177 @@
   def test_alt_predicates
     @boingboing = Hpricot.parse(TestFiles::BOINGBOING)
-    assert_equal 2, @boingboing.search('//table/tr:last').length
+    assert_equal 1, @boingboing.search('//table/tr:last').length
 
     @basic = Hpricot.parse(TestFiles::BASIC)