libxml-ruby 0.8.3 → 0.9.0

data/ext/libxml/ruby_xml_sax_parser.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_sax_parser.h 111 2006-11-20 01:39:14Z roscopeco $ */
+/* $Id: ruby_xml_sax_parser.h 544 2008-11-16 09:50:27Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -6,51 +6,15 @@
 #define __RUBY_XML_SAX_PARSER__
 
 extern VALUE cXMLSaxParser;
-extern VALUE mXMLSaxParserCallbacks;
-
-/*
-typedef struct ruby_xml_sax_parser_callbacks {
-    VALUE internalSubset;
-    VALUE isStandalone;
-    VALUE hasInternalSubset;
-    VALUE hasExternalSubset;
-    VALUE resolveEntity;
-    VALUE getEntity;
-    VALUE entityDecl;
-    VALUE notationDecl;
-    VALUE attributeDecl;
-    VALUE elementDecl;
-    VALUE unparsedEntityDecl;
-    VALUE setDocumentLocator;
-    VALUE startDocument;
-    VALUE endDocument;
-    VALUE startElement;
-    VALUE endElement;
-    VALUE reference;
-    VALUE characters;
-    VALUE ignorableWhitespace;
-    VALUE processingInstruction;
-    VALUE comment;
-    VALUE xmlParserWarning;
-    VALUE xmlParserError;
-    VALUE xmlParserFatalError;
-    VALUE getParameterEntity;
-    VALUE cdataBlock;
-    VALUE externalSubset;  
-} ruby_xml_sax_parser_callbacks;
-*/
 
 typedef struct ruby_xml_sax_parser {
   xmlParserCtxtPtr xpc;
   xmlSAXHandlerPtr xsh;
-  //ruby_xml_sax_parser_callbacks *cbp;
   VALUE callbackHandler;
   VALUE filename;
   VALUE str;
 } ruby_xml_sax_parser;
 
-void ruby_xml_sax_parser_free(ruby_xml_sax_parser *rxsp);
 void ruby_init_xml_sax_parser(void);
-VALUE ruby_xml_sax_parser_new(VALUE class);
 
 #endif

data/ext/libxml/ruby_xml_schema.c

