nokogiri 1.6.5-java → 1.6.6.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1148b14986575ffdf88e32369713e071b058ed5b
-  data.tar.gz: aff3cd8473522f0eece98be2bcde6bc1fdbc35d2
+  metadata.gz: c221c2bb5589110b400152cbbbf0785d8da989d0
+  data.tar.gz: cc543c794183d4aae095e6dfa31dbaf204f2febb
 SHA512:
-  metadata.gz: 60e01772a9bb88140f6fec66ea489ea19d24d515c209ddb98250183c8a7afee3fcdbd17c767ee52dc1eb81b53afc5002f8c7b36cd01329a8ad863b119a139753
-  data.tar.gz: b8e5157309140b6c767a34adf1f2d700fad690dd373638cb108cc6969873dc1e8b600c5f37a59b1080c3d835d1484b218c2169f2f4c952d0c1e0bc2d9ebeb61c
+  metadata.gz: bfbe69e4d43e664d0fe03ff63e309218859c8680f0595d62c6953f978e0ed24ea208d4b289693b64b5e2634aa48375674f1ca7aa66b9f6052d1c956fc0481e4b
+  data.tar.gz: b18823e13651c2c60e71861f2995bf1a01224df6a8473c78c7e7d2fe8ae4e0a853aebf209610b18aa028601d38cb13f0926e0c15d9a99fcce9ddc8f27ee354cd

data/.cross_rubies

@@ -0,0 +1,5 @@
+1.9.3-p547:i586-mingw32msvc
+2.0.0-p576:i686-w64-mingw32
+2.0.0-p576:x86_64-w64-mingw32
+2.1.3:i686-w64-mingw32
+2.1.3:x86_64-w64-mingw32

data/.travis.yml

@@ -1,12 +1,16 @@
 language: ruby
+
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.3
-  - ruby-head
+  - ruby-1.9.2
+  - ruby-1.9.3
+  - ruby-2.0
+  - ruby-2.1
+  - ruby-2.2
   - jruby-19mode
-  - jruby-20mode
+  - jruby-1.7.18
+  - jruby-9.0.0.0.pre1
   - rbx-19mode
+  - rbx-2
 
 os:
   - linux
@@ -14,22 +18,8 @@ os:
 
 jdk:
   - openjdk7
-  - openjdk6
 
 matrix:
   allow_failures:
     - os: osx
-    - rvm: rbx-19mode
-    # currently broken on Travis CI
-    - rvm: jruby-20mode
-  exclude:
-    - rvm: 1.9.3
-      jdk: openjdk7
-    - rvm: 2.0.0
-      jdk: openjdk7
-    - rvm: 2.1.3
-      jdk: openjdk7
-    - rvm: ruby-head
-      jdk: openjdk7
-    - rvm: rbx-19mode
-      jdk: openjdk7
+    - rvm: jruby-9.0.0.0.pre1

data/CHANGELOG.ja.rdoc

