nokogiri 1.13.3 → 1.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a9e9c98ef383eff954865accb42edd57b6521476c8f457e1d8530247e2bb9d5
-  data.tar.gz: 5c949a7d6c384851830dd42703050431dd718ee2500387c3a88ba73dbaf69d18
+  metadata.gz: 111da6f69d040f9ac5c3573b0e03cdc5e09fb27c5d8ae8bc6e0bf70079dbcdb8
+  data.tar.gz: ccbda476379e696103cf61983df914c6b7312090b5905daccb3077f0a25e60ba
 SHA512:
-  metadata.gz: 05451ca1438a1bde88ab4c210d0d5a460c205c365d1853a554e2eb5b6736933dfd64a487f6e1db4a0002f517d92da22ad83e5f92b40a0639c6286f544b93fc8b
-  data.tar.gz: 290e2a97df760bcdfb91c3994a1062cb49ffd9f63722bf3608db2b9a2e45f1dffc14e46f2105c74133bc8bb134a77caddf8a6092d251419e904354e4580db082
+  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"
@@ -9,8 +9,8 @@ libxslt:
   # sha-256 hash provided in https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.35.sha256sum
 
 zlib:
-  version: "1.2.11"
-  sha256: "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1"
+  version: "1.2.12"
+  sha256: "91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9"
   # SHA-256 hash provided on http://zlib.net/
 
 libiconv:

data/ext/nokogiri/extconf.rb

@@ -382,6 +382,7 @@ def iconv_configure_flags
   ["iconv", "opt"].each do |target|
     config = preserving_globals { dir_config(target) }
     next unless config.any? && try_link_iconv("--with-#{target}-* flags") { dir_config(target) }
+
     idirs, ldirs = config.map do |dirs|
       Array(dirs).flat_map do |dir|
         dir.split(File::PATH_SEPARATOR)
@@ -715,14 +716,6 @@ else
             execute("configure",
               ["env", "CHOST=#{host}", "CFLAGS=#{cflags}", "./configure", "--static", configure_prefix])
           end
-
-          def compile
-            if /darwin/.match?(host)
-              execute("compile", "make AR=#{host}-libtool")
-            else
-              super
-            end
-          end
         end
       end
     end

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/css/parser_extras.rb

@@ -24,12 +24,14 @@ module Nokogiri
         # Get the css selector in +string+ from the cache
         def [](string)
           return nil unless cache_on?
+
           @mutex.synchronize { @cache[string] }
         end
 
         # Set the css selector in +string+ in the cache to +value+
         def []=(string, value)
           return value unless cache_on?
+
           @mutex.synchronize { @cache[string] = value }
         end
 

data/lib/nokogiri/html4/document.rb

@@ -125,8 +125,9 @@ module Nokogiri
       private :set_metadata_element
 
       ####
-      # Serialize Node using +options+.  Save options can also be set using a
-      # block. See SaveOptions.
+      # Serialize Node using +options+. Save options can also be set using a block.
+      #
+      # See also Nokogiri::XML::Node::SaveOptions and Node@Serialization+and+Generating+Output.
       #
       # These two statements are equivalent:
       #
@@ -241,6 +242,7 @@ module Nokogiri
 
           def start_element(name, attrs = [])
             return unless name == "meta"
+
             attr = Hash[attrs]
             (charset = attr["charset"]) &&
               (@encoding = charset)
@@ -266,7 +268,7 @@ module Nokogiri
         end
 
         def self.detect_encoding(chunk)
-          (m = chunk.match(/\A(<\?xml[ \t\r\n]+[^>]*>)/)) &&
+          (m = chunk.match(/\A(<\?xml[ \t\r\n][^>]*>)/)) &&
             (return Nokogiri.XML(m[1]).encoding)
 
           if Nokogiri.jruby?

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

@@ -28,8 +28,9 @@ 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)
           yield ctx if block_given?
           ctx.parse_with(self)
@@ -51,6 +52,7 @@ module Nokogiri
           raise ArgumentError unless filename
           raise Errno::ENOENT unless File.exist?(filename)
           raise Errno::EISDIR if File.directory?(filename)
+
           ctx = ParserContext.file(filename, encoding)
           yield ctx if block_given?
           ctx.parse_with(self)

data/lib/nokogiri/html5/document.rb

@@ -39,16 +39,19 @@ module Nokogiri
         unless string_or_io.respond_to?(:read) || string_or_io.respond_to?(:to_str)
           raise ArgumentError, "not a string or IO object"
         end
