libxml-ruby 3.2.3 → 3.2.4

data/ext/libxml/ruby_xml_schema_attribute.c

@@ -2,6 +2,52 @@
 #include "ruby_xml_schema_attribute.h"
 #include "ruby_xml_schema_type.h"
 
+/**
+ * xmlSchemaBasicItem:
+ *
+ * The abstract base type for schema components.
+ */
+typedef struct _xmlSchemaBasicItem xmlSchemaBasicItem;
+typedef xmlSchemaBasicItem *xmlSchemaBasicItemPtr;
+struct _xmlSchemaBasicItem {
+    xmlSchemaTypeType type;
+};
+
+/**
+ * xmlSchemaQNameRef:
+ *
+ * A component reference item (not a schema component)
+ * (Extends xmlSchemaBasicItem)
+ */
+typedef struct _xmlSchemaQNameRef xmlSchemaQNameRef;
+typedef xmlSchemaQNameRef *xmlSchemaQNameRefPtr;
+struct _xmlSchemaQNameRef {
+    xmlSchemaTypeType type;
+    xmlSchemaBasicItemPtr item;
+    /* The resolved referenced item. */
+    xmlSchemaTypeType itemType;
+    const xmlChar *name;
+    const xmlChar *targetNamespace;
+    xmlNodePtr node;
+};
+
+/**
+ * xmlSchemaAttributeUseProhibPtr:
+ *
+ * A helper component to reflect attribute prohibitions.
+ * (Extends xmlSchemaBasicItem)
+ */
+typedef struct _xmlSchemaAttributeUseProhib xmlSchemaAttributeUseProhib;
+typedef xmlSchemaAttributeUseProhib *xmlSchemaAttributeUseProhibPtr;
+struct _xmlSchemaAttributeUseProhib {
+    xmlSchemaTypeType type;
+    /* == XML_SCHEMA_EXTRA_ATTR_USE_PROHIB */
+    xmlNodePtr node;
+    const xmlChar *name;
+    const xmlChar *targetNamespace;
+    int isRef;
+};
+
 VALUE cXMLSchemaAttribute;
 
 static void rxml_schema_attribute_free(xmlSchemaAttributeUsePtr attr)

data/ext/libxml/ruby_xml_schema_attribute.h

@@ -2,12 +2,34 @@
 #define __RXML_SCHEMA_ATTRIBUTE__
 
 #include "ruby_xml_schema.h"
-#include <libxml/schemasInternals.h>
-#include <libxml/xmlschemas.h>
-#include <libxml/xmlschemastypes.h>
 
 extern VALUE cXMLSchemaAttribute;
 
+/**
+ * xmlSchemaAttributeUsePtr:
+ *
+ * The abstract base type for tree-like structured schema components.
+ * (Extends xmlSchemaTreeItem)
+ */
+typedef struct _xmlSchemaAttributeUse xmlSchemaAttributeUse;
+typedef xmlSchemaAttributeUse *xmlSchemaAttributeUsePtr;
+struct _xmlSchemaAttributeUse {
+    xmlSchemaTypeType type;
+    xmlSchemaAnnotPtr annot;
+    xmlSchemaAttributeUsePtr next; /* The next attr. use. */
+    /*
+    * The attr. decl. OR a QName-ref. to an attr. decl. OR
+    * a QName-ref. to an attribute group definition.
+    */
+    xmlSchemaAttributePtr attrDecl;
+
+    int flags;
+    xmlNodePtr node;
+    int occurs;
+    /* required, optional */
+    const xmlChar *defValue;
+    xmlSchemaValPtr defVal;
+};
 
 void rxml_init_schema_attribute(void);
 VALUE rxml_wrap_schema_attribute(xmlSchemaAttributeUsePtr attr);

data/ext/libxml/ruby_xml_schema_element.h

@@ -2,9 +2,6 @@
 #define __RXML_SCHEMA_ELEMENT__
 
 #include "ruby_xml_schema.h"
-#include <libxml/schemasInternals.h>
-#include <libxml/xmlschemas.h>
-#include <libxml/xmlschemastypes.h>
 
 extern VALUE cXMLSchemaElement;
 

