libxml-ruby 3.2.4-x64-mingw-ucrt → 4.1.1-x64-mingw-ucrt

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 133d86e0978fad8ee63caac2b000d64528da03c5141e484327dc1bd443f85ad5
-  data.tar.gz: 3d43359e5daed2d0e6ea23481aaf405aa9422419edaefe8a51d18767c463c052
+  metadata.gz: d6eefbf4cf6f18a76d82973c0c297dd1ef37892a83ec1eea6b2b8a041e51a905
+  data.tar.gz: 427764544b4ca067c643cb9d504502dc56d22c4a722be2b7248016edd282b098
 SHA512:
-  metadata.gz: 7b91fe3b0daa9a90706a531e552ff16a3e785612e259aa7e379d9e948f72c0d2738c34a33a5e5697cee6ba4cb43c991e657347e40d35a13f749c494a64e54bea
-  data.tar.gz: 68afd10bef5ba4f05bdc275b526c319c0d6f98492ba039bff0ce599b58c5eeb72789669a361175491cca6225934a053054955a36ad4833d3bd5a79eee7e4da3d
+  metadata.gz: 9314838d6d6cbe1f0d87e48d2037ec3ad20eb70371f8022f5244a9a15b3d515bd901e577ebae90a39e7a36667bc5a0505e4ccc210471c3787dbf788adb396ec4
+  data.tar.gz: f1409c4f6e05cdd89e1596f49760b62ef1a65d22da343913488e74ee9d52c6a7c87019ceb61f958b1217064249d0f9a1ce3ee2fbd776ff234c67543a1ecd1d81

data/HISTORY

@@ -1,5 +1,20 @@
 = Release History
 
+== 4.1.1 / 2023-05-01
+
+* Fix compile warning (or error) for input_callbacks_register_input_callbacks (Charlie Savage)
+* Remove call to deprecated function htmlDefaultSAXHandlerInit (Charlie Savage)
+
+== 4.1.0 / 2023-04-30
+
+* Fix compile warning (or error) for rxml_encoding_to_rb_encoding (Charlie Savage)
+* Breaking - Remove LibXML::XML.features since its uses functionality deprecated in LibXML (Charlie Savage)
+
+== 4.0.0 / 2022-12-28
+
+* Breaking - Remove support for XPointer since libxml2 has deprecated it and will remove it (Charlie Savage)
+* Breaking - Remove support for ancient setup.rb script (Charlie Savage)
+
 == 3.2.4 / 2022-10-29
 
 * Support libxml2 version 2.10.2 (Charlie Savage)

data/ext/libxml/libxml.c

@@ -67,7 +67,6 @@ void Init_libxml_ruby(void)
   rxml_init_xpath_object();
   rxml_init_xpath_context();
   rxml_init_xpath_expression();
-  rxml_init_xpointer();
   rxml_init_html_parser();
   rxml_init_html_parser_options();
   rxml_init_html_parser_context();

data/ext/libxml/libxml_ruby.def

@@ -25,7 +25,6 @@ cXMLXInclude DATA
 cXMLXPathContext DATA
 cXMLXPathExpression DATA
 cXMLXPathObject DATA
-cXMLXPointer DATA
 eXMLError DATA
 mLibXML DATA
 mXML DATA

data/ext/libxml/ruby_libxml.h

@@ -34,7 +34,6 @@
 #include "ruby_xml_xpath_expression.h"
 #include "ruby_xml_xpath_context.h"
 #include "ruby_xml_xpath_object.h"
-#include "ruby_xml_xpointer.h"
 #include "ruby_xml_input_cbg.h"
 #include "ruby_xml_dtd.h"
 #include "ruby_xml_schema.h"

data/ext/libxml/ruby_xml.c

@@ -479,7 +479,7 @@ static VALUE rxml_default_line_numbers_set(VALUE klass, VALUE value)
   }
 }
 
-int rxml_libxml_default_options()
+int rxml_libxml_default_options(void)
 {
   int options = 0;
 
@@ -757,45 +757,6 @@ static VALUE rxml_default_save_no_empty_tags_set(VALUE klass, VALUE value)
   }
 }
 