+
         do_parse(string_or_io, url, encoding, options)
       end
 
       def self.read_io(io, url = nil, encoding = nil, **options)
         raise ArgumentError, "io object doesn't respond to :read" unless io.respond_to?(:read)
+
         do_parse(io, url, encoding, options)
       end
 
       def self.read_memory(string, url = nil, encoding = nil, **options)
         raise ArgumentError, "string object doesn't respond to :to_str" unless string.respond_to?(:to_str)
+
         do_parse(string, url, encoding, options)
       end
 

data/lib/nokogiri/html5/node.rb

@@ -27,6 +27,7 @@ module Nokogiri
     module Node
       def inner_html(options = {})
         return super(options) unless document.is_a?(HTML5::Document)
+
         result = options[:preserve_newline] && HTML5.prepend_newline?(self) ? +"\n" : +""
         result << children.map { |child| child.to_html(options) }.join
         result
@@ -34,6 +35,7 @@ module Nokogiri
 
       def write_to(io, *options)
         return super(io, *options) unless document.is_a?(HTML5::Document)
+
         options = options.first.is_a?(Hash) ? options.shift : {}
         encoding = options[:encoding] || options[0]
         if Nokogiri.jruby?
@@ -64,6 +66,7 @@ module Nokogiri
 
       def fragment(tags)
         return super(tags) unless document.is_a?(HTML5::Document)
+
         DocumentFragment.new(document, tags, self)
       end
 
@@ -76,6 +79,7 @@ module Nokogiri
       # actually create the xml namespace if it doesn't exist already.
       def add_child_node_and_reparent_attrs(node)
         return super(node) unless document.is_a?(HTML5::Document)
+
         # I'm not sure what this method is supposed to do. Reparenting
         # namespaces is handled by libxml2, including child namespaces which
         # this method wouldn't handle.

data/lib/nokogiri/html5.rb

@@ -468,6 +468,7 @@ module Nokogiri
 
     def self.prepend_newline?(node)
       return false unless ["pre", "textarea", "listing"].include?(node.name) && !node.children.empty?
+
       first_child = node.children[0]
       first_child.text? && first_child.content.start_with?("\n")
     end

data/lib/nokogiri/version/constant.rb

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

data/lib/nokogiri/version/info.rb

@@ -191,6 +191,7 @@ module Nokogiri
   def self.uses_libxml?(requirement = nil)
     return false unless VersionInfo.instance.libxml2?
     return true unless requirement
+
     Gem::Requirement.new(requirement).satisfied_by?(VersionInfo.instance.loaded_libxml_version)
   end
 

data/lib/nokogiri/xml/builder.rb

@@ -363,6 +363,7 @@ module Nokogiri
 
         @parent.ancestors.each do |a|
           next if a == doc
+
           @ns = a.namespace_definitions.find { |x| x.prefix == ns.to_s }
           return self if @ns
         end
@@ -407,6 +408,7 @@ module Nokogiri
             if node.namespace.nil?
               raise ArgumentError, "Namespace #{@ns[:pending]} has not been defined"
             end
+
             @ns = nil
           end
 

data/lib/nokogiri/xml/document.rb

@@ -321,6 +321,7 @@ module Nokogiri
       # the document or +nil+ when there is no DTD.
       def validate
         return nil unless internal_subset
+
         internal_subset.validate(self)
       end
 
@@ -353,8 +354,10 @@ module Nokogiri
       # Apply any decorators to +node+
       def decorate(node)
         return unless @decorators
+
         @decorators.each do |klass, list|
           next unless node.is_a?(klass)
+
           list.each { |moodule| node.extend(moodule) }
         end
       end
@@ -380,9 +383,11 @@ module Nokogiri
 
       def add_child(node_or_tags)
         raise "A document may not have multiple root nodes." if (root && root.name != "nokogiri_text_wrapper") && !(node_or_tags.comment? || node_or_tags.processing_instruction?)
+
         node_or_tags = coerce(node_or_tags)
         if node_or_tags.is_a?(XML::NodeSet)
           raise "A document may not have multiple root nodes." if node_or_tags.size > 1
+
           super(node_or_tags.first)
         else
           super

data/lib/nokogiri/xml/node/save_options.rb

@@ -4,7 +4,8 @@ module Nokogiri
   module XML
     class Node
       ###
-      # Save options for serializing nodes
+      # Save options for serializing nodes.
+      # See the method group entitled Node@Serialization+and+Generating+Output for usage.
       class SaveOptions
         # Format serialized xml
         FORMAT          = 1

