nokogiri 1.11.5-arm64-darwin → 1.11.6-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e15ddde70d5d2807e2f081f265d4562a666dfb02778f74e476a5ca6e5f0fef3
-  data.tar.gz: dc4ef9aa94cd267feb736f19114bf02499451f0cfe16a6cf66c1a633da0df754
+  metadata.gz: b76fe804204c8616d599a04908fcba19e6c608cf146ee59b0c6713368e0abb3f
+  data.tar.gz: 6a5f4e10c4c47e084f5b6d6060e9e46b4ac6e33f4e30ad2235d4dc147648fbb9
 SHA512:
-  metadata.gz: 82dc371cf0a03820eb7d96ff88074ae5cd12b9009f8d86caee31fbfe2ab226b702a7e5a946809795f33f1152517aff30175f068c8f47b24bede88b9808ab47a8
-  data.tar.gz: f5aaa071f93a3137216c556d01950ed6bc2d4054c581406023c13ec93f8381bb63911535a179d05b7f50c190dcb035b51f9c7ad0e85983f4f943dd849845b8c9
+  metadata.gz: b941c9a308a435c2d39f37360c2c1887bc6352456566a2c22362b73358eace86fd272a25a19764b5b4080ba5e76643f7fbad4a138596ebfc802ad752040392e2
+  data.tar.gz: ad85c4fab713aaaafa2e74f01f1c2e1a941d6f1ff4f276c38ce9bca931a349d24a4cb0ff43b5ae98f245a92f0631ff847e72b03d75d5cb47c76adaf9c6aeda34

data/ext/nokogiri/include/libxslt/xsltconfig.h

@@ -133,7 +133,7 @@ extern "C" {
 #ifndef WITH_MODULES
 #define WITH_MODULES
 #endif
-#define LIBXSLT_DEFAULT_PLUGINS_PATH() "/home/flavorjones/code/oss/nokogiri/ports/x86_64-apple-darwin/libxslt/1.1.34/lib/libxslt-plugins"
+#define LIBXSLT_DEFAULT_PLUGINS_PATH() "/home/flavorjones/code/oss/nokogiri/ports/aarch64-apple-darwin/libxslt/1.1.34/lib/libxslt-plugins"
 #endif
 
 /**

data/ext/nokogiri/xml_node.c

@@ -1292,17 +1292,25 @@ get_name(VALUE self)
  * Returns the path associated with this Node
  */
 static VALUE
-path(VALUE self)
+noko_xml_node_path(VALUE rb_node)
 {
-  xmlNodePtr node;
-  xmlChar *path ;
+  xmlNodePtr c_node;
+  xmlChar *c_path ;
   VALUE rval;
 
-  Data_Get_Struct(self, xmlNode, node);
+  Data_Get_Struct(rb_node, xmlNode, c_node);
+
+  c_path = xmlGetNodePath(c_node);
+  if (c_path == NULL) {
+    // see https://github.com/sparklemotion/nokogiri/issues/2250
+    // this behavior is clearly undesirable, but is what libxml <= 2.9.10 returned, and so we
+    // do this for now to preserve the behavior across libxml2 versions.
+    rval = NOKOGIRI_STR_NEW2("?");
+  } else {
+    rval = NOKOGIRI_STR_NEW2(c_path);
+    xmlFree(c_path);
+  }
 
-  path = xmlGetNodePath(node);
-  rval = NOKOGIRI_STR_NEW2(path);
-  xmlFree(path);
   return rval ;
 }
 
@@ -1779,7 +1787,7 @@ noko_init_xml_node()
   rb_define_method(cNokogiriXmlNode, "next_element", next_element, 0);
   rb_define_method(cNokogiriXmlNode, "previous_element", previous_element, 0);
   rb_define_method(cNokogiriXmlNode, "node_type", node_type, 0);
-  rb_define_method(cNokogiriXmlNode, "path", path, 0);
+  rb_define_method(cNokogiriXmlNode, "path", noko_xml_node_path, 0);
   rb_define_method(cNokogiriXmlNode, "key?", key_eh, 1);
   rb_define_method(cNokogiriXmlNode, "namespaced_key?", namespaced_key_eh, 2);
   rb_define_method(cNokogiriXmlNode, "blank?", blank_eh, 0);

data/lib/nokogiri/version/constant.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = "1.11.5"
+  VERSION = "1.11.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.11.5
+  version: 1.11.6
 platform: arm64-darwin
 authors:
 - Mike Dalessio
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-20 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc