libxml-ruby 2.8.0 → 3.2.3

data/ext/libxml/ruby_xml_schema_attribute.c

@@ -1,109 +1,61 @@
-#include "ruby_libxml.h"
-#include "ruby_xml_schema_attribute.h"
-#include "ruby_xml_schema_type.h"
-
-VALUE cXMLSchemaAttribute;
-
-static void rxml_schema_attribute_free(xmlSchemaAttributeUsePtr attr)
-{
-  attr = NULL;
-  xmlFree(attr);
-}
-
-VALUE rxml_wrap_schema_attribute(xmlSchemaAttributeUsePtr attr)
-{
-  return Data_Wrap_Struct(cXMLSchemaAttribute, NULL, rxml_schema_attribute_free, attr);
-}
-
-static VALUE rxml_schema_attribute_namespace(VALUE self)
-{
-  xmlSchemaAttributeUsePtr attr;
-  const xmlChar *tns;
-
-  Data_Get_Struct(self, xmlSchemaAttributeUse, attr);
-
-  if (attr == NULL)
-    return Qnil;
-
-  if (attr->type == XML_SCHEMA_EXTRA_ATTR_USE_PROHIB) {
-      tns = ((xmlSchemaAttributeUseProhibPtr) attr)->targetNamespace;
-  } else if (attr->type == XML_SCHEMA_EXTRA_QNAMEREF) {
-      tns = ((xmlSchemaQNameRefPtr) attr)->targetNamespace;
-  } else {
-      tns = ((xmlSchemaAttributePtr) ((xmlSchemaAttributeUsePtr) (attr))->attrDecl)->targetNamespace;
-  }
-
-  QNIL_OR_STRING(tns)
-}
-
-static VALUE rxml_schema_attribute_name(VALUE self)
-{
-  xmlSchemaAttributeUsePtr attr;
-  const xmlChar *name;
-
-  Data_Get_Struct(self, xmlSchemaAttributeUse, attr);
-
-  if (attr == NULL)
-    return Qnil;
-
-  if (attr->type == XML_SCHEMA_EXTRA_ATTR_USE_PROHIB) {
-      name = ((xmlSchemaAttributeUseProhibPtr) attr)->name;
-  } else if (attr->type == XML_SCHEMA_EXTRA_QNAMEREF) {
-      name = ((xmlSchemaQNameRefPtr) attr)->name;
-  } else {
-      xmlSchemaAttributePtr attrDecl = ((xmlSchemaAttributeUsePtr) attr)->attrDecl;
-      name = attrDecl->name;
-  }
-
-  QNIL_OR_STRING(name)
-}
-
-static VALUE rxml_schema_attribute_type(VALUE self)
-{
-  xmlSchemaAttributeUsePtr attr;
-  xmlSchemaTypePtr xtype;
-
-  Data_Get_Struct(self, xmlSchemaAttributeUse, attr);
-
-  xtype = attr->attrDecl->subtypes;
-
-  return rxml_wrap_schema_type((xmlSchemaTypePtr) xtype);
-}
-
-static VALUE rxml_schema_attribute_node(VALUE self)
-{
-  xmlSchemaAttributeUsePtr attr;
-
-  Data_Get_Struct(self, xmlSchemaAttributeUse, attr);
-
-  return rxml_node_wrap(attr->node);
-}
-
-static VALUE rxml_schema_attribute_value(VALUE self)
-{
-  xmlSchemaAttributeUsePtr attr;
-
-  Data_Get_Struct(self, xmlSchemaAttributeUse, attr);
-
-  QNIL_OR_STRING(attr->defValue)
-}
-
-static VALUE rxml_schema_attribute_occurs(VALUE self)
-{
-  xmlSchemaAttributeUsePtr attr;
-
-  Data_Get_Struct(self, xmlSchemaAttributeUse, attr);
-
-  return INT2NUM(attr->occurs);
-}
-
-void rxml_init_schema_attribute(void)
-{
-  cXMLSchemaAttribute = rb_define_class_under(cXMLSchema, "Attribute", rb_cObject);
-  rb_define_method(cXMLSchemaAttribute, "namespace", rxml_schema_attribute_namespace, 0);
-  rb_define_method(cXMLSchemaAttribute, "name", rxml_schema_attribute_name, 0);
-  rb_define_method(cXMLSchemaAttribute, "type", rxml_schema_attribute_type, 0);
-  rb_define_method(cXMLSchemaAttribute, "node", rxml_schema_attribute_node, 0);
-  rb_define_method(cXMLSchemaAttribute, "value", rxml_schema_attribute_value, 0);
-  rb_define_method(cXMLSchemaAttribute, "occurs", rxml_schema_attribute_occurs, 0);
-}
+#include "ruby_libxml.h"
+#include "ruby_xml_schema_attribute.h"
+#include "ruby_xml_schema_type.h"
+
+VALUE cXMLSchemaAttribute;
+
+static void rxml_schema_attribute_free(xmlSchemaAttributeUsePtr attr)
+{
+  attr = NULL;
+  xmlFree(attr);
+}
+
+VALUE rxml_wrap_schema_attribute(xmlSchemaAttributeUsePtr attr)
+{
+  VALUE result;
+  const xmlChar *tns_str, *name_str;
+
+  if (!attr)
+    rb_raise(rb_eArgError, "XML::Schema::Attribute required!");
+
+  result = Data_Wrap_Struct(cXMLSchemaAttribute, NULL, rxml_schema_attribute_free, attr);
+
+  if (attr->type == XML_SCHEMA_EXTRA_ATTR_USE_PROHIB) {
+    tns_str = ((xmlSchemaAttributeUseProhibPtr) attr)->targetNamespace;
+    name_str = ((xmlSchemaAttributeUseProhibPtr) attr)->name;
+  } else if (attr->type == XML_SCHEMA_EXTRA_QNAMEREF) {
+    tns_str = ((xmlSchemaQNameRefPtr) attr)->targetNamespace;
+    name_str = ((xmlSchemaQNameRefPtr) attr)->name;
+  } else {
+    tns_str = ((xmlSchemaAttributePtr) (attr->attrDecl))->targetNamespace;
+    name_str = ((xmlSchemaAttributePtr) (attr->attrDecl))->name;
+  }
+  rb_iv_set(result, "@target_namespace", QNIL_OR_STRING(tns_str));
+  rb_iv_set(result, "@name", QNIL_OR_STRING(name_str));
+  rb_iv_set(result, "@type", rxml_wrap_schema_type((xmlSchemaTypePtr)attr->attrDecl->subtypes));
+  rb_iv_set(result, "@value", QNIL_OR_STRING(attr->defValue));
+  rb_iv_set(result, "@occurs", INT2NUM(attr->occurs));
+
+  return result;
+}
+
+static VALUE rxml_schema_attribute_node(VALUE self)
+{
+  xmlSchemaAttributeUsePtr attr;
+
+  Data_Get_Struct(self, xmlSchemaAttributeUse, attr);
+
+  return rxml_node_wrap(attr->node);
+}
+
+void rxml_init_schema_attribute(void)
+{
+  cXMLSchemaAttribute = rb_define_class_under(cXMLSchema, "Attribute", rb_cObject);
+  rb_define_attr(cXMLSchemaAttribute, "name", 1, 0);
+  rb_define_attr(cXMLSchemaAttribute, "type", 1, 0);
+  rb_define_attr(cXMLSchemaAttribute, "namespace", 1, 0);
+  rb_define_attr(cXMLSchemaAttribute, "value", 1, 0);
+  rb_define_attr(cXMLSchemaAttribute, "occurs", 1, 0);
+
+  rb_define_method(cXMLSchemaAttribute, "node", rxml_schema_attribute_node, 0);
+}