@@ -1,145 +1,174 @@
-#include "ruby_libxml.h"
-#include "ruby_xml_schema.h"
-
-VALUE cXMLSchema;
-
-// Rdoc needs to know 
-#ifdef RDOC_NEVER_DEFINED
-  mLibXML = rb_define_module("LibXML");
-  mXML = rb_define_module_under(mLibXML, "XML");
-#endif
-
-static void
-ruby_xml_schema_mark(ruby_xml_schema *rxschema) {
-  return;
-}
-
-void
-ruby_xml_schema_free(ruby_xml_schema *rxschema) {
-  if (rxschema->schema != NULL) {
-    xmlSchemaFree(rxschema->schema);
-    rxschema->schema = NULL;
-  }
-
-  ruby_xfree(rxschema);
-}
-
-/*
- * call-seq:
- *    XML::Schema.new(schema_uri) -> schema
- * 
- * Create a new schema from the specified URI.
- */
-VALUE
-ruby_xml_schema_init_from_uri(VALUE class, VALUE uri) {
-  xmlSchemaParserCtxtPtr parser;
-  ruby_xml_schema *schema;
-
-  Check_Type(uri, T_STRING);
-
-  parser = xmlSchemaNewParserCtxt(StringValuePtr(uri));
-  schema = ALLOC(ruby_xml_schema);
-  schema->schema = xmlSchemaParse(parser);
-  xmlSchemaFreeParserCtxt(parser);
-
-  return Data_Wrap_Struct(cXMLSchema, ruby_xml_schema_mark, ruby_xml_schema_free, schema);
-}
-
-/*
- * call-seq:
- *    XML::Schema.document(document) -> schema
- * 
- * Create a new schema from the specified document.
- */
-VALUE
-ruby_xml_schema_init_from_document(VALUE class, VALUE document) {
-  ruby_xml_document_t *rdoc;
-  ruby_xml_schema *schema;
-  xmlSchemaParserCtxtPtr parser;
-
-  Data_Get_Struct(document, ruby_xml_document_t, rdoc);
-
-  parser = xmlSchemaNewDocParserCtxt(rdoc->doc);
-  schema = ALLOC(ruby_xml_schema);
-  schema->schema = xmlSchemaParse(parser);
-  xmlSchemaFreeParserCtxt(parser);
-
-  return Data_Wrap_Struct(cXMLSchema, ruby_xml_schema_mark, ruby_xml_schema_free, schema);
-}
-
-/*
- * call-seq:
- *    XML::Schema.string("schema_data") -> "value"
- * 
- * Create a new schema using the specified string.
- */
-VALUE
-ruby_xml_schema_init_from_string(VALUE self, VALUE schema_str) {
-  xmlSchemaParserCtxtPtr  parser;
-  ruby_xml_schema *rxschema;
-
-  Check_Type(schema_str, T_STRING);
-
-  parser = xmlSchemaNewMemParserCtxt(StringValuePtr(schema_str), strlen(StringValuePtr(schema_str)));
-  rxschema = ALLOC(ruby_xml_schema);
-  rxschema->schema = xmlSchemaParse(parser);
-  xmlSchemaFreeParserCtxt(parser);
-
-  return Data_Wrap_Struct(cXMLSchema, ruby_xml_schema_mark, ruby_xml_schema_free, rxschema);
-}
-  
-/* TODO what is this patch doing here?
- 
- 	xmlSchemaParserCtxtPtr  parser;
- 	xmlSchemaPtr            sptr;
- 	xmlSchemaValidCtxtPtr   vptr;
-+	int                     is_invalid;
- 	
- 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &source) == FAILURE) {
- 		return;
-@@ -598,26 +598,24 @@
- 			convert_to_string_ex(&source);
- 			parser = xmlSchemaNewParserCtxt(Z_STRVAL_P(source));
- 			sptr = xmlSchemaParse(parser);
- 			break;
- 		case SCHEMA_BLOB:
- 			convert_to_string_ex(&source);
- 			parser = xmlSchemaNewMemParserCtxt(Z_STRVAL_P(source), Z_STRLEN_P(source));
- 			sptr = xmlSchemaParse(parser);
- 			break;
- 	}
- 
- 	vptr = xmlSchemaNewValidCtxt(sptr);
-+	is_invalid = xmlSchemaValidateDoc(vptr, (xmlDocPtr) sxe->document->ptr);
- 	xmlSchemaFree(sptr);
- 	xmlSchemaFreeValidCtxt(vptr);
- 	xmlSchemaFreeParserCtxt(parser);
- 
--	if (is_valid) {
--		RETURN_TRUE;
--	} else {
-+	if (is_invalid) {
- 		RETURN_FALSE;
-+	} else {
-+		RETURN_TRUE;
- 	}
- }
-  }}} 
-@@ -695,7 +693,7 @@
- {
- 	if (!strcmp(method, "xsearch")) {
- 		simplexml_ce_xpath_search(INTERNAL_FUNCTION_PARAM_PASSTHRU);
--#ifdef xmlSchemaParserCtxtPtr
-+#ifdef LIBXML_SCHEMAS_ENABLED
- 	} else if (!strcmp(method, "validate_schema_file")) {
- 		simplexml_ce_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, SCHEMA_FILE);	
- 	} else if (!strcmp(method, "validate_schema_buffer")) {
-*/
-
-void  ruby_init_xml_schema(void) {
-  cXMLSchema = rb_define_class_under(mXML, "Schema", rb_cObject);
-  rb_define_singleton_method(cXMLSchema, "new",         ruby_xml_schema_init_from_uri, 1);
-  rb_define_singleton_method(cXMLSchema, "from_string", ruby_xml_schema_init_from_string, 1);
-  rb_define_singleton_method(cXMLSchema, "document",    ruby_xml_schema_init_from_document, 1);
-}
-
+#include "ruby_libxml.h"
+#include "ruby_xml_schema.h"
+
+/* 
+ * Document-class: LibXML::XML::Schema
+ *
+ * The XML::Schema class is used to prepare XML Schemas for validation of xml
+ * documents.
+ * 
+ * Schemas can be created from XML documents, strings or URIs using the
+ * corresponding methods (new for URIs).
+ *
+ * Once a schema is prepared, an XML document can be validated by the
+ * XML::Document#validate_schema method providing the XML::Schema object
+ * as parameter. The method return true if the document validates, false 
+ * otherwise.
+ *
+ * Basic usage:
+ * 
+ *  # parse schema as xml document
+ *  schema_document = XML::Document.file('schema.rng')
+ *
+ *  # prepare schema for validation
+ *  schema = XML::Schema.document(schema_document)
+ *
+ *  # parse xml document to be validated
+ *  instance = XML::Document.file('instance.xml')
+ *
+ *  # validate
+ *  instance.validate_schema(schema)
+ */
+
+VALUE cXMLSchema;
+
+// Rdoc needs to know 
+#ifdef RDOC_NEVER_DEFINED
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
+#endif
+
+static void
+ruby_xml_schema_mark(ruby_xml_schema *rxschema) {
+  return;
+}
+
+void
+ruby_xml_schema_free(ruby_xml_schema *rxschema) {
+  if (rxschema->schema != NULL) {
+    xmlSchemaFree(rxschema->schema);
+    rxschema->schema = NULL;
+  }
+
+  ruby_xfree(rxschema);
+}
+
+/*
+ * call-seq:
+ *    XML::Schema.new(schema_uri) -> schema
+ * 
+ * Create a new schema from the specified URI.
+ */
+VALUE
+ruby_xml_schema_init_from_uri(VALUE class, VALUE uri) {
+  xmlSchemaParserCtxtPtr parser;
+  ruby_xml_schema *schema;
+
+  Check_Type(uri, T_STRING);
+
+  parser = xmlSchemaNewParserCtxt(StringValuePtr(uri));
+  schema = ALLOC(ruby_xml_schema);
+  schema->schema = xmlSchemaParse(parser);
+  xmlSchemaFreeParserCtxt(parser);
+
+  return Data_Wrap_Struct(cXMLSchema, ruby_xml_schema_mark, ruby_xml_schema_free, schema);
+}
+
+/*
+ * call-seq:
+ *    XML::Schema.document(document) -> schema
+ * 
+ * Create a new schema from the specified document.
+ */
+VALUE
+ruby_xml_schema_init_from_document(VALUE class, VALUE document) {
+  xmlDocPtr xdoc;
+  ruby_xml_schema *schema;
+  xmlSchemaParserCtxtPtr parser;
+
+  Data_Get_Struct(document, xmlDoc, xdoc);
+
+  parser = xmlSchemaNewDocParserCtxt(xdoc);
+  schema = ALLOC(ruby_xml_schema);
+  schema->schema = xmlSchemaParse(parser);
+  xmlSchemaFreeParserCtxt(parser);
+
+  return Data_Wrap_Struct(cXMLSchema, ruby_xml_schema_mark, ruby_xml_schema_free, schema);
+}
+
+/*
+ * call-seq:
+ *    XML::Schema.string("schema_data") -> "value"
+ * 
+ * Create a new schema using the specified string.
+ */
+VALUE
+ruby_xml_schema_init_from_string(VALUE self, VALUE schema_str) {
+  xmlSchemaParserCtxtPtr  parser;
+  ruby_xml_schema *rxschema;
+
+  Check_Type(schema_str, T_STRING);
+
+  parser = xmlSchemaNewMemParserCtxt(StringValuePtr(schema_str), strlen(StringValuePtr(schema_str)));
+  rxschema = ALLOC(ruby_xml_schema);
+  rxschema->schema = xmlSchemaParse(parser);
+  xmlSchemaFreeParserCtxt(parser);
+
+  return Data_Wrap_Struct(cXMLSchema, ruby_xml_schema_mark, ruby_xml_schema_free, rxschema);
+}
+  
+/* TODO what is this patch doing here?
+ 
+ 	xmlSchemaParserCtxtPtr  parser;
+ 	xmlSchemaPtr            sptr;
+ 	xmlSchemaValidCtxtPtr   vptr;
++	int                     is_invalid;
+ 	
+ 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &source) == FAILURE) {
+ 		return;
+@@ -598,26 +598,24 @@
+ 			convert_to_string_ex(&source);
+ 			parser = xmlSchemaNewParserCtxt(Z_STRVAL_P(source));
+ 			sptr = xmlSchemaParse(parser);
+ 			break;
+ 		case SCHEMA_BLOB:
+ 			convert_to_string_ex(&source);
+ 			parser = xmlSchemaNewMemParserCtxt(Z_STRVAL_P(source), Z_STRLEN_P(source));
+ 			sptr = xmlSchemaParse(parser);
+ 			break;
+ 	}
+ 
+ 	vptr = xmlSchemaNewValidCtxt(sptr);
++	is_invalid = xmlSchemaValidateDoc(vptr, (xmlDocPtr) sxe->document->ptr);
+ 	xmlSchemaFree(sptr);
+ 	xmlSchemaFreeValidCtxt(vptr);
+ 	xmlSchemaFreeParserCtxt(parser);
+ 
+-	if (is_valid) {
+-		RETURN_TRUE;
+-	} else {
++	if (is_invalid) {
+ 		RETURN_FALSE;
++	} else {
++		RETURN_TRUE;
+ 	}
+ }
+  }}} 
+@@ -695,7 +693,7 @@
+ {
+ 	if (!strcmp(method, "xsearch")) {
+ 		simplexml_ce_xpath_search(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+-#ifdef xmlSchemaParserCtxtPtr
++#ifdef LIBXML_SCHEMAS_ENABLED
+ 	} else if (!strcmp(method, "validate_schema_file")) {
+ 		simplexml_ce_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, SCHEMA_FILE);	
+ 	} else if (!strcmp(method, "validate_schema_buffer")) {
+*/
+
+void  ruby_init_xml_schema(void) {
+  cXMLSchema = rb_define_class_under(mXML, "Schema", rb_cObject);
+  rb_define_singleton_method(cXMLSchema, "new",         ruby_xml_schema_init_from_uri, 1);
+  rb_define_singleton_method(cXMLSchema, "from_string", ruby_xml_schema_init_from_string, 1);
+  rb_define_singleton_method(cXMLSchema, "document",    ruby_xml_schema_init_from_document, 1);
+}
+

