nokogiri 1.13.4 → 1.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b49c5143224576879e1ebecbf90ec6a20a7bee3870b65abf2439241f82023cd
-  data.tar.gz: 85d6f7e37a385880295658851ef8381a7efd93306dea8711d732f48db014d2f0
+  metadata.gz: 111da6f69d040f9ac5c3573b0e03cdc5e09fb27c5d8ae8bc6e0bf70079dbcdb8
+  data.tar.gz: ccbda476379e696103cf61983df914c6b7312090b5905daccb3077f0a25e60ba
 SHA512:
-  metadata.gz: dd962310814487c4e193962f860e0ab21be7aa0014fd0258509f18c0b72757cb7b090a89b48e01e44381c6ef30e4f8ac7f46ff41ee1ecc2a4bae8722b9d42888
-  data.tar.gz: 98d53814e674107cfed30523252e2f8d433a2d68b25294d7cc94fd5d7da426e11b01d43013df562f7d7c75df6f15290222671937942fc10ac70facbace5c3309
+  metadata.gz: bbf69d93304d43cf38667fe66e84caf84b8ca4b89a3ec3d8139fe2f986c10bc5b971d4ed97870601be2ed92b6e748593fea02b89e7f6e2deed09c5a604d2d101
+  data.tar.gz: 4a2a6b55fd87f8b4adb5e8687959d9f0c88334638ca2746761155b0214095ce14d648482833b8f80a59b94a54d29e26d9cae4caacda57b772fe00804de6cdabe

data/dependencies.yml

@@ -1,7 +1,7 @@
 libxml2:
-  version: "2.9.13"
-  sha256: "276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e"
-  # sha-256 hash provided in https://download.gnome.org/sources/libxml2/2.9/libxml2-2.9.13.sha256sum
+  version: "2.9.14"
+  sha256: "60d74a257d1ccec0475e749cba2f21559e48139efba6ff28224357c7c798dfee"
+  # sha-256 hash provided in https://download.gnome.org/sources/libxml2/2.9/libxml2-2.9.14.sha256sum
 
 libxslt:
   version: "1.1.35"

data/ext/nokogiri/html4_sax_parser_context.c

