libxml-ruby 3.2.4 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f06b4949ffd040a0587458c5e06af9638a8bbd5138d9febdade9c1ffe89f9e9
-  data.tar.gz: d4e6ba9273e3b897fe09710e56a6e13faf9b37b99ac409dfac950f9ebce8cca7
+  metadata.gz: 30b8d15c0c7e89faa19b317afbca0d4f4b575ac452a625d3c4e9990cffda68c5
+  data.tar.gz: 2aa2fb69b81a258ee9c94bbd8d8ef0c79183e2258ecb9ad962b4e4384719c79b
 SHA512:
-  metadata.gz: 87a83e5460f26c7ee1678587b2123ca5663cb45af60f2f8aef4e49486e7c77c6f0b7d74f15c9c6e45f025d3206e9f0b986bc416a18077af1cc35c9ce5f2c7d52
-  data.tar.gz: c6bb25a27405a90be3ce34cffea4c79c2a359daebd82041dd1f2c2b536a1c064bcedeb75157b440ca2cc629c6c86cbaad7d58eaba1a877c383f6cffc8930fd05
+  metadata.gz: 86bfba334a01441d4805f099111428c79b35715ed5abe758dee67ff01ff51fb0cc086837631065561f7e157f9b1a682ea10bfb4ca015995bd5cef430c62b0a3e
+  data.tar.gz: e4879c9c500eecfc1a828482d72d5f3f86f977eeb02dc111d15498744a363b87ea01b2c44baaec262755276d6c19442da3195c6f728baa0ef3153f8d683666e1

data/HISTORY

@@ -1,5 +1,10 @@
 = Release History
 
