libxml-ruby 3.2.1 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8b07d4dd732e06fdc8d4ffefcc9f9ea4a2a70faf8504bfdc1ef064e466656f9
-  data.tar.gz: 31fb804f2d87c2b3db049eb24eb2086bbaadc8a3850314060bc066fa87b078f9
+  metadata.gz: 4f06b4949ffd040a0587458c5e06af9638a8bbd5138d9febdade9c1ffe89f9e9
+  data.tar.gz: d4e6ba9273e3b897fe09710e56a6e13faf9b37b99ac409dfac950f9ebce8cca7
 SHA512:
-  metadata.gz: 21126d00b18029300b5d49d32d4534071453d1dfb76e51fbc86d311e47779e606885fe792ca3bc58aab98bafe8dc3e4153cefce5f9bdb41db47755fba00ed44f
-  data.tar.gz: f510878992373c898082dfd6291bf6fb4d1b8d096095d08ec2a2550ca99f3b0bcc22b53d230f314e05a3e3fed17e8caf3fea9cc49f5fa682b6c39d44ece876db
+  metadata.gz: 87a83e5460f26c7ee1678587b2123ca5663cb45af60f2f8aef4e49486e7c77c6f0b7d74f15c9c6e45f025d3206e9f0b986bc416a18077af1cc35c9ce5f2c7d52
+  data.tar.gz: c6bb25a27405a90be3ce34cffea4c79c2a359daebd82041dd1f2c2b536a1c064bcedeb75157b440ca2cc629c6c86cbaad7d58eaba1a877c383f6cffc8930fd05

data/HISTORY

@@ -1,5 +1,27 @@
 = Release History
 
+== 3.2.4 / 2022-10-29
+
+* Support libxml2 version 2.10.2 (Charlie Savage)
+* Reduce number of globally included C header files (Charlie Savage)
+
+== 3.2.3 / 2022-05-22
+
+* Change some getter methods to instance variables with attr_accessors for easier debuggability (David Hansen)
+* Add a number of tests related to schemas  (David Hansen)
+* Add schema.imported_elements so we can find imported elements (David Hansen)
+* Fix segfault under windows when dereferencing a pre-existing error where the node has already been freed (David Hansen)
+* Update to change name from imported_elements to imported_ns_elements and return a hash of hashes for namespaced elements (David Hansen)
+* Only call xmlGetFeaturesList if LIBXML_LEGACY_ENABLED is defined. Most distros still ship libxml2 with legacy features enabled, but this will change (Nick Wellnhofer)
+* Update GitHub Actions to use ruby/setup-ruby (Greg)
+* Fix memory leak in rxml_node_path, node.path (vovanmozg)
+
+== 3.2.2 / 2022-01-15
+* Switch to Github actions for CI/CD (Greg)
+* Test fixes (Greg, Sergio Durigan Junior)
+* Fix typo on test/test_sax_parser.rb (Sergio Durigan Junior)
+* Update homepage in gemspec (Pirate Praveen Arimbrathodiyil)
+
 == 3.2.1 / 2020-11-05
 
 * Fix incorrect handling of encodings when using XMLWriter.io (Charlie Savage)

data/Rakefile

@@ -16,21 +16,29 @@ spec = Gem::Specification.load("#{GEM_NAME}.gemspec")
 task :default => [:test]
 
 # Setup compile tasks