data/ext/libxml/ruby_xml_schema_attribute.h

@@ -1,15 +1,15 @@
-#ifndef __RXML_SCHEMA_ATTRIBUTE__
-#define __RXML_SCHEMA_ATTRIBUTE__
-
-#include "ruby_xml_schema.h"
-#include <libxml/schemasInternals.h>
-#include <libxml/xmlschemas.h>
-#include <libxml/xmlschemastypes.h>
-
-extern VALUE cXMLSchemaAttribute;
-
-
-void rxml_init_schema_attribute(void);
-VALUE rxml_wrap_schema_attribute(xmlSchemaAttributeUsePtr attr);
-
-#endif
+#ifndef __RXML_SCHEMA_ATTRIBUTE__
+#define __RXML_SCHEMA_ATTRIBUTE__
+
+#include "ruby_xml_schema.h"
+#include <libxml/schemasInternals.h>
+#include <libxml/xmlschemas.h>
+#include <libxml/xmlschemastypes.h>
+
+extern VALUE cXMLSchemaAttribute;
+
+
+void rxml_init_schema_attribute(void);
+VALUE rxml_wrap_schema_attribute(xmlSchemaAttributeUsePtr attr);
+
+#endif

data/ext/libxml/ruby_xml_schema_element.c

@@ -1,94 +1,69 @@
-#include "ruby_libxml.h"
-#include "ruby_xml_schema_element.h"
-#include "ruby_xml_schema_type.h"
-
-VALUE cXMLSchemaElement;
-
-static void rxml_schema_element_free(xmlSchemaElementPtr xschema_element)
-{
-  xschema_element = NULL;
-  xmlFree(xschema_element);
-}
-
-VALUE rxml_wrap_schema_element(xmlSchemaElementPtr xelement)
-{
-  return Data_Wrap_Struct(cXMLSchemaElement, NULL, rxml_schema_element_free, xelement);
-}
-
-static VALUE rxml_schema_element_namespace(VALUE self)
-{
-  xmlSchemaElementPtr xelem;
-
-  Data_Get_Struct(self, xmlSchemaElement, xelem);
-
-  QNIL_OR_STRING(xelem->targetNamespace)
-}
-
-static VALUE rxml_schema_element_name(VALUE self)
-{
-  xmlSchemaElementPtr xelem;
-
-  Data_Get_Struct(self, xmlSchemaElement, xelem);
-
-
-  QNIL_OR_STRING(xelem->name)
-}
-
-static VALUE rxml_schema_element_type(VALUE self)
-{
-  xmlSchemaElementPtr xelem;
-  xmlSchemaTypePtr xtype;
-
-  Data_Get_Struct(self, xmlSchemaElement, xelem);
-
-  xtype = xelem->subtypes;
-
-  return rxml_wrap_schema_type((xmlSchemaTypePtr) xtype);
-}
-
-static VALUE rxml_schema_element_node(VALUE self)
-{
-  xmlSchemaElementPtr xelem;
-
-  Data_Get_Struct(self, xmlSchemaElement, xelem);
-
-  return rxml_node_wrap(xelem->node);
-}
-
-static VALUE rxml_schema_element_value(VALUE self)
-{
-  xmlSchemaElementPtr xelem;
-
-  Data_Get_Struct(self, xmlSchemaElement, xelem);
-
-  QNIL_OR_STRING(xelem->value)
-}
-
-static VALUE rxml_schema_element_min_occurs(VALUE self)
-{
-  return rb_iv_get(self, "@min");
-}
-
-static VALUE rxml_schema_element_max_occurs(VALUE self)
-{
-  return rb_iv_get(self, "@max");
-}
-
-static VALUE rxml_schema_element_annot(VALUE self)
-{
-  return rb_iv_get(self, "@annotation");
-}
-
-
-void rxml_init_schema_element(void)
-{
-  cXMLSchemaElement = rb_define_class_under(cXMLSchema, "Element", rb_cObject);
-  rb_define_method(cXMLSchemaElement, "namespace", rxml_schema_element_namespace, 0);
-  rb_define_method(cXMLSchemaElement, "name", rxml_schema_element_name, 0);
-  rb_define_method(cXMLSchemaElement, "type", rxml_schema_element_type, 0);
-  rb_define_method(cXMLSchemaElement, "node", rxml_schema_element_node, 0);
-  rb_define_method(cXMLSchemaElement, "value", rxml_schema_element_value, 0);
-  rb_define_method(cXMLSchemaElement, "min_occurs", rxml_schema_element_min_occurs, 0);
-  rb_define_method(cXMLSchemaElement, "max_occurs", rxml_schema_element_max_occurs, 0);
-  rb_define_method(cXMLSchemaElement, "annotation", rxml_schema_element_annot, 0);
-}
+#include "ruby_libxml.h"
+#include "ruby_xml_schema_element.h"
+#include "ruby_xml_schema_type.h"
+
+VALUE cXMLSchemaElement;
+
+static void rxml_schema_element_free(xmlSchemaElementPtr xschema_element)
+{
+  xschema_element = NULL;
+  xmlFree(xschema_element);
+}
+
+VALUE rxml_wrap_schema_element(xmlSchemaElementPtr xelem)
+{
+  VALUE result;
+
+  if (!xelem)
+    rb_raise(rb_eArgError, "XML::Schema::Element is required!");
+
+  result = Data_Wrap_Struct(cXMLSchemaElement, NULL, rxml_schema_element_free, xelem);
+
+  rb_iv_set(result, "@name", QNIL_OR_STRING(xelem->name));
+  rb_iv_set(result, "@value", QNIL_OR_STRING(xelem->value));
+  rb_iv_set(result, "@namespace", QNIL_OR_STRING(xelem->targetNamespace));
+  rb_iv_set(result, "@type", rxml_wrap_schema_type((xmlSchemaTypePtr) (xelem->subtypes)));
+
+  return result;
+}
+
+static VALUE rxml_schema_element_node(VALUE self)
+{
+  xmlSchemaElementPtr xelem;
+
+  Data_Get_Struct(self, xmlSchemaElement, xelem);
+
+  return rxml_node_wrap(xelem->node);
+}
+
+static VALUE rxml_schema_element_annot(VALUE self)
+{
+  xmlSchemaElementPtr xelem;
+  VALUE annotation = Qnil;
+
+  Data_Get_Struct(self, xmlSchemaElement, xelem);
+
+  if ((xelem->annot != NULL) && (xelem->annot->content != NULL))
+  {
+    xmlChar *content = xmlNodeGetContent(xelem->annot->content);
+    if (content)
+    {
+      annotation = rxml_new_cstr(content, NULL);
+      xmlFree(content);
+    }
+  }
+
+  return annotation;
+}
+
+void rxml_init_schema_element(void)
+{
+  cXMLSchemaElement = rb_define_class_under(cXMLSchema, "Element", rb_cObject);
+  rb_define_attr(cXMLSchemaElement, "name", 1, 0);
+  rb_define_attr(cXMLSchemaElement, "value", 1, 0);
+  rb_define_attr(cXMLSchemaElement, "namespace", 1, 0);
+  rb_define_attr(cXMLSchemaElement, "type", 1, 0);
+
+  rb_define_method(cXMLSchemaElement, "node", rxml_schema_element_node, 0);
+  rb_define_method(cXMLSchemaElement, "annotation", rxml_schema_element_annot, 0);
+}

