nokogiri 1.4.3.1-java → 1.5.0-java

data/lib/nokogiri/xslt/stylesheet.rb

@@ -6,7 +6,7 @@ module Nokogiri
     # an XML::Document with a Stylesheet:
     #
     #   doc   = Nokogiri::XML(File.read('some_file.xml'))
-    #   xslt  = Nokogir::XSLT(File.read('some_transformer.xslt'))
+    #   xslt  = Nokogiri::XSLT(File.read('some_transformer.xslt'))
     #
     #   puts xslt.transform(doc)
     #

data/lib/nokogiri/xslt.rb

@@ -9,8 +9,8 @@ module Nokogiri
     #
     #   xslt = Nokogiri::XSLT(File.read(ARGV[0]))
     #
-    def XSLT stylesheet
-      XSLT.parse(stylesheet)
+    def XSLT stylesheet, modules = {}
+      XSLT.parse(stylesheet, modules)
     end
   end
 
@@ -20,11 +20,15 @@ module Nokogiri
   module XSLT
     class << self
       ###
-      # Parse the stylesheet in +string+
-      def parse string
+      # Parse the stylesheet in +string+, register any +modules+
+      def parse string, modules = {}
+        modules.each do |url, klass|
+          XSLT.register url, klass
+	end
+
         Stylesheet.parse_stylesheet_doc(XML.parse(string))
       end
-      
+
       ###
       # Quote parameters in +params+ for stylesheet safety
       def quote_params params

data/lib/nokogiri.rb

@@ -6,32 +6,26 @@ ENV['PATH'] = [File.expand_path(
   File.join(File.dirname(__FILE__), "..", "ext", "nokogiri")
 ), ENV['PATH']].compact.join(';') if RbConfig::CONFIG['host_os'] =~ /(mswin|mingw)/i
 
-if ENV['NOKOGIRI_FFI'] || RUBY_PLATFORM =~ /java/
-  require 'ffi'
-  require 'nokogiri/ffi/libxml'
-else
-  require 'nokogiri/nokogiri'
+if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
+  # The line below caused a problem on non-GAE rack environment.
+  # unless defined?(JRuby::Rack::VERSION) || defined?(AppEngine::ApiProxy)
+  #
+  # However, simply cutting defined?(JRuby::Rack::VERSION) off resulted in
+  # an unable-to-load-nokogiri problem. Thus, now, Nokogiri checks the presense
+  # of appengine-rack.jar in $LOAD_PATH. If Nokogiri is on GAE, Nokogiri
+  # should skip loading xml jars. This is because those are in WEB-INF/lib and 
+  # already set in the classpath.
+  unless $LOAD_PATH.to_s.include?("appengine-rack")
+    require 'isorelax.jar'
+    require 'jing.jar'
+    require 'nekohtml.jar'
+    require 'nekodtd.jar'
+    require 'xercesImpl.jar'
+  end
 end
 
-warn(<<-eowarn) if '1.8.6' == RUBY_VERSION && $VERBOSE
-!!! DEPRECATION WARNING !!!
-Hey Champ!  I see you're using Ruby 1.8.6!  While I applaud you for sticking to
-your guns and using The One True Ruby, I have to let you know that we're going
-to stop supporting 1.8.6.  I know, it's sad.  But, we just don't have time to
-support every version of Ruby out there.  Whether we like it or not, time moves
-forward and so does our software.
-
-On August 1, 2010, we will no longer support Ruby 1.8.6.  If nokogiri happens to
-work on 1.8.6 after that date, then great!  We will hownever, no longer test,
-use, or endorse 1.8.6 as a supported platform.
-
-Thanks,
-
-  Team Nokogiri
-eowarn
-
+require 'nokogiri/nokogiri'
 require 'nokogiri/version'
-require 'nokogiri/version_warning'
 require 'nokogiri/syntax_error'
 require 'nokogiri/xml'
 require 'nokogiri/xslt'
@@ -73,13 +67,13 @@ module Nokogiri
       doc =
         if string.respond_to?(:read) ||
           string =~ /^\s*<[^Hh>]*html/i # Probably html
