nokogiri 1.18.0.rc1-arm-linux-gnu → 1.18.1-arm-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0854faecb64ef375e29a0ce800d7892a94591e50cc76bb94afae806e34e18a07'
-  data.tar.gz: 24a57276eaa98dac1044befe32d4149991eea1cbc834e085864f81cf6adfc85f
+  metadata.gz: e5f23002c7886cca72feba881a1a8ef1b3764712dd9663d9422d41f141c50f42
+  data.tar.gz: 3e3f76df712ae360dfbdcaf05e4111ea73c378063a395614b1a7d54417473afe
 SHA512:
-  metadata.gz: 644436551458cf7630626fc2d94b7a6e73627994cda688764299e059cfc1a2f3a50d01eb71404c4d63dcb29e5db6d760f5c45db9ab9722e24e7d47003baa4883
-  data.tar.gz: f16e913184c94fa60838a76e58ee1c68dd077a11d3975047f651f3f484953c48680e430b7c2546e02a8362b5991ce2143c9e235fc41c22686d287f56404a9802
+  metadata.gz: 958a4ab193006bedde62a116d1dbd168ee9cb2fba2d7abccf70c7ddd27db1b2777a54b3ff0c8e57bdf1f57e097f3f7ea7f0f48c30fedabba1c2cab185752e8f4
+  data.tar.gz: e948b945de96c6784e91438b6a7bbeadfad1766802bf0776fa5a9801a7b1ff41b5e7fb50b10b636939264e9a5f92ec9693f877c3fd682b007440a18977784d6b

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/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: arm-linux-gnu
 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: 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