libxml-ruby 0.8.1-x86-mswin32-60 → 0.8.2-x86-mswin32-60

data/ext/libxml/libxml.c

@@ -1,4 +1,4 @@
-/* $Id: libxml.c 462 2008-07-15 21:52:47Z cfis $ */
+/* $Id: libxml.c 489 2008-07-21 22:41:11Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -52,6 +52,7 @@ Init_libxml_ruby(void) {
   ruby_init_input_callbacks(); 
   ruby_init_xml_dtd();         
   ruby_init_xml_schema();      
+  ruby_init_xml_relaxng();      
   ruby_init_xml_reader();      
 
   ruby_xml_parser_default_substitute_entities_set(cXMLParser, Qtrue);

data/ext/libxml/ruby_libxml.h

@@ -81,6 +81,7 @@ typedef struct rx_xpath_data {
 #include "ruby_xml_input_cbg.h"
 #include "ruby_xml_dtd.h"
 #include "ruby_xml_schema.h"
+#include "ruby_xml_relaxng.h"
 #include "ruby_xml_html_parser.h"
 #include "ruby_xml_reader.h"
 

data/ext/libxml/ruby_xml_attr.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_attr.c 461 2008-07-15 21:35:56Z cfis $ */
+/* $Id: ruby_xml_attr.c 502 2008-07-22 01:45:31Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -9,7 +9,7 @@
 * calling XML::Node#attributes method.
 *
 * Basic Usage:
-*  require 'libxml'
+*  require 'xml'
 *
 *  doc = XML::Document.new(<some_file>)
 *  attribute = doc.root.attributes.get_attribute_ns('http://www.w3.org/1999/xlink', 'href')
@@ -109,6 +109,9 @@ ruby_xml_attr_initialize(int argc, VALUE *argv, VALUE self) {
   Check_Type(value, T_STRING);
   
   Data_Get_Struct(node, xmlNode, xnode);
+
+  if (xnode->type != XML_ELEMENT_NODE)
+    rb_raise(rb_eArgError, "Attributes can only be created on element nodes.");
   
   if NIL_P(ns)
   {
@@ -120,6 +123,9 @@ ruby_xml_attr_initialize(int argc, VALUE *argv, VALUE self) {
     Data_Get_Struct(ns, xmlNs, xns);
     xattr = xmlNewNsProp(xnode, xns, (xmlChar*)StringValuePtr(name), (xmlChar*)StringValuePtr(value));
   }
+
+  if (!xattr)
+    rb_raise(rb_eRuntimeError, "Could not create attribute.");
   
   xattr->_private = (void *)self;
   DATA_PTR(self) = xattr;

data/ext/libxml/ruby_xml_attributes.c

@@ -8,7 +8,7 @@
 * Provides access to an elements attributes (XML::Attr).
 *
 * Basic Usage:
-*  require 'libxml'
+*  require 'xml'
 *
 *  doc = XML::Document.new(<some_file>)
 *  attributes = doc.root.attributes
@@ -249,10 +249,10 @@ ruby_xml_attributes_first(VALUE self) {
 }
 
 // Rdoc needs to know 
-#ifdef RDOC_NEVER_DEFINED
-  mLibXML = rb_define_module("LibXML");
-  mXML = rb_define_module_under(mLibXML, "XML");
-#endif
+#ifdef RDOC_NEVER_DEFINED
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
+#endif
     
 void
 ruby_init_xml_attributes(void) {

data/ext/libxml/ruby_xml_document.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_document.c 461 2008-07-15 21:35:56Z cfis $ */
+/* $Id: ruby_xml_document.c 502 2008-07-22 01:45:31Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -8,7 +8,7 @@
 * Reads or writes an XML document:
 *
 * Reading:
-*  require 'libxml'
+*  require 'xml'
 *
 *  doc = XML::Document.new()
 *  doc.root = XML::Node.new('root_node')
@@ -932,6 +932,10 @@ LibXML_validity_warning(void * ctxt, const char * msg, va_list ap)
  *    document.validate_schema(schema) -> (true|false)
  * 
  * Validate this document against the specified XML::Schema.
+ * 
+ * If a block is provided it is used as an error handler for validaten errors.
+ * The block is called with two argument, the message and a flag indication
+ * if the message is an error (true) or a warning (false).
  */
 VALUE
 ruby_xml_document_validate_schema(VALUE self, VALUE schema) {
@@ -957,6 +961,40 @@ ruby_xml_document_validate_schema(VALUE self, VALUE schema) {
   }
 }
 