-          Nokogiri::HTML(
+          Nokogiri.HTML(
             string,
             url,
             encoding, options || XML::ParseOptions::DEFAULT_HTML
           )
         else
-          Nokogiri::XML(string, url, encoding,
+          Nokogiri.XML(string, url, encoding,
                         options || XML::ParseOptions::DEFAULT_XML)
         end
       yield doc if block_given?

data/nokogiri_help_responses.md

@@ -0,0 +1,40 @@
+# not-enough-information
+
+Hello!
+
+Thanks for asking this question! However, without more information,
+Team Nokogiri cannot reproduce your issue, and so we cannot offer much
+help.
+
+Please provide us with:
+
+* A self-contained script (one that we can run without modification,
+  and preferably without making external network connections).
+
+* Please note that you need to include the XML/HTML that you are
+  operating on.
+
+* The output of `nokogiri -v`, which will provide details about your
+  platform and versions of ruby, libxml2 and nokogiri.
+
+For more information about requesting help or reporting bugs, please
+take a look at http://bit.ly/nokohelp
+
+Thank you so much!
+
+# not-a-bug
+
+Hello!
+
+Thanks for asking this question! Your request for help will not go
+unanswered!
+
+However, Nokogiri's Github Issues is reserved for reporting bugs or
+submitting patches. If you ask your question on the mailing list, Team
+Nokogiri promises someone will provide you with an answer in a timely
+manner.
+
+If you'd like to read up on Team Nokogiri's rationale for this policy,
+please go to http://bit.ly/nokohelp.
+
+Thank you so much for understanding! And thank you for using Nokogiri.

data/tasks/cross_compile.rb

@@ -1,158 +1,152 @@
 require 'rake/extensioncompiler'
 HOST = Rake::ExtensionCompiler.mingw_host
-TARGET = 'i386-pc-mingw32'
 
-ZLIB    = 'zlib-1.2.5'
-ICONV   = 'libiconv-1.13.1'
-LIBXML  = 'libxml2-2.7.7'
-LIBXSLT = 'libxslt-1.1.26'
-
-### Build zlib ###
-file "tmp/cross/download/#{ZLIB}" do |t|
-  FileUtils.mkdir_p('tmp/cross/download')
-
-  file = ZLIB
-  url  = "http://zlib.net/#{file}.tar.gz"
-
-  Dir.chdir('tmp/cross/download') do
-    sh "wget #{url} || curl -O #{url}"
-    sh "tar zxvf #{file}.tar.gz"
-  end
-
-  Dir.chdir t.name do
-    mk = File.read('win32/Makefile.gcc')
-    File.open('win32/Makefile.gcc', 'wb') do |f|
-      f.puts "BINARY_PATH = #{CROSS_DIR}/bin"
-      f.puts "LIBRARY_PATH = #{CROSS_DIR}/lib"
-      f.puts "INCLUDE_PATH = #{CROSS_DIR}/include"
-
-      # FIXME: need to make the cross compiler dynamic
-      f.puts mk.sub(/^PREFIX\s*=\s*$/, "PREFIX = #{HOST}-") #.
-        #sub(/^SHARED_MODE=0$/, 'SHARED_MODE=1').
-        #sub(/^IMPLIB\s*=.*$/, 'IMPLIB=libz.dll.a')
-    end
+require 'mini_portile'
+$recipes = {}
+$recipes[:zlib]     = MiniPortile.new "zlib", "1.2.5"
+$recipes[:libiconv] = MiniPortile.new "libiconv", "1.13.1"
+$recipes[:libxml2]  = MiniPortile.new "libxml2", "2.7.7"
+$recipes[:libxslt]  = MiniPortile.new "libxslt", "1.1.26"
+$recipes.each { |_, recipe| recipe.host = HOST }
+
+file "lib/nokogiri/nokogiri.rb" do
+  File.open("lib/nokogiri/nokogiri.rb", 'wb') do |f|
+    f.write %Q{require "nokogiri/\#{RUBY_VERSION.sub(/\\.\\d+$/, '')}/nokogiri"\n}
   end
 end
 
-file 'tmp/cross/lib/libz.a' => "tmp/cross/download/#{ZLIB}" do |t|
-  Dir.chdir t.prerequisites.first do
-    sh 'make -f win32/Makefile.gcc'
-    sh 'make -f win32/Makefile.gcc install'
-  end
-end
-### End build zlib ###
-
-### Build iconv ###
-file "tmp/cross/download/#{ICONV}" do |t|
-  FileUtils.mkdir_p('tmp/cross/download')
-
-  file = ICONV
-  url  = "http://ftp.gnu.org/pub/gnu/libiconv/#{file}.tar.gz"
-
-  Dir.chdir('tmp/cross/download') do
-    sh "wget #{url} || curl -O #{url}"
-    sh "tar zxvf #{file}.tar.gz"
-  end
-
-  Dir.chdir t.name do
-    # FIXME: need to make the host dynamic
-    sh "./configure --disable-shared --enable-static --host=#{HOST} --target=#{TARGET} --prefix=#{CROSS_DIR} CPPFLAGS='-mno-cygwin -Wall' CFLAGS='-mno-cygwin -O2 -g' CXXFLAGS='-mno-cygwin -O2 -g' LDFLAGS=-mno-cygwin"
-  end
-end
-
-file 'tmp/cross/bin/iconv.exe' => "tmp/cross/download/#{ICONV}" do |t|
-  Dir.chdir t.prerequisites.first do
-    sh 'make'
-    sh 'make install'
-  end
-end
-### End build iconv ###
-
-### Build libxml2 ###
-file "tmp/cross/download/#{LIBXML}" do |t|
-  FileUtils.mkdir_p('tmp/cross/download')
-
-  file = LIBXML
-  url  = "ftp://ftp.xmlsoft.org/libxml2/#{file}.tar.gz"
-
-  Dir.chdir('tmp/cross/download') do
-    sh "wget #{url} || curl -O #{url}"
-    sh "tar zxvf #{file}.tar.gz"
-  end
-
-  Dir.chdir t.name do
-    # FIXME: need to make the host dynamic
-    sh "CFLAGS='-DIN_LIBXML' ./configure --host=#{HOST} --target=#{TARGET} --enable-static --disable-shared --prefix=#{CROSS_DIR} --with-zlib=#{CROSS_DIR} --with-iconv=#{CROSS_DIR} --without-python --without-readline"
-  end
-end
+namespace :cross do
+  task :zlib do
+    recipe = $recipes[:zlib]
+    recipe.files = ["http://zlib.net/#{recipe.name}-#{recipe.version}.tar.gz"]
+    class << recipe
+      def configure
+        Dir.chdir work_path do
+          mk = File.read 'win32/Makefile.gcc'
+          File.open 'win32/Makefile.gcc', 'wb' do |f|
+            f.puts "BINARY_PATH = #{CROSS_DIR}/bin"
+            f.puts "LIBRARY_PATH = #{CROSS_DIR}/lib"
+            f.puts "INCLUDE_PATH = #{CROSS_DIR}/include"
+            f.puts mk.sub(/^PREFIX\s*=\s*$/, "PREFIX = #{HOST}-")
+          end
+        end
+      end
+
+      def configured?
+        Dir.chdir work_path do
+          !! (File.read('win32/Makefile.gcc') =~ /^BINARY_PATH/)
+        end
+      end
+
+      def compile
+        execute "compile", "make -f win32/Makefile.gcc"
+      end
+
+      def install
+        execute "install", "make -f win32/Makefile.gcc install"
+      end
+    end
 
-file 'tmp/cross/bin/xml2-config' => "tmp/cross/download/#{LIBXML}" do |t|
-  Dir.chdir t.prerequisites.first do
-    sh 'make LDFLAGS="-avoid-version"'
-    sh 'make install'
+    checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}.installed"
+    unless File.exist?(checkpoint)
+      recipe.cook
+      touch checkpoint
+    end
+    recipe.activate
   end
-end
-### End build libxml2 ###
-
-### Build libxslt ###
-file "tmp/cross/download/#{LIBXSLT}" do |t|
-  FileUtils.mkdir_p('tmp/cross/download')
 
-  file = LIBXSLT
-  url  = "ftp://ftp.xmlsoft.org/libxml2/#{file}.tar.gz"
-
-  Dir.chdir('tmp/cross/download') do
-    sh "wget #{url} || curl -O #{url}"
-    sh "tar zxvf #{file}.tar.gz"
+  task :libiconv do
+    recipe = $recipes[:libiconv]
+    recipe.files = ["http://ftp.gnu.org/pub/gnu/libiconv/#{recipe.name}-#{recipe.version}.tar.gz"]
+    recipe.configure_options = [
+      "--host=#{HOST}",
+      "--enable-static",
+      "--disable-shared",
+      "CPPFLAGS='-mno-cygwin -Wall'",
+      "CFLAGS='-mno-cygwin -O2 -g'",
+      "CXXFLAGS='-mno-cygwin -O2 -g'",
+      "LDFLAGS=-mno-cygwin"
+    ]
+
+    checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}.installed"
+    unless File.exist?(checkpoint)
+      recipe.cook
+      touch checkpoint
+    end
+    recipe.activate
   end
 
