nokogiri 1.10.1-java → 1.10.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e494bcd53ca9b668b441e9ac7004710eab1157144414a9cf17a225ae7331cd3c
-  data.tar.gz: c321b8e32d8b6f3b3603a5176e45e568d1486bf93b503f59666d451b9a112231
+  metadata.gz: d3c43a257fb267d93e02093917d8d0299b56d781f6a26035fb0154ce26cc0197
+  data.tar.gz: 28b21e37d42567eb71f5d3ad893770dbe534357e082f5d23b130b506a3fc1a6f
 SHA512:
-  metadata.gz: fec7dedb5e770c7698e078855bda287ce7a400207991dd04db185bf5f3d2f464962fa954f2c23784938bbc70ced8daa2aa7d44ccc47147a224d9fe45a47854a3
-  data.tar.gz: 358510c46d46aa1f46388f153a873ff5d238c239e934b6fb24329fae865e7d466f260cfe567e9db063d6307f4f706a9539bdb122c9d670faeb3dab7ddf02a72a
+  metadata.gz: 9ae62018214d9b9362b94415bf2815cd1042263a960e590ed8a74cfbde6d451f628646f8e0ae45801d3e07ae36bdcfa8760c90f58968a15045893b47900cc549
+  data.tar.gz: 2079dcc1014d64f273674391708181d70fa90b15cbeceac970b37d685ebab21a61c43b555cba83627aa882472051e40470c7b1ee330086888acb4a4b6e882643

data/README.md

@@ -9,17 +9,22 @@ or CSS3 selectors.
 
 ## Links
 
