nokogiri 1.18.0.rc1-java → 1.18.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e025518efd4b954f720962dc521a275c720e4ed5ca35169be6fd8db2ade55b5
-  data.tar.gz: 15ae77aaf7577b48a2b0536f15453b9ee45b9a640bc7c46c50225fb6390a0ef9
+  metadata.gz: aa9083455f575ed7d510dd06d7493f9965119161b36055a42633778524561441
+  data.tar.gz: 6676a22d5766bd7622b6332160aac208be8e3605d6fc0bbf29323a87fd69a83c
 SHA512:
-  metadata.gz: 6c8de60d916ed408598361aea0916be561766da29a3232f56bbcd4e29bf95811aa4aac6a1ad21086d9694d1811f0aec47e72c01551854e4354fab5938a315dd3
-  data.tar.gz: 3e83a4ffdbb3723c8e50dc87a4c02e617e07ffbe9352f0ce0a9dbb61f1d0dbf05b336066e06bcc745ffc7051efbce5eb7f7178d1281eb17a0c6ec7308d2493d3
+  metadata.gz: 7735ea1266e0dcd2f3a896ec40b9d8908c1987109c542523a3e48160ca7b77d61e0d315d85960a3eff0db59c818c3bbfffb846913a22617eec45c45728df66a3
+  data.tar.gz: aced9ad5b05847a538943711fa446016120a6d41f230b3a68141356512995ba6a05181cbd095a0e96a3120011c2cd791a8381f0825b158152cbef4db0f0c39d8

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"
@@ -33,6 +33,8 @@ end
 # If Psych doesn't build, you can disable this group locally by running
 # `bundle config set --local without rdoc`
 # Then re-run `bundle install`.
-group :rdoc do
-  gem "rdoc", "6.9.0"
+unless RUBY_PLATFORM == "java" # see #3391 and https://github.com/jruby/jruby/issues/7262
+  group :rdoc do
+    gem "rdoc", "6.10.0"
+  end
 end

data/ext/java/nokogiri/XmlXpathContext.java

@@ -154,7 +154,11 @@ public class XmlXpathContext extends RubyObject
   public IRubyObject
   register_ns(IRubyObject prefix, IRubyObject uri)
   {
-    nsContext.registerNamespace(prefix.asJavaString(), uri.asJavaString());
+    if (uri.isNil()) {
+      nsContext.deregisterNamespace(prefix.asJavaString());
+    } else {
+      nsContext.registerNamespace(prefix.asJavaString(), uri.asJavaString());
+    }
     return this;
   }
 
@@ -169,10 +173,23 @@ public class XmlXpathContext extends RubyObject
       variableResolver = NokogiriXPathVariableResolver.create();
       this.variableResolver = variableResolver;
     }
-    variableResolver.registerVariable(name.asJavaString(), value.asJavaString());
+    if (value.isNil()) {
+      variableResolver.deregisterVariable(name.asJavaString());
+    } else {
+      variableResolver.registerVariable(name.asJavaString(), value.asJavaString());
+    }
     return this;
   }
 
+  @JRubyMethod(name = "node=")
+  public IRubyObject
+  set_node(ThreadContext context, IRubyObject rb_node)
+  {
+    this.context = (XmlNode) rb_node;
+    return rb_node;
+  }
+
+
   private IRubyObject
   node_set(ThreadContext context, String expr, IRubyObject handler)
   {

data/ext/java/nokogiri/internals/NokogiriNamespaceContext.java

@@ -107,4 +107,10 @@ public final class NokogiriNamespaceContext implements NamespaceContext
     register.put(prefix, uri);
   }
 
+  public void
+  deregisterNamespace(String prefix)
+  {
+    if ("xmlns".equals(prefix)) { prefix = ""; }
+    register.remove(prefix);
+  }
 }

data/ext/java/nokogiri/internals/NokogiriXPathVariableResolver.java

@@ -34,4 +34,10 @@ public class NokogiriXPathVariableResolver implements XPathVariableResolver
   {
     variables.put(new QName(name), value);
   }
+  public void
+  deregisterVariable(String name)
+  {
+    variables.remove(new QName(name));
+  }
+
 }

data/ext/nokogiri/xml_sax_parser_context.c

@@ -102,7 +102,10 @@ noko_xml_sax_parser_context_s_native_io(VALUE rb_class, VALUE rb_io, VALUE rb_en
     c_context->sax = NULL;
   }
 
-  return noko_xml_sax_parser_context_wrap(rb_class, c_context);
+  VALUE rb_context = noko_xml_sax_parser_context_wrap(rb_class, c_context);
+  rb_iv_set(rb_context, "@input", rb_io);
+
+  return rb_context;
 }
 
 /* :nodoc: */
@@ -154,7 +157,10 @@ noko_xml_sax_parser_context_s_native_memory(VALUE rb_class, VALUE rb_input, VALU
     c_context->sax = NULL;
   }
 
-  return noko_xml_sax_parser_context_wrap(rb_class, c_context);
+  VALUE rb_context = noko_xml_sax_parser_context_wrap(rb_class, c_context);
+  rb_iv_set(rb_context, "@input", rb_input);
+
+  return rb_context;
 }
 
 /*

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.1"
 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.1
 platform: java
 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-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jar-dependencies
@@ -343,9 +343,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - jar isorelax, isorelax, 20030108
 - jar org.nokogiri, nekodtd, 0.1.11.noko2