-  Dir.chdir t.name do
-    # FIXME: need to make the host dynamic
-    sh "CFLAGS='-DIN_LIBXML' ./configure --host=#{HOST} --target=#{TARGET} --enable-static --disable-shared --prefix=#{CROSS_DIR} --with-libxml-prefix=#{CROSS_DIR} --without-python"
-  end
-end
+  task :libxml2 => ["cross:zlib", "cross:libiconv"] do
+    recipe = $recipes[:libxml2]
+    recipe.files = ["ftp://ftp.xmlsoft.org/libxml2/#{recipe.name}-#{recipe.version}.tar.gz"]
+    recipe.configure_options = [
+      "--host=#{HOST}",
+      "--enable-static",
+      "--disable-shared",
+      "--with-zlib=#{CROSS_DIR}",
+      "--with-iconv=#{$recipes[:libiconv].path}",
+      "--without-python",
+      "--without-readline",
+      "CFLAGS='-DIN_LIBXML'"
+    ]
+    class << recipe
+      def download
+        Dir.chdir archives_path do
+          @files.each do |url|
+            sh "wget #{url} || curl -O #{url}"
+          end
+        end
+      end
+    end
 
-file 'tmp/cross/bin/xslt-config' => "tmp/cross/download/#{LIBXSLT}" do |t|
-  Dir.chdir t.prerequisites.first do
-    sh 'make LDFLAGS="-avoid-version"'
-    sh 'make install'
+    checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}.installed"
+    unless File.exist?(checkpoint)
+      recipe.cook
+      touch checkpoint
+    end
+    recipe.activate
   end