-/*
- * call-seq:
- *    XML.features -> ["feature", ..., "feature"]
- *
- * Obtains an array of strings representing features supported
- * (and enabled) by the installed libxml.
- */
-static VALUE rxml_features(VALUE klass)
-{
-#ifndef LIBXML_LEGACY_ENABLED
-  return Qnil;
-#else
-  VALUE arr, str;
-  int i, len = MAX_LIBXML_FEATURES_LEN;
-  char **list = NULL;
-
-  list = ALLOC_N(char *,MAX_LIBXML_FEATURES_LEN);
-  MEMZERO(list, char *, MAX_LIBXML_FEATURES_LEN);
-
-  arr = rb_ary_new();
-  if (xmlGetFeaturesList(&len, (const char **) list) == -1)
-    return Qnil;
-
-  for (i = 0; i < len; i++)
-  {
-    str = rb_str_new2((const char *) list[i]);
-    rb_gc_unregister_address(&str);
-    rb_ary_push(arr, str);
-  }
-
-  if (len == MAX_LIBXML_FEATURES_LEN)
-    rb_warn(
-        "Please contact libxml-devel@rubyforge.org and ask to have the \"MAX_LIBXML_FEATURES_LEN increased\" because you could possibly be seeing an incomplete list");
-
-  ruby_xfree(list);
-  return (arr);
-#endif /* LIBXML_LEGACY_ENABLED */
-}
-
 /*
  * call-seq:
  *    XML.indent_tree_output -> (true|false)
@@ -931,7 +892,6 @@ void rxml_init_xml(void)
   rb_define_module_function(mXML, "default_warnings=", rxml_default_warnings_set, 1);
   rb_define_module_function(mXML, "default_save_no_empty_tags", rxml_default_save_no_empty_tags_get, 0);
   rb_define_module_function(mXML, "default_save_no_empty_tags=", rxml_default_save_no_empty_tags_set, 1);
-  rb_define_module_function(mXML, "features", rxml_features, 0);
   rb_define_module_function(mXML, "indent_tree_output", rxml_indent_tree_output_get, 0);
   rb_define_module_function(mXML, "indent_tree_output=", rxml_indent_tree_output_set, 1);
   rb_define_module_function(mXML, "memory_dump", rxml_memory_dump, 0);

data/ext/libxml/ruby_xml.h

@@ -4,7 +4,7 @@
 #define __RUBY_XML_H__
 
 extern VALUE mXML;
-int rxml_libxml_default_options();
+int rxml_libxml_default_options(void);
 void rxml_init_xml(void);
 
 #endif

data/ext/libxml/ruby_xml_cbg.c

@@ -79,7 +79,7 @@ int deb_Close(void *context)
   return 1;
 }
 
-void deb_register_cbg()
+void deb_register_cbg(void)
 {
   xmlRegisterInputCallbacks(deb_Match, deb_Open, deb_Read, deb_Close);
 }

data/ext/libxml/ruby_xml_dtd.c

@@ -235,7 +235,7 @@ static VALUE rxml_dtd_initialize(int argc, VALUE *argv, VALUE self)
   return self;
 }
 
-void rxml_init_dtd()
+void rxml_init_dtd(void)
 {
   cXMLDtd = rb_define_class_under(mXML, "Dtd", rb_cObject);
   rb_define_alloc_func(cXMLDtd, rxml_dtd_alloc);

data/ext/libxml/ruby_xml_encoding.c

@@ -182,7 +182,7 @@ rb_encoding* rxml_figure_encoding(const xmlChar* xencoding)
 VALUE rxml_new_cstr(const xmlChar* xstr, const xmlChar* xencoding)
 {
   rb_encoding *rbencoding = rxml_figure_encoding(xencoding);
-  return rb_external_str_new_with_enc((const char*)xstr, strlen((const char*)xstr), rbencoding);
+  return rb_external_str_new_with_enc((const char*)xstr, (long)strlen((const char*)xstr), rbencoding);
 }
 
 VALUE rxml_new_cstr_len(const xmlChar* xstr, const long length, const xmlChar* xencoding)
@@ -197,7 +197,7 @@ void rxml_init_encoding(void)
   rb_define_module_function(mXMLEncoding, "from_s", rxml_encoding_from_s, 1);
   rb_define_module_function(mXMLEncoding, "to_s", rxml_encoding_to_s, 1);
 
-  rb_define_module_function(mXMLEncoding, "to_rb_encoding", rxml_encoding_to_rb_encoding, 2);
+  rb_define_module_function(mXMLEncoding, "to_rb_encoding", rxml_encoding_to_rb_encoding, 1);
 
   /* -1: No char encoding detected. */
   rb_define_const(mXMLEncoding, "ERROR", INT2NUM(XML_CHAR_ENCODING_ERROR));

data/ext/libxml/ruby_xml_error.c

@@ -44,7 +44,7 @@ static ID ERROR_HANDLER_ID;
  * Returns the proc that will be called when libxml generates
  * warning, error or fatal error messages.
  */