data/ext/libxml/ruby_xml_xinclude.c

@@ -1,12 +1,17 @@
-/* $Id: ruby_xml_xinclude.c 461 2008-07-15 21:35:56Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
+/* $Id: ruby_xml_xinclude.c 566 2008-11-18 06:53:36Z cfis $ */
 
 #include "ruby_libxml.h"
 #include "ruby_xml_xinclude.h"
 
 VALUE cXMLXInclude;
-VALUE eXMLXIncludeError;
+
+/*
+* Document-class: LibXML::XML::XInclude
+*
+* The ruby bindings do not currently expose libxml's 
+* XInclude fuctionality.
+*/
+
 
 // Rdoc needs to know 
 #ifdef RDOC_NEVER_DEFINED
@@ -17,5 +22,4 @@ VALUE eXMLXIncludeError;
 void
 ruby_init_xml_xinclude(void) {
   cXMLXInclude = rb_define_class_under(mXML, "XInclude", rb_cObject);
-  eXMLXIncludeError = rb_define_class_under(cXMLXInclude, "Error", rb_eRuntimeError);
 }

data/ext/libxml/ruby_xml_xpath.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpath.c 461 2008-07-15 21:35:56Z cfis $ */
+/* $Id: ruby_xml_xpath.c 566 2008-11-18 06:53:36Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -25,10 +25,31 @@
  *                             'xi' => 'http://www.w3.org/2001/XInclude')
  *
  *
- * === Working With Namespaces
+ * === Working With Default Namespaces
  *
  * Finding namespaced elements and attributes can be tricky.  
- * Lets work through some examples using the following xml document:
+ * Lets work through an example of a document with a default
+ * namespace:
+ *
+ *  <?xml version="1.0" encoding="utf-8"?>
+ *  <feed xmlns="http://www.w3.org/2005/Atom">
+ *    <title type="text">Phil Bogle's Contacts</title>
+ *  </feed>
+ *
+ * To find nodes you must define the atom namespace for
+ * libxml.  One way to do this is:
+ *
+ *   node = doc.find('atom:title', 'atom:http://www.w3.org/2005/Atom')
+ *
+ * Alternatively, you can register the default namespace like this:
+ *
+ *   doc.root.register_default_namespace('atom')
+ *   node = doc.find('atom:title')
+ *
+ * === More Complex Namespace Examples
+ *
+ * Lets work through some more complex examples using the 
+ * following xml document:
  *
  *  <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
  *    <soap:Body>
@@ -58,10 +79,9 @@
  *  # xpath expression.
  *  doc.find('/soap:Envelope/soap:Body/ns0:getManufacturerNamesResponse/ns0:IDAndNameList/ns1:IdAndName', 
              ['ns0:http://services.somewhere.com', 'ns1:http://domain.somewhere.com'])
-*/
+ */
 
 VALUE mXPath;
-VALUE eXMLXPathInvalidPath;
 
 // Rdoc needs to know 
 #ifdef RDOC_NEVER_DEFINED
@@ -72,7 +92,6 @@ VALUE eXMLXPathInvalidPath;
 void
 ruby_init_xml_xpath(void) {
   mXPath = rb_define_module_under(mXML, "XPath");
-  eXMLXPathInvalidPath = rb_define_class_under(mXPath, "InvalidPath", eXMLError);
 
   rb_define_const(mXPath, "UNDEFINED", INT2NUM(XPATH_UNDEFINED));
   rb_define_const(mXPath, "NODESET", INT2NUM(XPATH_NODESET));