-if RUBY_PLATFORM.match(/mswin32|mswin64|mingw32/)
-  Rake::ExtensionTask.new do |ext|
-    ext.gem_spec = spec
-    ext.name = SO_NAME
-    ext.ext_dir = "ext/libxml"
-    ext.lib_dir = "lib/#{RUBY_VERSION.sub(/\.\d$/, '')}"
-    ext.config_options << "--with-xml2-include=C:/msys64/mingw64/include/libxml2"
-  end
-else
-  Rake::ExtensionTask.new do |ext|
-    ext.gem_spec = spec
-    ext.name = SO_NAME
-    ext.ext_dir = "ext/libxml"
-    ext.lib_dir = "lib/#{RUBY_VERSION.sub(/\.\d$/, '')}"
-    ext.config_options << "--with-xml2-include=/usr/include/libxml2"
+Rake::ExtensionTask.new do |ext|
+  ext.gem_spec = spec
+  ext.name = SO_NAME
+  ext.ext_dir = "ext/libxml"
+  ext.lib_dir = "lib/#{RUBY_VERSION.sub(/\.\d$/, '')}"
+  if RUBY_PLATFORM.match(/mswin|mingw/)
+    ext.config_options <<
+      if (dir = ENV['WINDOWS_XML2_INCLUDE'])
+        "--with-xml2-include=#{dir}"
+      else
+        case RUBY_PLATFORM
+        when 'i386-mingw32'
+          '--with-xml2-include=C:/msys64/mingw32/include/libxml2'
+        when 'x64-mingw32'
+          '--with-xml2-include=C:/msys64/mingw64/include/libxml2'
+        when 'x64-mingw-ucrt'
+          '--with-xml2-include=C:/msys64/ucrt64/include/libxml2'
+        else
+          raise "Unknown Windows Ruby, please set ENV['WINDOWS_XML2_INCLUDE']"
+        end
+      end
+  else
+    ext.config_options << '--with-xml2-include=/usr/include/libxml2'
   end
 end
 
@@ -41,7 +49,7 @@ Gem::PackageTask.new(spec) do |pkg|
 end
 
 # Setup Windows Gem
-if RUBY_PLATFORM.match(/mswin32|mswin64|mingw32/)
+if RUBY_PLATFORM.match(/mswin|mingw/)
   binaries = (FileList['lib/**/*.so',
                        'lib/**/*dll'])
 

data/ext/libxml/ruby_libxml.h

@@ -4,29 +4,7 @@
 #define __RUBY_LIBXML_H__
 
 #include <ruby.h>
-#include <libxml/parser.h>
-#include <libxml/parserInternals.h>
-#include <libxml/debugXML.h>
 #include <libxml/xmlversion.h>
-#include <libxml/xmlmemory.h>
-#include <libxml/xpath.h>
-#include <libxml/valid.h>
-#include <libxml/catalog.h>
-#include <libxml/HTMLparser.h>
-#include <libxml/xmlreader.h>
-#include <libxml/c14n.h>
-
-#include <ruby/encoding.h>
-
-#ifdef LIBXML_DEBUG_ENABLED
-#include <libxml/xpathInternals.h>
-#endif
-#ifdef LIBXML_XINCLUDE_ENABLED
-#include <libxml/xinclude.h>
-#endif
-#ifdef LIBXML_XPTR_ENABLED
-#include <libxml/xpointer.h>
-#endif
 
 #include "ruby_xml_version.h"
 #include "ruby_xml.h"

data/ext/libxml/ruby_xml.c

@@ -1,6 +1,8 @@
 #include "ruby_libxml.h"
 #include "ruby_xml.h"
 
+#include <libxml/catalog.h>
+
 VALUE mXML;
 
 /*
@@ -764,6 +766,9 @@ static VALUE rxml_default_save_no_empty_tags_set(VALUE klass, VALUE value)
  */
 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;
@@ -788,6 +793,7 @@ static VALUE rxml_features(VALUE klass)
 
   ruby_xfree(list);
   return (arr);
+#endif /* LIBXML_LEGACY_ENABLED */
 }
 
 /*

data/ext/libxml/ruby_xml_document.c

@@ -52,6 +52,12 @@
 #include "ruby_libxml.h"
 #include "ruby_xml_document.h"
 
+#include <libxml/c14n.h>
+#include <libxml/debugXML.h>
+#include <libxml/relaxng.h>
+#include <libxml/xmlschemas.h>
+#include <libxml/xinclude.h>
+
 VALUE cXMLDocument;
 
 void rxml_document_free(xmlDocPtr xdoc)

data/ext/libxml/ruby_xml_encoding.h

@@ -3,6 +3,8 @@
 #ifndef __RXML_ENCODING__
 #define __RXML_ENCODING__
 
+#include <ruby/encoding.h>
+
 extern VALUE mXMLEncoding;
 
 void rxml_init_encoding();

data/ext/libxml/ruby_xml_error.h

@@ -3,6 +3,8 @@
 #ifndef __RXML_ERROR__
 #define __RXML_ERROR__
 
+#include <libxml/xmlerror.h>
+
 extern VALUE eXMLError;
 
 void rxml_init_error();

data/ext/libxml/ruby_xml_html_parser.c

@@ -2,6 +2,8 @@
 
 #include "ruby_libxml.h"
 
+#include <libxml/HTMLparser.h>
+
 /* Document-class: LibXML::XML::HTMLParser
  *
  * The HTML parser implements an HTML 4.0 non-verifying parser with an API

data/ext/libxml/ruby_xml_html_parser_context.c

@@ -3,6 +3,7 @@
 #include "ruby_libxml.h"
 #include "ruby_xml_html_parser_context.h"
 
+#include <libxml/parserInternals.h>
 
 /*
  * Document-class: LibXML::XML::HTMLParser::Context

data/ext/libxml/ruby_xml_html_parser_options.c

@@ -2,6 +2,8 @@
 
 #include "ruby_libxml.h"
 
+#include <libxml/HTMLparser.h>
+
 /* Document-class: LibXML::XML::HTMLParser::Options
  *
  * Options to control the operation of the HTMLParser.  The easiest

data/ext/libxml/ruby_xml_namespace.c

@@ -52,6 +52,7 @@ static VALUE rxml_namespace_initialize(VALUE self, VALUE node, VALUE prefix,
 
   Check_Type(node, T_DATA);
   Data_Get_Struct(node, xmlNode, xnode);
+  xmlResetLastError();
 
   /* Prefix can be null - that means its the default namespace */
   xmlPrefix = NIL_P(prefix) ? NULL : (xmlChar *)StringValuePtr(prefix);

data/ext/libxml/ruby_xml_node.c

@@ -2,6 +2,10 @@
 #include "ruby_xml_node.h"
 #include <assert.h>
 
+#include <libxml/debugXML.h>
+#include <libxml/parserInternals.h>
+#include <libxml/xlink.h>
+
 VALUE cXMLNode;
 
 /* Document-class: LibXML::XML::Node
@@ -983,14 +987,18 @@ static VALUE rxml_node_path(VALUE self)
 {
   xmlNodePtr xnode;
   xmlChar *path;
+  VALUE result = Qnil;
 
   xnode = rxml_get_xnode(self);
   path = xmlGetNodePath(xnode);
 
-  if (path == NULL)
-    return (Qnil);
-  else
-    return (rxml_new_cstr( path, NULL));
+  if (path)
+  {
+    result = rxml_new_cstr( path, NULL);
+    xmlFree(path);
+  }
+
+  return result;
 }
 
 /*

data/ext/libxml/ruby_xml_parser_context.c

@@ -3,6 +3,8 @@
 #include "ruby_libxml.h"
 #include "ruby_xml_parser_context.h"
 
+#include <libxml/parserInternals.h>
+
 VALUE cXMLParserContext;
 static ID IO_ATTR;
 

data/ext/libxml/ruby_xml_reader.c

@@ -4,6 +4,9 @@
 #include "ruby_libxml.h"
 #include "ruby_xml_reader.h"
 
+#include <libxml/xmlreader.h>
+#include <libxml/xmlschemas.h>
+
 /*
  * Document-class: LibXML::XML::Reader
  *

data/ext/libxml/ruby_xml_reader.h

@@ -4,9 +4,6 @@
 #ifndef __RXML_READER__
 #define __RXML_READER__
 
-#include <libxml/xmlreader.h>
-#include <libxml/xmlschemas.h>
-
 extern VALUE cXMLReader;
 
 void rxml_init_reader(void);

data/ext/libxml/ruby_xml_relaxng.c

@@ -1,6 +1,8 @@
 #include "ruby_libxml.h"
 #include "ruby_xml_relaxng.h"
 
+#include <libxml/relaxng.h>
+
 /*
  * Document-class: LibXML::XML::RelaxNG
  *

data/ext/libxml/ruby_xml_relaxng.h

@@ -1,8 +1,6 @@
 #ifndef __RXML_RELAXNG__
 #define __RXML_RELAXNG__
 
-#include <libxml/relaxng.h>
-
 extern VALUE cXMLRelaxNG;
 
 void  rxml_init_relaxng(void);