@@ -1,4 +1,31 @@
-=== 1.6.5 / 未リリース
+=== 1.6.6.1 / 2015年01月22日
+
+Note that 1.6.6.0 was not released.
+
+==== 機能
+
+* Unified Node and NodeSet implementations of #search, #xpath and #css.
+* Added Node#lang and Node#lang=.
+* bin/nokogiri passes the URI to parse() if an HTTP URL is given.
+* bin/nokogiri now loads ~/.nokogirirc so user can define helper methods, etc.
+* bin/nokogiri can be configured to use Pry instead of IRB by adding a couple of lines to ~/.nokogirirc. (#1198)
+* bin/nokogiri can better handle urls from STDIN (aiding use of xargs). (#1065)
+* JRuby 9K support.
+
+
+==== バグ修正
+
+* DocumentFragment#search now matches against root nodes. (#1205)
+* (MRI) More fixes related to handling libxml2 parse errors during DocumentFragment#dup. (#1196)
+* (JRuby) Builder now handles namespace hrefs properly when there is a default ns. (#1039)
+* (JRuby) Clear the XPath cache on attr removal. (#1109)
+* `XML::Comment.new` argument types are now consistent and safe (and documented) across MRI and JRuby. (#1224)
+* (MRI) Restoring support for Ruby 1.9.2 that was broken in v1.6.4.1 and v1.6.5. (#1207)
+* Check if `zlib` is available before building `libxml2`. (#1188)
+* (JRuby) HtmlSaxPushParser now exists. (#1147) (Thanks, Piotr Szmielew!)
+
+
+=== 1.6.5 / 2014年11月26日
 
 ==== 機能
 

data/CHANGELOG.rdoc

@@ -1,4 +1,31 @@
-=== 1.6.5 / unreleased
+=== 1.6.6.1 / 2015-01-22
+
+Note that 1.6.6.0 was not released.
+
+==== Features
+
+* Unified Node and NodeSet implementations of #search, #xpath and #css.
+* Added Node#lang and Node#lang=.
+* bin/nokogiri passes the URI to parse() if an HTTP URL is given.
+* bin/nokogiri now loads ~/.nokogirirc so user can define helper methods, etc.
+* bin/nokogiri can be configured to use Pry instead of IRB by adding a couple of lines to ~/.nokogirirc. (#1198)
+* bin/nokogiri can better handle urls from STDIN (aiding use of xargs). (#1065)
+* JRuby 9K support.
+
+
+==== Bug fixes
+
+* DocumentFragment#search now matches against root nodes. (#1205)
+* (MRI) More fixes related to handling libxml2 parse errors during DocumentFragment#dup. (#1196)
+* (JRuby) Builder now handles namespace hrefs properly when there is a default ns. (#1039)
+* (JRuby) Clear the XPath cache on attr removal. (#1109)
+* `XML::Comment.new` argument types are now consistent and safe (and documented) across MRI and JRuby. (#1224)
+* (MRI) Restoring support for Ruby 1.9.2 that was broken in v1.6.4.1 and v1.6.5. (#1207)
+* Check if `zlib` is available before building `libxml2`. (#1188)
+* (JRuby) HtmlSaxPushParser now exists. (#1147) (Thanks, Piotr Szmielew!)
+
+
+=== 1.6.5 / 2014-11-26
 
 ==== Features
 

data/Gemfile

@@ -8,7 +8,7 @@ gem "mini_portile", "~>0.6.0"
 
 gem "rdoc", "~>4.0", :group => [:development, :test]
 gem "hoe-bundler", ">=1.1", :group => [:development, :test]
-gem "hoe-debugging", ">=1.0.3", :group => [:development, :test]
+gem "hoe-debugging", "~>1.2.0", :group => [:development, :test]
 gem "hoe-gemspec", ">=1.0", :group => [:development, :test]
 gem "hoe-git", ">=1.4", :group => [:development, :test]
 gem "minitest", "~>2.2.2", :group => [:development, :test]

data/Manifest.txt

@@ -1,4 +1,5 @@
 .autotest
+.cross_rubies
 .editorconfig
 .gemtest
 .travis.yml
@@ -21,6 +22,7 @@ ext/java/nokogiri/HtmlDocument.java
 ext/java/nokogiri/HtmlElementDescription.java
 ext/java/nokogiri/HtmlEntityLookup.java
 ext/java/nokogiri/HtmlSaxParserContext.java
+ext/java/nokogiri/HtmlSaxPushParser.java
 ext/java/nokogiri/NokogiriService.java
 ext/java/nokogiri/XmlAttr.java
 ext/java/nokogiri/XmlAttributeDecl.java
@@ -230,6 +232,7 @@ lib/nokogiri/xml/sax/parser.rb
 lib/nokogiri/xml/sax/parser_context.rb
 lib/nokogiri/xml/sax/push_parser.rb
 lib/nokogiri/xml/schema.rb
+lib/nokogiri/xml/searchable.rb
 lib/nokogiri/xml/syntax_error.rb
 lib/nokogiri/xml/text.rb
 lib/nokogiri/xml/xpath.rb
@@ -253,12 +256,12 @@ ports/patches/libxslt/0010-Fix-handling-of-UTF-8-strings-in-EXSLT-crypto-module.
 ports/patches/libxslt/0013-Memory-leak-in-xsltCompileIdKeyPattern-error-path.patch
 ports/patches/libxslt/0014-Fix-for-bug-436589.patch
 ports/patches/libxslt/0015-Fix-mkdir-for-mingw.patch
+ports/patches/sort-patches-by-date
 suppressions/README.txt
 suppressions/nokogiri_ree-1.8.7.358.supp
 suppressions/nokogiri_ruby-1.8.7.370.supp
 suppressions/nokogiri_ruby-1.9.2.320.supp
 suppressions/nokogiri_ruby-1.9.3.327.supp
-tasks/nokogiri.org.rb
 tasks/test.rb
 test/css/test_nthiness.rb
 test/css/test_parser.rb
@@ -303,6 +306,7 @@ test/files/xinclude.xml
 test/helper.rb
 test/html/sax/test_parser.rb
 test/html/sax/test_parser_context.rb
+test/html/sax/test_push_parser.rb
 test/html/test_builder.rb
 test/html/test_document.rb
 test/html/test_document_encoding.rb

data/README.ja.rdoc

@@ -38,24 +38,25 @@ IRCのチャンネルはfreenodeの #nokogiri です。
 
   require 'nokogiri'
   require 'open-uri'
-  
-  doc = Nokogiri::HTML(open('http://www.google.com/search?q=tenderlove'))
-  
+
+  # Fetch and parse HTML document
+  doc = Nokogiri::HTML(open('http://www.nokogiri.org/tutorials/installing_nokogiri.html'))
+
   ####
   # Search for nodes by css
-  doc.css('h3.r a.l').each do |link|
+  doc.css('nav ul.menu li a').each do |link|
     puts link.content
   end
-  
+
   ####
   # Search for nodes by xpath
-  doc.xpath('//h3/a[@class="l"]').each do |link|
+  doc.xpath('//h2 | //h3').each do |link|
     puts link.content
   end
-  
+
   ####
   # Or mix and match.
-  doc.search('h3.r a.l', '//h3/a[@class="l"]').each do |link|
+  doc.search('code.sh', '//h2').each do |link|
     puts link.content
   end
 
@@ -81,7 +82,7 @@ IRCのチャンネルはfreenodeの #nokogiri です。
 
 (The MIT License)
 
-Copyright (c) 2008 - 2014:
+Copyright (c) 2008 - 2015:
 
 * {Aaron Patterson}[http://tenderlovemaking.com]
 * {Mike Dalessio}[http://mike.daless.io]

data/README.rdoc

@@ -45,27 +45,24 @@ The IRC channel is #nokogiri on freenode.
   require 'nokogiri'
   require 'open-uri'
 
-  # Get a Nokogiri::HTML::Document for the page we’re interested in...
-
-  doc = Nokogiri::HTML(open('http://www.google.com/search?q=sparklemotion'))
-
-  # Do funky things with it using Nokogiri::XML::Node methods...
+  # Fetch and parse HTML document
+  doc = Nokogiri::HTML(open('http://www.nokogiri.org/tutorials/installing_nokogiri.html'))
 
   ####
   # Search for nodes by css
-  doc.css('h3.r a').each do |link|
+  doc.css('nav ul.menu li a').each do |link|
     puts link.content
   end
 
   ####
   # Search for nodes by xpath
-  doc.xpath('//h3/a').each do |link|
+  doc.xpath('//h2 | //h3').each do |link|
     puts link.content
   end
 
   ####
   # Or mix and match.
-  doc.search('h3.r a.l', '//h3/a').each do |link|
+  doc.search('code.sh', '//h2').each do |link|
     puts link.content
   end
 
@@ -150,7 +147,7 @@ Then run rake:
 
 (The MIT License)
 
-Copyright (c) 2008 - 2014:
+Copyright (c) 2008 - 2015:
 
 * {Aaron Patterson}[http://tenderlovemaking.com]
 * {Mike Dalessio}[http://mike.daless.io]

data/ROADMAP.md

@@ -57,6 +57,7 @@
   - https://github.com/sparklemotion/nokogiri/issues/370
   - https://github.com/sparklemotion/nokogiri/issues/454
   - https://github.com/sparklemotion/nokogiri/issues/572
+  could we fix this by making DocumentFragment be a subclass of NodeSet?
 
 
 ## Better Syntax for custom XPath function handler
@@ -70,9 +71,6 @@
   * we should standardize on a hash of options for these and other calls
 * what should NodeSet#xpath return?
   * https://github.com/sparklemotion/nokogiri/issues/656
-* also, clean up or unify the implementations of #xpath-and-friends in Node and NodeSet
-  * implementations are very similar, but no shared code :(
-  * decorate nodes in a consistent manner
 
 ## Encoding
 
@@ -87,3 +85,17 @@ Somebody who knows encoding well should head this up.
 
 It's fundamentally broken, in that we can't stop people from crashing
 their application if they want to use object reference unsafely.
+
+
+## Class methods that require Document
+
+There are a few methods, like `Nokogiri::XML::Comment.new` that
+require a Document object.
+
+We should probably make Document instance methods to wrap this, since
+it's a non-obvious expectation and thus fails as a convention.
+
+So, instead, let's make alternative methods like
+`Nokogiri::XML::Document#new_comment`, and recommend those as the
+proper convention.
+

data/Rakefile

@@ -101,8 +101,6 @@ CROSS_RUBIES = File.read('.cross_rubies').lines.flat_map { |line|
 
 ENV['RUBY_CC_VERSION'] ||= CROSS_RUBIES.map(&:ver).uniq.join(":")
 
-require 'tasks/nokogiri.org'
-
 HOE = Hoe.spec 'nokogiri' do
   developer 'Aaron Patterson', 'aaronp@rubyforge.org'
   developer 'Mike Dalessio',   'mike.dalessio@gmail.com'
@@ -142,7 +140,7 @@ HOE = Hoe.spec 'nokogiri' do
 
   self.extra_dev_deps += [
     ["hoe-bundler",     ">= 1.1"],
-    ["hoe-debugging",   ">= 1.0.3"],
+    ["hoe-debugging",   "~> 1.2.0"],
     ["hoe-gemspec",     ">= 1.0"],
     ["hoe-git",         ">= 1.4"],
     ["minitest",        "~> 2.2.2"],

data/bin/nokogiri

@@ -1,14 +1,41 @@
 #!/usr/bin/env ruby
 require 'optparse'
 require 'open-uri'
-require 'irb'
 require 'uri'
 require 'rubygems'
 require 'nokogiri'
+autoload :IRB, 'irb'
 
 parse_class = Nokogiri
 encoding = nil
 
+# This module provides some tunables with the nokogiri CLI for use in
+# your ~/.nokogirirc.
+module Nokogiri::CLI
+  class << self
+    # Specify the console engine, defaulted to IRB.
+    #
+    # call-seq:
+    #   require 'pry'
+    #   Nokogiri::CLI.console = Pry
+    attr_writer :console
+
+    def console
+      case @console
+      when Symbol
+        Kernel.const_get(@console)
+      else
+        @console
+      end
+    end
+
+    attr_accessor :rcfile
+  end
+
+  self.rcfile  = File.expand_path('~/.nokogirirc')
+  self.console = :IRB
+end
+
 opts = OptionParser.new do |opts|
   opts.banner = "Nokogiri: an HTML, XML, SAX, and Reader parser"
   opts.define_head "Usage: nokogiri <uri|path> [options]"
@@ -20,11 +47,15 @@ opts = OptionParser.new do |opts|
   opts.separator ""
   opts.separator "Options:"
 
-  opts.on("--type [TYPE]", [:xml, :html]) do |v|
+  opts.on("--type type", "Parse as type: xml or html (default: auto)", [:xml, :html]) do |v|
     parse_class = {:xml => Nokogiri::XML, :html => Nokogiri::HTML}[v]
   end
 
-  opts.on("-E", "--encoding encoding", "Read as encoding (default #{encoding})") do |v|
+  opts.on("-C file", "Specifies initialization file to load (default #{Nokogiri::CLI.rcfile})") do |v|
+    Nokogiri::CLI.rcfile = v
+  end
+
+  opts.on("-E", "--encoding encoding", "Read as encoding (default: #{encoding || 'none'})") do |v|
     encoding = v
   end
 
@@ -48,15 +79,24 @@ opts = OptionParser.new do |opts|
 end
 opts.parse!
 
-uri = ARGV.shift
+url = ARGV.shift
 
-if uri.to_s.strip.empty? && $stdin.tty?
+if url.to_s.strip.empty? && $stdin.tty?
   puts opts
   exit 1
 end
 
-if $stdin.tty?
-  @doc = parse_class.parse(open(uri).read, nil, encoding)
+if File.file?(Nokogiri::CLI.rcfile)
+  load Nokogiri::CLI.rcfile
+end
+
+if url || $stdin.tty?
+  case uri = (URI(url) rescue url)
+  when URI::HTTP
+    @doc = parse_class.parse(uri.read, url, encoding)
+  else
+    @doc = parse_class.parse(open(url).read, nil, encoding)
+  end
 else
   @doc = parse_class.parse($stdin, nil, encoding)
 end
@@ -72,7 +112,7 @@ else
     eval @script, binding, '<main>'
   else
     puts "Your document is stored in @doc..."
-    IRB.start
+    Nokogiri::CLI.console.start
   end
 end
 

data/ext/java/nokogiri/HtmlSaxParserContext.java

@@ -226,7 +226,7 @@ public class HtmlSaxParserContext extends XmlSaxParserContext {
     /**
      * Create a new parser context that will read from a raw input
      * stream. Not a JRuby method.  Meant to be run in a separate
-     * thread by XmlSaxPushParser.
+     * thread by HtmlSaxPushParser.
      */
     public static IRubyObject parse_stream(ThreadContext context,
                                            IRubyObject klazz,

data/ext/java/nokogiri/HtmlSaxPushParser.java

@@ -0,0 +1,244 @@
+/**
+ * (The MIT License)
+ *
+ * Copyright (c) 2008 - 2012:
+ *
+ * * {Aaron Patterson}[http://tenderlovemaking.com]
+ * * {Mike Dalessio}[http://mike.daless.io]
+ * * {Charles Nutter}[http://blog.headius.com]
+ * * {Sergio Arbeo}[http://www.serabe.com]
+ * * {Patrick Mahoney}[http://polycrystal.org]
+ * * {Yoko Harada}[http://yokolet.blogspot.com]
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * 'Software'), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nokogiri;
+
+import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
+import static org.jruby.javasupport.util.RuntimeHelpers.invoke;
+import static nokogiri.internals.NokogiriHelpers.rubyStringToString;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.charset.IllegalCharsetNameException;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.EnumSet;
+import java.util.concurrent.Future;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.ThreadFactory;
+
+import nokogiri.internals.ClosedStreamException;
+import nokogiri.internals.NokogiriBlockingQueueInputStream;
+import nokogiri.internals.ParserContext;
+
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.RubyException;
+import org.jruby.RubyFixnum;
+import org.jruby.RubyObject;
+import org.jruby.RubyString;
+import org.jruby.anno.JRubyClass;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.exceptions.RaiseException;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+
+/**
+ * Class for Nokogiri::HTML::SAX::PushParser
+ *
+ * @author 
+ * @author Piotr Szmielew <p.szmielew@ava.waw.pl> - based on Nokogiri::XML::SAX::PushParser
+ */
+@JRubyClass(name="Nokogiri::HTML::SAX::PushParser")
+public class HtmlSaxPushParser extends RubyObject {
+    ParserContext.Options options;
+    IRubyObject optionsRuby;
+    IRubyObject saxParser;
+    NokogiriBlockingQueueInputStream stream;
+    ParserTask parserTask = null;
+    FutureTask<HtmlSaxParserContext> futureTask = null;
+    ExecutorService executor = null;
+
+    public HtmlSaxPushParser(Ruby ruby, RubyClass rubyClass) {
+        super(ruby, rubyClass);
+    }
+
+    @Override
+    public void finalize() {
+      terminateTask(null);
+    }
+
+    /**
+    * Silently skips provided encoding
+    *
+    */
+    @JRubyMethod
+    public IRubyObject initialize_native(final ThreadContext context,
+                                         IRubyObject saxParser,
+                                         IRubyObject fileName,
+                                         IRubyObject encoding) {
+        optionsRuby
+            = invoke(context, context.getRuntime().getClassFromPath("Nokogiri::XML::ParseOptions"), "new");
+       
+        options = new ParserContext.Options(0);
+        this.saxParser = saxParser;
+        return this;
+    }
+
+    /**
+     * Returns an integer.
+     */
+    @JRubyMethod(name="options")
+    public IRubyObject getOptions(ThreadContext context) {
+        return invoke(context, optionsRuby, "options");
+    }
+
+    /**
+     * <code>val</code> is an integer.
+     */
+    @JRubyMethod(name="options=")
+    public IRubyObject setOptions(ThreadContext context, IRubyObject val) {
+        invoke(context, optionsRuby, "options=", val);
+        options =
+            new ParserContext.Options(val.convertToInteger().getLongValue());
+        return getOptions(context);
+    }
+
+    @JRubyMethod
+    public IRubyObject native_write(ThreadContext context, IRubyObject chunk,
+                                    IRubyObject isLast) {
+        try {
+            initialize_task(context);
+        } catch (IOException e) {
+            throw context.getRuntime().newRuntimeError(e.getMessage());
+        }
+        byte[] data = null;
+        if (chunk instanceof RubyString || chunk.respondsTo("to_str")) {
+            data = chunk.convertToString().getBytes();
+        } else {
+            terminateTask(context);
+            XmlSyntaxError xmlSyntaxError =
+                (XmlSyntaxError) NokogiriService.XML_SYNTAXERROR_ALLOCATOR.allocate(context.getRuntime(), getNokogiriClass(context.getRuntime(), "Nokogiri::HTML::SyntaxError"));
+            throw new RaiseException(xmlSyntaxError);
+        }
+
+        int errorCount0 = parserTask.getErrorCount();;
+
+
+        if (isLast.isTrue()) {
+            IRubyObject document = invoke(context, this, "document");
+            invoke(context, document, "end_document");
+            terminateTask(context);
+        } else {
+            try {
+              Future<Void> task = stream.addChunk(new ByteArrayInputStream(data));
+              task.get();
+            } catch (ClosedStreamException ex) {
+              // this means the stream is closed, ignore this exception
+            } catch (Exception e) {
+              throw context.getRuntime().newRuntimeError(e.getMessage());
+            }
+
+        }
+
+        if (!options.recover && parserTask.getErrorCount() > errorCount0) {
+            terminateTask(context);
+            throw new RaiseException(parserTask.getLastError(), true);
+        }
+
+        return this;
+    }
+
+    private void initialize_task(ThreadContext context) throws IOException {
+        if (futureTask == null || stream == null) {
+            stream = new NokogiriBlockingQueueInputStream();
+
+            parserTask = new ParserTask(context, saxParser);
+            futureTask = new FutureTask<HtmlSaxParserContext>(parserTask);
+            executor = Executors.newSingleThreadExecutor(new ThreadFactory() {
+              @Override
+              public Thread newThread(Runnable r) {
+                Thread t = new Thread(r);
+                t.setName("HtmlSaxPushParser");
+                t.setDaemon(true);
+                return t;
+              }
+            });
+            executor.submit(futureTask);
+        }
+    }
+
+    private synchronized void terminateTask(ThreadContext context) {
+        try {
+          Future<Void> task = stream.addChunk(NokogiriBlockingQueueInputStream.END);
+          task.get();
+        } catch (ClosedStreamException ex) {
+          // ignore this exception, it means the stream was closed
+        } catch (Exception e) {
+            if (context != null)
+              throw context.getRuntime().newRuntimeError(e.getMessage());
+        }
+        futureTask.cancel(true);
+        executor.shutdown();
+        executor = null;
+        stream = null;
+        futureTask = null;
+    }
+    
+
+    private class ParserTask implements Callable<HtmlSaxParserContext> {
+        private final ThreadContext context;
+        private final IRubyObject handler;
+        private final HtmlSaxParserContext parser;
+
+        private ParserTask(ThreadContext context, IRubyObject handler) {
+            RubyClass klazz = getNokogiriClass(context.getRuntime(), "Nokogiri::HTML::SAX::ParserContext");
+            this.context = context;
+            this.handler = handler;
+            this.parser = (HtmlSaxParserContext) HtmlSaxParserContext.parse_stream(context, klazz, stream);
+        }
+
+        @Override
+        public HtmlSaxParserContext call() throws Exception {
+          try {
+            parser.parse_with(context, handler);
+          } finally {
+            // we have to close the stream before exiting, otherwise someone
+            // can add a chunk and block on task.get() forever.
+            stream.close();
+          }
+          return parser;
+        }
+
+        private synchronized int getErrorCount() {
+            // check for null because thread may not have started yet
+            if (parser.getNokogiriHandler() == null) return 0;
+            else return parser.getNokogiriHandler().getErrorCount();
+        }
+
+        private synchronized RubyException getLastError() {
+            return (RubyException) parser.getNokogiriHandler().getLastError();
+        }
+    }
+}