data/ext/libxml/ruby_xml_schema_facet.c

@@ -1,6 +1,10 @@
 #include "ruby_libxml.h"
 #include "ruby_xml_schema_facet.h"
 
+#include <libxml/schemasInternals.h>
+#include <libxml/xmlschemas.h>
+#include <libxml/xmlschemastypes.h>
+
 VALUE cXMLSchemaFacet;
 
 static void rxml_schema_facet_free(xmlSchemaFacetPtr xschema_type)

data/ext/libxml/ruby_xml_schema_facet.h

@@ -1,10 +1,6 @@
 #ifndef __RXML_SCHEMA_FACET__
 #define __RXML_SCHEMA_FACET__
 
-#include <libxml/schemasInternals.h>
-#include <libxml/xmlschemas.h>
-#include <libxml/xmlschemastypes.h>
-
 extern VALUE cXMLSchemaFacet;
 
 VALUE rxml_wrap_schema_facet(xmlSchemaFacetPtr facet);

data/ext/libxml/ruby_xml_schema_type.c

@@ -7,6 +7,43 @@
 #define UNBOUNDED 1 << 30
 #define FREE_AND_NULL(str) if ((str) != NULL) { xmlFree((xmlChar *) (str)); str = NULL; }
 
+/**
+ * xmlSchemaTreeItem:
+ *
+ * The abstract base type for tree-like structured schema components.
+ * (Extends xmlSchemaAnnotItem)
+ */
+typedef struct _xmlSchemaTreeItem xmlSchemaTreeItem;
+typedef xmlSchemaTreeItem *xmlSchemaTreeItemPtr;
+struct _xmlSchemaTreeItem {
+    xmlSchemaTypeType type;
+    xmlSchemaAnnotPtr annot;
+    xmlSchemaTreeItemPtr next;
+    xmlSchemaTreeItemPtr children;
+};
+
+ /**
+ * xmlSchemaParticle:
+ *
+ * A particle component.
+ * (Extends xmlSchemaTreeItem)
+ */
+typedef struct _xmlSchemaParticle xmlSchemaParticle;
+typedef xmlSchemaParticle *xmlSchemaParticlePtr;
+struct _xmlSchemaParticle {
+    xmlSchemaTypeType type;
+    xmlSchemaAnnotPtr annot;
+    xmlSchemaTreeItemPtr next;
+    /* next particle */
+    xmlSchemaTreeItemPtr children;
+    /* the "term" (e.g. a model group,
+a group definition, a XML_SCHEMA_EXTRA_QNAMEREF (if a reference),
+   etc.) */
+    int minOccurs;
+    int maxOccurs;
+    xmlNodePtr node;
+};
+
 VALUE cXMLSchemaType;
 
 static void rxml_schema_type_free(xmlSchemaTypePtr xschema_type)

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.3"
-#define RUBY_LIBXML_VERNUM   323
+#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   3
+#define RUBY_LIBXML_VER_MIC   4
 #define RUBY_LIBXML_VER_PATCH 0

data/ext/libxml/ruby_xml_writer.c

@@ -1,6 +1,10 @@
 #include "ruby_libxml.h"
 #include "ruby_xml_writer.h"
 
+#ifdef LIBXML_WRITER_ENABLED
+#include <libxml/xmlwriter.h>
+#endif
+
 VALUE cXMLWriter;
 static VALUE sEncoding, sStandalone;
 

data/ext/libxml/ruby_xml_writer.h

@@ -1,10 +1,6 @@
 #ifndef __RXML_WRITER__
 #define __RXML_WRITER__
 
-#ifdef LIBXML_WRITER_ENABLED
-#include <libxml/xmlwriter.h>
-#endif
-
 extern VALUE cXMLWriter;
 void rxml_init_writer(void);
 #endif

data/ext/libxml/ruby_xml_xinclude.c

@@ -1,6 +1,10 @@
 #include "ruby_libxml.h"
 #include "ruby_xml_xinclude.h"
 
