nokogiri 1.11.5 → 1.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80609ec021e22dd8b9d8b242d454cc5e70d2101239b6cdab98077a596d31d123
-  data.tar.gz: b539d9c99ad03558986088a6f2d30d50339e06748ab4fd955b6b16d19289f2f5
+  metadata.gz: 0cd8509ca6a1609635cf79076efa4d0ccc203d69e8a9ce68f7b4648e5a30c8b4
+  data.tar.gz: 171144f295bac5337867370b0b2ade023a697f08c089580d681dd4c9316494da
 SHA512:
-  metadata.gz: fb154784e0701fa971219ee9f5bb063ddaed450e7a319838c6a42b1fe56e4ea5e686371e931df36194df0e8c23620ca967e4c7f37fc04ee1a5f22b3757fdee18
-  data.tar.gz: 108feddcb715f056e823a560a6df65d04a2f818758986409396b3337124d6ac13e3b9b062495e950c7d37080298f3c895d483a2baa75f3d03bcbc3a179d000d9
+  metadata.gz: 40876ba4cda6e2191f4380340b4b35d1ac30906818c5a1fcddc7bda1aef767d31deef38683d19dc76560c55627103f481aedeb0b78ef083c7b51e64de0556dbd
+  data.tar.gz: 6739c13cbe2a3bab87bc02af7ff8209a60a6ddb30c05cce7a844cd4272937285f6617fb8cfe4def6e4e3fa1bd267b41672507bd682fdc050d6d69f512032458d

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: ruby
 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