nokogiri 1.15.4 → 1.17.2

data/lib/nokogiri/xml/syntax_error.rb

@@ -6,11 +6,33 @@ module Nokogiri
     # This class provides information about XML SyntaxErrors.  These
     # exceptions are typically stored on Nokogiri::XML::Document#errors.
     class SyntaxError < ::Nokogiri::SyntaxError
+      class << self
+        def aggregate(errors)
+          return nil if errors.empty?
+          return errors.first if errors.length == 1
+
+          messages = ["Multiple errors encountered:"]
+          errors.each do |error|
+            messages << error.to_s
+          end
+          new(messages.join("\n"))
+        end
+      end
+
       attr_reader :domain
       attr_reader :code
       attr_reader :level
       attr_reader :file
       attr_reader :line
+
+      # The XPath path of the node that caused the error when validating a `Nokogiri::XML::Document`.
+      #
+      # This attribute will only be non-nil when the error is emitted by `Schema#validate` on
+      # Document objects. It will return `nil` for DOM parsing errors and for errors emitted during
+      # Schema validation of files.
+      #
+      # ⚠ `#path` is not supported on JRuby, where it will always return `nil`.
+      attr_reader :path
       attr_reader :str1
       attr_reader :str2
       attr_reader :str3
@@ -63,7 +85,7 @@ module Nokogiri
       end
 
       def location_to_s
-        return nil if nil_or_zero?(line) && nil_or_zero?(column)
+        return if nil_or_zero?(line) && nil_or_zero?(column)
 
         "#{line}:#{column}"
       end

data/lib/nokogiri/xml.rb

@@ -2,45 +2,34 @@
 
 module Nokogiri
   class << self
-    ###
-    # Parse XML.  Convenience method for Nokogiri::XML::Document.parse
-    def XML(thing, url = nil, encoding = nil, options = XML::ParseOptions::DEFAULT_XML, &block)
-      Nokogiri::XML::Document.parse(thing, url, encoding, options, &block)
+    # Convenience method for Nokogiri::XML::Document.parse
+    def XML(...)
+      Nokogiri::XML::Document.parse(...)
     end
   end
 
   module XML
     # Original C14N 1.0 spec canonicalization
-    XML_C14N_1_0 =       0
+    XML_C14N_1_0 = 0
     # Exclusive C14N 1.0 spec canonicalization
     XML_C14N_EXCLUSIVE_1_0 = 1
     # C14N 1.1 spec canonicalization
     XML_C14N_1_1 = 2
-    class << self
-      ###
-      # Parse an XML document using the Nokogiri::XML::Reader API.  See
-      # Nokogiri::XML::Reader for mor information
-      def Reader(string_or_io, url = nil, encoding = nil, options = ParseOptions::STRICT)
-        options = Nokogiri::XML::ParseOptions.new(options) if Integer === options
-        yield options if block_given?
-
-        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)
+    class << self
+      # Convenience method for Nokogiri::XML::Reader.new
+      def Reader(...)
+        Reader.new(...)
       end
 
-      ###
-      # Parse XML.  Convenience method for Nokogiri::XML::Document.parse
-      def parse(thing, url = nil, encoding = nil, options = ParseOptions::DEFAULT_XML, &block)
-        Document.parse(thing, url, encoding, options, &block)
+      # Convenience method for Nokogiri::XML::Document.parse
+      def parse(...)
+        Document.parse(...)
       end
 
-      ####
-      # Parse a fragment from +string+ in to a NodeSet.
-      def fragment(string, options = ParseOptions::DEFAULT_XML, &block)
-        XML::DocumentFragment.parse(string, options, &block)
+      # Convenience method for Nokogiri::XML::DocumentFragment.parse
+      def fragment(...)
+        XML::DocumentFragment.parse(...)
       end
     end
   end

data/lib/nokogiri/xslt/stylesheet.rb

@@ -10,15 +10,37 @@ module Nokogiri
     #   doc   = Nokogiri::XML(File.read('some_file.xml'))
     #   xslt  = Nokogiri::XSLT(File.read('some_transformer.xslt'))
     #
