nokogiri 1.18.0.rc1-x86_64-linux-musl → 1.18.0-x86_64-linux-musl

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c514cd13af11b305df62e8f29ce107e2db3351345bd97133774a4dfcad0495be
-  data.tar.gz: 9c0c4575d0387b3fb05ebae44db4b157ee9a3d08a19dbb54a48f79253923345f
+  metadata.gz: 5175dd79d221bad9cea3dc95f0894c3593bd67391d2d1c1a8ffa165c045aeeb7
+  data.tar.gz: beb6c2877f619ee369abd45e39dfc388867d2d615517c1348c33fa62bdc4ff4c
 SHA512:
-  metadata.gz: ae911d50da8fe3eb57f525874db00016991a4999b3a02ede481405a44f3534f5393268d120d4dd11d81848b18129b442b579b976e6dc610a92f05ddb6275aa32
-  data.tar.gz: 7b4c78d13fd5816f88a93ae2d1f6a3163a7149e2416141498b2c4a1e08afd9611c457f422b06ff4c12131a142d1aec46452f0e0a1fb0ab57e9a4fb51511cf1a9
+  metadata.gz: 61a39cd0d88f8a4af68bb31a7332ab8f4cdb42237d3faaec1099cf67e67fc1d2fd6713ab66194e65f6d5f10f3cdad6fce1a4778dea67ccbcd5e3351df705542a
+  data.tar.gz: 5249dbb88924722303df3b2c27923157682ebbca2e9003ebf1fe8ba31aec77a63006c0d3cc9f4d620242d0d10c04b5e76ea0bb39b69ef80b7e762593a9b9ccb9

data/Gemfile

@@ -11,7 +11,7 @@ group :development do
 
   # building extensions
   gem "rake-compiler", "1.2.8"
-  gem "rake-compiler-dock", "1.7.0.rc1"
+  gem "rake-compiler-dock", "1.7.0"
 
   # parser generator
   gem "rexical", "1.0.8"
@@ -34,5 +34,6 @@ end
 # `bundle config set --local without rdoc`
 # Then re-run `bundle install`.
 group :rdoc do
-  gem "rdoc", "6.9.0"
+  gem "rdoc", "6.10.0"
+  gem "jar-dependencies", "0.4.1" if RUBY_PLATFORM == "java" # https://github.com/jruby/jruby/issues/7262
 end

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

@@ -112,7 +112,7 @@ extern "C" {
 #ifndef WITH_MODULES
 #define WITH_MODULES
 #endif
-#define LIBXSLT_DEFAULT_PLUGINS_PATH() "/home/flavorjones/code/oss/nokogiri/ports/x86_64-linux-gnu/libxslt/1.1.42/lib/libxslt-plugins"
+#define LIBXSLT_DEFAULT_PLUGINS_PATH() "/home/flavorjones/code/oss/nokogiri/ports/x86_64-linux-musl/libxslt/1.1.42/lib/libxslt-plugins"
 #endif
 
 /**

data/ext/nokogiri/xml_xpath_context.c

@@ -144,13 +144,6 @@ noko_xml_xpath_context_register_ns(VALUE rb_context, VALUE prefix, VALUE uri)
 
   xmlXPathRegisterNs(c_context, (const xmlChar *)StringValueCStr(prefix), ns_uri);
 
-  VALUE registered_namespaces = rb_iv_get(rb_context, "@registered_namespaces");
-  if (NIL_P(uri)) {
-    rb_hash_delete(registered_namespaces, prefix);
-  } else {
-    rb_hash_aset(registered_namespaces, prefix, Qtrue);
-  }
-
   return rb_context;
 }
 
@@ -179,13 +172,6 @@ noko_xml_xpath_context_register_variable(VALUE rb_context, VALUE name, VALUE val
 
   xmlXPathRegisterVariable(c_context, (const xmlChar *)StringValueCStr(name), xmlValue);
 
-  VALUE registered_variables = rb_iv_get(rb_context, "@registered_variables");
-  if (NIL_P(value)) {
-    rb_hash_delete(registered_variables, name);
-  } else {
-    rb_hash_aset(registered_variables, name, Qtrue);
-  }
-
   return rb_context;
 }
 
@@ -402,6 +388,7 @@ noko_xml_xpath_context_evaluate(int argc, VALUE *argv, VALUE rb_context)
     );
   }
 
+  /* TODO: use xmlXPathSetErrorHandler (as of 2.13.0) */
   xmlSetStructuredErrorFunc((void *)rb_errors, noko__error_array_pusher);
   xmlSetGenericErrorFunc((void *)rb_errors, _noko_xml_xpath_context__generic_exception_pusher);
 
@@ -460,9 +447,6 @@ noko_xml_xpath_context_new(VALUE klass, VALUE rb_node)
 
   rb_context = TypedData_Wrap_Struct(klass, &_noko_xml_xpath_context_type, c_context);
 
-  rb_iv_set(rb_context, "@registered_namespaces", rb_hash_new());
-  rb_iv_set(rb_context, "@registered_variables", rb_hash_new());
-
   return rb_context;
 }
 

