nokogiri 1.0.0 → 1.6.8.1

data/suppressions/nokogiri_ruby-1.9.2.320.supp

@@ -0,0 +1,28 @@
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Addr4
+   fun:glob_helper
+   fun:ruby_glob0
+   fun:rb_push_glob
+   fun:vm_call_method
+   fun:vm_exec_core
+   fun:vm_exec
+   fun:rb_yield
+   fun:rb_ary_each
+   fun:vm_call_method
+   fun:vm_exec_core
+   fun:vm_exec
+   fun:vm_call0
+   fun:rb_iterate
+   fun:rb_block_call
+   fun:enum_find_all
+   fun:vm_call_method
+   fun:vm_exec_core
+   fun:vm_exec
+   fun:vm_call0
+   fun:rb_class_new_instance
+   fun:vm_call_method
+   fun:vm_exec_core
+   fun:vm_exec
+   fun:vm_call0
+}

data/suppressions/nokogiri_ruby-1.9.3.327.supp

@@ -0,0 +1,28 @@
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Addr4
+   fun:glob_helper
+   fun:ruby_glob0
+   fun:rb_push_glob
+   fun:vm_call_method
+   fun:vm_exec_core
+   fun:vm_exec
+   fun:rb_yield
+   fun:rb_ary_each
+   fun:vm_call_method
+   fun:vm_exec_core
+   fun:vm_exec
+   fun:vm_call0
+   fun:rb_iterate
+   fun:rb_block_call
+   fun:enum_find_all
+   fun:vm_call_method
+   fun:vm_exec_core
+   fun:vm_exec
+   fun:vm_call0
+   fun:rb_class_new_instance
+   fun:vm_call_method
+   fun:vm_exec_core
+   fun:vm_exec
+   fun:vm_call0
+}

data/tasks/test.rb

@@ -0,0 +1,100 @@
+namespace :test do
+  desc "run test suite with aggressive GC"
+  task :gc => :build do
+    ENV['NOKOGIRI_GC'] = "true"
+    Rake::Task["test"].invoke
+  end
+
+  task :installed do
+    ENV['RUBY_FLAGS'] = "-w -Itest:."
+    sh 'rake test'
+  end
+
+  desc "find call-seq in the rdoc"
+  task :rdoc_call_seq => 'docs' do
+    Dir['doc/**/*.html'].each { |docfile|
+      next if docfile =~ /\.src/
+      puts "FAIL: #{docfile}" if File.read(docfile) =~ /call-seq/
+    }
+  end
+
+  desc "find all undocumented things"
+  task :rdoc => 'docs' do
+    base = File.expand_path(File.join(File.dirname(__FILE__), '..', 'doc'))
+    require 'test/unit'
+    test = Class.new(Test::Unit::TestCase)
+    Dir["#{base}/**/*.html"].each { |docfile|
+      test.class_eval(<<-eotest)
+        def test_#{docfile.sub("#{base}/", '').gsub(/[\/\.-]/, '_')}
+          assert_no_match(
+            /Not documented/,
+            File.read('#{docfile}'),
+            '#{docfile} has undocumented things'
+          )
+        end
+      eotest
+    }
+  end
+
+  desc "Test against multiple versions of libxml2 (MULTIXML2_DIR=directory)"
+  task :multixml2 do
+    MULTI_XML = File.join(ENV['HOME'], '.multixml2')
+    unless File.exists?(MULTI_XML)
+      %w{ versions install build }.each { |x|
+        FileUtils.mkdir_p(File.join(MULTI_XML, x))
+      }
+      Dir.chdir File.join(MULTI_XML, 'versions') do
+        require 'net/ftp'
+        puts "Contacting xmlsoft.org ..."
+        ftp = Net::FTP.new('xmlsoft.org')
+        ftp.login('anonymous', 'anonymous')
+        ftp.chdir('libxml2')
+        ftp.list('libxml2-2.*.tar.gz').each do |x|
+          file = x[/[^\s]*$/]
+          puts "Downloading #{file}"
+          ftp.getbinaryfile(file)
+        end
+      end
+    end
+
+    # Build any libxml2 versions in $HOME/.multixml2/versions that
+    # haven't been built yet
+    Dir[File.join(MULTI_XML, 'versions','*.tar.gz')].each do |f|
+      filename = File.basename(f, '.tar.gz')
+
+      install_dir = File.join(MULTI_XML, 'install', filename)
+      next if File.exists?(install_dir)
+
+      Dir.chdir File.join(MULTI_XML, 'versions') do
+        system "tar zxvf #{f} -C #{File.join(MULTI_XML, 'build')}"
+      end
+
+      Dir.chdir File.join(MULTI_XML, 'build', filename) do
+        system "./configure --without-http --prefix=#{install_dir}"
+        system "make && make install"
+      end
+    end
+
+    test_results = {}
+    libxslt = Dir[File.join(MULTI_XML, 'install', 'libxslt*')].first
+
+    directories = ENV['MULTIXML2_DIR'] ? [ENV['MULTIXML2_DIR']] : Dir[File.join(MULTI_XML, 'install', '*')]
+    directories.sort.reverse_each do |xml2_version|
+      next unless xml2_version =~ /libxml2/
+      extopts = "--with-xml2-include=#{xml2_version}/include/libxml2 --with-xml2-lib=#{xml2_version}/lib --with-xslt-dir=#{libxslt} --with-iconv-dir=/usr"
+      cmd = "#{$0} clean test EXTOPTS='#{extopts}' LD_LIBRARY_PATH='#{xml2_version}/lib'"
+
+      version = File.basename(xml2_version)
+      result = system(cmd)
+      test_results[version] = {
+        :result => result,
+        :cmd    => cmd
+      }
+    end
+    test_results.sort_by { |k,v| k }.each do |k,v|
+      passed = v[:result]
+      puts "#{k}: #{passed ? 'PASS' : 'FAIL'}"
+      puts "repro: #{v[:cmd]}" unless passed
+    end
+  end
+end