+#ifdef LIBXML_XINCLUDE_ENABLED
+#include <libxml/xinclude.h>
+#endif
+
 VALUE cXMLXInclude;
 
 /*

data/ext/libxml/ruby_xml_xpath.c

@@ -75,6 +75,7 @@
 */
 
 #include "ruby_libxml.h"
+#include <libxml/xpathInternals.h>
 
 VALUE mXPath;
 

data/ext/libxml/ruby_xml_xpath.h

@@ -3,6 +3,8 @@
 #ifndef __RXML_XPATH__
 #define __RXML_XPATH__
 
+#include <libxml/xpath.h>
+
 extern VALUE mXPath;
 
 void rxml_init_xpath(void);

data/ext/libxml/ruby_xml_xpath_context.c

@@ -10,6 +10,8 @@
 #include <st.h>
 #endif
 
+#include <libxml/xpathInternals.h>
+
 /*
  * Document-class: LibXML::XML::XPath::Context
  *

data/ext/libxml/ruby_xml_xpath_object.c

@@ -1,4 +1,5 @@
 #include "ruby_libxml.h"
+#include <libxml/xpathInternals.h>
 
 /*
  * Document-class: LibXML::XML::XPath::Object

data/ext/libxml/ruby_xml_xpointer.c

@@ -3,6 +3,10 @@
 #include "ruby_libxml.h"
 #include "ruby_xml_xpointer.h"
 
+#ifdef LIBXML_XPTR_ENABLED
+#include <libxml/xpointer.h>
+#endif
+
 VALUE cXMLXPointer;
 
 /*
@@ -62,7 +66,7 @@ VALUE rxml_xpointer_point2(VALUE node, VALUE xptr_str)
  */
 static VALUE rxml_xpointer_range(VALUE class, VALUE rstart, VALUE rend)
 {
-#ifdef LIBXML_XPTR_ENABLED
+#if defined LIBXML_XPTR_ENABLED && defined LIBXML_XPTR_LOCS_ENABLED
   xmlNodePtr start, end;
   VALUE rxxp;
   xmlXPathObjectPtr xpath;

data/lib/libxml-ruby.rb

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

data/test/test_helper.rb

@@ -6,4 +6,8 @@ require 'bundler/setup'
 require 'minitest/autorun'
 require 'libxml-ruby'
 
+def windows?
+  !(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/).nil?
+end
+
 STDOUT.write "\nlibxml2: #{LibXML::XML::LIBXML_VERSION}\n#{RUBY_DESCRIPTION}\n\n"

data/test/test_xml.rb

@@ -167,11 +167,19 @@ class TestXml < Minitest::Test
   end
 
   def test_enabled_docbook
-    assert(LibXML::XML.enabled_docbook?)
+    if windows?
+      refute(LibXML::XML.enabled_docbook?)
+    else
+      assert(LibXML::XML.enabled_docbook?)
+    end
   end
 
   def test_enabled_ftp
-    assert(LibXML::XML.enabled_ftp?)
+    if windows?
+      refute(LibXML::XML.enabled_ftp?)
+    else
+      assert(LibXML::XML.enabled_ftp?)
+    end
   end
 
   def test_enabled_http
@@ -242,7 +250,11 @@ class TestXml < Minitest::Test
   end
 
   def test_libxml_parser_features
-    assert_instance_of(Array, LibXML::XML.features)
+    if windows?
+      assert_nil(LibXML::XML.features)
+    else
+      assert_instance_of(Array, LibXML::XML.features)
+    end
   end
 
   def test_default_options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libxml-ruby
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.2.4
 platform: ruby
 authors:
 - Ross Bamform
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-22 00:00:00.000000000 Z
+date: 2022-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -61,6 +61,7 @@ files:
 - MANIFEST
 - README.rdoc
 - Rakefile
+- ext/libxml/extconf.h
 - ext/libxml/extconf.rb
 - ext/libxml/libxml.c
 - ext/libxml/libxml_ruby.def
@@ -279,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.4
+rubygems_version: 3.3.14
 signing_key:
 specification_version: 4
 summary: Ruby Bindings for LibXML2