nokogiri 1.6.0 → 1.13.2

data/lib/nokogiri.rb

@@ -1,91 +1,67 @@
-# -*- coding: utf-8 -*-
-# Modify the PATH on windows so that the external DLLs will get loaded.
+# coding: utf-8
+# frozen_string_literal: true
 
-require 'rbconfig'
-ENV['PATH'] = [File.expand_path(
-  File.join(File.dirname(__FILE__), "..", "ext", "nokogiri")
-), ENV['PATH']].compact.join(';') if RbConfig::CONFIG['host_os'] =~ /(mswin|mingw)/i
+require "rbconfig"
 
 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 'stringio'
-    require 'isorelax.jar'
-    require 'jing.jar'
-    require 'nekohtml.jar'
-    require 'nekodtd.jar'
-    require 'xercesImpl.jar'
-  end
+  require_relative "nokogiri/jruby/dependencies"
 end
 
-require 'nokogiri/nokogiri'
-require 'nokogiri/version'
-require 'nokogiri/syntax_error'
-require 'nokogiri/xml'
-require 'nokogiri/xslt'
-require 'nokogiri/html'
-require 'nokogiri/decorators/slop'
-require 'nokogiri/css'
-require 'nokogiri/html/builder'
+require_relative "nokogiri/extension"
 
 # Nokogiri parses and searches XML/HTML very quickly, and also has
-# correctly implemented CSS3 selector support as well as XPath support.
+# correctly implemented CSS3 selector support as well as XPath 1.0
+# support.
 #
 # Parsing a document returns either a Nokogiri::XML::Document, or a
-# Nokogiri::HTML::Document depending on the kind of document you parse.
+# Nokogiri::HTML4::Document depending on the kind of document you parse.
 #
 # Here is an example:
 #
-#   require 'nokogiri'
-#   require 'open-uri'
+#     require 'nokogiri'
+#     require 'open-uri'
+#
+#     # Get a Nokogiri::HTML4::Document for the page we’re interested in...
 #
-#   # Get a Nokogiri::HTML:Document for the page we’re interested in...
+#     doc = Nokogiri::HTML4(URI.open('http://www.google.com/search?q=tenderlove'))
 #
-#   doc = Nokogiri::HTML(open('http://www.google.com/search?q=tenderlove'))
+#     # Do funky things with it using Nokogiri::XML::Node methods...
 #
-#   # Do funky things with it using Nokogiri::XML::Node methods...
+#     ####
+#     # Search for nodes by css
+#     doc.css('h3.r a.l').each do |link|
+#       puts link.content
+#     end
 #
-#   ####
-#   # Search for nodes by css
-#   doc.css('h3.r a.l').each do |link|
-#     puts link.content
-#   end
+# See also:
 #
-# See Nokogiri::XML::Node#css for more information about CSS searching.
-# See Nokogiri::XML::Node#xpath for more information about XPath searching.
+# - Nokogiri::XML::Searchable#css for more information about CSS searching
+# - Nokogiri::XML::Searchable#xpath for more information about XPath searching
 module Nokogiri
   class << self
     ###
     # Parse an HTML or XML document.  +string+ contains the document.
-    def parse string, url = nil, encoding = nil, options = nil
-      doc =
-        if string.respond_to?(:read) ||
-          string =~ /^\s*<[^Hh>]*html/i # Probably html
-          Nokogiri.HTML(
-            string,
-            url,
-            encoding, options || XML::ParseOptions::DEFAULT_HTML
-          )
-        else
-          Nokogiri.XML(string, url, encoding,
-                        options || XML::ParseOptions::DEFAULT_XML)
-        end
-      yield doc if block_given?
-      doc
+    def parse(string, url = nil, encoding = nil, options = nil)
+      if string.respond_to?(:read) ||
+          /^\s*<(?:!DOCTYPE\s+)?html[\s>]/i.match?(string[0, 512])
+        # Expect an HTML indicator to appear within the first 512
+        # characters of a document. (<?xml ?> + <?xml-stylesheet ?>
+        # shouldn't be that long)
+        Nokogiri.HTML4(string, url, encoding,
+          options || XML::ParseOptions::DEFAULT_HTML)
+      else
+        Nokogiri.XML(string, url, encoding,
+          options || XML::ParseOptions::DEFAULT_XML)
+      end.tap do |doc|
+        yield doc if block_given?
+      end
     end
 
     ###
     # Create a new Nokogiri::XML::DocumentFragment
