nokogiri 1.11.5-java → 1.11.6-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 359540eb42f3e46da5a14557c11873e1e4b6ddc82d472fe26f96f29ebe007be4
-  data.tar.gz: 2ca21fc10cc5e1063a0584e62359467c4875f133821b8377f92f23d183784033
+  metadata.gz: d7566c9ba7c4bfc525562b8f80e7da42f28780dd7ffa7fb2904e2cea4c6c5d7d
+  data.tar.gz: 570824e9e3a95884c947544fd59205a916f580f8c4ecfd36e92ceebe7b84e3af
 SHA512:
-  metadata.gz: 963b43a88afafb2d62023afed3269bf8b90ccfca08cb38b77b56bf9d6dc309de68c7310750817b0075690b44639535d0eafb4d480c463d1ecf58de22a62f4fcc
-  data.tar.gz: 170bcbdf0d6f12ad359e3aaf56fab9a06a5ef59a0ed165dc12b5d0faeee65f3df68f7ca640c264f698308172950182c894bb957fef0e548f8e2f713127e0a72b
+  metadata.gz: c2dfd6bec1a38767f3aa2ed4ef45d110d32e72f357a8ff2b6c1cde04b6300f30d136a81b67d429b2991aed4c5687e341577ea3e76be625addaabf68cabdfcdfa
+  data.tar.gz: 618f739f628a5df78c18415ecb0f1fee22b4aa0c5292b349eb7e5e561bd0929b863b5b937c21e4f724b050d54942f469d584374b5a0e0b5c5eda4908bb8413f9

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: java
 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
   requirement: !ruby/object:Gem::Requirement