-    #   puts xslt.transform(doc)
+    #   xslt.transform(doc) # => Nokogiri::XML::Document
     #
-    # See Nokogiri::XSLT::Stylesheet#transform for more transformation
-    # information.
+    # Many XSLT transformations include serialization behavior to emit a non-XML document. For these
+    # cases, please take care to invoke the #serialize method on the result of the transformation:
+    #
+    #   doc   = Nokogiri::XML(File.read('some_file.xml'))
+    #   xslt  = Nokogiri::XSLT(File.read('some_transformer.xslt'))
+    #   xslt.serialize(xslt.transform(doc)) # => String
+    #
+    # or use the #apply_to method, which is a shortcut for `serialize(transform(document))`:
+    #
+    #   doc   = Nokogiri::XML(File.read('some_file.xml'))
+    #   xslt  = Nokogiri::XSLT(File.read('some_transformer.xslt'))
+    #   xslt.apply_to(doc) # => String
+    #
+    # See Nokogiri::XSLT::Stylesheet#transform for more information and examples.
     class Stylesheet
-      ###
-      # Apply an XSLT stylesheet to an XML::Document.
-      # +params+ is an array of strings used as XSLT parameters.
-      # returns serialized document
+      # :call-seq:
+      #   apply_to(document, params = []) -> String
+      #
+      # Apply an XSLT stylesheet to an XML::Document and serialize it properly. This method is
+      # equivalent to calling #serialize on the result of #transform.
+      #
+      # [Parameters]
+      # - +document+ is an instance of XML::Document to transform
+      # - +params+ is an array of strings used as XSLT parameters, passed into #transform
+      #
+      # [Returns]
+      #   A string containing the serialized result of the transformation.
+      #
+      # See Nokogiri::XSLT::Stylesheet#transform for more information and examples.
       def apply_to(document, params = [])
         serialize(transform(document, params))
       end

data/lib/nokogiri/xslt.rb

@@ -3,15 +3,9 @@
 
 module Nokogiri
   class << self
-    ###
-    # Create a Nokogiri::XSLT::Stylesheet with +stylesheet+.
-    #
-    # Example:
-    #
-    #   xslt = Nokogiri::XSLT(File.read(ARGV[0]))
-    #
-    def XSLT(stylesheet, modules = {})
-      XSLT.parse(stylesheet, modules)
+    # Convenience method for Nokogiri::XSLT.parse
+    def XSLT(...)
+      XSLT.parse(...)
     end
   end
 
@@ -101,7 +95,7 @@ module Nokogiri
         params.flatten.each_slice(2).with_object([]) do |kv, quoted_params|
           key, value = kv.map(&:to_s)
           value = if value.include?("'")
-            "concat('#{value.gsub(/'/, %q{', "'", '})}')"
+            "concat('#{value.gsub("'", %q{', "'", '})}')"
           else
             "'#{value}'"
           end

data/lib/nokogiri.rb

@@ -94,7 +94,7 @@ module Nokogiri
 
     # :nodoc:
     def install_default_aliases
-      warn("Nokogiri.install_default_aliases is deprecated and will be removed in a future version of Nokogiri. Please call Nokogiri::EncodingHandler.install_default_aliases instead.")
+      warn("Nokogiri.install_default_aliases is deprecated. Please call Nokogiri::EncodingHandler.install_default_aliases instead. This will become an error in Nokogiri v1.17.0.", uplevel: 1, category: :deprecated) # deprecated in v1.14.0, remove in v1.17.0
       Nokogiri::EncodingHandler.install_default_aliases
     end
   end

data/lib/xsd/xmlparser/nokogiri.rb

@@ -7,10 +7,9 @@ module XSD
     ###
     # Nokogiri XML parser for soap4r.
     #
