libxml-ruby 2.8.0 → 3.2.3

data/ext/libxml/ruby_xml_schema_type.c

@@ -1,259 +1,214 @@
-#include "ruby_libxml.h"
-#include "ruby_xml_schema_type.h"
-#include "ruby_xml_schema_element.h"
-#include "ruby_xml_schema_attribute.h"
-#include "ruby_xml_schema_facet.h"
-
-#define UNBOUNDED 1 << 30
-#define FREE_AND_NULL(str) if ((str) != NULL) { xmlFree((xmlChar *) (str)); str = NULL; }
-
-VALUE cXMLSchemaType;
-
-static void rxml_schema_type_free(xmlSchemaTypePtr xschema_type)
-{
-  xschema_type = NULL;
-  xmlFree(xschema_type);
-}
-
-VALUE rxml_wrap_schema_type(xmlSchemaTypePtr xtype)
-{
-  return Data_Wrap_Struct(cXMLSchemaType, NULL, rxml_schema_type_free, xtype);
-}
-
-static VALUE rxml_schema_type_namespace(VALUE self)
-{
-  xmlSchemaTypePtr xtype;
-
-  Data_Get_Struct(self, xmlSchemaType, xtype);
-
-  QNIL_OR_STRING(xtype->targetNamespace)
-}
-
-static VALUE rxml_schema_type_name(VALUE self)
-{
-  xmlSchemaTypePtr xtype;
-
-  Data_Get_Struct(self, xmlSchemaType, xtype);
-
-  QNIL_OR_STRING(xtype->name)
-}
-
-static VALUE rxml_schema_type_base(VALUE self)
-{
-  xmlSchemaTypePtr xtype;
-
-  Data_Get_Struct(self, xmlSchemaType, xtype);
-
-  return Data_Wrap_Struct(cXMLSchemaType, NULL, rxml_schema_type_free, xtype->baseType);
-}
-
-static VALUE rxml_schema_type_facets(VALUE self)
-{
-  xmlSchemaTypePtr xtype;
-  xmlSchemaFacetPtr facet;
-  VALUE facets;
-  VALUE rfacet;
-
-  facets = rb_iv_get(self, "@facets");
-
-  if (facets == Qnil) {
-    facets = rb_ary_new();
-    Data_Get_Struct(self, xmlSchemaType, xtype);
-
-    facet = xtype->facets;
-
-    while (facet != NULL) {
-      rfacet = rxml_wrap_schema_facet((xmlSchemaFacetPtr) facet);
-      rb_ary_push(facets, rfacet);
-      facet = facet->next;
-    }
-
-    rb_iv_set(self, "@facets", facets);
-  }
-
-  return facets;
-}
-
-static VALUE rxml_schema_type_node(VALUE self)
-{
-  xmlSchemaTypePtr xtype;
-
-  Data_Get_Struct(self, xmlSchemaType, xtype);
-
-  if(xtype->node != NULL)
-    return rxml_node_wrap(xtype->node);
-  else
-    return Qnil;
-}
-
-static VALUE rxml_schema_type_kind(VALUE self)
-{
-  xmlSchemaTypePtr xtype;
-
-  Data_Get_Struct(self, xmlSchemaType, xtype);
-
-  return INT2NUM(xtype->type);
-}
-
-static VALUE get_annotation(xmlSchemaAnnotPtr annot)
-{
-  if(annot != NULL && annot->content != NULL && annot->content->content != NULL)
-    return rb_str_new2((const char *) annot->content->content);
-  else
-    return Qnil;
-}
-
-static VALUE rxml_schema_type_annot(VALUE self)
-{
-  xmlSchemaTypePtr xtype;
-
-  Data_Get_Struct(self, xmlSchemaType, xtype);
-
-  if(xtype != NULL && xtype->annot != NULL)
-    return get_annotation(xtype->annot);
-  else
-    return Qnil;
-}
-
-static void rxmlSchemaCollectElements(xmlSchemaParticlePtr particle, VALUE self)
-{
-  VALUE elements;
-  VALUE relement;
-  xmlSchemaTreeItemPtr term;
-
-  if (particle == NULL)
-    return;
-
-  term = particle->children;
-
-  if (term != NULL) {
-    elements = rb_iv_get(self, "@elements");
-
-    switch (term->type) {
-      case XML_SCHEMA_TYPE_ELEMENT:
-        relement = rxml_wrap_schema_element((xmlSchemaElementPtr) term);
-
-
-        rb_iv_set(relement, "@min", INT2NUM(particle->minOccurs));
-
-        if (particle->maxOccurs >= UNBOUNDED)
-          rb_iv_set(relement, "@max", rb_const_get(rb_path2class("Float"), rb_intern("INFINITY")));
-        else
-          rb_iv_set(relement, "@max", INT2NUM(particle->maxOccurs));
-
-        if (particle->annot != NULL)
-        {
-          xmlChar *content;
-
-          content = xmlNodeGetContent(particle->annot->content);
-
-          if (content != NULL)
-          {
-            rb_iv_set(relement, "@annotation", rb_str_new2((const char *) content));
-            xmlFree(content);
-          }
-        }
-
-        rb_hash_aset(elements, rb_str_new2((const char *) ((xmlSchemaElementPtr) term)->name), relement);
-
-        break;
-
-      case XML_SCHEMA_TYPE_SEQUENCE:
-        break;
-
-      case XML_SCHEMA_TYPE_CHOICE:
-        break;
-
-      case XML_SCHEMA_TYPE_ALL:
-        break;
-
-      case XML_SCHEMA_TYPE_ANY:
-        break;
-
-      default:
-
-        return;
-    }
-  }
-
-  if (term &&
-      ((term->type == XML_SCHEMA_TYPE_SEQUENCE) ||
-          (term->type == XML_SCHEMA_TYPE_CHOICE) ||
-          (term->type == XML_SCHEMA_TYPE_ALL)) &&
-      (term->children != NULL)) {
-
-    rxmlSchemaCollectElements((xmlSchemaParticlePtr) term->children, self);
-  }
-
-  if (particle->next != NULL)
-    rxmlSchemaCollectElements((xmlSchemaParticlePtr) particle->next, self);
-}
-
-static VALUE
-rxml_schema_type_elements(VALUE self)
-{
-  VALUE elements;
-  xmlSchemaTypePtr xtype;
-
-  Data_Get_Struct(self, xmlSchemaType, xtype);
-
-  if (rb_iv_get(self, "@elements") == Qnil) {
-    elements = rb_hash_new();
-    rb_iv_set(self, "@elements", elements);
-    rxmlSchemaCollectElements((xmlSchemaParticlePtr) xtype->subtypes, self);
-  }
-
-  return rb_iv_get(self, "@elements");
-}
-
-static VALUE
-rxml_schema_type_attributes(VALUE self)
-{
-  VALUE attributes;
-  xmlSchemaTypePtr xtype;
-  xmlSchemaAttributeUsePtr use;
-  xmlSchemaItemListPtr uses;
-  int i;
-
-  Data_Get_Struct(self, xmlSchemaType, xtype);
-
-  if (rb_iv_get(self, "@attributes") == Qnil) {
-    attributes = rb_ary_new();
-    rb_iv_set(self, "@attributes", attributes);
-
-    uses = xtype->attrUses;
-
-    if ((uses == NULL) || (uses->nbItems == 0))
-      return rb_iv_get(self, "@attributes");
-
-    for (i = 0; i < uses->nbItems; i++) {
-      use = (xmlSchemaAttributeUsePtr) uses->items[i];
-      rb_ary_push(attributes, rxml_wrap_schema_attribute(use));
-    }
-  }
-
-  return rb_iv_get(self, "@attributes");
-}
-
-
-void rxml_init_schema_type(void)
-{
-  /* Add in infinity support for ruby 1.8.7 */
-  #if !defined(RUBY_VM) && defined(INFINITY)
-  ID infinityId = rb_intern("INFINITY");
-  if (rb_const_defined(rb_cFloat, infinityId) == Qfalse)
-    rb_define_const(rb_cFloat, "INFINITY", rb_float_new(INFINITY));
-  #endif
-
-  cXMLSchemaType = rb_define_class_under(cXMLSchema, "Type", rb_cObject);
-
-  rb_define_method(cXMLSchemaType, "namespace", rxml_schema_type_namespace, 0);
-  rb_define_method(cXMLSchemaType, "name", rxml_schema_type_name, 0);
-  rb_define_method(cXMLSchemaType, "elements", rxml_schema_type_elements, 0);
-  rb_define_method(cXMLSchemaType, "attributes", rxml_schema_type_attributes, 0);
-  rb_define_method(cXMLSchemaType, "base", rxml_schema_type_base, 0);
-  rb_define_method(cXMLSchemaType, "kind", rxml_schema_type_kind, 0);
-  rb_define_method(cXMLSchemaType, "node", rxml_schema_type_node, 0);
-  rb_define_method(cXMLSchemaType, "facets", rxml_schema_type_facets, 0);
-  rb_define_method(cXMLSchemaType, "annotation", rxml_schema_type_annot, 0);
-}
+#include "ruby_libxml.h"
+#include "ruby_xml_schema_type.h"
+#include "ruby_xml_schema_element.h"
+#include "ruby_xml_schema_attribute.h"
+#include "ruby_xml_schema_facet.h"
+
+#define UNBOUNDED 1 << 30
+#define FREE_AND_NULL(str) if ((str) != NULL) { xmlFree((xmlChar *) (str)); str = NULL; }
+
+VALUE cXMLSchemaType;
+
+static void rxml_schema_type_free(xmlSchemaTypePtr xschema_type)
+{
+  xschema_type = NULL;
+  xmlFree(xschema_type);
+}
+
+VALUE rxml_wrap_schema_type(xmlSchemaTypePtr xtype)
+{
+  VALUE result;
+
+  if (!xtype)
+    rb_raise(rb_eArgError, "XML::Schema::Type required!");
+
+  result = Data_Wrap_Struct(cXMLSchemaType, NULL, rxml_schema_type_free, xtype);
+
+  rb_iv_set(result, "@name", QNIL_OR_STRING(xtype->name));
+  rb_iv_set(result, "@namespace", QNIL_OR_STRING(xtype->targetNamespace));
+  rb_iv_set(result, "@kind", INT2NUM(xtype->type));
+
+  return result;
+}
+
+static VALUE rxml_schema_type_base(VALUE self)
+{
+  xmlSchemaTypePtr xtype;
+
+  Data_Get_Struct(self, xmlSchemaType, xtype);
+
+  return (xtype->baseType != xtype) ? rxml_wrap_schema_type(xtype->baseType) : Qnil;
+}
+
+static VALUE rxml_schema_type_node(VALUE self)
+{
+  xmlSchemaTypePtr xtype;
+
+  Data_Get_Struct(self, xmlSchemaType, xtype);
+
+  return (xtype->node != NULL) ? rxml_node_wrap(xtype->node) : Qnil;
+}
+
+static VALUE rxml_schema_type_facets(VALUE self)
+{
+  xmlSchemaTypePtr xtype;
+  xmlSchemaFacetPtr xfacet;
+  VALUE result = rb_ary_new();
+  VALUE facet;
+
+  Data_Get_Struct(self, xmlSchemaType, xtype);
+
+  xfacet = xtype->facets;
+
+  while (xfacet != NULL)
+  {
+    facet = rxml_wrap_schema_facet((xmlSchemaFacetPtr)xfacet);
+    rb_ary_push(result, facet);
+    xfacet = xfacet->next;
+  }
+
+  return result;
+}
+
+static VALUE rxml_schema_type_annot(VALUE self)
+{
+  VALUE result = Qnil;
+  xmlSchemaTypePtr xtype;
+
+  Data_Get_Struct(self, xmlSchemaType, xtype);
+
+  if(xtype != NULL && xtype->annot != NULL && xtype->annot->content != NULL)
+  {
+    xmlChar *content = xmlNodeGetContent(xtype->annot->content);
+	if (content)
+	{
+	  result = rxml_new_cstr(content, NULL);
+	  xmlFree(content);
+    }
+  }
+  return result;
+}
+
+static void rxmlSchemaCollectElements(xmlSchemaParticlePtr xparticle, VALUE hash)
+{
+  VALUE element;
+  xmlSchemaTreeItemPtr xterm;
+
+  if (xparticle == NULL)
+    return;
+
+  xterm = xparticle->children;
+
+  if (xterm != NULL)
+  {
+    switch (xterm->type)
+	{
+      case XML_SCHEMA_TYPE_ELEMENT:
+        element = rxml_wrap_schema_element((xmlSchemaElementPtr)xterm);
+        rb_iv_set(element, "@min", INT2NUM(xparticle->minOccurs));
+
+        if (xparticle->maxOccurs >= UNBOUNDED)
+          rb_iv_set(element, "@max", rb_const_get(rb_path2class("Float"), rb_intern("INFINITY")));
+        else
+          rb_iv_set(element, "@max", INT2NUM(xparticle->maxOccurs));
+
+        if (xparticle->annot != NULL)
+        {
+          xmlChar *content = xmlNodeGetContent(xparticle->annot->content);
+
+          if (content != NULL)
+          {
+            rb_iv_set(element, "@annotation", rb_str_new2((const char *) content));
+            xmlFree(content);
+          }
+        }
+
+        rb_hash_aset(hash, rb_str_new2((const char *) ((xmlSchemaElementPtr)xterm)->name), element);
+        break;
+
+      case XML_SCHEMA_TYPE_SEQUENCE:
+        break;
+
+      case XML_SCHEMA_TYPE_CHOICE:
+        break;
+
+      case XML_SCHEMA_TYPE_ALL:
+        break;
+
+      case XML_SCHEMA_TYPE_ANY:
+        break;
+
+      default:
+        return;
+    }
+  }
+
+  if (xterm &&
+      ((xterm->type == XML_SCHEMA_TYPE_SEQUENCE) || (xterm->type == XML_SCHEMA_TYPE_CHOICE) || (xterm->type == XML_SCHEMA_TYPE_ALL)) &&
+      (xterm->children != NULL))
+  {
+    rxmlSchemaCollectElements((xmlSchemaParticlePtr)xterm->children, hash);
+  }
+
+  if (xparticle->next != NULL)
+  {
+	rxmlSchemaCollectElements((xmlSchemaParticlePtr)xparticle->next, hash);
+  }
+}
+
+static VALUE rxml_schema_type_elements(VALUE self)
+{
+  VALUE result = rb_hash_new();
+  xmlSchemaTypePtr xtype;
+
+  Data_Get_Struct(self, xmlSchemaType, xtype);
+  rxmlSchemaCollectElements((xmlSchemaParticlePtr) xtype->subtypes, result);
+
+  return result;
+}
+
+static VALUE rxml_schema_type_attributes(VALUE self)
+{
+  VALUE result = rb_ary_new();
+  xmlSchemaTypePtr xtype;
+  xmlSchemaAttributeUsePtr xuse;
+  xmlSchemaItemListPtr xuses;
+  int i;
+
+  Data_Get_Struct(self, xmlSchemaType, xtype);
+  xuses = xtype->attrUses;
+
+  if (xuses != NULL)
+  {
+    for (i = 0; i < xuses->nbItems; i++)
+	{
+      xuse = (xmlSchemaAttributeUsePtr)xuses->items[i];
+      rb_ary_push(result, rxml_wrap_schema_attribute(xuse));
+    }
+  }
+
+  return result;
+}
+
+void rxml_init_schema_type(void)
+{
+  /* Add in infinity support for ruby 1.8.7 */
+  #if !defined(RUBY_VM) && defined(INFINITY)
+  ID infinityId = rb_intern("INFINITY");
+  if (rb_const_defined(rb_cFloat, infinityId) == Qfalse)
+    rb_define_const(rb_cFloat, "INFINITY", rb_float_new(INFINITY));
+  #endif
+
+  cXMLSchemaType = rb_define_class_under(cXMLSchema, "Type", rb_cObject);
+
+  rb_define_attr(cXMLSchemaType, "namespace", 1, 0);
+  rb_define_attr(cXMLSchemaType, "name", 1, 0);
+  rb_define_attr(cXMLSchemaType, "kind", 1, 0);
+
+  rb_define_method(cXMLSchemaType, "base", rxml_schema_type_base, 0);
+  rb_define_method(cXMLSchemaType, "node", rxml_schema_type_node, 0);
+  rb_define_method(cXMLSchemaType, "elements", rxml_schema_type_elements, 0);
+  rb_define_method(cXMLSchemaType, "attributes", rxml_schema_type_attributes, 0);
+  rb_define_method(cXMLSchemaType, "facets", rxml_schema_type_facets, 0);
+  rb_define_method(cXMLSchemaType, "annotation", rxml_schema_type_annot, 0);
+}

data/ext/libxml/ruby_xml_schema_type.h

@@ -1,9 +1,9 @@
-#ifndef __RXML_SCHEMA_TYPE__
-#define __RXML_SCHEMA_TYPE__
-
-extern VALUE cXMLSchemaType;
-
-VALUE rxml_wrap_schema_type(xmlSchemaTypePtr xtype);
-void rxml_init_schema_type(void);
-
-#endif
+#ifndef __RXML_SCHEMA_TYPE__
+#define __RXML_SCHEMA_TYPE__
+
+extern VALUE cXMLSchemaType;
+
+VALUE rxml_wrap_schema_type(xmlSchemaTypePtr xtype);
+void rxml_init_schema_type(void);
+
+#endif

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  "2.8.0"
-#define RUBY_LIBXML_VERNUM   280
-#define RUBY_LIBXML_VER_MAJ   2
-#define RUBY_LIBXML_VER_MIN   8
-#define RUBY_LIBXML_VER_MIC   0
-#define RUBY_LIBXML_VER_PATCH 0
+/* 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_VER_MAJ   3
+#define RUBY_LIBXML_VER_MIN   2
+#define RUBY_LIBXML_VER_MIC   3
+#define RUBY_LIBXML_VER_PATCH 0