data/test/css/test_nthiness.rb

@@ -1,9 +1,10 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module CSS
     class TestNthiness < Nokogiri::TestCase
       def setup
+        super
         doc = <<EOF
 <html>
 <table>
@@ -25,10 +26,20 @@ module Nokogiri
 <div>
   <b>bold1 </b>
   <i>italic1 </i>
-  <b>bold2 </b>
+  <b class="a">bold2 </b>
+  <em class="a">emphasis1 </em>
   <i>italic2 </i>
   <p>para1 </p>
-  <b>bold3 </b>
+  <b class="a">bold3 </b>
+</div>
+<div>
+  <i class="b">italic3 </i>
+  <em>emphasis2 </em>
+  <i class="b">italic4 </i>
+  <em>emphasis3 </em>
+  <i class="c">italic5 </i>
+  <span><i class="b">italic6 </i></span>  
+  <i>italic7 </i>
 </div>
 <div>
   <p>para2 </p>
@@ -37,11 +48,25 @@ module Nokogiri
 <div>
   <p>para4 </p>
 </div>
+
+<div>
+  <h2></h2>
+  <h1 class='c'>header1 </h1>
+  <h2></h2>
+</div>
+<div>
+  <h1 class='c'>header2 </h1>
+  <h1 class='c'>header3 </h1>
+</div>
+<div>
+  <h1 class='c'>header4</h1>
+</div>
+  
 <p class='empty'></p>
 <p class='not-empty'><b></b></p>
 </html>
 EOF
-        @parser = Nokogiri.Hpricot doc
+        @parser = Nokogiri.HTML doc
       end
 
 
@@ -53,6 +78,10 @@ EOF
         assert_result_rows [1,3,5,7,9,11,13], @parser.search("table/tr:nth(odd)")
       end
 
+      def test_n
+        assert_result_rows((1..14).to_a, @parser.search("table/tr:nth(n)"))
+      end
+
       def test_2n
         assert_equal @parser.search("table/tr:nth(even)").inner_text, @parser.search("table/tr:nth(2n)").inner_text
       end
@@ -73,6 +102,10 @@ EOF
         assert_result_rows [1,2,3], @parser.search("table/tr:nth(-n+3)")
       end
 
