fixing broken space selectors

sparklemotion · Feb 23, 2009 · 5468973 · 5468973
1 parent e4d1071
commit 5468973
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/History.txt b/History.txt
@@ -1,3 +1,9 @@
+=== HEAD
+
+* Bugfixes
+
+  * Fixed a CSS selector space bug
+
 === 1.2.0 / 2008-02-22
 
 * New features

diff --git a/lib/nokogiri/css/tokenizer.rex b/lib/nokogiri/css/tokenizer.rex
@@ -32,9 +32,9 @@ rule
             {w}\*={w}        { [:SUBSTRINGMATCH, text] }
             {w}!={w}         { [:NOT_EQUAL, text] }
             {w}={w}          { [:EQUAL, text] }
-            {w}\){w}         { [:RPAREN, text] }
+            {w}\)            { [:RPAREN, text] }
             {w}\[{w}         { [:LSQUARE, text] }
-            {w}\]{w}         { [:RSQUARE, text] }
+            {w}\]            { [:RSQUARE, text] }
             {w}\+{w}         { [:PLUS, text] }
             {w}>{w}          { [:GREATER, text] }
             {w},{w}          { [:COMMA, text] }

diff --git a/test/css/test_parser.rb b/test/css/test_parser.rb
@@ -73,7 +73,7 @@ def test_attributes_with_at
 
       def test_attributes_with_at_and_stuff
         ## This is non standard CSS
-        assert_xpath  "//a[@id = 'Boing'] div",
+        assert_xpath  "//a[@id = 'Boing']//div",
                       @parser.parse("a[@id='Boing'] div")
       end
 

diff --git a/test/html/test_document.rb b/test/html/test_document.rb
@@ -111,6 +111,14 @@ def test_find_by_css_with_square_brackets
         assert_equal 1, found.length
       end
 
+      def test_find_with_function
+        found = @html.css("div:awesome() h1", Class.new {
+          def awesome divs
+            [divs.first]
+          end
+        }.new)
+      end
+
       def test_dup_shallow
         found = @html.search('//div/a').first
         dup = found.dup(0)