-* http://nokogiri.org
-* [Installation Help](http://nokogiri.org/tutorials/installing_nokogiri.html)
-* [Tutorials](http://nokogiri.org)
+* https://nokogiri.org
+* [Installation Help](https://nokogiri.org/tutorials/installing_nokogiri.html)
+* [Tutorials](https://nokogiri.org)
 * [Cheat Sheet](https://github.com/sparklemotion/nokogiri/wiki/Cheat-sheet)
 * [GitHub](https://github.com/sparklemotion/nokogiri)
 * [Mailing List](https://groups.google.com/group/nokogiri-talk)
 * [Chat/Gitter](https://gitter.im/sparklemotion/nokogiri)
 
-[![Concourse CI](https://ci.nokogiri.org/api/v1/teams/nokogiri-core/pipelines/nokogiri/jobs/ruby-2.4-system/badge)](https://ci.nokogiri.org/teams/nokogiri-core/pipelines/nokogiri?groups=master)
 
+## Status
+
+[![Concourse CI](https://ci.nokogiri.org/api/v1/teams/nokogiri-core/pipelines/nokogiri/jobs/ruby-2.4-system/badge)](https://ci.nokogiri.org/teams/nokogiri-core/pipelines/nokogiri)
+[![Appveyor CI](https://ci.appveyor.com/api/projects/status/xj2pqwvlxwuwgr06/branch/master?svg=true)](https://ci.appveyor.com/project/flavorjones/nokogiri/branch/master)
 [![Code Climate](https://codeclimate.com/github/sparklemotion/nokogiri.svg)](https://codeclimate.com/github/sparklemotion/nokogiri)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/59c67b0e8976027a45ad/test_coverage)](https://codeclimate.com/github/sparklemotion/nokogiri/test_coverage)
+
 [![Gem Version](https://badge.fury.io/rb/nokogiri.svg)](https://rubygems.org/gems/nokogiri)
 [![SemVer compatibility](https://api.dependabot.com/badges/compatibility_score?dependency-name=nokogiri&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=nokogiri&package-manager=bundler&version-scheme=semver)
 [![Tidelift dependencies](https://tidelift.com/badges/github/sparklemotion/nokogiri)](https://tidelift.com/subscription/pkg/rubygems-nokogiri?utm_source=rubygems-nokogiri&utm_medium=referral&utm_campaign=readme)
@@ -50,13 +55,13 @@ gem install nokogiri
 
 then please start troubleshooting here:
 
-> http://www.nokogiri.org/tutorials/installing_nokogiri.html
+> https://nokogiri.org/tutorials/installing_nokogiri.html
 
 There are currently 1,237 Stack Overflow questions about Nokogiri
 installation. The vast majority of them are out of date and therefore
 incorrect. __Please do not use Stack Overflow.__
 
-Instead, [tell us](http://nokogiri.org/tutorials/getting_help.html)
+Instead, [tell us](https://nokogiri.org/tutorials/getting_help.html)
 when the above instructions don't work for you. This allows us to both
 help you directly and improve the documentation.
 
@@ -72,12 +77,13 @@ Binary packages are available for some distributions.
 
 ## Support
 
-There are open-source tutorials (to which we invite contributions!) here: http://nokogiri.org/tutorials
+All official documentation is posted at https://nokogiri.org (the source for which is at https://github.com/sparklemotion/nokogiri.org/, and we welcome contributions).
 
 * The Nokogiri mailing list is active: https://groups.google.com/group/nokogiri-talk
 * The Nokogiri bug tracker is here: https://github.com/sparklemotion/nokogiri/issues
 * Before filing a bug report, please read our submission guidelines: http://nokogiri.org/tutorials/getting_help.html
-* The IRC channel is #nokogiri on freenode.
+* The IRC channel is `#nokogiri` on freenode.
+* The project's GitHub wiki has an excellent community-maintained [Cheat Sheet](https://github.com/sparklemotion/nokogiri/wiki/Cheat-sheet) which might be useful.
 
 Consider subscribing to [Tidelift][tidelift] which provides license assurances and timely security notifications for your open source dependencies, including Nokogiri. [Tidelift][tidelift] subscriptions also help the Nokogiri maintainers fund our [automated testing](https://ci.nokogiri.org) which in turn allows us to ship releases, bugfixes, and security updates more often.
 
@@ -102,7 +108,7 @@ require 'nokogiri'
 require 'open-uri'
 
 # Fetch and parse HTML document
-doc = Nokogiri::HTML(open('http://www.nokogiri.org/tutorials/installing_nokogiri.html'))
+doc = Nokogiri::HTML(open('https://nokogiri.org/tutorials/installing_nokogiri.html'))
 
 puts "### Search for nodes by css"
 doc.css('nav ul.menu li a', 'article h2').each do |link|
@@ -136,7 +142,7 @@ end
   * At install time, set the environment variable
     `NOKOGIRI_USE_SYSTEM_LIBRARIES` or else use the
     `--use-system-libraries` argument. (See
-    http://nokogiri.org/tutorials/installing_nokogiri.html#using_your_system_libraries
+    https://nokogiri.org/tutorials/installing_nokogiri.html#install-with-system-libraries
     for specifics.)
 
   * libxml2 >=2.6.21 with iconv support
@@ -176,7 +182,7 @@ explicitly setting the encoding to EUC-JP on the parser:
 
 ```bash
   bundle install
-  bundle exec rake
+  bundle exec rake compile test
 ```
 
 

data/ext/java/nokogiri/HtmlDocument.java

@@ -32,13 +32,12 @@
 
 package nokogiri;
 
-import nokogiri.internals.HtmlDomParserContext;
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
-import org.jruby.javasupport.util.RuntimeHelpers;
 import org.jruby.runtime.Arity;
+import org.jruby.runtime.Helpers;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.w3c.dom.Attr;
@@ -47,6 +46,8 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import nokogiri.internals.HtmlDomParserContext;
+
 /**
  * Class for Nokogiri::HTML::Document.
  *
@@ -81,7 +82,7 @@ public class HtmlDocument extends XmlDocument {
             throw context.getRuntime().newRuntimeError("couldn't create document: " + ex);
         }
 
-        RuntimeHelpers.invoke(context, htmlDocument, "initialize", args);
+        Helpers.invoke(context, htmlDocument, "initialize", args);
 
         return htmlDocument;
     }

data/ext/java/nokogiri/HtmlEntityLookup.java

@@ -32,7 +32,7 @@
 
 package nokogiri;
 
-import static org.jruby.javasupport.util.RuntimeHelpers.invoke;
+import static org.jruby.runtime.Helpers.invoke;
 
 import org.cyberneko.html.HTMLEntities;
 import org.jruby.Ruby;

data/ext/java/nokogiri/HtmlSaxPushParser.java

@@ -34,7 +34,7 @@ package nokogiri;
 
 import static nokogiri.XmlSaxPushParser.terminateExecution;
 import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
-import static org.jruby.javasupport.util.RuntimeHelpers.invoke;
+import static org.jruby.runtime.Helpers.invoke;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;

data/ext/java/nokogiri/XmlDocument.java

@@ -45,14 +45,6 @@ import java.util.List;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import nokogiri.internals.NokogiriHelpers;
-import nokogiri.internals.NokogiriNamespaceCache;
-import nokogiri.internals.SaveContextVisitor;
-import nokogiri.internals.XmlDomParserContext;
-import nokogiri.internals.c14n.CanonicalFilter;
-import nokogiri.internals.c14n.CanonicalizationException;
-import nokogiri.internals.c14n.Canonicalizer;
-
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
@@ -61,9 +53,9 @@ import org.jruby.RubyNil;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.javasupport.JavaUtil;
-import org.jruby.javasupport.util.RuntimeHelpers;
 import org.jruby.runtime.Arity;
 import org.jruby.runtime.Block;
+import org.jruby.runtime.Helpers;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.w3c.dom.Attr;
@@ -73,6 +65,14 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import nokogiri.internals.NokogiriHelpers;
+import nokogiri.internals.NokogiriNamespaceCache;
+import nokogiri.internals.SaveContextVisitor;
+import nokogiri.internals.XmlDomParserContext;
+import nokogiri.internals.c14n.CanonicalFilter;
+import nokogiri.internals.c14n.CanonicalizationException;
+import nokogiri.internals.c14n.Canonicalizer;
+
 /**
  * Class for Nokogiri::XML::Document
  *
@@ -264,7 +264,7 @@ public class XmlDocument extends XmlNode {
             throw context.getRuntime().newRuntimeError("couldn't create document: "+ex.toString());
         }
 
-        RuntimeHelpers.invoke(context, xmlDocument, "initialize", args);
+        Helpers.invoke(context, xmlDocument, "initialize", args);
 
         return xmlDocument;
     }
@@ -397,6 +397,20 @@ public class XmlDocument extends XmlNode {
             return getCachedNodeOrCreate(context.getRuntime(), rootNode);
     }
 
+    protected IRubyObject dup_implementation(Ruby runtime, boolean deep) {
+        XmlDocument doc = (XmlDocument) super.dup_implementation(runtime, deep);
+        // Avoid creating a new XmlDocument since we cloned one
+        // already. Otherwise the following test will fail:
+        //
+        //   dup = doc.dup
+        //   dup.equal?(dup.children[0].document)
+        //
+        // Since `dup.children[0].document' will end up creating a new
+        // XmlDocument.  See #1060.
+        doc.resetCache();
+        return doc;
+    }
+
     @JRubyMethod(name="root=")
     public IRubyObject root_set(ThreadContext context, IRubyObject newRoot_) {
         // in case of document fragment, temporary root node should be deleted.
@@ -551,7 +565,7 @@ public class XmlDocument extends XmlNode {
     @JRubyMethod(meta=true)
     public static IRubyObject wrapJavaDocument(ThreadContext context, IRubyObject klazz, IRubyObject arg) {
         XmlDocument xmlDocument = (XmlDocument) NokogiriService.XML_DOCUMENT_ALLOCATOR.allocate(context.getRuntime(), getNokogiriClass(context.getRuntime(), "Nokogiri::XML::Document"));
-        RuntimeHelpers.invoke(context, xmlDocument, "initialize");
+        Helpers.invoke(context, xmlDocument, "initialize");
         Document document = (Document)arg.toJava(Document.class);
         xmlDocument.setDocumentNode(context, document);
         return xmlDocument;

data/ext/java/nokogiri/XmlDocumentFragment.java

@@ -40,7 +40,6 @@ import static nokogiri.internals.NokogiriHelpers.rubyStringToString;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -50,7 +49,7 @@ import org.jruby.RubyClass;
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
-import org.jruby.javasupport.util.RuntimeHelpers;
+import org.jruby.runtime.Helpers;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
@@ -103,7 +102,7 @@ public class XmlDocumentFragment extends XmlNode {
         if (args.length == 3 && args[2] != null && args[2] instanceof XmlElement) {
             fragment.fragmentContext = (XmlElement)args[2];
         }
-        RuntimeHelpers.invoke(context, fragment, "initialize", args);
+        Helpers.invoke(context, fragment, "initialize", args);
         return fragment;
     }
 

data/ext/java/nokogiri/XmlNode.java

@@ -17,10 +17,10 @@
  * 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.
@@ -64,7 +64,7 @@ import org.jruby.RubyString;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.exceptions.RaiseException;
-import org.jruby.javasupport.util.RuntimeHelpers;
+import org.jruby.runtime.Helpers;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.Visibility;
@@ -227,7 +227,7 @@ public class XmlNode extends RubyObject {
                 doc = document(context.runtime);
 
                 if (doc != null && ! doc.isNil()) {
-                    RuntimeHelpers.invoke(context, doc, "decorate", this);
+                    Helpers.invoke(context, doc, "decorate", this);
                 }
             }
         }
@@ -570,7 +570,7 @@ public class XmlNode extends RubyObject {
     static void setDocumentAndDecorate(ThreadContext context, RubyObject self, IRubyObject doc) {
         self.setInstanceVariable("@document", doc);
         if (doc != null) {
-            RuntimeHelpers.invoke(context, doc, "decorate", self);
+            Helpers.invoke(context, doc, "decorate", self);
         }
     }
 
@@ -709,7 +709,7 @@ public class XmlNode extends RubyObject {
 
     @JRubyMethod(name = "blank?")
     public IRubyObject blank_p(ThreadContext context) {
-        // according to libxml doc, 
+        // according to libxml doc,
         // a node is blank if if it is a Text or CDATA node consisting of whitespace only
         if (node.getNodeType() == Node.TEXT_NODE || node.getNodeType() == Node.CDATA_SECTION_NODE) {
             String data = node.getTextContent();
@@ -853,7 +853,7 @@ public class XmlNode extends RubyObject {
         	HtmlDomParserContext htmlCtx= (HtmlDomParserContext) ctx;
         	htmlCtx.setEncoding(document.getEncoding().asJavaString());
         }
-        
+
         XmlDocument doc = ctx.parse(context, klass, runtime.getNil());
 
         RubyArray documentErrors = getErrorArray(document);
@@ -1158,7 +1158,7 @@ public class XmlNode extends RubyObject {
     @JRubyMethod
     public IRubyObject namespace_definitions(ThreadContext context) {
         // don't use namespace_definitions cache anymore since
-        // namespaces might be deleted. Reflecting the result of 
+        // namespaces might be deleted. Reflecting the result of
         // namesapce removals is complicated, so the cache might not be
         // updated.
         Ruby ruby = context.getRuntime();
@@ -1279,7 +1279,7 @@ public class XmlNode extends RubyObject {
 
         String encString = encoding.isNil() ? null : rubyStringToString(encoding);
 
-        SaveContextVisitor visitor = 
+        SaveContextVisitor visitor =
             new SaveContextVisitor(RubyFixnum.fix2int(options), rubyStringToString(indentString), encString, isHtmlDoc(context), isFragment(), 0);
         accept(context, visitor);
 
@@ -1291,7 +1291,7 @@ public class XmlNode extends RubyObject {
             ByteList str = new ByteList(bytes.array(), bytes.arrayOffset(), bytes.remaining());
             rubyString = RubyString.newString(context.getRuntime(), str);
         }
-        RuntimeHelpers.invoke(context, io, "write", rubyString);
+        Helpers.invoke(context, io, "write", rubyString);
 
         return io;
     }
@@ -1764,7 +1764,7 @@ public class XmlNode extends RubyObject {
      *
      * Loads and substitutes all xinclude elements below the node. The
      * parser context will be initialized with +options+.
-     * 
+     *
      */
     @JRubyMethod(visibility=Visibility.PRIVATE)
     public IRubyObject process_xincludes(ThreadContext context, IRubyObject options) {

data/ext/java/nokogiri/XmlProcessingInstruction.java

@@ -33,19 +33,20 @@
 package nokogiri;
 
 import static nokogiri.internals.NokogiriHelpers.rubyStringToString;
-import nokogiri.internals.SaveContextVisitor;
 
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
-import org.jruby.javasupport.util.RuntimeHelpers;
+import org.jruby.runtime.Helpers;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.ProcessingInstruction;
 
+import nokogiri.internals.SaveContextVisitor;
+
 /**
  * Class for Nokogiri::XML::ProcessingInstruction
  * 
@@ -81,7 +82,7 @@ public class XmlProcessingInstruction extends XmlNode {
                                          (RubyClass) klazz,
                                          node);
 
-        RuntimeHelpers.invoke(context, self, "initialize", args);
+        Helpers.invoke(context, self, "initialize", args);
 
         // TODO: if_block_given.
 

data/ext/java/nokogiri/XmlSaxParserContext.java

@@ -32,7 +32,7 @@
 
 package nokogiri;
 
-import static org.jruby.javasupport.util.RuntimeHelpers.invoke;
+import static org.jruby.runtime.Helpers.invoke;
 
 import java.io.IOException;
 import java.io.InputStream;

data/ext/java/nokogiri/XmlSaxPushParser.java

@@ -33,7 +33,7 @@
 package nokogiri;
 
 import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
-import static org.jruby.javasupport.util.RuntimeHelpers.invoke;
+import static org.jruby.runtime.Helpers.invoke;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -45,18 +45,20 @@ import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.ThreadFactory;
 
-import nokogiri.internals.*;
-
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
-import org.jruby.RubyException;
 import org.jruby.RubyObject;
 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;
-import org.xml.sax.SAXException;
+
+import nokogiri.internals.ClosedStreamException;
+import nokogiri.internals.NokogiriBlockingQueueInputStream;
+import nokogiri.internals.NokogiriHandler;
+import nokogiri.internals.NokogiriHelpers;
+import nokogiri.internals.ParserContext;
 
 /**
  * Class for Nokogiri::XML::SAX::PushParser

data/ext/java/nokogiri/XsltStylesheet.java

@@ -40,9 +40,6 @@ import java.io.IOException;
 import java.io.PipedReader;
 import java.io.PipedWriter;
 import java.io.StringReader;
-import java.nio.CharBuffer;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -57,8 +54,6 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import nokogiri.internals.NokogiriXsltErrorListener;
-
 import org.apache.xalan.transformer.TransformerImpl;
 import org.apache.xml.serializer.SerializationHandler;
 import org.jruby.Ruby;
@@ -69,11 +64,13 @@ import org.jruby.RubyObject;
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
-import org.jruby.javasupport.util.RuntimeHelpers;
+import org.jruby.runtime.Helpers;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.w3c.dom.Document;
 
+import nokogiri.internals.NokogiriXsltErrorListener;
+
 /**
  * Class for Nokogiri::XSLT::Stylesheet
  *
@@ -327,14 +324,14 @@ public class XsltStylesheet extends RubyObject {
         if (htmlish) {
             args[3] = parse_options.getConstant("DEFAULT_HTML");
             RubyClass htmlDocumentClass = getNokogiriClass(runtime, "Nokogiri::HTML::Document");
-            return RuntimeHelpers.invoke(context, htmlDocumentClass, "parse", args);
+            return Helpers.invoke(context, htmlDocumentClass, "parse", args);
         } else {
             args[3] = parse_options.getConstant("DEFAULT_XML");
             RubyClass xmlDocumentClass = getNokogiriClass(runtime, "Nokogiri::XML::Document");            
-            XmlDocument xmlDocument = (XmlDocument) RuntimeHelpers.invoke(context, xmlDocumentClass, "parse", args);
+            XmlDocument xmlDocument = (XmlDocument) Helpers.invoke(context, xmlDocumentClass, "parse", args);
             if (((Document)xmlDocument.getNode()).getDocumentElement() == null) {
                 RubyArray errors = (RubyArray) xmlDocument.getInstanceVariable("@errors");
-                RuntimeHelpers.invoke(context, errors, "<<", args[0]);
+                Helpers.invoke(context, errors, "<<", args[0]);
             }
             return xmlDocument;
         }

data/ext/java/nokogiri/internals/NokogiriEncodingReaderWrapper.java

@@ -1,13 +1,11 @@
 package nokogiri.internals;
 
-import java.io.IOException;
 import java.io.InputStream;
 
 import org.jruby.Ruby;
 import org.jruby.RubyObject;
-import org.jruby.RubyProcess.Sys;
 import org.jruby.exceptions.RaiseException;
-import org.jruby.javasupport.util.RuntimeHelpers;
+import org.jruby.runtime.Helpers;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
@@ -41,7 +39,7 @@ public class NokogiriEncodingReaderWrapper extends InputStream {
     this.encodingReader = encodingReader;
     this.ruby = context.getRuntime();
 
-    if (!RuntimeHelpers.invoke(context, encodingReader, "respond_to?", ruby.newSymbol("read")).isTrue()
+    if (!Helpers.invoke(context, encodingReader, "respond_to?", ruby.newSymbol("read")).isTrue()
         || encodingReader.getInstanceVariable("@io") == null) {
       throw ruby.newArgumentError("Argument doesn't respond to read or doesn't have instance variable @io");
     }

data/ext/java/nokogiri/internals/NokogiriHandler.java

@@ -42,14 +42,11 @@ import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.Set;
 
-import nokogiri.XmlSyntaxError;
-
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
-import org.jruby.RubyObject;
 import org.jruby.exceptions.RaiseException;
-import org.jruby.javasupport.util.RuntimeHelpers;
+import org.jruby.runtime.Helpers;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.xml.sax.Attributes;
@@ -58,6 +55,8 @@ import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 import org.xml.sax.ext.DefaultHandler2;
 
+import nokogiri.XmlSyntaxError;
+
 /**
  * A handler for SAX parsing.
  *
@@ -178,7 +177,7 @@ public class NokogiriHandler extends DefaultHandler2 implements XmlDeclHandler {
                     };
                 }
 
-                rubyAttr.append( RuntimeHelpers.invoke(context, attrClass, "new", args) );
+                rubyAttr.append( Helpers.invoke(context, attrClass, "new", args) );
             }
         }
 
@@ -246,27 +245,25 @@ public class NokogiriHandler extends DefaultHandler2 implements XmlDeclHandler {
         charactersBuilder.setLength(0);
     }
 
-    @Override
-    public void error(SAXParseException ex) {
+    void handleError(SAXParseException ex) {
         try {
             final String msg = ex.getMessage();
             call("error", runtime.newString(msg == null ? "" : msg));
             addError(new RaiseException(XmlSyntaxError.createError(runtime, ex), true));
-        } catch(RaiseException e) {
+        } catch( RaiseException e) {
             addError(e);
+            throw e;
         }
     }
 
     @Override
-    public void fatalError(SAXParseException ex) {
-        try {
-            final String msg = ex.getMessage();
-            call("error", runtime.newString(msg == null ? "" : msg));
-            addError(new RaiseException(XmlSyntaxError.createFatalError(runtime, ex), true));
+    public void error(SAXParseException ex) {
+        handleError(ex);
+    }
 
-        } catch(RaiseException e) {
-            addError(e);
-        }
+    @Override
+    public void fatalError(SAXParseException ex) {
+        handleError(ex);
     }
 
     @Override
@@ -289,22 +286,22 @@ public class NokogiriHandler extends DefaultHandler2 implements XmlDeclHandler {
 
     private void call(String methodName) {
         ThreadContext context = runtime.getCurrentContext();
-        RuntimeHelpers.invoke(context, document(context), methodName);
+        Helpers.invoke(context, document(context), methodName);
     }
 
     private void call(String methodName, IRubyObject argument) {
         ThreadContext context = runtime.getCurrentContext();
-        RuntimeHelpers.invoke(context, document(context), methodName, argument);
+        Helpers.invoke(context, document(context), methodName, argument);
     }
 
     private void call(String methodName, IRubyObject arg1, IRubyObject arg2) {
         ThreadContext context = runtime.getCurrentContext();
-        RuntimeHelpers.invoke(context, document(context), methodName, arg1, arg2);
+        Helpers.invoke(context, document(context), methodName, arg1, arg2);
     }
 
     private void call(String methodName, IRubyObject arg1, IRubyObject arg2, IRubyObject arg3) {
         ThreadContext context = runtime.getCurrentContext();
-        RuntimeHelpers.invoke(context, document(context), methodName, arg1, arg2, arg3);
+        Helpers.invoke(context, document(context), methodName, arg1, arg2, arg3);
     }
 
     private void call(String methodName,
@@ -314,7 +311,7 @@ public class NokogiriHandler extends DefaultHandler2 implements XmlDeclHandler {
                       IRubyObject arg3,
                       IRubyObject arg4) {
         ThreadContext context = runtime.getCurrentContext();
-        RuntimeHelpers.invoke(context, document(context), methodName, arg0, arg1, arg2, arg3, arg4);
+        Helpers.invoke(context, document(context), methodName, arg0, arg1, arg2, arg3, arg4);
     }
 
     private IRubyObject document(ThreadContext context) {

data/ext/java/nokogiri/internals/NokogiriXPathFunction.java

@@ -45,7 +45,7 @@ import org.jruby.RubyFloat;
 import org.jruby.RubyInteger;
 import org.jruby.RubyString;
 import org.jruby.javasupport.JavaUtil;
-import org.jruby.javasupport.util.RuntimeHelpers;
+import org.jruby.runtime.Helpers;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.w3c.dom.NodeList;
@@ -83,7 +83,7 @@ public class NokogiriXPathFunction implements XPathFunction {
         final Ruby runtime = this.handler.getRuntime();
         ThreadContext context = runtime.getCurrentContext();
 
-        IRubyObject result = RuntimeHelpers.invoke(context, this.handler, this.name, fromObjectToRubyArgs(runtime, args));
+        IRubyObject result = Helpers.invoke(context, this.handler, this.name, fromObjectToRubyArgs(runtime, args));
 
         return fromRubyToObject(runtime, result);
     }

data/lib/nokogiri/version.rb

@@ -1,6 +1,6 @@
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = '1.10.1'
+  VERSION = "1.10.2"
 
   class VersionInfo # :nodoc:
     def jruby?

data/patches/libxml2/0002-Remove-script-macro-support.patch

@@ -0,0 +1,40 @@
+From 27e4aa8d885e47a296ea78d114dbbe8fc7aa3508 Mon Sep 17 00:00:00 2001
+From: Kevin Solorio <soloriok@gmail.com>
+Date: Fri, 1 Feb 2019 14:32:42 -0800
+Subject: [PATCH] Revert-support-html-h-b-7-1
+
+---
+ entities.c | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+diff --git a/entities.c b/entities.c
+index 43549bc5..82652f6d 100644
+--- a/entities.c
++++ b/entities.c
+@@ -623,23 +623,6 @@ xmlEncodeEntitiesInternal(xmlDocPtr doc, const xmlChar *input, int attr) {
+ 	    *out++ = 't';
+ 	    *out++ = ';';
+ 	} else if (*cur == '&') {
+-	    /*
+-	     * Special handling of &{...} construct from HTML 4, see
+-	     * http://www.w3.org/TR/html401/appendix/notes.html#h-B.7.1
+-	     */
+-	    if (html && attr && (cur[1] == '{') &&
+-	        (strchr((const char *) cur, '}'))) {
+-	        while (*cur != '}') {
+-		    *out++ = *cur++;
+-		    indx = out - buffer;
+-		    if (indx + 100 > buffer_size) {
+-			growBufferReentrant();
+-			out = &buffer[indx];
+-		    }
+-		}
+-		*out++ = *cur++;
+-		continue;
+-	    }
+ 	    *out++ = '&';
+ 	    *out++ = 'a';
+ 	    *out++ = 'm';
+-- 
+2.16.2
+

data/patches/libxml2/0003-Update-entities-to-remove-handling-of-ssi.patch

@@ -0,0 +1,44 @@
+From ffc08467744bd2305d41ca882c37fa30adf3a067 Mon Sep 17 00:00:00 2001
+From: Kevin Solorio <soloriok@gmail.com>
+Date: Wed, 27 Feb 2019 14:34:17 -0800
+Subject: [PATCH 2/2] update entities.c to remove handling of ssi
+
+---
+ entities.c | 21 ---------------------
+ 1 file changed, 21 deletions(-)
+
+diff --git a/entities.c b/entities.c
+index 43549bc5..5c4a2a60 100644
+--- a/entities.c
++++ b/entities.c
+@@ -592,27 +592,6 @@ xmlEncodeEntitiesInternal(xmlDocPtr doc, const xmlChar *input, int attr) {
+ 	 * By default one have to encode at least '<', '>', '"' and '&' !
+ 	 */
+ 	if (*cur == '<') {
+-	    const xmlChar *end;
+-
+-	    /*
+-	     * Special handling of server side include in HTML attributes
+-	     */
+-	    if (html && attr &&
+-	        (cur[1] == '!') && (cur[2] == '-') && (cur[3] == '-') &&
+-	        ((end = xmlStrstr(cur, BAD_CAST "-->")) != NULL)) {
+-	        while (cur != end) {
+-		    *out++ = *cur++;
+-		    indx = out - buffer;
+-		    if (indx + 100 > buffer_size) {
+-			growBufferReentrant();
+-			out = &buffer[indx];
+-		    }
+-		}
+-		*out++ = *cur++;
+-		*out++ = *cur++;
+-		*out++ = *cur++;
+-		continue;
+-	    }
+ 	    *out++ = '&';
+ 	    *out++ = 'l';
+ 	    *out++ = 't';
+-- 
+2.16.2
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.10.2
 platform: java
 authors:
 - Aaron Patterson
@@ -14,14 +14,14 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-13 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.24'
   name: concourse
   prerelease: false
   type: :development
@@ -29,7 +29,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.24'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -509,6 +509,8 @@ files:
 - lib/xml-apis.jar
 - lib/xsd/xmlparser/nokogiri.rb
 - patches/libxml2/0001-Revert-Do-not-URI-escape-in-server-side-includes.patch
+- patches/libxml2/0002-Remove-script-macro-support.patch
+- patches/libxml2/0003-Update-entities-to-remove-handling-of-ssi.patch
 homepage:
 licenses:
 - MIT