+      def test_4nm1
+        assert_result_rows [3,7,11], @parser.search("table/tr:nth(4n-1)")
+      end
+
       def test_np3
         assert_result_rows [3,4,5,6,7,8,9,10,11,12,13,14], @parser.search("table/tr:nth(n+3)")
       end
@@ -90,29 +123,64 @@ EOF
       def test_first_child
         assert_result_rows [1], @parser.search("div/b:first-child"), "bold"
         assert_result_rows [1], @parser.search("table/tr:first-child")
+        assert_result_rows [2,4],  @parser.search("div/h1.c:first-child"), "header"
       end
 
       def test_last_child
         assert_result_rows [3], @parser.search("div/b:last-child"), "bold"
         assert_result_rows [14], @parser.search("table/tr:last-child")
+        assert_result_rows [3,4], @parser.search("div/h1.c:last-child"), "header"
+      end
+      
+      def test_nth_child
+        assert_result_rows [2], @parser.search("div/b:nth-child(3)"), "bold"
+        assert_result_rows [5], @parser.search("table/tr:nth-child(5)")
+        assert_result_rows [1,3], @parser.search("div/h1.c:nth-child(2)"), "header"
+        assert_result_rows [3,4], @parser.search("div/i.b:nth-child(2n+1)"), "italic"
       end
 
       def test_first_of_type
         assert_result_rows [1], @parser.search("table/tr:first-of-type")
         assert_result_rows [1], @parser.search("div/b:first-of-type"), "bold"
+        assert_result_rows [2], @parser.search("div/b.a:first-of-type"), "bold"
+        assert_result_rows [3], @parser.search("div/i.b:first-of-type"), "italic"
       end
 
       def test_last_of_type
         assert_result_rows [14], @parser.search("table/tr:last-of-type")
         assert_result_rows [3], @parser.search("div/b:last-of-type"), "bold"
+        assert_result_rows [2,7], @parser.search("div/i:last-of-type"), "italic"
+        assert_result_rows [2,6,7], @parser.search("div i:last-of-type"), "italic"
+        assert_result_rows [4], @parser.search("div/i.b:last-of-type"), "italic"
+      end
+      
+      def test_nth_of_type
+        assert_result_rows [1], @parser.search("div/b:nth-of-type(1)"), "bold"
+        assert_result_rows [2], @parser.search("div/b:nth-of-type(2)"), "bold"
+        assert_result_rows [2], @parser.search("div/.a:nth-of-type(1)"), "bold"
+        assert_result_rows [2,4,7], @parser.search("div i:nth-of-type(2n)"), "italic"
+        assert_result_rows [1,3,5,6], @parser.search("div i:nth-of-type(2n+1)"), "italic"
+        assert_result_rows [1], @parser.search("div .a:nth-of-type(2n)"), "emphasis"
+        assert_result_rows [2,3], @parser.search("div .a:nth-of-type(2n+1)"), "bold"
+      end
+      
+      def test_nth_last_of_type
+        assert_result_rows [14], @parser.search("table/tr:nth-last-of-type(1)")
+        assert_result_rows [12], @parser.search("table/tr:nth-last-of-type(3)")
+        assert_result_rows [2,6,7], @parser.search("div i:nth-last-of-type(1)"), "italic"
+        assert_result_rows [1,5], @parser.search("div i:nth-last-of-type(2)"), "italic"        
+        assert_result_rows [4], @parser.search("div/i.b:nth-last-of-type(1)"), "italic"
+        assert_result_rows [3], @parser.search("div/i.b:nth-last-of-type(2)"), "italic"
       end
 
       def test_only_of_type
         assert_result_rows [1,4], @parser.search("div/p:only-of-type"), "para"
+        assert_result_rows [5], @parser.search("div/i.c:only-of-type"), "italic"
       end
 
       def test_only_child
         assert_result_rows [4], @parser.search("div/p:only-child"), "para"
+        assert_result_rows [4], @parser.search("div/h1.c:only-child"), "header"
       end
 
       def test_empty
@@ -139,8 +207,7 @@ EOF
 <p id="4">p4 </p>
 <p id="5">p5 </p>
 EOF