-end
-### End build libxslt ###
 
-file 'lib/nokogiri/nokogiri.rb' => 'cross:libxslt' do
-  File.open("lib/#{HOE.name}/#{HOE.name}.rb", 'wb') do |f|
-    f.write <<-eoruby
-require "#{HOE.name}/\#{RUBY_VERSION.sub(/\\.\\d+$/, '')}/#{HOE.name}"
-    eoruby
-  end
-end
+  task :libxslt => ['cross:libxml2'] do
+    recipe = $recipes[:libxslt]
+    recipe.files = ["ftp://ftp.xmlsoft.org/libxml2/#{recipe.name}-#{recipe.version}.tar.gz"]
+    recipe.configure_options = [
+      "--host=#{HOST}",
+      "--enable-static",
+      "--disable-shared",
+      "--with-libxml-prefix=#{$recipes[:libxml2].path}",
+      "--without-python",
+      "--without-crypto",
+      "CFLAGS='-DIN_LIBXML'"
+    ]
+    class << recipe
+      def download
+        Dir.chdir archives_path do
+          @files.each do |url|
+            sh "wget #{url} || curl -O #{url}"
+          end
+        end
+      end
+    end
 
-namespace :cross do
-  task :iconv   => 'tmp/cross/bin/iconv.exe'
-  task :zlib    => 'tmp/cross/lib/libz.a'
-  task :libxml2 => ['cross:zlib', 'cross:iconv', 'tmp/cross/bin/xml2-config']
-  task :libxslt => ['cross:libxml2', 'tmp/cross/bin/xslt-config']
-
-  task :copy_dlls do
-    Dir['tmp/cross/bin/*.dll'].each do |file|
-      cp file, "ext/nokogiri"
+    checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}.installed"
+    unless File.exist?(checkpoint)
+      recipe.cook
+      touch checkpoint
     end
+    recipe.activate
   end
 
-  task :file_list => 'cross:copy_dlls' do
-    HOE.spec.extensions = []
-    HOE.spec.files += Dir["lib/#{HOE.name}/#{HOE.name}.rb"]
-    HOE.spec.files += Dir["lib/#{HOE.name}/1.{8,9}/#{HOE.name}.so"]
-    HOE.spec.files += Dir["ext/nokogiri/*.dll"]
+  task :file_list do
+    HOE.spec.files += Dir["lib/nokogiri/nokogiri.rb"]
+    HOE.spec.files += Dir["lib/nokogiri/1.{8,9}/nokogiri.so"]
   end
 end
 