-    # Nokogiri may be used as the XML parser in soap4r.  Simply require
-    # 'xsd/xmlparser/nokogiri' in your soap4r applications, and soap4r
-    # will use Nokogiri as it's XML parser.  No other changes should be
-    # required to use Nokogiri as the XML parser.
+    # Nokogiri may be used as the XML parser in soap4r. Require 'xsd/xmlparser/nokogiri' in your
+    # soap4r applications, and soap4r will use Nokogiri as its XML parser. No other changes should
+    # be required to use Nokogiri as the XML parser.
     #
     # Example (using UW ITS Web Services):
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.15.4
+  version: 1.17.2
 platform: ruby
 authors:
 - Mike Dalessio
@@ -17,10 +17,10 @@ authors:
 - Sergio Arbeo
 - Timothy Elliott
 - Nobuyoshi Nakada
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-11 00:00:00.000000000 Z
+date: 2024-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -36,7 +36,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.8.2
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: racc
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +50,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-  force_ruby_platform: false
 description: |
   Nokogiri (鋸) makes it easy and painless to work with XML and HTML from Ruby. It provides a
   sensible, easy-to-understand API for reading, writing, modifying, and querying documents. It is
@@ -66,9 +64,10 @@ extra_rdoc_files:
 - ext/nokogiri/html4_document.c
 - ext/nokogiri/html4_element_description.c
 - ext/nokogiri/html4_entity_lookup.c
+- ext/nokogiri/html4_sax_parser.c
 - ext/nokogiri/html4_sax_parser_context.c
 - ext/nokogiri/html4_sax_push_parser.c
-- ext/nokogiri/libxml2_backwards_compat.c
+- ext/nokogiri/libxml2_polyfill.c
 - ext/nokogiri/nokogiri.c
 - ext/nokogiri/test_global_handlers.c
 - ext/nokogiri/xml_attr.c
@@ -111,9 +110,10 @@ files:
 - ext/nokogiri/html4_document.c
 - ext/nokogiri/html4_element_description.c
 - ext/nokogiri/html4_entity_lookup.c
+- ext/nokogiri/html4_sax_parser.c
 - ext/nokogiri/html4_sax_parser_context.c
 - ext/nokogiri/html4_sax_push_parser.c
-- ext/nokogiri/libxml2_backwards_compat.c
+- ext/nokogiri/libxml2_polyfill.c
 - ext/nokogiri/nokogiri.c
 - ext/nokogiri/nokogiri.h
 - ext/nokogiri/test_global_handlers.c
@@ -195,6 +195,7 @@ files:
 - lib/nokogiri/css/parser.rb
 - lib/nokogiri/css/parser.y
 - lib/nokogiri/css/parser_extras.rb
+- lib/nokogiri/css/selector_cache.rb
 - lib/nokogiri/css/syntax_error.rb
 - lib/nokogiri/css/tokenizer.rb
 - lib/nokogiri/css/tokenizer.rex
@@ -216,6 +217,7 @@ files:
 - lib/nokogiri/html4/sax/parser_context.rb
 - lib/nokogiri/html4/sax/push_parser.rb
 - lib/nokogiri/html5.rb
+- lib/nokogiri/html5/builder.rb
 - lib/nokogiri/html5/document.rb
 - lib/nokogiri/html5/document_fragment.rb
 - lib/nokogiri/html5/node.rb
@@ -267,13 +269,12 @@ files:
 - lib/xsd/xmlparser/nokogiri.rb
 - patches/libxml2/0001-Remove-script-macro-support.patch
 - patches/libxml2/0002-Update-entities-to-remove-handling-of-ssi.patch
-- patches/libxml2/0003-libxml2.la-is-in-top_builddir.patch
 - patches/libxml2/0009-allow-wildcard-namespaces.patch
 - patches/libxml2/0010-update-config.guess-and-config.sub-for-libxml2.patch
 - patches/libxml2/0011-rip-out-libxml2-s-libc_single_threaded-support.patch
 - patches/libxslt/0001-update-config.guess-and-config.sub-for-libxslt.patch
-- ports/archives/libxml2-2.11.5.tar.xz
-- ports/archives/libxslt-1.1.38.tar.xz
+- ports/archives/libxml2-2.13.5.tar.xz
+- ports/archives/libxslt-1.1.42.tar.xz
 homepage: https://nokogiri.org
 licenses:
 - MIT