-        parser = Nokogiri.Hpricot doc
-        
+        parser = Nokogiri.HTML doc
         assert_equal 2, parser.search("#3 ~ p").size
         assert_equal "p4 p5 ", parser.search("#3 ~ p").inner_text
         assert_equal 0, parser.search("#5 ~ p").size

data/test/css/test_parser.rb

@@ -1,10 +1,27 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module CSS
     class TestParser < Nokogiri::TestCase
       def setup
+        super
         @parser = Nokogiri::CSS::Parser.new
+        @parser_with_ns = Nokogiri::CSS::Parser.new({
+          "xmlns" => "http://default.example.com/",
+          "hoge" => "http://hoge.example.com/",
+        })
+      end
+
+      def test_extra_single_quote
+        assert_raises(CSS::SyntaxError) { @parser.parse("'") }
+      end
+
+      def test_syntax_error_raised
+        assert_raises(CSS::SyntaxError) { @parser.parse("a[x=]") }
+      end
+
+      def test_function_and_pseudo
+        assert_xpath '//child::text()[position() = 99]', @parser.parse('text():nth-of-type(99)')
       end
 
       def test_find_by_type
@@ -45,28 +62,66 @@ module Nokogiri
         )
       end
 
+      def test_has
+        assert_xpath  "//a[b]", @parser.parse("a:has(b)")
+        assert_xpath  "//a[b/c]", @parser.parse("a:has(b > c)")
+      end
+
+      def test_dashmatch
+        assert_xpath  "//a[@class = 'bar' or starts-with(@class, concat('bar', '-'))]",
+                      @parser.parse("a[@class|='bar']")
+        assert_xpath  "//a[@class = 'bar' or starts-with(@class, concat('bar', '-'))]",
+                      @parser.parse("a[@class |= 'bar']")
+      end
+
+      def test_includes
+        assert_xpath  "//a[contains(concat(\" \", @class, \" \"),concat(\" \", 'bar', \" \"))]",
+                      @parser.parse("a[@class~='bar']")
+        assert_xpath  "//a[contains(concat(\" \", @class, \" \"),concat(\" \", 'bar', \" \"))]",
+                      @parser.parse("a[@class ~= 'bar']")
+      end
+
       def test_function_with_arguments
-        assert_xpath  "//*[position() = 2 and self::a]",
+        assert_xpath  "//a[count(preceding-sibling::*) = 1]",
                       @parser.parse("a[2]")
-        assert_xpath  "//*[position() = 2 and self::a]",
+        assert_xpath  "//a[count(preceding-sibling::*) = 1]",
                       @parser.parse("a:nth-child(2)")
       end
 
       def test_carrot
         assert_xpath  "//a[starts-with(@id, 'Boing')]",
                       @parser.parse("a[id^='Boing']")
+        assert_xpath  "//a[starts-with(@id, 'Boing')]",
+                      @parser.parse("a[id ^= 'Boing']")
+      end
+
+      def test_suffix_match
+        assert_xpath "//a[substring(@id, string-length(@id) - string-length('Boing') + 1, string-length('Boing')) = 'Boing']",
+                      @parser.parse("a[id$='Boing']")
+        assert_xpath "//a[substring(@id, string-length(@id) - string-length('Boing') + 1, string-length('Boing')) = 'Boing']",
+                      @parser.parse("a[id $= 'Boing']")
       end
 
       def test_attributes_with_at
         ## This is non standard CSS
         assert_xpath  "//a[@id = 'Boing']",
                       @parser.parse("a[@id='Boing']")
+        assert_xpath  "//a[@id = 'Boing']",
+                      @parser.parse("a[@id = 'Boing']")
+      end
+
+      def test_attributes_with_at_and_stuff
+        ## This is non standard CSS
+        assert_xpath  "//a[@id = 'Boing']//div",
+                      @parser.parse("a[@id='Boing'] div")
       end
 
       def test_not_equal
         ## This is non standard CSS
         assert_xpath  "//a[child::text() != 'Boing']",
                       @parser.parse("a[text()!='Boing']")
