nokogiri 1.11.5-x86-mingw32 → 1.11.6-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bc20245d3bbab39ba2fdc74dfca3d60f18752f1928adf999d51e136dddee33a
-  data.tar.gz: e03d4a39b11f58e2be22e38133f7fd82b76a4d68a70db88817f4a976f1c97b84
+  metadata.gz: a682e58a262fcd1a2f28a1150d90bbe09c2467a5c4a70d75a4c4b4c562f531bc
+  data.tar.gz: 712c24c47ec15b722f25b3a63f2a38a194edb047bc6fa33175fbb3d9a02996c4
 SHA512:
-  metadata.gz: bd3f9eb0a13d6efd9f207a8e1cf3ffc5e95d67ebd9f2dac81822e8db35cab36197bbb42733e15995f803181abc7a6c1c8dfc9c964588c2aec2c10970ce72c9ea
-  data.tar.gz: e2e8e3ca1e8cedfeb222d0f4c4f408c1f39c1b4dba1e41db3a4fdf65e1fccaac9ab2926ae57e01c93e641b058af9824fa5701e955215fadbd64a2eafc706f3fc
+  metadata.gz: b86f6eca20a27365f8b5fe14d2e8542f733875259d7ff6e0fb1a0a832ecef1384fa5ccbaad6bd984598a9301ab774ec5bec9aea91a13551ddf80905687f926db
+  data.tar.gz: 463fa75b12e71223f661de4d6f6bafb41aae9b19a08f342d006f9e195af151e4cc077bd0519c649e22a1b5d563922a48e3892854305f6390af74caef71710a2f

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-w64-mingw32/libxslt/1.1.34/lib/libxslt-plugins"
+#define LIBXSLT_DEFAULT_PLUGINS_PATH() "/home/flavorjones/code/oss/nokogiri/ports/i686-w64-mingw32/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: x86-mingw32
 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