@@ -19,9 +19,8 @@ parse_memory(VALUE klass, VALUE data, VALUE encoding)
 {
   htmlParserCtxtPtr ctxt;
 
-  if (NIL_P(data)) {
-    rb_raise(rb_eArgError, "data cannot be nil");
-  }
+  Check_Type(data, T_STRING);
+
   if (!(int)RSTRING_LEN(data)) {
     rb_raise(rb_eRuntimeError, "data cannot be empty");
   }

data/ext/nokogiri/xml_sax_parser_context.c

@@ -2,6 +2,8 @@
 
 VALUE cNokogiriXmlSaxParserContext ;
 
+static ID id_read;
+
 static void
 deallocate(xmlParserCtxtPtr ctxt)
 {
@@ -26,6 +28,10 @@ parse_io(VALUE klass, VALUE io, VALUE encoding)
   xmlParserCtxtPtr ctxt;
   xmlCharEncoding enc = (xmlCharEncoding)NUM2INT(encoding);
 
+  if (!rb_respond_to(io, id_read)) {
+    rb_raise(rb_eTypeError, "argument expected to respond to :read");
+  }
+
   ctxt = xmlCreateIOParserCtxt(NULL, NULL,
                                (xmlInputReadCallback)noko_io_read,
                                (xmlInputCloseCallback)noko_io_close,
@@ -62,9 +68,8 @@ parse_memory(VALUE klass, VALUE data)
 {
   xmlParserCtxtPtr ctxt;
 
-  if (NIL_P(data)) {
-    rb_raise(rb_eArgError, "data cannot be nil");
-  }
+  Check_Type(data, T_STRING);
+
   if (!(int)RSTRING_LEN(data)) {
     rb_raise(rb_eRuntimeError, "data cannot be empty");
   }
@@ -278,4 +283,6 @@ noko_init_xml_sax_parser_context()
   rb_define_method(cNokogiriXmlSaxParserContext, "recovery", get_recovery, 0);
   rb_define_method(cNokogiriXmlSaxParserContext, "line", line, 0);
   rb_define_method(cNokogiriXmlSaxParserContext, "column", column, 0);
+
+  id_read = rb_intern("read");
 }

data/lib/nokogiri/html4/sax/parser.rb

@@ -28,7 +28,7 @@ module Nokogiri
         ###
         # Parse html stored in +data+ using +encoding+
         def parse_memory(data, encoding = "UTF-8")
-          raise ArgumentError unless data
+          raise TypeError unless String === data
           return if data.empty?
 
           ctx = ParserContext.memory(data, encoding)

data/lib/nokogiri/version/constant.rb

@@ -2,5 +2,5 @@
 
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = "1.13.4"
+  VERSION = "1.13.6"
 end

data/lib/nokogiri/xml/node.rb

@@ -123,8 +123,8 @@ module Nokogiri
       # [Yields] Nokogiri::XML::Node
       # [Returns] Nokogiri::XML::Node
       #
-      def initialize(name, document) # rubocop:disable Style/RedundantInitialize
-        # This is intentionally empty.
+      def initialize(name, document)
+        # This is intentionally empty, and sets the method signature for subclasses.
       end
 
       ###

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.13.4
+  version: 1.13.6
 platform: ruby
 authors:
 - Mike Dalessio
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-11 00:00:00.000000000 Z
+date: 2022-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -182,14 +182,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '1.28'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.28.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '1.28'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.28.2
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
@@ -492,9 +498,8 @@ files:
 - patches/libxml2/0006-update-automake-files-for-arm64.patch
 - patches/libxml2/0008-htmlParseComment-handle-abruptly-closed-comments.patch
 - patches/libxml2/0009-allow-wildcard-namespaces.patch
-- patches/libxml2/0010-Revert-Different-approach-to-fix-quadratic-behavior.patch
 - patches/libxslt/0001-update-automake-files-for-arm64.patch
-- ports/archives/libxml2-2.9.13.tar.xz
+- ports/archives/libxml2-2.9.14.tar.xz
 - ports/archives/libxslt-1.1.35.tar.xz
 homepage: https://nokogiri.org
 licenses:

data/patches/libxml2/0010-Revert-Different-approach-to-fix-quadratic-behavior.patch

@@ -1,45 +0,0 @@
-From ddc5f3d22644e0f6fbcc20541c86825757ffee62 Mon Sep 17 00:00:00 2001
-From: Mike Dalessio <mike.dalessio@gmail.com>
-Date: Mon, 21 Feb 2022 18:27:45 -0500
-Subject: [PATCH] Revert "Different approach to fix quadratic behavior in HTML
- push parser"
-
-This reverts commit 798bdf13f6964a650b9a0b7b4b3a769f6f1d509a.
----
- HTMLparser.c | 14 +-------------
- 1 file changed, 1 insertion(+), 13 deletions(-)
-
-diff --git a/HTMLparser.c b/HTMLparser.c
-index eba2d7c..c0b8119 100644
---- a/HTMLparser.c
-+++ b/HTMLparser.c
-@@ -3960,25 +3960,13 @@ htmlParseStartTag(htmlParserCtxtPtr ctxt) {
- 	htmlParseErr(ctxt, XML_ERR_NAME_REQUIRED,
- 	             "htmlParseStartTag: invalid element name\n",
- 		     NULL, NULL);
--        /*
--         * The recovery code is disabled for now as it can result in
--         * quadratic behavior with the push parser. htmlParseStartTag
--         * must consume all content up to the final '>' in order to avoid
--         * rescanning for this terminator.
--         *
--         * For a proper fix in line with HTML5, htmlParseStartTag and
--         * htmlParseElement should only be called when there's an ASCII
--         * alpha character following the initial '<'. Otherwise, the '<'
--         * should be emitted as text (unless followed by '!', '/' or '?').
--         */
--#if 0
- 	/* if recover preserve text on classic misconstructs */
- 	if ((ctxt->recovery) && ((IS_BLANK_CH(CUR)) || (CUR == '<') ||
- 	    (CUR == '=') || (CUR == '>') || (((CUR >= '0') && (CUR <= '9'))))) {
- 	    htmlParseCharDataInternal(ctxt, '<');
- 	    return(-1);
- 	}
--#endif
-+
- 
- 	/* Dump the bogus tag like browsers do */
- 	while ((CUR != 0) && (CUR != '>') &&
--- 
-2.31.0
-