-    def make input = nil, opts = {}, &blk
+    def make(input = nil, opts = {}, &blk)
       if input
-        Nokogiri::HTML.fragment(input).children.first
+        Nokogiri::HTML4.fragment(input).children.first
       else
         Nokogiri(&blk)
       end
@@ -109,20 +85,44 @@ module Nokogiri
     def Slop(*args, &block)
       Nokogiri(*args, &block).slop!
     end
+
+    # :nodoc:
+    def install_default_aliases
+      # Make sure to support some popular encoding aliases not known by
+      # all iconv implementations.
+      {
+        "Windows-31J" => "CP932",	# Windows-31J is the IANA registered name of CP932.
+      }.each do |alias_name, name|
+        EncodingHandler.alias(name, alias_name) if EncodingHandler[alias_name].nil?
+      end
+    end
   end
+
+  Nokogiri.install_default_aliases
 end
 
 ###
-# Parser a document contained in +args+.  Nokogiri will try to guess what
-# type of document you are attempting to parse.  For more information, see
-# Nokogiri.parse
+# Parse a document contained in +args+.  Nokogiri will try to guess what type of document you are
+# attempting to parse.  For more information, see Nokogiri.parse
 #
-# To specify the type of document, use Nokogiri.XML or Nokogiri.HTML.
+# To specify the type of document, use {Nokogiri.XML}, {Nokogiri.HTML4}, or {Nokogiri.HTML5}.
 def Nokogiri(*args, &block)
-  if block_given?
-    builder = Nokogiri::HTML::Builder.new(&block)
-    return builder.doc.root
+  if block
+    Nokogiri::HTML4::Builder.new(&block).doc.root
   else
     Nokogiri.parse(*args)
   end
 end
+
+require_relative "nokogiri/version"
+require_relative "nokogiri/class_resolver"
+require_relative "nokogiri/syntax_error"
+require_relative "nokogiri/xml"
+require_relative "nokogiri/xslt"
+require_relative "nokogiri/html4"
+require_relative "nokogiri/html"
+require_relative "nokogiri/decorators/slop"
+require_relative "nokogiri/css"
+require_relative "nokogiri/html4/builder"
+
+require_relative "nokogiri/html5" if Nokogiri.uses_gumbo?

data/lib/xsd/xmlparser/nokogiri.rb

@@ -1,7 +1,9 @@
-require 'nokogiri'
+# frozen_string_literal: true
 
-module XSD # :nodoc:
-  module XMLParser # :nodoc:
+require "nokogiri"
+
+module XSD
+  module XMLParser
     ###
     # Nokogiri XML parser for soap4r.
     #
@@ -26,40 +28,40 @@ module XSD # :nodoc:
     class Nokogiri < XSD::XMLParser::Parser
       ###
       # Create a new XSD parser with +host+ and +opt+
-      def initialize host, opt = {}
+      def initialize(host, opt = {})
         super
-        @parser = ::Nokogiri::XML::SAX::Parser.new(self, @charset || 'UTF-8')
+        @parser = ::Nokogiri::XML::SAX::Parser.new(self, @charset || "UTF-8")
       end
 
       ###
       # Start parsing +string_or_readable+
-      def do_parse string_or_readable
+      def do_parse(string_or_readable)
         @parser.parse(string_or_readable)
       end
 
       ###
       # Handle the start_element event with +name+ and +attrs+
-      def start_element name, attrs = []
+      def start_element(name, attrs = [])
         super(name, Hash[*attrs.flatten])
       end
 
       ###
       # Handle the end_element event with +name+
-      def end_element name
+      def end_element(name)
         super
       end
 
       ###
       # Handle errors with message +msg+
-      def error msg
-        raise ParseError.new(msg)
+      def error(msg)
+        raise ParseError, msg
       end
-      alias :warning :error
+      alias_method :warning, :error
 
       ###
       # Handle cdata_blocks containing +string+
-      def cdata_block string
-        characters string
+      def cdata_block(string)
+        characters(string)
       end
 
       ###
@@ -69,16 +71,16 @@ module XSD # :nodoc:
       # +prefix+ is the namespace prefix for the element
       # +uri+ is the associated namespace URI
       # +ns+ is a hash of namespace prefix:urls associated with the element
