libxml-ruby 3.2.3 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5173bcced46009decd7e7a710aaf20b4005cf8baa5e8ee55148cb28733fd3c97
-  data.tar.gz: 3649de749c1064ec31c3d563a1328abfb43e401372beb6af4b0b5ad891af1ae3
+  metadata.gz: 4f06b4949ffd040a0587458c5e06af9638a8bbd5138d9febdade9c1ffe89f9e9
+  data.tar.gz: d4e6ba9273e3b897fe09710e56a6e13faf9b37b99ac409dfac950f9ebce8cca7
 SHA512:
-  metadata.gz: 3f5e71808404d9553073ae483c15a55b4d72e7a0e5b40939c7f2c72c8867386e7c7489769f6da2ce7da13cbbbd3329f0851d949f6dc48d7c5b40d9ec5784b630
-  data.tar.gz: 731d9152dca3cf219af862eb67171b9e5cce8df6c8bde4262eae3c53f1a5528e211188a50b472be67e3a294cf4b4f0d2a239317b5c08a3b2886b5e9c5fece14a
+  metadata.gz: 87a83e5460f26c7ee1678587b2123ca5663cb45af60f2f8aef4e49486e7c77c6f0b7d74f15c9c6e45f025d3206e9f0b986bc416a18077af1cc35c9ce5f2c7d52
+  data.tar.gz: c6bb25a27405a90be3ce34cffea4c79c2a359daebd82041dd1f2c2b536a1c064bcedeb75157b440ca2cc629c6c86cbaad7d58eaba1a877c383f6cffc8930fd05

data/HISTORY

@@ -1,5 +1,10 @@
 = 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)

data/ext/libxml/extconf.h

@@ -0,0 +1,3 @@
+#ifndef EXTCONF_H
+#define EXTCONF_H
+#endif

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;
 
 /*

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_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

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);

data/ext/libxml/ruby_xml_schema.c

@@ -1,6 +1,4 @@
 #include "ruby_libxml.h"
-#define LIBXML_OUTPUT_ENABLED
-#define DUMP_CONTENT_MODEL
 #include "ruby_xml_schema.h"
 
 #include "ruby_xml_schema_type.h"
@@ -8,6 +6,78 @@
 #include "ruby_xml_schema_attribute.h"
 #include "ruby_xml_schema_facet.h"
 
+#include <libxml/xmlschemas.h>
+
+typedef struct _xmlSchemaBucket xmlSchemaBucket;
+typedef xmlSchemaBucket *xmlSchemaBucketPtr;
+
+/**
+ * xmlSchemaSchemaRelation:
+ *
+ * Used to create a graph of schema relationships.
+ */
+typedef struct _xmlSchemaSchemaRelation xmlSchemaSchemaRelation;
+typedef xmlSchemaSchemaRelation *xmlSchemaSchemaRelationPtr;
+struct _xmlSchemaSchemaRelation {
+    xmlSchemaSchemaRelationPtr next;
+    int type;
+    /* E.g. XML_SCHEMA_SCHEMA_IMPORT */
+    const xmlChar *importNamespace;
+    xmlSchemaBucketPtr bucket;
+};
+
+struct _xmlSchemaBucket {
+    int type;
+    int flags;
+    const xmlChar *schemaLocation;
+    const xmlChar *origTargetNamespace;
+    const xmlChar *targetNamespace;
+    xmlDocPtr doc;
+    xmlSchemaSchemaRelationPtr relations;
+    int located;
+    int parsed;
+    int imported;
+    int preserveDoc;
+    xmlSchemaItemListPtr globals;
+    /* Global components. */
+    xmlSchemaItemListPtr locals; /* Local components. */
+};
+
+/**
+ * xmlSchemaImport:
+ * (extends xmlSchemaBucket)
+ *
+ * Reflects a schema. Holds some information
+ * about the schema and its toplevel components. Duplicate
+ * toplevel components are not checked at this level.
+ */
+typedef struct _xmlSchemaImport xmlSchemaImport;
+typedef xmlSchemaImport *xmlSchemaImportPtr;
+struct _xmlSchemaImport {
+    int type;
+    /* Main OR import OR include. */
+    int flags;
+    const xmlChar *schemaLocation; /* The URI of the schema document. */
+    /* For chameleon includes, @origTargetNamespace will be NULL */
+    const xmlChar *origTargetNamespace;
+    /*
+    * For chameleon includes, @targetNamespace will be the
+    * targetNamespace of the including schema.
+    */
+    const xmlChar *targetNamespace;
+    xmlDocPtr doc; /* The schema node-tree. */
+    /* @relations will hold any included/imported/redefined schemas. */
+    xmlSchemaSchemaRelationPtr relations;
+    int located;
+    int parsed;
+    int imported;
+    int preserveDoc;
+    xmlSchemaItemListPtr globals;
+    xmlSchemaItemListPtr locals;
+    /* The imported schema. */
+    xmlSchemaPtr schema;
+};
+
 /*
  * Document-class: LibXML::XML::Schema
  *