nokogiri 1.10.10 → 1.12.5

data/lib/nokogiri/xslt.rb

@@ -1,5 +1,4 @@
-require 'nokogiri/xslt/stylesheet'
-
+# frozen_string_literal: true
 module Nokogiri
   class << self
     ###
@@ -21,32 +20,32 @@ module Nokogiri
     class << self
       ###
       # Parse the stylesheet in +string+, register any +modules+
-      def parse string, modules = {}
+      def parse(string, modules = {})
         modules.each do |url, klass|
-          XSLT.register url, klass
+          XSLT.register(url, klass)
         end
 
+        doc = XML::Document.parse(string, nil, nil, XML::ParseOptions::DEFAULT_XSLT)
         if Nokogiri.jruby?
-          Stylesheet.parse_stylesheet_doc(XML.parse(string), string)
+          Stylesheet.parse_stylesheet_doc(doc, string)
         else
-          Stylesheet.parse_stylesheet_doc(XML.parse(string))
+          Stylesheet.parse_stylesheet_doc(doc)
         end
       end
 
       ###
       # Quote parameters in +params+ for stylesheet safety
-      def quote_params params
+      def quote_params(params)
         parray = (params.instance_of?(Hash) ? params.to_a.flatten : params).dup
-        parray.each_with_index do |v,i|
-          if i % 2 > 0
-            parray[i]=
-              if v =~ /'/
-                "concat('#{ v.gsub(/'/, %q{', "'", '}) }')"
-              else
-                "'#{v}'";
-              end
+        parray.each_with_index do |v, i|
+          parray[i] = if i % 2 > 0
+            if v =~ /'/
+              "concat('#{v.gsub(/'/, %q{', "'", '})}')"
+            else
+              "'#{v}'"
+            end
           else
-            parray[i] = v.to_s
+            v.to_s
           end
         end
         parray.flatten
@@ -54,3 +53,5 @@ module Nokogiri
     end
   end
 end
+
+require_relative "xslt/stylesheet"

data/lib/nokogiri.rb

@@ -1,60 +1,30 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 # Modify the PATH on windows so that the external DLLs will get loaded.
 
-require 'rbconfig'
+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'
-    require 'serializer.jar'
-    require 'xalan.jar'
-    require 'xml-apis.jar'
-  end
+  require_relative "nokogiri/jruby/dependencies"
 end
 
-begin
-  RUBY_VERSION =~ /(\d+\.\d+)/
-  require "nokogiri/#{$1}/nokogiri"
-rescue LoadError
-  require 'nokogiri/nokogiri'
-end
-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 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'
 #
-#   # Get a Nokogiri::HTML:Document for the page we’re interested in...
+#   # Get a Nokogiri::HTML4::Document for the page we’re interested in...
 #
-#   doc = Nokogiri::HTML(open('http://www.google.com/search?q=tenderlove'))
+#   doc = Nokogiri::HTML4(URI.open('http://www.google.com/search?q=tenderlove'))
 #
 #   # Do funky things with it using Nokogiri::XML::Node methods...
 #
@@ -70,27 +40,27 @@ module Nokogiri
   class << self
     ###
     # Parse an HTML or XML document.  +string+ contains the document.
-    def parse string, url = nil, encoding = nil, options = nil
+    def parse(string, url = nil, encoding = nil, options = nil)
       if string.respond_to?(:read) ||
           /^\s*<(?:!DOCTYPE\s+)?html[\s>]/i === 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.HTML(string, url, encoding,
+        Nokogiri.HTML4(string, url, encoding,
           options || XML::ParseOptions::DEFAULT_HTML)
       else
         Nokogiri.XML(string, url, encoding,
           options || XML::ParseOptions::DEFAULT_XML)
-      end.tap { |doc|
+      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
@@ -119,10 +89,10 @@ module Nokogiri
       # 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 { |alias_name, name|
+        "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
 
@@ -130,15 +100,26 @@ module Nokogiri
 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?
-    Nokogiri::HTML::Builder.new(&block).doc.root
+    Nokogiri::HTML4::Builder.new(&block).doc.root
   else
     Nokogiri.parse(*args)
   end
 end
+
+require_relative "nokogiri/version"
+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,3 +1,4 @@
+# frozen_string_literal: true
 require 'nokogiri'
 
 module XSD # :nodoc:

data/patches/libxml2/{0004-libxml2.la-is-in-top_builddir.patch → 0003-libxml2.la-is-in-top_builddir.patch}

@@ -16,7 +16,7 @@ index cf96d41..1372d8b 100644
  	}
  
 -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) 
++$(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) 

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,14 +423,9 @@ xmlStrsub(const xmlChar *str, int start, int len) {
+
+ int
+ xmlStrlen(const xmlChar *str) {
+-    int len = 0;
+-
+     if (str == NULL) return(0);
+-    while (*str != 0) { /* non input consuming */
+-        str++;
+-        len++;
+-    }
+-    return(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 */