+== 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;
 

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)

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(void)
 {
   VALUE block = rb_cvar_get(eXMLError, ERROR_HANDLER_ID);
   return block;
@@ -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_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(void)
 {
   xmlRegisterInputCallbacks(ic_match, ic_open, ic_read, ic_close);
   return (Qtrue);

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_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.0.0"
+#define RUBY_LIBXML_VERNUM   400
+#define RUBY_LIBXML_VER_MAJ   4
+#define RUBY_LIBXML_VER_MIN   0
+#define RUBY_LIBXML_VER_MIC   0
 #define RUBY_LIBXML_VER_PATCH 0

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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libxml-ruby
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 4.0.0
 platform: ruby
 authors:
 - Ross Bamform
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-29 00:00:00.000000000 Z
+date: 2022-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -58,7 +58,6 @@ extra_rdoc_files: []
 files:
 - HISTORY
 - LICENSE
-- MANIFEST
 - README.rdoc
 - Rakefile
 - ext/libxml/extconf.h
@@ -136,8 +135,6 @@ files:
 - ext/libxml/ruby_xml_xpath_expression.h
 - ext/libxml/ruby_xml_xpath_object.c
 - ext/libxml/ruby_xml_xpath_object.h
-- ext/libxml/ruby_xml_xpointer.c
-- ext/libxml/ruby_xml_xpointer.h
 - ext/vc/libxml_ruby.sln
 - lib/libxml-ruby.rb
 - lib/libxml.rb
@@ -168,7 +165,6 @@ files:
 - script/benchmark/sock_entries.xml
 - script/benchmark/throughput
 - script/test
-- setup.rb
 - test/c14n/given/doc.dtd
 - test/c14n/given/example-1.xml
 - test/c14n/given/example-2.xml
@@ -252,7 +248,6 @@ files:
 - test/test_relaxng.rb
 - test/test_sax_parser.rb
 - test/test_schema.rb
-- test/test_suite.rb
 - test/test_traversal.rb
 - test/test_writer.rb
 - test/test_xinclude.rb
@@ -260,7 +255,6 @@ files:
 - test/test_xpath.rb
 - test/test_xpath_context.rb
 - test/test_xpath_expression.rb
-- test/test_xpointer.rb
 homepage: https://xml4r.github.io/libxml-ruby/
 licenses:
 - MIT
@@ -280,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.14
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Ruby Bindings for LibXML2
@@ -317,7 +311,6 @@ test_files:
 - test/test_relaxng.rb
 - test/test_sax_parser.rb
 - test/test_schema.rb
-- test/test_suite.rb
 - test/test_traversal.rb
 - test/test_writer.rb
 - test/test_xinclude.rb
@@ -325,4 +318,3 @@ test_files:
 - test/test_xpath.rb
 - test/test_xpath_context.rb
 - test/test_xpath_expression.rb
-- test/test_xpointer.rb

data/MANIFEST

@@ -1,166 +0,0 @@
-#!mast -x doc/libxml-ruby/rdoc -i .gitignore ext doc lib script test [A-Z]*
-ext/libxml/extconf.rb
-ext/libxml/libxml.c
-ext/libxml/ruby_libxml.h
-ext/libxml/ruby_xml.c
-ext/libxml/ruby_xml.h
-ext/libxml/ruby_xml_attr.c
-ext/libxml/ruby_xml_attr.h
-ext/libxml/ruby_xml_attr_decl.c
-ext/libxml/ruby_xml_attr_decl.h
-ext/libxml/ruby_xml_attributes.c
-ext/libxml/ruby_xml_attributes.h
-ext/libxml/ruby_xml_cbg.c
-ext/libxml/ruby_xml_document.c
-ext/libxml/ruby_xml_document.h
-ext/libxml/ruby_xml_dtd.c
-ext/libxml/ruby_xml_dtd.h
-ext/libxml/ruby_xml_encoding.c
-ext/libxml/ruby_xml_encoding.h
-ext/libxml/ruby_xml_error.c
-ext/libxml/ruby_xml_error.h
-ext/libxml/ruby_xml_html_parser.c
-ext/libxml/ruby_xml_html_parser.h
-ext/libxml/ruby_xml_html_parser_context.c
-ext/libxml/ruby_xml_html_parser_context.h
-ext/libxml/ruby_xml_html_parser_options.c
-ext/libxml/ruby_xml_html_parser_options.h
-ext/libxml/ruby_xml_input_cbg.c
-ext/libxml/ruby_xml_input_cbg.h
-ext/libxml/ruby_xml_io.c
-ext/libxml/ruby_xml_io.h
-ext/libxml/ruby_xml_namespace.c
-ext/libxml/ruby_xml_namespace.h
-ext/libxml/ruby_xml_namespaces.c
-ext/libxml/ruby_xml_namespaces.h
-ext/libxml/ruby_xml_node.c
-ext/libxml/ruby_xml_node.h
-ext/libxml/ruby_xml_parser.c
-ext/libxml/ruby_xml_parser.h
-ext/libxml/ruby_xml_parser_context.c
-ext/libxml/ruby_xml_parser_context.h
-ext/libxml/ruby_xml_parser_options.c
-ext/libxml/ruby_xml_parser_options.h
-ext/libxml/ruby_xml_reader.c
-ext/libxml/ruby_xml_reader.h
-ext/libxml/ruby_xml_relaxng.c
-ext/libxml/ruby_xml_relaxng.h
-ext/libxml/ruby_xml_sax2_handler.c
-ext/libxml/ruby_xml_sax2_handler.h
-ext/libxml/ruby_xml_sax_parser.c
-ext/libxml/ruby_xml_sax_parser.h
-ext/libxml/ruby_xml_schema.c
-ext/libxml/ruby_xml_schema.h
-ext/libxml/ruby_xml_version.h
-ext/libxml/ruby_xml_xinclude.c
-ext/libxml/ruby_xml_xinclude.h
-ext/libxml/ruby_xml_xpath.c
-ext/libxml/ruby_xml_xpath.h
-ext/libxml/ruby_xml_xpath_context.c
-ext/libxml/ruby_xml_xpath_context.h
-ext/libxml/ruby_xml_xpath_expression.c
-ext/libxml/ruby_xml_xpath_expression.h
-ext/libxml/ruby_xml_xpath_object.c
-ext/libxml/ruby_xml_xpath_object.h
-ext/libxml/ruby_xml_xpointer.c
-ext/libxml/ruby_xml_xpointer.h
-ext/mingw/Rakefile
-ext/mingw/build.rake
-ext/mingw/libiconv-2.dll
-ext/mingw/libxml2-2.dll
-ext/mingw/libxml_ruby.dll.a
-ext/mingw/libxml_ruby.so
-ext/vc/libxml_ruby.sln
-ext/vc/libxml_ruby_18/libxml_ruby.vcproj
-ext/vc/libxml_ruby_19/libxml_ruby_19.vcproj
-doc/.htaccess
-doc/.rsync-filter
-lib/libxml/attr.rb
-lib/libxml/attr_decl.rb
-lib/libxml/attributes.rb
-lib/libxml/document.rb
-lib/libxml/error.rb
-lib/libxml/hpricot.rb
-lib/libxml/html_parser.rb
-lib/libxml/namespace.rb
-lib/libxml/namespaces.rb
-lib/libxml/node.rb
-lib/libxml/ns.rb
-lib/libxml/parser.rb
-lib/libxml/properties.rb
-lib/libxml/reader.rb
-lib/libxml/sax_callbacks.rb
-lib/libxml/sax_parser.rb
-lib/libxml/tree.rb
-lib/libxml/xpath_object.rb
-lib/libxml.rb
-lib/xml/libxml.rb
-lib/xml.rb
-script/benchmark/depixelate
-script/benchmark/hamlet.xml
-script/benchmark/parsecount
-script/benchmark/sock_entries.xml
-script/benchmark/throughput
-script/test
-test/etc_doc_to_s.rb
-test/ets_doc_file.rb
-test/ets_doc_to_s.rb
-test/ets_gpx.rb
-test/ets_node_gc.rb
-test/ets_test.xml
-test/ets_tsr.rb
-test/model/atom.xml
-test/model/bands.xml
-test/model/books.xml
-test/model/merge_bug_data.xml
-test/model/ruby-lang.html
-test/model/rubynet.xml
-test/model/rubynet_project
-test/model/shiporder.rnc
-test/model/shiporder.rng
-test/model/shiporder.xml
-test/model/shiporder.xsd
-test/model/soap.xml
-test/model/xinclude.xml
-test/test_attr.rb
-test/test_attr_decl.rb
-test/test_attributes.rb
-test/test_deprecated_require.rb
-test/test_document.rb
-test/test_document_write.rb
-test/test_dtd.rb
-test/test_error.rb
-test/test_html_parser.rb
-test/test_namespace.rb
-test/test_namespaces.rb
-test/test_node.rb
-test/test_node_cdata.rb
-test/test_node_comment.rb
-test/test_node_copy.rb
-test/test_node_edit.rb
-test/test_node_pi.rb
-test/test_node_text.rb
-test/test_node_write.rb
-test/test_node_xlink.rb
-test/test_parser.rb
-test/test_parser_context.rb
-test/test_properties.rb
-test/test_reader.rb
-test/test_relaxng.rb
-test/test_sax_parser.rb
-test/test_schema.rb
-test/test_traversal.rb
-test/test_xinclude.rb
-test/test_xml.rb
-test/test_xpath.rb
-test/test_xpath_context.rb
-test/test_xpath_expression.rb
-test/test_xpointer.rb
-test/test_suite.rb
-Rakefile
-HISTORY.rdoc
-PROFILE
-TODO
-LICENSE
-README.rdoc
-VERSION

data/ext/libxml/ruby_xml_xpointer.c

@@ -1,103 +0,0 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#include "ruby_libxml.h"
-#include "ruby_xml_xpointer.h"
-
-#ifdef LIBXML_XPTR_ENABLED
-#include <libxml/xpointer.h>
-#endif
-
-VALUE cXMLXPointer;
-
-/*
- * Document-class: LibXML::XML::XPointer
- *
- * The XML::Pointer class provides a standards based API for searching an xml document.
- * XPointer is based on the XML Path Language (XML::XPath) and is documented
- * at http://www.w3.org/TR/WD-xptr.
- */
-
-static VALUE rxml_xpointer_point(VALUE class, VALUE rnode, VALUE xptr_str)
-{
-#ifdef LIBXML_XPTR_ENABLED
-  xmlNodePtr xnode;
-  xmlXPathContextPtr xctxt;
-  xmlXPathObjectPtr xpop;
-
-  VALUE context;
-  VALUE result;
-  VALUE argv[1];
-
-  Check_Type(xptr_str, T_STRING);
-  if (rb_obj_is_kind_of(rnode, cXMLNode) == Qfalse)
-  rb_raise(rb_eTypeError, "require an XML::Node object");
-
-  Data_Get_Struct(rnode, xmlNode, xnode);
-
-  argv[0] = rb_funcall(rnode, rb_intern("doc"), 0);
-  context = rb_class_new_instance(1, argv, cXMLXPathContext);
-  Data_Get_Struct(context, xmlXPathContext, xctxt);
-
-  xpop = xmlXPtrEval((xmlChar*)StringValuePtr(xptr_str), xctxt);
-  if (!xpop)
-  rxml_raise(&xmlLastError);
-
-  result = rxml_xpath_object_wrap(xnode->doc, xpop);
-  rb_iv_set(result, "@context", context);
-
-  return(result);
-#else
-  rb_warn("libxml was compiled without XPointer support");
-  return (Qfalse);
-#endif
-}
-
-VALUE rxml_xpointer_point2(VALUE node, VALUE xptr_str)
-{
-  return (rxml_xpointer_point(cXMLXPointer, node, xptr_str));
-}
-
-/*
- * call-seq:
- *    XML::XPointer.range(start_node, end_node) -> xpath
- *
- * Create an xpath representing the range between the supplied
- * start and end node.
- */
-static VALUE rxml_xpointer_range(VALUE class, VALUE rstart, VALUE rend)
-{
-#if defined LIBXML_XPTR_ENABLED && defined LIBXML_XPTR_LOCS_ENABLED
-  xmlNodePtr start, end;
-  VALUE rxxp;
-  xmlXPathObjectPtr xpath;
-
-  if (rb_obj_is_kind_of(rstart, cXMLNode) == Qfalse)
-  rb_raise(rb_eTypeError, "require an XML::Node object as a starting point");
-  if (rb_obj_is_kind_of(rend, cXMLNode) == Qfalse)
-  rb_raise(rb_eTypeError, "require an XML::Node object as an ending point");
-
-  Data_Get_Struct(rstart, xmlNode, start);
-  if (start == NULL)
-  return(Qnil);
-
-  Data_Get_Struct(rend, xmlNode, end);
-  if (end == NULL)
-  return(Qnil);
-
-  xpath = xmlXPtrNewRangeNodes(start, end);
-  if (xpath == NULL)
-  rb_fatal("You shouldn't be able to have this happen");
-
-  rxxp = rxml_xpath_object_wrap(start->doc, xpath);
-  return(rxxp);
-#else
-  rb_warn("libxml was compiled without XPointer support");
-  return (Qfalse);
-#endif
-}
-
-void rxml_init_xpointer(void)
-{
-  cXMLXPointer = rb_define_class_under(mXML, "XPointer", rb_cObject);
-  rb_define_singleton_method(cXMLXPointer, "range", rxml_xpointer_range, 2);
-}

data/ext/libxml/ruby_xml_xpointer.h

@@ -1,11 +0,0 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RXML_XPOINTER__
-#define __RXML_XPOINTER__
-
-extern VALUE cXMLXPointer;
-
-void rxml_init_xpointer(void);
-VALUE rxml_xpointer_point2(VALUE node, VALUE xptr_str);
-
-#endif