-      def start_element_namespace name, attrs = [], prefix = nil, uri = nil, ns = []
+      def start_element_namespace(name, attrs = [], prefix = nil, uri = nil, ns = [])
         ###
         # Deal with SAX v1 interface
-        name = [prefix, name].compact.join(':')
-        attributes = ns.map { |ns_prefix,ns_uri|
-          [['xmlns', ns_prefix].compact.join(':'), ns_uri]
-        } + attrs.map { |attr|
-          [[attr.prefix, attr.localname].compact.join(':'), attr.value]
-        }.flatten
-        start_element name, attributes
+        name = [prefix, name].compact.join(":")
+        attributes = ns.map do |ns_prefix, ns_uri|
+          [["xmlns", ns_prefix].compact.join(":"), ns_uri]
+        end + attrs.map do |attr|
+          [[attr.prefix, attr.localname].compact.join(":"), attr.value]
+        end.flatten
+        start_element(name, attributes)
       end
 
       ###
@@ -86,13 +88,13 @@ module XSD # :nodoc:
       # +name+ is the element's name
       # +prefix+ is the namespace prefix associated with the element
       # +uri+ is the associated namespace URI
-      def end_element_namespace name, prefix = nil, uri = nil
+      def end_element_namespace(name, prefix = nil, uri = nil)
         ###
         # Deal with SAX v1 interface
-        end_element [prefix, name].compact.join(':')
+        end_element([prefix, name].compact.join(":"))
       end
 
-      %w{ xmldecl start_document end_document comment }.each do |name|
+      ["xmldecl", "start_document", "end_document", "comment"].each do |name|
         class_eval %{ def #{name}(*args); end }
       end
 

data/patches/libxml2/0001-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/0002-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
+

data/patches/libxml2/0003-libxml2.la-is-in-top_builddir.patch

@@ -0,0 +1,25 @@
+From 0b6ae484761fa01242fe8b67b54e3eb2d282d83d Mon Sep 17 00:00:00 2001
+From: Mike Dalessio <mike.dalessio@gmail.com>
+Date: Wed, 4 Dec 2019 08:43:51 -0500
+Subject: [PATCH] fix libxml2.la's path
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index cf96d41..1372d8b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1057,7 +1057,7 @@ clean-noinstLTLIBRARIES:
+ 	  rm -f $${locs}; \
+ 	}
+ 
+-libxml2.la: $(libxml2_la_OBJECTS) $(libxml2_la_DEPENDENCIES) $(EXTRA_libxml2_la_DEPENDENCIES) 
++$(top_builddir)/libxml2.la: $(libxml2_la_OBJECTS) $(libxml2_la_DEPENDENCIES) $(EXTRA_libxml2_la_DEPENDENCIES)
+ 	$(AM_V_CCLD)$(libxml2_la_LINK) -rpath $(libdir) $(libxml2_la_OBJECTS) $(libxml2_la_LIBADD) $(LIBS)
+ 
+ testdso.la: $(testdso_la_OBJECTS) $(testdso_la_DEPENDENCIES) $(EXTRA_testdso_la_DEPENDENCIES) 
+-- 
+2.17.1
+

data/patches/libxml2/0004-use-glibc-strlen.patch