-static VALUE rxml_error_get_handler()
+static VALUE rxml_error_get_handler(VALUE self)
 {
   VALUE block = rb_cvar_get(eXMLError, ERROR_HANDLER_ID);
   return block;
@@ -102,7 +102,7 @@ static void structuredErrorFunc(void *userData, xmlErrorPtr xerror)
   VALUE error = rxml_error_wrap(xerror);
 
   /* Wrap error up as Ruby object and send it off to ruby */
-  VALUE block = rxml_error_get_handler();
+  VALUE block = rxml_error_get_handler(error);
 
   /* Now call global handler */
   if (block != Qnil)
@@ -165,7 +165,7 @@ NORETURN(void rxml_raise(xmlErrorPtr xerror))
   rb_exc_raise(error);
 }
 
-void rxml_init_error()
+void rxml_init_error(void)
 {
   CALL_METHOD = rb_intern("call");
   ERROR_HANDLER_ID = rb_intern("@@__error_handler_callback__");

data/ext/libxml/ruby_xml_error.h

@@ -7,7 +7,7 @@
 
 extern VALUE eXMLError;
 
-void rxml_init_error();
+void rxml_init_error(void);
 VALUE rxml_error_wrap(xmlErrorPtr xerror);
 NORETURN(void rxml_raise(xmlErrorPtr xerror));
 

data/ext/libxml/ruby_xml_html_parser_context.c

@@ -243,7 +243,6 @@ static VALUE rxml_html_parser_context_string(VALUE klass, VALUE string)
      sets to 0 and xmlCtxtUseOptionsInternal sets to 1.  So we have to call both. */
   htmlCtxtUseOptions(ctxt, rxml_libxml_default_options());
 
-  htmlDefaultSAXHandlerInit();
   if (ctxt->sax != NULL)
     memcpy(ctxt->sax, &htmlDefaultSAXHandler, sizeof(xmlSAXHandlerV1));
   

data/ext/libxml/ruby_xml_input_cbg.c

@@ -88,7 +88,7 @@ int ic_close(void *context)
  *
  * Register a new set of I/O callback for handling parser input.
  */
-static VALUE input_callbacks_register_input_callbacks()
+static VALUE input_callbacks_register_input_callbacks(VALUE self)
 {
   xmlRegisterInputCallbacks(ic_match, ic_open, ic_read, ic_close);
   return (Qtrue);
@@ -182,10 +182,7 @@ void rxml_init_input_callbacks(void)
   cInputCallbacks = rb_define_class_under(mXML, "InputCallbacks", rb_cObject);
 
   /* Class Methods */
-  rb_define_singleton_method(cInputCallbacks, "register",
-      input_callbacks_register_input_callbacks, 0);
-  rb_define_singleton_method(cInputCallbacks, "add_scheme",
-      input_callbacks_add_scheme, 2);
-  rb_define_singleton_method(cInputCallbacks, "remove_scheme",
-      input_callbacks_remove_scheme, 1);
+  rb_define_singleton_method(cInputCallbacks, "register", input_callbacks_register_input_callbacks, 0);
+  rb_define_singleton_method(cInputCallbacks, "add_scheme", input_callbacks_add_scheme, 2);
+  rb_define_singleton_method(cInputCallbacks, "remove_scheme", input_callbacks_remove_scheme, 1);
 }

data/ext/libxml/ruby_xml_io.c

@@ -30,7 +30,7 @@ int rxml_write_callback(VALUE io, const char *buffer, int len)
     {
         // Could be StringIO
         VALUE written, string;
-        string = rb_external_str_new_with_enc(buffer, strlen(buffer), rb_enc_get(io));
+        string = rb_external_str_new_with_enc(buffer, (long)strlen(buffer), rb_enc_get(io));
         written = rb_funcall(io, WRITE_METHOD, 1, string);
         return NUM2INT(written);
     }

data/ext/libxml/ruby_xml_node.c

@@ -1001,17 +1001,6 @@ static VALUE rxml_node_path(VALUE self)
   return result;
 }
 