+/*
+ * call-seq:
+ *    document.validate_schema(relaxng) -> (true|false)
+ * 
+ * Validate this document against the specified XML::RelaxNG.
+ *
+ * If a block is provided it is used as an error handler for validaten errors.
+ * The block is called with two argument, the message and a flag indication
+ * if the message is an error (true) or a warning (false).
+ */
+VALUE
+ruby_xml_document_validate_relaxng(VALUE self, VALUE relaxng) {
+  xmlRelaxNGValidCtxtPtr vptr;
+  ruby_xml_document_t     *c_doc;
+  ruby_xml_relaxng       *c_relaxng;
+  int is_invalid;
+
+  Data_Get_Struct(self,   ruby_xml_document_t, c_doc);
+  Data_Get_Struct(relaxng, ruby_xml_relaxng,   c_relaxng);
+
+  vptr = xmlRelaxNGNewValidCtxt(c_relaxng->relaxng);
+
+  xmlRelaxNGSetValidErrors(vptr, (xmlRelaxNGValidityErrorFunc)LibXML_validity_error,
+                                (xmlRelaxNGValidityWarningFunc)LibXML_validity_warning, NULL);
+  
+  is_invalid = xmlRelaxNGValidateDoc(vptr, c_doc->doc);
+  xmlRelaxNGFreeValidCtxt(vptr);
+  if (is_invalid) {
+	return Qfalse;
+  } else {
+	return Qtrue;
+  }
+}
+
 
 /*
  * call-seq:
@@ -1092,5 +1130,6 @@ ruby_init_xml_document(void) {
   rb_define_method(cXMLDocument, "xinclude", ruby_xml_document_xinclude, 0);
   rb_define_method(cXMLDocument, "validate", ruby_xml_document_validate_dtd, 1);
   rb_define_method(cXMLDocument, "validate_schema", ruby_xml_document_validate_schema, 1);
+  rb_define_method(cXMLDocument, "validate_relaxng", ruby_xml_document_validate_relaxng, 1);
   rb_define_method(cXMLDocument, "reader", ruby_xml_document_reader, 0);
 }

data/ext/libxml/ruby_xml_dtd.c

@@ -1,169 +1,169 @@
-#include "ruby_libxml.h"
-#include "ruby_xml_dtd.h"
-
-VALUE cXMLDtd;
-
-void
-ruby_xml_dtd_free(ruby_xml_dtd *rxdtd) {
-  if (rxdtd->dtd != NULL) {
-    xmlFreeDtd(rxdtd->dtd);
-    rxdtd->dtd = NULL;
-  }
-
-  ruby_xfree(rxdtd);
-}
-
-static void
-ruby_xml_dtd_mark(ruby_xml_dtd *rxdtd) {
-  return;
-  //if (rxdtd == NULL) return;
-  //if (!NIL_P(rxd->xmlver)) rb_gc_mark(rxd->xmlver);
-}
-
-/*
- * call-seq:
- *    XML::Dtd.new("public system") -> dtd
- *    XML::Dtd.new("public", "system") -> dtd
- * 
- * Create a new Dtd from the specified public and system
- * identifiers.
- */
-VALUE
-ruby_xml_dtd_initialize(int argc, VALUE *argv, VALUE class) {
-  ruby_xml_dtd *rxdtd;
-  VALUE external, system, dtd_string;
-  xmlParserInputBufferPtr buffer;
-  xmlCharEncoding enc = XML_CHAR_ENCODING_NONE;
-  xmlChar *new_string;
-
-  // 1 argument -- string               --> parsujeme jako dtd
-  // 2 argumenty -- public, system      --> bude se hledat
-  switch (argc) {
-  case 2:
-    rb_scan_args(argc, argv, "20", &external, &system);
-
-    Check_Type(external, T_STRING);
-    Check_Type(system,   T_STRING);
-    rxdtd = ALLOC(ruby_xml_dtd);
-    rxdtd->dtd = xmlParseDTD( (xmlChar*)StringValuePtr(external),
-                              (xmlChar*)StringValuePtr(system) );
-    if (rxdtd->dtd == NULL) {
-      ruby_xfree(rxdtd);
-      return(Qfalse);
-    }
-
-    xmlSetTreeDoc( (xmlNodePtr)rxdtd->dtd, NULL );
-    return( Data_Wrap_Struct(cXMLDtd, ruby_xml_dtd_mark, ruby_xml_dtd_free, rxdtd) );
-    break;
-
-/*
-SV *
-new(CLASS, external, system)
-        char * CLASS
-        char * external
-        char * system
-    ALIAS:
-        parse_uri = 1
-    PREINIT:
-        xmlDtdPtr dtd = NULL;
-    CODE:
-        LibXML_error = sv_2mortal(newSVpv("", 0));
-        dtd = xmlParseDTD((const xmlChar*)external, (const xmlChar*)system);
-        if ( dtd == NULL ) {
-            XSRETURN_UNDEF;
-        }
-        xmlSetTreeDoc((xmlNodePtr)dtd, NULL);
-        RETVAL = PmmNodeToSv( (xmlNodePtr) dtd, NULL );
-    OUTPUT:
-        RETVAL
-*/
-
-  case 1:
-
-    rb_scan_args(argc, argv, "10", &dtd_string);
-    buffer = xmlAllocParserInputBuffer(enc);
-    //if ( !buffer) return Qnil
-    new_string = xmlStrdup((xmlChar*)StringValuePtr(dtd_string));
-    xmlParserInputBufferPush(buffer, xmlStrlen(new_string), (const char*)new_string);
-
-    rxdtd = ALLOC(ruby_xml_dtd);
-    rxdtd->dtd = xmlIOParseDTD(NULL, buffer, enc);
-
-    // NOTE: For some reason freeing this InputBuffer causes a segfault! 
-    // xmlFreeParserInputBuffer(buffer); 
-    xmlFree(new_string);
-
-    return( Data_Wrap_Struct(cXMLDtd, ruby_xml_dtd_mark, ruby_xml_dtd_free, rxdtd) );
-
-    break;
-/*
-SV * parse_string(CLASS, str, ...)
-        char * CLASS
-        char * str
-    PREINIT:
-        STRLEN n_a;
-        xmlDtdPtr res;
-        SV * encoding_sv;
-        xmlParserInputBufferPtr buffer;
-        xmlCharEncoding enc = XML_CHAR_ENCODING_NONE;
-        xmlChar * new_string;
-        STRLEN len;
-    CODE:
-        LibXML_init_error();
-        if (items > 2) {
-            encoding_sv = ST(2);
-            if (items > 3) {
-                croak("parse_string: too many parameters");
-            }
-            // warn("getting encoding...\n"); 
-            enc = xmlParseCharEncoding(SvPV(encoding_sv, n_a));
-            if (enc == XML_CHAR_ENCODING_ERROR) {
-                croak("Parse of encoding %s failed: %s", SvPV(encoding_sv, n_a), SvPV(LibXML_error, n_a));
-            }
-        }
-        buffer = xmlAllocParserInputBuffer(enc);
-        // buffer = xmlParserInputBufferCreateMem(str, xmlStrlen(str), enc); 
-        if ( !buffer)
-            croak("cant create buffer!\n" );
-
-        new_string = xmlStrdup((const xmlChar*)str);
-        xmlParserInputBufferPush(buffer, xmlStrlen(new_string), (const char*)new_string);
-
-        res = xmlIOParseDTD(NULL, buffer, enc);
-
-        // NOTE: For some reason freeing this InputBuffer causes a segfault! 
-        // xmlFreeParserInputBuffer(buffer); 
-        xmlFree(new_string);
-
-        sv_2mortal( LibXML_error );
-        LibXML_croak_error();
-
-        if (res == NULL) {
-            croak("no DTD parsed!");
-        }
-        RETVAL = PmmNodeToSv((xmlNodePtr)res, NULL);
-    OUTPUT:
-        RETVAL
- */
-    
-  default:
-    rb_raise(rb_eArgError, "wrong number of arguments (need 1 or 2)");
-  }
-
-  //docobj = ruby_xml_document_new2(cXMLDocument, xmlver);
-  return Qnil;
-}
-
-// Rdoc needs to know 
-#ifdef RDOC_NEVER_DEFINED
-  mLibXML = rb_define_module("LibXML");
-  mXML = rb_define_module_under(mLibXML, "XML");
-#endif
-
-void
-ruby_init_xml_dtd(void) {
-  cXMLDtd = rb_define_class_under(mXML, "Dtd", rb_cObject);
-  rb_define_singleton_method(cXMLDtd, "new", ruby_xml_dtd_initialize, -1);
-  //rb_define_method(cXMLDocument, "xinclude", ruby_xml_document_xinclude, 0);
-}
-
+#include "ruby_libxml.h"
+#include "ruby_xml_dtd.h"
+
+VALUE cXMLDtd;
+
+void
+ruby_xml_dtd_free(ruby_xml_dtd *rxdtd) {
+  if (rxdtd->dtd != NULL) {
+    xmlFreeDtd(rxdtd->dtd);
+    rxdtd->dtd = NULL;
+  }
+
+  ruby_xfree(rxdtd);
+}
+
+static void
+ruby_xml_dtd_mark(ruby_xml_dtd *rxdtd) {
+  return;
+  //if (rxdtd == NULL) return;
+  //if (!NIL_P(rxd->xmlver)) rb_gc_mark(rxd->xmlver);
+}
+
+/*
+ * call-seq:
+ *    XML::Dtd.new("public system") -> dtd
+ *    XML::Dtd.new("public", "system") -> dtd
+ * 
+ * Create a new Dtd from the specified public and system
+ * identifiers.
+ */
+VALUE
+ruby_xml_dtd_initialize(int argc, VALUE *argv, VALUE class) {
+  ruby_xml_dtd *rxdtd;
+  VALUE external, system, dtd_string;
+  xmlParserInputBufferPtr buffer;
+  xmlCharEncoding enc = XML_CHAR_ENCODING_NONE;
+  xmlChar *new_string;
+
+  // 1 argument -- string               --> parsujeme jako dtd
+  // 2 argumenty -- public, system      --> bude se hledat
+  switch (argc) {
+  case 2:
+    rb_scan_args(argc, argv, "20", &external, &system);
+
+    Check_Type(external, T_STRING);
+    Check_Type(system,   T_STRING);
+    rxdtd = ALLOC(ruby_xml_dtd);
+    rxdtd->dtd = xmlParseDTD( (xmlChar*)StringValuePtr(external),
+                              (xmlChar*)StringValuePtr(system) );
+    if (rxdtd->dtd == NULL) {
+      ruby_xfree(rxdtd);
+      return(Qfalse);
+    }
+
+    xmlSetTreeDoc( (xmlNodePtr)rxdtd->dtd, NULL );
+    return( Data_Wrap_Struct(cXMLDtd, ruby_xml_dtd_mark, ruby_xml_dtd_free, rxdtd) );
+    break;
+
+/*
+SV *
+new(CLASS, external, system)
+        char * CLASS
+        char * external
+        char * system
+    ALIAS:
+        parse_uri = 1
+    PREINIT:
+        xmlDtdPtr dtd = NULL;
+    CODE:
+        LibXML_error = sv_2mortal(newSVpv("", 0));
+        dtd = xmlParseDTD((const xmlChar*)external, (const xmlChar*)system);
+        if ( dtd == NULL ) {
+            XSRETURN_UNDEF;
+        }
+        xmlSetTreeDoc((xmlNodePtr)dtd, NULL);
+        RETVAL = PmmNodeToSv( (xmlNodePtr) dtd, NULL );
+    OUTPUT:
+        RETVAL
+*/
+
+  case 1:
+
+    rb_scan_args(argc, argv, "10", &dtd_string);
+    buffer = xmlAllocParserInputBuffer(enc);
+    //if ( !buffer) return Qnil
+    new_string = xmlStrdup((xmlChar*)StringValuePtr(dtd_string));
+    xmlParserInputBufferPush(buffer, xmlStrlen(new_string), (const char*)new_string);
+
+    rxdtd = ALLOC(ruby_xml_dtd);
+    rxdtd->dtd = xmlIOParseDTD(NULL, buffer, enc);
+
+    // NOTE: For some reason freeing this InputBuffer causes a segfault! 
+    // xmlFreeParserInputBuffer(buffer); 
+    xmlFree(new_string);
+
+    return( Data_Wrap_Struct(cXMLDtd, ruby_xml_dtd_mark, ruby_xml_dtd_free, rxdtd) );
+
+    break;
+/*
+SV * parse_string(CLASS, str, ...)
+        char * CLASS
+        char * str
+    PREINIT:
+        STRLEN n_a;
+        xmlDtdPtr res;
+        SV * encoding_sv;
+        xmlParserInputBufferPtr buffer;
+        xmlCharEncoding enc = XML_CHAR_ENCODING_NONE;
+        xmlChar * new_string;
+        STRLEN len;
+    CODE:
+        LibXML_init_error();
+        if (items > 2) {
+            encoding_sv = ST(2);
+            if (items > 3) {
+                croak("parse_string: too many parameters");
+            }
+            // warn("getting encoding...\n"); 
+            enc = xmlParseCharEncoding(SvPV(encoding_sv, n_a));
+            if (enc == XML_CHAR_ENCODING_ERROR) {
+                croak("Parse of encoding %s failed: %s", SvPV(encoding_sv, n_a), SvPV(LibXML_error, n_a));
+            }
+        }
+        buffer = xmlAllocParserInputBuffer(enc);
+        // buffer = xmlParserInputBufferCreateMem(str, xmlStrlen(str), enc); 
+        if ( !buffer)
+            croak("cant create buffer!\n" );
+
+        new_string = xmlStrdup((const xmlChar*)str);
+        xmlParserInputBufferPush(buffer, xmlStrlen(new_string), (const char*)new_string);
+
+        res = xmlIOParseDTD(NULL, buffer, enc);
+
+        // NOTE: For some reason freeing this InputBuffer causes a segfault! 
+        // xmlFreeParserInputBuffer(buffer); 
+        xmlFree(new_string);
+
+        sv_2mortal( LibXML_error );
+        LibXML_croak_error();
+
+        if (res == NULL) {
+            croak("no DTD parsed!");
+        }
+        RETVAL = PmmNodeToSv((xmlNodePtr)res, NULL);
+    OUTPUT:
+        RETVAL
+ */
+    
+  default:
+    rb_raise(rb_eArgError, "wrong number of arguments (need 1 or 2)");
+  }
+
+  //docobj = ruby_xml_document_new2(cXMLDocument, xmlver);
+  return Qnil;
+}
+
+// Rdoc needs to know 
+#ifdef RDOC_NEVER_DEFINED
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
+#endif
+
+void
+ruby_init_xml_dtd(void) {
+  cXMLDtd = rb_define_class_under(mXML, "Dtd", rb_cObject);
+  rb_define_singleton_method(cXMLDtd, "new", ruby_xml_dtd_initialize, -1);
+  //rb_define_method(cXMLDocument, "xinclude", ruby_xml_document_xinclude, 0);
+}
+