data/lib/nokogiri/xml/node.rb

@@ -124,7 +124,7 @@ module Nokogiri
       # [Returns] Nokogiri::XML::Node
       #
       def initialize(name, document)
-        # This is intentionally empty.
+        # This is intentionally empty, and sets the method signature for subclasses.
       end
 
       ###
@@ -163,6 +163,7 @@ module Nokogiri
         if (first = children.first)
           # Mimic the error add_child would raise.
           raise "Document already has a root node" if document? && !(node_or_tags.comment? || node_or_tags.processing_instruction?)
+
           first.__send__(:add_sibling, :previous, node_or_tags)
         else
           add_child(node_or_tags)
@@ -1072,6 +1073,7 @@ module Nokogiri
       # nil on XML documents and on unknown tags.
       def description
         return nil if document.xml?
+
         Nokogiri::HTML4::ElementDescription[name]
       end
 
@@ -1119,6 +1121,7 @@ module Nokogiri
 
         while parents.last.respond_to?(:parent)
           break unless (ctx_parent = parents.last.parent)
+
           parents << ctx_parent
         end
 
@@ -1150,6 +1153,7 @@ module Nokogiri
       def ==(other)
         return false unless other
         return false unless other.respond_to?(:pointer_id)
+
         pointer_id == other.pointer_id
       end
 
@@ -1159,14 +1163,16 @@ module Nokogiri
       def <=>(other)
         return nil unless other.is_a?(Nokogiri::XML::Node)
         return nil unless document == other.document
+
         compare(other)
       end
 
       # :section: Serialization and Generating Output
 
       ###
-      # Serialize Node using +options+.  Save options can also be set using a
-      # block. See SaveOptions.
+      # Serialize Node using +options+. Save options can also be set using a block.
+      #
+      # See also Nokogiri::XML::Node::SaveOptions and Node@Serialization+and+Generating+Output.
       #
       # These two statements are equivalent:
       #

data/lib/nokogiri/xml/node_set.rb

@@ -27,6 +27,7 @@ module Nokogiri
       # Get the first element of the NodeSet.
       def first(n = nil)
         return self[0] unless n
+
         list = []
         [n, length].min.times { |i| list << self[i] }
         list
@@ -304,6 +305,7 @@ module Nokogiri
       # the set is empty
       def pop
         return nil if length == 0
+
         delete(last)
       end
 
@@ -312,6 +314,7 @@ module Nokogiri
       # +nil+ if the set is empty.
       def shift
         return nil if length == 0
+
         delete(first)
       end
 
@@ -322,6 +325,7 @@ module Nokogiri
       def ==(other)
         return false unless other.is_a?(Nokogiri::XML::NodeSet)
         return false unless length == other.length
+
         each_with_index do |node, i|
           return false unless node == other[i]
         end

data/lib/nokogiri/xml/parse_options.rb

@@ -89,6 +89,7 @@ module Nokogiri
 
       constants.each do |constant|
         next if constant.to_sym == :STRICT
+
         class_eval %{
           def #{constant.downcase}
             @options |= #{constant}

data/lib/nokogiri/xml/processing_instruction.rb

@@ -3,7 +3,7 @@
 module Nokogiri
   module XML
     class ProcessingInstruction < Node
-      def initialize(document, name, content)
+      def initialize(document, name, content) # rubocop:disable Style/RedundantInitialize
       end
     end
   end

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

@@ -101,6 +101,7 @@ module Nokogiri
           raise ArgumentError unless filename
           raise Errno::ENOENT unless File.exist?(filename)
           raise Errno::EISDIR if File.directory?(filename)
+
           ctx = ParserContext.file(filename)
           yield ctx if block_given?
           ctx.parse_with(self)

data/lib/nokogiri/xml/syntax_error.rb

@@ -64,6 +64,7 @@ module Nokogiri
 
       def location_to_s
         return nil if nil_or_zero?(line) && nil_or_zero?(column)
+
         "#{line}:#{column}"
       end
     end

data/lib/nokogiri/xml.rb

@@ -27,6 +27,7 @@ module Nokogiri
         if string_or_io.respond_to?(:read)
           return Reader.from_io(string_or_io, url, encoding, options.to_i)
         end
+
         Reader.from_memory(string_or_io, url, encoding, options.to_i)
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.13.3
+  version: 1.13.6
 platform: ruby
 authors:
 - Mike Dalessio
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-22 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
-