data/ext/libxml/ruby_xml_schema_element.h

@@ -1,14 +1,14 @@
-#ifndef __RXML_SCHEMA_ELEMENT__
-#define __RXML_SCHEMA_ELEMENT__
-
-#include "ruby_xml_schema.h"
-#include <libxml/schemasInternals.h>
-#include <libxml/xmlschemas.h>
-#include <libxml/xmlschemastypes.h>
-
-extern VALUE cXMLSchemaElement;
-
-VALUE rxml_wrap_schema_element(xmlSchemaElementPtr xelement);
-void rxml_init_schema_element(void);
-
-#endif
+#ifndef __RXML_SCHEMA_ELEMENT__
+#define __RXML_SCHEMA_ELEMENT__
+
+#include "ruby_xml_schema.h"
+#include <libxml/schemasInternals.h>
+#include <libxml/xmlschemas.h>
+#include <libxml/xmlschemastypes.h>
+
+extern VALUE cXMLSchemaElement;
+
+VALUE rxml_wrap_schema_element(xmlSchemaElementPtr xelement);
+void rxml_init_schema_element(void);
+
+#endif

data/ext/libxml/ruby_xml_schema_facet.c

@@ -1,52 +1,46 @@
-#include "ruby_libxml.h"
-#include "ruby_xml_schema_facet.h"
-
-VALUE cXMLSchemaFacet;
-
-static void rxml_schema_facet_free(xmlSchemaFacetPtr xschema_type)
-{
-  xschema_type = NULL;
-  xmlFree(xschema_type);
-}
-
-/* START FACET*/
-
-static VALUE rxml_schema_facet_node(VALUE self)
-{
-  xmlSchemaFacetPtr facet;
-
-  Data_Get_Struct(self, xmlSchemaFacet, facet);
-
-  return rxml_node_wrap(facet->node);
-}
-
-static VALUE rxml_schema_facet_value(VALUE self)
-{
-  xmlSchemaFacetPtr facet;
-
-  Data_Get_Struct(self, xmlSchemaFacet, facet);
-
-  QNIL_OR_STRING(facet->value)
-}
-
-static VALUE rxml_schema_facet_kind(VALUE self)
-{
-  xmlSchemaFacetPtr facet;
-
-  Data_Get_Struct(self, xmlSchemaFacet, facet);
-
-  return INT2NUM(facet->type);
-}
-
-VALUE rxml_wrap_schema_facet(xmlSchemaFacetPtr facet)
-{
-  return Data_Wrap_Struct(cXMLSchemaFacet, NULL, rxml_schema_facet_free, facet);
-}
-
-void rxml_init_schema_facet(void)
-{
-  cXMLSchemaFacet = rb_define_class_under(cXMLSchema, "Facet", rb_cObject);
-  rb_define_method(cXMLSchemaFacet, "value", rxml_schema_facet_value, 0);
-  rb_define_method(cXMLSchemaFacet, "node", rxml_schema_facet_node, 0);
-  rb_define_method(cXMLSchemaFacet, "kind", rxml_schema_facet_kind, 0);
-}
+#include "ruby_libxml.h"
+#include "ruby_xml_schema_facet.h"
+
+VALUE cXMLSchemaFacet;
+
+static void rxml_schema_facet_free(xmlSchemaFacetPtr xschema_type)
+{
+  xschema_type = NULL;
+  xmlFree(xschema_type);
+}
+
+VALUE rxml_wrap_schema_facet(xmlSchemaFacetPtr facet)
+{
+  VALUE result;
+
+  if (!facet)
+    rb_raise(rb_eArgError, "XML::Schema::Facet required!");
+
+  result = Data_Wrap_Struct(cXMLSchemaFacet, NULL, rxml_schema_facet_free, facet);
+
+  rb_iv_set(result, "@kind", INT2NUM(facet->type));
+  rb_iv_set(result, "@value", QNIL_OR_STRING(facet->value));
+
+  return result;
+
+}
+
+/* START FACET*/
+
+static VALUE rxml_schema_facet_node(VALUE self)
+{
+  xmlSchemaFacetPtr facet;
+
+  Data_Get_Struct(self, xmlSchemaFacet, facet);
+
+  return rxml_node_wrap(facet->node);
+}
+
+void rxml_init_schema_facet(void)
+{
+  cXMLSchemaFacet = rb_define_class_under(cXMLSchema, "Facet", rb_cObject);
+  rb_define_attr(cXMLSchemaFacet, "kind", 1, 0);
+  rb_define_attr(cXMLSchemaFacet, "value", 1, 0);
+
+  rb_define_method(cXMLSchemaFacet, "node", rxml_schema_facet_node, 0);
+}

data/ext/libxml/ruby_xml_schema_facet.h

@@ -1,13 +1,13 @@
-#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);
-void rxml_init_schema_facet(void);
-
-#endif
+#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);
+void rxml_init_schema_facet(void);
+
+#endif