+        assert_xpath  "//a[child::text() != 'Boing']",
+                      @parser.parse("a[text() != 'Boing']")
       end
 
       def test_function
@@ -81,6 +136,8 @@ module Nokogiri
         ## This is non standard CSS
         assert_xpath  "//a[contains(child::text(), 'Boing')]",
                       @parser.parse("a[text()*='Boing']")
+        assert_xpath  "//a[contains(child::text(), 'Boing')]",
+                      @parser.parse("a[text() *= 'Boing']")
 
         ## This is non standard CSS
         assert_xpath  "//script//comment()",
@@ -89,35 +146,43 @@ module Nokogiri
 
       def test_nonstandard_nth_selectors
         ## These are non standard CSS
-        assert_xpath '//a[position() = 99]', @parser.parse('a:eq(99)')
-        assert_xpath '//a[position() = 1]', @parser.parse('a:first') # no parens
-        assert_xpath '//a[position() = last()]', @parser.parse('a:last') # no parens
-        assert_xpath '//a[position() = 99]', @parser.parse('a:nth(99)')
-        assert_xpath '//a[position() = 1]', @parser.parse('a:first()')
-        assert_xpath '//a[position() = last()]', @parser.parse('a:last()')
-        assert_xpath '//a[node()]', @parser.parse('a:parent')
+        assert_xpath '//a[position() = 1]',             @parser.parse('a:first()')
+        assert_xpath '//a[position() = 1]',             @parser.parse('a:first') # no parens
+        assert_xpath '//a[position() = 99]',            @parser.parse('a:eq(99)')
+        assert_xpath '//a[position() = 99]',            @parser.parse('a:nth(99)')
+        assert_xpath '//a[position() = last()]',        @parser.parse('a:last()')
+        assert_xpath '//a[position() = last()]',        @parser.parse('a:last') # no parens
+        assert_xpath '//a[node()]',                     @parser.parse('a:parent')
       end
 
       def test_standard_nth_selectors
-        assert_xpath '//a[position() = 99]', @parser.parse('a:nth-of-type(99)')
-        assert_xpath '//a[position() = 1]', @parser.parse('a:first-of-type()')
-        assert_xpath '//a[position() = last()]', @parser.parse('a:last-of-type()')
-        assert_xpath '//a[position() = 1]', @parser.parse('a:first-of-type') # no parens
-        assert_xpath '//a[position() = last()]', @parser.parse('a:last-of-type') # no parens
-        assert_xpath '//a[position() = last() - 99]', @parser.parse('a:nth-last-of-type(99)')
-        assert_xpath '//a[position() = last() - 99]', @parser.parse('a:nth-last-of-type(99)')
+        assert_xpath '//a[position() = 1]',             @parser.parse('a:first-of-type()')
+        assert_xpath '//a[position() = 1]',             @parser.parse('a:first-of-type') # no parens
+        assert_xpath "//a[contains(concat(' ', normalize-space(@class), ' '), ' b ')][position() = 1]",
+                     @parser.parse('a.b:first-of-type') # no parens
+        assert_xpath '//a[position() = 99]',            @parser.parse('a:nth-of-type(99)')
+        assert_xpath "//a[contains(concat(' ', normalize-space(@class), ' '), ' b ')][position() = 99]",
+                     @parser.parse('a.b:nth-of-type(99)')
+        assert_xpath '//a[position() = last()]',        @parser.parse('a:last-of-type()')
+        assert_xpath '//a[position() = last()]',        @parser.parse('a:last-of-type') # no parens
+        assert_xpath "//a[contains(concat(' ', normalize-space(@class), ' '), ' b ')][position() = last()]",
+                     @parser.parse('a.b:last-of-type') # no parens
+        assert_xpath '//a[position() = last()]',        @parser.parse('a:nth-last-of-type(1)')
+        assert_xpath '//a[position() = last() - 98]',   @parser.parse('a:nth-last-of-type(99)')
+        assert_xpath "//a[contains(concat(' ', normalize-space(@class), ' '), ' b ')][position() = last() - 98]",
+                     @parser.parse('a.b:nth-last-of-type(99)')
       end
 
       def test_nth_child_selectors