data/lib/nokogiri/version/constant.rb

@@ -2,5 +2,5 @@
 
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = "1.18.0.rc1"
+  VERSION = "1.18.0"
 end

data/lib/nokogiri/xml/searchable.rb

@@ -261,36 +261,13 @@ module Nokogiri
       end
 
       def xpath_impl(node, path, handler, ns, binds)
-        get_xpath_context(node) do |context|
-          context.register_namespaces(ns)
-          context.register_variables(binds)
+        context = XPathContext.new(node)
+        context.register_namespaces(ns)
+        context.register_variables(binds)
 
-          path = path.gsub("xmlns:", " :") unless Nokogiri.uses_libxml?
+        path = path.gsub("xmlns:", " :") unless Nokogiri.uses_libxml?
 
-          context.evaluate(path, handler)
-        end
-      end
-
-      if Nokogiri.uses_libxml? && ENV["NOKOGIRI_DEOPTIMIZE_XPATH"].nil? # env var is an escape hatch
-        # optimized path
-        def get_xpath_context(node)
-          context = Thread.current.thread_variable_get(:nokogiri_xpath_context)
-          if context
-            context.node = node
-          else
-            context = Thread.current.thread_variable_set(:nokogiri_xpath_context, XPathContext.new(node))
-          end
-
-          begin
-            yield context
-          ensure
-            context.reset
-          end
-        end
-      else
-        def get_xpath_context(node)
-          yield XPathContext.new(node)
-        end
+        context.evaluate(path, handler)
       end
     end
   end

data/lib/nokogiri/xml/xpath_context.rb

@@ -22,28 +22,6 @@ module Nokogiri
           register_variable(key, value)
         end
       end
-
-      if Nokogiri.uses_libxml?
-        def reset
-          return unless
-
-          @registered_namespaces.each do |key, _|
-            register_ns(key, nil)
-          end
-          unless @registered_namespaces.empty?
-            warn "Nokogiri::XML::XPathContext#reset: unexpected registered namespaces: #{@registered_namespaces.keys}"
-            @registered_namespaces.clear
-          end
-
-          @registered_variables.each do |key, _|
-            register_variable(key, nil)
-          end
-          unless @registered_variables.empty?
-            warn "Nokogiri::XML::XPathContext#reset: unexpected registered variables: #{@registered_variables.keys}"
-            @registered_variables.clear
-          end
-        end
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.18.0.rc1
+  version: 1.18.0
 platform: x86_64-linux-musl
 authors:
 - Mike Dalessio
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-16 00:00:00.000000000 Z
+date: 2024-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc
@@ -310,9 +310,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 3.5.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
-    - !ruby/object:Gem::Version
-      version: 1.3.1
   - - ">="
     - !ruby/object:Gem::Version
       version: 3.3.22