nokogiri 1.11.5-x86-linux → 1.11.6-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e73da305a2df57eecd33d9eec52a4832a6079bd782e706ff485e4efcad83e25f
-  data.tar.gz: a750fd777e84ea23e5892efd704fb58ebe9a437d90a9d07e6df1f48063a1c4d4
+  metadata.gz: c844f9cc527b5b8cc38b7e22a061aa4bc036e5f0f7fefe4d4c0b9c4c009e8810
+  data.tar.gz: 7981bd3438a30e8ad576202d30f18acb6678d159f3207d28a82d838a18c53e60
 SHA512:
-  metadata.gz: 81550a114bf9da8d574ff4155c1a34df9e1e4bd56c85ecabefc61a3e4b841cef83a0efb21f7f70deb490392904025b0ae5cacb27f4d75f63f9c44149658d9f08
-  data.tar.gz: fceccf33c15de2563860793b514c4fc19ad562a934b5b65df6d3ce074f1a025ada005d3ecf0100d3e449e9270beca2ad13875ea0b1bf658c24f8a001518a5399
+  metadata.gz: 87ede9ebceeec95fde6f6443d3f0decbf3d1a61683cb94d0ca4ee2c567957d7b26bd9578f0cb9fe642cd3a3f18d8acb3ca1b0ab8d444a486485998bdc6663be6
+  data.tar.gz: 7251a765b430864d5f7d5fe10823896bc7e7a0c98cc355153e3ed6ac6d59fb753b18e93c3f11b0e4bc07f47cf376f8f70f39367281c9136c22ad84bd12caa8f5

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: x86-linux
 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