-        assert_xpath '//*[position() = 1 and self::a]', @parser.parse('a:first-child')
-        assert_xpath '//*[position() = last() and self::a]', @parser.parse('a:last-child')
-        assert_xpath '//*[position() = 99 and self::a]', @parser.parse('a:nth-child(99)')
-        assert_xpath '//*[position() = last() - 99 and self::a]', @parser.parse('a:nth-last-child(99)')
+        assert_xpath '//a[count(preceding-sibling::*) = 0]',  @parser.parse('a:first-child')
+        assert_xpath '//a[count(preceding-sibling::*) = 98]', @parser.parse('a:nth-child(99)')
+        assert_xpath '//a[count(following-sibling::*) = 0]',  @parser.parse('a:last-child')
+        assert_xpath '//a[count(following-sibling::*) = 0]',  @parser.parse('a:nth-last-child(1)')
+        assert_xpath '//a[count(following-sibling::*) = 98]', @parser.parse('a:nth-last-child(99)')
       end
 
       def test_miscellaneous_selectors
-        assert_xpath '//*[last() = 1 and self::a]',
-          @parser.parse('a:only-child')
+        assert_xpath '//a[count(preceding-sibling::*) = 0 and count(following-sibling::*) = 0]',  @parser.parse('a:only-child')
         assert_xpath '//a[last() = 1]', @parser.parse('a:only-of-type')
         assert_xpath '//a[not(node())]', @parser.parse('a:empty')
       end
@@ -128,20 +193,63 @@ module Nokogiri
         assert_xpath '//a[(position() mod 2) = 0]', @parser.parse('a:nth-of-type(even)')
         assert_xpath '//a[(position() >= 1) and (((position()-1) mod 2) = 0)]', @parser.parse('a:nth-of-type(odd)')
         assert_xpath '//a[(position() >= 3) and (((position()-3) mod 4) = 0)]', @parser.parse('a:nth-of-type(4n+3)')
-        assert_xpath '//a[(position() <= 3) and (((position()-3) mod 1) = 0)]', @parser.parse('a:nth-of-type(-1n+3)')
-        assert_xpath '//a[(position() <= 3) and (((position()-3) mod 1) = 0)]', @parser.parse('a:nth-of-type(-n+3)')
-        assert_xpath '//a[(position() >= 3) and (((position()-3) mod 1) = 0)]', @parser.parse('a:nth-of-type(1n+3)')
-        assert_xpath '//a[(position() >= 3) and (((position()-3) mod 1) = 0)]', @parser.parse('a:nth-of-type(n+3)')
+        assert_xpath '//a[position() <= 3]', @parser.parse('a:nth-of-type(-1n+3)')
+        assert_xpath '//a[position() <= 3]', @parser.parse('a:nth-of-type(-n+3)')
+        assert_xpath '//a[position() >= 3]', @parser.parse('a:nth-of-type(1n+3)')
+        assert_xpath '//a[position() >= 3]', @parser.parse('a:nth-of-type(n+3)')
+
+        assert_xpath '//a[((last()-position()+1) mod 2) = 0]', @parser.parse('a:nth-last-of-type(2n)')
+        assert_xpath '//a[((last()-position()+1) >= 1) and ((((last()-position()+1)-1) mod 2) = 0)]', @parser.parse('a:nth-last-of-type(2n+1)')
+        assert_xpath '//a[((last()-position()+1) mod 2) = 0]', @parser.parse('a:nth-last-of-type(even)')
+        assert_xpath '//a[((last()-position()+1) >= 1) and ((((last()-position()+1)-1) mod 2) = 0)]', @parser.parse('a:nth-last-of-type(odd)')
+        assert_xpath '//a[((last()-position()+1) >= 3) and ((((last()-position()+1)-3) mod 4) = 0)]', @parser.parse('a:nth-last-of-type(4n+3)')
+        assert_xpath '//a[(last()-position()+1) <= 3]', @parser.parse('a:nth-last-of-type(-1n+3)')
+        assert_xpath '//a[(last()-position()+1) <= 3]', @parser.parse('a:nth-last-of-type(-n+3)')
+        assert_xpath '//a[(last()-position()+1) >= 3]', @parser.parse('a:nth-last-of-type(1n+3)')
+        assert_xpath '//a[(last()-position()+1) >= 3]', @parser.parse('a:nth-last-of-type(n+3)')
       end
 
       def test_preceding_selector
-        assert_xpath  "//F[preceding-sibling::E]",
+        assert_xpath  "//E/following-sibling::F",
                       @parser.parse("E ~ F")
+
+        assert_xpath  "//E/following-sibling::F//G",
+                      @parser.parse("E ~ F G")
       end
 
       def test_direct_preceding_selector
         assert_xpath  "//E/following-sibling::*[1]/self::F",
                       @parser.parse("E + F")
+
+        assert_xpath  "//E/following-sibling::*[1]/self::F//G",
+                      @parser.parse("E + F G")
+      end
+
+      def test_child_selector
+        assert_xpath("//a//b/i", @parser.parse('a b>i'))
+        assert_xpath("//a//b/i", @parser.parse('a b > i'))
+        assert_xpath("//a/b/i", @parser.parse('a > b > i'))
+      end
+
+      def test_prefixless_child_selector
+        assert_xpath("./a", @parser.parse('>a'))
+        assert_xpath("./a", @parser.parse('> a'))
+        assert_xpath("./a//b/i", @parser.parse('>a b>i'))
+        assert_xpath("./a/b/i", @parser.parse('> a > b > i'))
+      end
+
+      def test_prefixless_preceding_sibling_selector
+        assert_xpath("./following-sibling::a", @parser.parse('~a'))
+        assert_xpath("./following-sibling::a", @parser.parse('~ a'))
+        assert_xpath("./following-sibling::a//b/following-sibling::i", @parser.parse('~a b~i'))
+        assert_xpath("./following-sibling::a//b/following-sibling::i", @parser.parse('~ a b ~ i'))
+      end
+
+      def test_prefixless_direct_adjacent_selector
+        assert_xpath("./following-sibling::*[1]/self::a", @parser.parse('+a'))
+        assert_xpath("./following-sibling::*[1]/self::a", @parser.parse('+ a'))
+        assert_xpath("./following-sibling::*[1]/self::a/following-sibling::*[1]/self::b", @parser.parse('+a+b'))
+        assert_xpath("./following-sibling::*[1]/self::a/following-sibling::*[1]/self::b", @parser.parse('+ a + b'))
       end
 
       def test_attribute
@@ -151,36 +259,66 @@ module Nokogiri
 
       def test_id
         assert_xpath "//*[@id = 'foo']", @parser.parse('#foo')
+        assert_xpath "//*[@id = 'escape:needed,']", @parser.parse('#escape\:needed\,')
+        assert_xpath "//*[@id = 'escape:needed,']", @parser.parse('#escape\3Aneeded\,')
+        assert_xpath "//*[@id = 'escape:needed,']", @parser.parse('#escape\3A needed\2C')
+        assert_xpath "//*[@id = 'escape:needed']", @parser.parse('#escape\00003Aneeded')
       end
 
       def test_pseudo_class_no_ident
-        assert_xpath "//*[1 = 1]", @parser.parse(':link')
+        assert_xpath "//*[link(.)]", @parser.parse(':link')
       end
 
       def test_pseudo_class
-        assert_xpath "//a[1 = 1]", @parser.parse('a:link')
-        assert_xpath "//a[1 = 1]", @parser.parse('a:visited')
-        assert_xpath "//a[1 = 1]", @parser.parse('a:hover')
-        assert_xpath "//a[1 = 1]", @parser.parse('a:active')
-        assert_xpath  "//a[1 = 1 and contains(concat(' ', @class, ' '), ' foo ')]",
+        assert_xpath "//a[link(.)]", @parser.parse('a:link')
+        assert_xpath "//a[visited(.)]", @parser.parse('a:visited')
+        assert_xpath "//a[hover(.)]", @parser.parse('a:hover')
+        assert_xpath "//a[active(.)]", @parser.parse('a:active')
+        assert_xpath  "//a[active(.) and contains(concat(' ', normalize-space(@class), ' '), ' foo ')]",
                       @parser.parse('a:active.foo')
       end
 