@@ -284,7 +285,7 @@ metadata:
   changelog_uri: https://nokogiri.org/CHANGELOG.html
   source_code_uri: https://github.com/sparklemotion/nokogiri
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -294,15 +295,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.3.22
+signing_key:
 specification_version: 4
 summary: Nokogiri (鋸) makes it easy and painless to work with XML and HTML from Ruby.
 test_files: []

data/ext/nokogiri/libxml2_backwards_compat.c

@@ -1,121 +0,0 @@
-#ifndef HAVE_XMLFIRSTELEMENTCHILD
-#include <nokogiri.h>
-/**
- * xmlFirstElementChild:
- * @parent: the parent node
- *
- * Finds the first child node of that element which is a Element node
- * Note the handling of entities references is different than in
- * the W3C DOM element traversal spec since we don't have back reference
- * from entities content to entities references.
- *
- * Returns the first element child or NULL if not available
- */
-xmlNodePtr
-xmlFirstElementChild(xmlNodePtr parent)
-{
-  xmlNodePtr cur = NULL;
-
-  if (parent == NULL) {
-    return (NULL);
-  }
-  switch (parent->type) {
-    case XML_ELEMENT_NODE:
-    case XML_ENTITY_NODE:
-    case XML_DOCUMENT_NODE:
-    case XML_HTML_DOCUMENT_NODE:
-      cur = parent->children;
-      break;
-    default:
-      return (NULL);
-  }
-  while (cur != NULL) {
-    if (cur->type == XML_ELEMENT_NODE) {
-      return (cur);
-    }
-    cur = cur->next;
-  }
-  return (NULL);
-}
-
-/**
- * xmlNextElementSibling:
- * @node: the current node
- *
- * Finds the first closest next sibling of the node which is an
- * element node.
- * Note the handling of entities references is different than in
- * the W3C DOM element traversal spec since we don't have back reference
- * from entities content to entities references.
- *
- * Returns the next element sibling or NULL if not available
- */
-xmlNodePtr
-xmlNextElementSibling(xmlNodePtr node)
-{
-  if (node == NULL) {
-    return (NULL);
-  }
-  switch (node->type) {
-    case XML_ELEMENT_NODE:
-    case XML_TEXT_NODE:
-    case XML_CDATA_SECTION_NODE:
-    case XML_ENTITY_REF_NODE:
-    case XML_ENTITY_NODE:
-    case XML_PI_NODE:
-    case XML_COMMENT_NODE:
-    case XML_DTD_NODE:
-    case XML_XINCLUDE_START:
-    case XML_XINCLUDE_END:
-      node = node->next;
-      break;
-    default:
-      return (NULL);
-  }
-  while (node != NULL) {
-    if (node->type == XML_ELEMENT_NODE) {
-      return (node);
-    }
-    node = node->next;
-  }
-  return (NULL);
-}
-
-/**
- * xmlLastElementChild:
- * @parent: the parent node
- *
- * Finds the last child node of that element which is a Element node
- * Note the handling of entities references is different than in
- * the W3C DOM element traversal spec since we don't have back reference
- * from entities content to entities references.
- *
- * Returns the last element child or NULL if not available
- */
-xmlNodePtr
-xmlLastElementChild(xmlNodePtr parent)
-{
-  xmlNodePtr cur = NULL;
-
-  if (parent == NULL) {
-    return (NULL);
-  }
-  switch (parent->type) {
-    case XML_ELEMENT_NODE:
-    case XML_ENTITY_NODE:
-    case XML_DOCUMENT_NODE:
-    case XML_HTML_DOCUMENT_NODE:
-      cur = parent->last;
-      break;
-    default:
-      return (NULL);
-  }
-  while (cur != NULL) {
-    if (cur->type == XML_ELEMENT_NODE) {
-      return (cur);
-    }
-    cur = cur->prev;
-  }
-  return (NULL);
-}
-#endif

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

@@ -1,25 +0,0 @@
-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
-