@@ -0,0 +1,53 @@
+From c94172d2a4451368530db2186190d70be8a1d9e5 Mon Sep 17 00:00:00 2001
+From: Ilya Zub <ilya@serpapi.com>
+Date: Wed, 23 Dec 2020 12:45:29 +0200
+Subject: Use glibc strlen to speed up xmlStrlen
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+xmlStrlen (entire HTML file): 926171.936981 μs
+glibc_xmlStrlen (entire HTML file): 36905.903992 μs
+delta (xmlStrlen ÷ glibc_xmlStrlen): 25.094584 times
+
+xmlStrlen (average string): 57479.204010 μs
+glibc_xmlStrlen (average string): 5802.069000 μs
+delta (xmlStrlen ÷ glibc_xmlStrlen): 9.905937 times
+
+xmlStrlen (bigger string): 388056.315979 μs
+glibc_xmlStrlen (bigger string): 12797.856995 μs
+delta (xmlStrlen ÷ glibc_xmlStrlen): 30.318382 times
+
+xmlStrlen (smallest string): 15870.046021 μs
+glibc_xmlStrlen (smallest string): 6282.208984 μs
+delta (xmlStrlen ÷ glibc_xmlStrlen): 2.527903 times
+
+See https://gitlab.gnome.org/GNOME/libxml2/-/issues/212 for reference.
+---
+ xmlstring.c | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/xmlstring.c b/xmlstring.c
+index e8a1e45d..df247dff 100644
+--- a/xmlstring.c
++++ b/xmlstring.c
+@@ -423,12 +423,7 @@ xmlStrsub(const xmlChar *str, int start, int len) {
+
+ int
+ xmlStrlen(const xmlChar *str) {
+-    size_t len = 0;
+-
+     if (str == NULL) return(0);
+-    while (*str != 0) { /* non input consuming */
+-        str++;
+-        len++;
+-    }
+-    return(len > INT_MAX ? 0 : len);
++
++    return strlen((const char*)str);
+ }
+
+ /**
+--
+2.29.2
+

data/patches/libxml2/0005-avoid-isnan-isinf.patch

@@ -0,0 +1,81 @@
+This patch is a result of rake-compiler-dock using centos 7 (manylinux2014) to cross-compile.
+
+Centos, for reasons I have not been able to discern, implements `isnan` and `isinf` as a function
+and not as a macro. Debian knows how to resolve that function at dynamic-link time (despite using a
+macro at compile time), but musl-based systems (like alpine) do not. Running `nm` on nokogiri.so
+created on such a centos system shows:
+
+```
+                 U __isinf@@GLIBC_2.2.5
+                 U __isnan@@GLIBC_2.2.5
+```
+
+(see https://github.com/sparklemotion/nokogiri/pull/2142 for more info)
+
+This patch avoids using glibc's `isnan` and `isinf` calls, instead using libxml2's fallback
+implementation. There's history here, see libxml2 commit 8813f39:
+
+    commit 8813f39
+    Author: Nick Wellnhofer <wellnhofer@aevum.de>
+    Date:   2017-09-21 00:11:26 +0200
+    
+        Simplify XPath NaN, inf and -0 handling
+        
+        Use C99 macros NAN, INFINITY, isnan, isinf. If they're not available:
+        
+        - Assume that (0.0 / 0.0) generates a NaN and !(x == x) tests for NaN.
+        - Use C89's HUGE_VAL for INFINITY.
+        
+        Remove manual handling of NaN, infinity and negative zero in functions
+        xmlXPathValueFlipSign and xmlXPathDivValues.
+        
+        Remove xmlXPathGetSign. All the tests for negative zero can be replaced
+        with a test for negative or positive zero.
+        
+        Simplify xmlXPathRoundFunction.
+        
+        Remove Trio dependency.
+        
+        This should work on IEEE 754 compliant implementations even if the C99
+        macros aren't available, but will likely break some ancient platforms.
+        If problems arise, my plan is to port the relevant trionan.c solution
+        to xpath.c. Note that non-compliant implementations are impossible
+        to fully support, anyway, since XPath requires IEEE 754.
+
+This patch would be unnecessary if any of the following was true:
+
+* centos implements these as macros, and doesn't generate an unresolved symbol for either in the shared library
+* we had a way to ensure `__isinf` and `__isnan` resolve on musl (e.g., we implement them locally)
+
+diff --git a/xpath.c b/xpath.c
+index 9f64ab9..5b6d999 100644
+--- a/xpath.c
++++ b/xpath.c
+@@ -515,11 +515,7 @@ xmlXPathInit(void) {
+  */
+ int
+ xmlXPathIsNaN(double val) {
+-#ifdef isnan
+-    return isnan(val);
+-#else
+     return !(val == val);
+-#endif
+ }
+ 
+ /**
+@@ -530,15 +530,11 @@ xmlXPathIsNaN(double val) {
+  */
+ int
+ xmlXPathIsInf(double val) {
+-#ifdef isinf
+-    return isinf(val) ? (val > 0 ? 1 : -1) : 0;
+-#else
+     if (val >= xmlXPathPINF)
+         return 1;
+     if (val <= -xmlXPathPINF)
+         return -1;
+     return 0;
+-#endif
+ }
+ 
+ #endif /* SCHEMAS or XPATH */