+      def test_significant_space
+        assert_xpath "//x//*[count(preceding-sibling::*) = 0]//*[@a]//*[@b]", @parser.parse("x :first-child [a] [b]")
+        assert_xpath "//*[@a]//*[@b]", @parser.parse(" [a] [b]")
+      end
+
       def test_star
         assert_xpath "//*", @parser.parse('*')
-        assert_xpath "//*[contains(concat(' ', @class, ' '), ' pastoral ')]",
+        assert_xpath "//*[contains(concat(' ', normalize-space(@class), ' '), ' pastoral ')]",
                       @parser.parse('*.pastoral')
       end
 
       def test_class
-        assert_xpath  "//*[contains(concat(' ', @class, ' '), ' a ') and contains(concat(' ', @class, ' '), ' b ')]",
+        assert_xpath  "//*[contains(concat(' ', normalize-space(@class), ' '), ' a ') and contains(concat(' ', normalize-space(@class), ' '), ' b ')]",
                       @parser.parse('.a.b')
-        assert_xpath  "//*[contains(concat(' ', @class, ' '), ' awesome ')]",
+        assert_xpath  "//*[contains(concat(' ', normalize-space(@class), ' '), ' awesome ')]",
                       @parser.parse('.awesome')
-        assert_xpath  "//foo[contains(concat(' ', @class, ' '), ' awesome ')]",
+        assert_xpath  "//foo[contains(concat(' ', normalize-space(@class), ' '), ' awesome ')]",
                       @parser.parse('foo.awesome')
-        assert_xpath  "//foo//*[contains(concat(' ', @class, ' '), ' awesome ')]",
+        assert_xpath  "//foo//*[contains(concat(' ', normalize-space(@class), ' '), ' awesome ')]",
                       @parser.parse('foo .awesome')
+        assert_xpath  "//foo//*[contains(concat(' ', normalize-space(@class), ' '), ' awe.some ')]",
+                      @parser.parse('foo .awe\.some')
+      end
+
+      def test_bare_not
+        assert_xpath "//*[not(contains(concat(' ', normalize-space(@class), ' '), ' a '))]",
+                     @parser.parse(':not(.a)')
+      end
+
+      def test_not_so_simple_not
+        assert_xpath "//*[@id = 'p' and not(contains(concat(' ', normalize-space(@class), ' '), ' a '))]",
+                     @parser.parse('#p:not(.a)')
+        assert_xpath "//p[contains(concat(' ', normalize-space(@class), ' '), ' a ') and not(contains(concat(' ', normalize-space(@class), ' '), ' b '))]",
+                     @parser.parse('p.a:not(.b)')
+        assert_xpath "//p[@a = 'foo' and not(contains(concat(' ', normalize-space(@class), ' '), ' b '))]",
+                     @parser.parse("p[a='foo']:not(.b)")
+      end
+
+      def test_multiple_not
+        assert_xpath "//p[not(contains(concat(' ', normalize-space(@class), ' '), ' a ')) and not(contains(concat(' ', normalize-space(@class), ' '), ' b ')) and not(contains(concat(' ', normalize-space(@class), ' '), ' c '))]",
+                    @parser.parse("p:not(.a):not(.b):not(.c)")
       end
 
       def test_ident
@@ -213,6 +351,13 @@ module Nokogiri
         # assert_xpath ['//x/y', '//y/z'], @parser.parse('x > y | y > z')
       end
 
+      def test_attributes_with_namespace
+        ## Default namespace is not applied to attributes.
+        ## So this must be @class, not @xmlns:class.
+        assert_xpath "//xmlns:a[@class = 'bar']", @parser_with_ns.parse("a[class='bar']")
+        assert_xpath "//xmlns:a[@hoge:class = 'bar']", @parser_with_ns.parse("a[hoge|class='bar']")
+      end
+
       def assert_xpath expecteds, asts
         expecteds = [expecteds].flatten
         expecteds.zip(asts).each do |expected, actual|