-/*
- * call-seq:
- *    node.pointer -> XML::NodeSet
- *
- * Evaluates an XPointer expression relative to this node.
- */
-static VALUE rxml_node_pointer(VALUE self, VALUE xptr_str)
-{
-  return (rxml_xpointer_point2(self, xptr_str));
-}
-
 /*
  * call-seq:
  *    node.prev -> XML::Node
@@ -1397,7 +1386,6 @@ void rxml_init_node(void)
   rb_define_method(cXMLNode, "output_escaping?", rxml_node_output_escaping_q, 0);
   rb_define_method(cXMLNode, "output_escaping=", rxml_node_output_escaping_set, 1);
   rb_define_method(cXMLNode, "path", rxml_node_path, 0);
-  rb_define_method(cXMLNode, "pointer", rxml_node_pointer, 1);
   rb_define_method(cXMLNode, "remove!", rxml_node_remove_ex, 0);
   rb_define_method(cXMLNode, "space_preserve", rxml_node_space_preserve_get, 0);
   rb_define_method(cXMLNode, "space_preserve=", rxml_node_space_preserve_set, 1);

data/ext/libxml/ruby_xml_parser.h

@@ -3,8 +3,6 @@
 #ifndef __RXML_PARSER__
 #define __RXML_PARSER__
 
-#define MAX_LIBXML_FEATURES_LEN 50
-
 extern VALUE cXMLParser;
 
 void rxml_init_parser();

data/ext/libxml/ruby_xml_parser_options.h

@@ -3,8 +3,6 @@
 #ifndef __RXML_PARSER_OPTIONS__
 #define __RXML_PARSER_OPTIONS__
 
-#define MAX_LIBXML_FEATURES_LEN 50
-
 extern VALUE mXMLParserOptions;
 
 void rxml_init_parser_options();

data/ext/libxml/ruby_xml_version.h

@@ -1,9 +1,9 @@
 /* Don't nuke this block!  It is used for automatically updating the
  * versions below. VERSION = string formatting, VERNUM = numbered
  * version for inline testing: increment both or none at all.*/
-#define RUBY_LIBXML_VERSION  "3.2.4"
-#define RUBY_LIBXML_VERNUM   324
-#define RUBY_LIBXML_VER_MAJ   3
-#define RUBY_LIBXML_VER_MIN   2
-#define RUBY_LIBXML_VER_MIC   4
+#define RUBY_LIBXML_VERSION  "4.1.1"
+#define RUBY_LIBXML_VERNUM   400
+#define RUBY_LIBXML_VER_MAJ   4
+#define RUBY_LIBXML_VER_MIN   1
+#define RUBY_LIBXML_VER_MIC   1
 #define RUBY_LIBXML_VER_PATCH 0

data/lib/libxml/error.rb

@@ -3,24 +3,24 @@
 module LibXML
   module XML
     class Error
-      # Create mapping from domain constant value to keys
+      # Create mapping from domain constant values to keys
       DOMAIN_CODE_MAP = [:NO_ERROR, :PARSER, :TREE, :NAMESPACE, :DTD, :HTML, :MEMORY,
                          :OUTPUT, :IO, :FTP, :HTTP, :XINCLUDE, :XPATH, :XPOINTER, :REGEXP,
                          :DATATYPE, :SCHEMASP, :SCHEMASV, :RELAXNGP, :RELAXNGV, :CATALOG,
                          :C14N, :XSLT, :VALID, :CHECK, :WRITER, :MODULE, :I18N, :SCHEMATRONV].inject(Hash.new) do |hash, code|
         if const_defined?(code)
-          hash[const_get(code)] = code.to_s
+          hash[const_get(code)] = code
         end
         hash
       end
 
-      # Create mapping from domain constant value to keys
+      # Create mapping from error constant values (so need to remove domain_codes) to keys
       ERROR_CODE_MAP = Hash.new.tap do |map|
         (constants -
          DOMAIN_CODE_MAP.values - #Domains
          [:NONE, :WARNING, :ERROR, :FATAL] # Levels
          ).each do |code|
-          map[const_get(code)] = code.to_s
+          map[const_get(code)] = code
         end
       end
       
@@ -70,11 +70,11 @@ module LibXML
       end
 
       def domain_to_s
-        DOMAIN_CODE_MAP[self.domain]
+        DOMAIN_CODE_MAP[self.domain].to_s
       end
 
       def code_to_s
-        ERROR_CODE_MAP[self.code]
+        ERROR_CODE_MAP[self.code].to_s
       end
 
       def to_s
@@ -92,4 +92,4 @@ module LibXML
   end
 end
 
-LibXML::XML::Error.set_handler(&LibXML::XML::Error::VERBOSE_HANDLER)
+LibXML::XML::Error.set_handler(&LibXML::XML::Error::VERBOSE_HANDLER)

data/lib/libxml-ruby.rb

@@ -4,7 +4,7 @@
 begin
   RUBY_VERSION =~ /(\d+.\d+)/
   require "#{$1}/libxml_ruby"
-rescue LoadError => e
+rescue LoadError
   require "libxml_ruby"
 end