-CLOBBER.include("lib/nokogiri/nokogiri.{so,dylib,rb,bundle}")
-CLOBBER.include("lib/nokogiri/1.{8,9}")
-CLOBBER.include("ext/nokogiri/*.dll")
+HOE.clean_globs += [
+  "#{CROSS_DIR}/*.installed",
+  "#{CROSS_DIR}/#{HOST}",
+  "tmp/#{HOST}",
+]
 
-if Rake::Task.task_defined?(:cross)
-  Rake::Task[:cross].prerequisites << "lib/nokogiri/nokogiri.rb"
-  Rake::Task[:cross].prerequisites << "cross:file_list"
-end
+task :cross => ["cross:libxslt", "lib/nokogiri/nokogiri.rb", "cross:file_list"]

data/tasks/nokogiri.org.rb

@@ -0,0 +1,18 @@
+namespace :docs do
+  desc "generate HTML docs for nokogiri.org"
+  task :website do
+    title = "#{HOE.name}-#{HOE.version} Documentation"
+
+    options = []
+    options << "--main=#{HOE.readme_file}"
+    options << '--format=activerecord'
+    options << '--threads=1'
+    options << "--title=#{title.inspect}"
+
+    options += HOE.spec.require_paths
+    options += HOE.spec.extra_rdoc_files
+    require 'rdoc/rdoc'
+    ENV['RAILS_ROOT'] ||= File.expand_path(File.join('..', 'nokogiri_ws'))
+    RDoc::RDoc.new.document options
+  end
+end

data/tasks/test.rb

@@ -64,7 +64,7 @@ namespace :test do
       end
 
       Dir.chdir File.join(MULTI_XML, 'build', filename) do
-        system "./configure --prefix=#{install_dir}"
+        system "./configure --without-http --prefix=#{install_dir}"
         system "make && make install"
       end
     end
@@ -73,7 +73,7 @@ namespace :test do
     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|
+    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'"

data/test/css/test_parser.rb

@@ -142,30 +142,31 @@ 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[position() = 99]',            @parser.parse('a: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[position() = last()]',        @parser.parse('a:nth-last-of-type(1)')
+        assert_xpath '//a[position() = last() - 98]',   @parser.parse('a: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 '//*[position() = 1 and self::a]',           @parser.parse('a:first-child')
+        assert_xpath '//*[position() = 99 and self::a]',          @parser.parse('a:nth-child(99)')
+        assert_xpath '//*[position() = last() and self::a]',      @parser.parse('a:last-child')
+        assert_xpath '//*[position() = last() and self::a]',      @parser.parse('a:nth-last-child(1)')
+        assert_xpath '//*[position() = last() - 98 and self::a]', @parser.parse('a:nth-last-child(99)')
       end
 
       def test_miscellaneous_selectors
@@ -185,6 +186,16 @@ module Nokogiri
         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[((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) and ((((last()-position()+1)-3) mod 1) = 0)]', @parser.parse('a:nth-last-of-type(-1n+3)')
+        assert_xpath '//a[((last()-position()+1) <= 3) and ((((last()-position()+1)-3) mod 1) = 0)]', @parser.parse('a:nth-last-of-type(-n+3)')
+        assert_xpath '//a[((last()-position()+1) >= 3) and ((((last()-position()+1)-3) mod 1) = 0)]', @parser.parse('a:nth-last-of-type(1n+3)')
+        assert_xpath '//a[((last()-position()+1) >= 3) and ((((last()-position()+1)-3) mod 1) = 0)]', @parser.parse('a:nth-last-of-type(n+3)')
       end
 
       def test_preceding_selector

data/test/css/test_tokenizer.rb

@@ -2,6 +2,14 @@
 
 require "helper"
 
+module Nokogiri
+  module CSS
+    class Tokenizer
+      alias :scan :scan_setup
+    end
+  end
+end
+
 module Nokogiri
   module CSS
     class TestTokenizer < Nokogiri::TestCase

data/test/decorators/test_slop.rb

@@ -0,0 +1,16 @@
+require "helper"
+
+module Nokogiri
+  class TestSlop < Nokogiri::TestCase
+    def test_description_tag
+      doc = Nokogiri.Slop(<<-eoxml)
+        <item>
+          <title>foo</title>
+          <description>this is the foo thing</description>
+        </item>
+      eoxml
+      assert doc.item.title
+      assert doc.item._description, 'should have description'
+    end
+  end
+end