nokogiri 1.13.6 → 1.13.9

data/ext/nokogiri/xml_xpath_context.c

@@ -371,9 +371,12 @@ new (VALUE klass, VALUE nodeobj)
   xmlXPathContextPtr ctx;
   VALUE self;
 
-  Data_Get_Struct(nodeobj, xmlNode, node);
+  Noko_Node_Get_Struct(nodeobj, xmlNode, node);
 
+#if LIBXML_VERSION < 21000
+  /* deprecated in 40483d0 */
   xmlXPathInit();
+#endif
 
   ctx = xmlXPathNewContext(node->doc);
   ctx->node = node;

data/lib/nokogiri/version/constant.rb

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

data/lib/nokogiri/xml/reader.rb

@@ -83,16 +83,14 @@ module Nokogiri
       end
       private :initialize
 
-      # Get the attributes of the current node as a Hash
+      # Get the attributes and namespaces of the current node as a Hash.
       #
-      # [Returns] (Hash<String, String>) Attribute names and values
+      # This is the union of Reader#attribute_hash and Reader#namespaces
+      #
+      # [Returns]
+      #   (Hash<String, String>) Attribute names and values, and namespace prefixes and hrefs.
       def attributes
-        attrs_hash = attribute_nodes.each_with_object({}) do |node, hash|
-          hash[node.name] = node.to_s
-        end
-        ns = namespaces
-        attrs_hash.merge!(ns) if ns
-        attrs_hash
+        attribute_hash.merge(namespaces)
       end
 
       ###

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.13.6
+  version: 1.13.9
 platform: ruby
 authors:
 - Mike Dalessio
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-08 00:00:00.000000000 Z
+date: 2022-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -138,16 +138,16 @@ dependencies:
   name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -182,20 +182,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.28'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.28.2
+        version: 1.30.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.28'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.28.2
+        version: 1.30.1
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
@@ -242,16 +236,16 @@ dependencies:
   name: rubocop-shopify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: ruby_memcheck
   requirement: !ruby/object:Gem::Requirement
@@ -493,14 +487,11 @@ files:
 - 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/0004-use-glibc-strlen.patch
 - patches/libxml2/0005-avoid-isnan-isinf.patch
-- 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/libxslt/0001-update-automake-files-for-arm64.patch
-- ports/archives/libxml2-2.9.14.tar.xz
-- ports/archives/libxslt-1.1.35.tar.xz
+- ports/archives/libxml2-2.10.3.tar.xz
+- ports/archives/libxslt-1.1.37.tar.xz
 homepage: https://nokogiri.org
 licenses:
 - MIT
@@ -528,7 +519,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Nokogiri (鋸) makes it easy and painless to work with XML and HTML from Ruby.

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

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