libxml-ruby 0.9.5 → 0.9.6

data/ext/libxml/ruby_xml_reader.h

@@ -1,8 +1,8 @@
 /* Copyright (c) 2006 Apple Computer Inc.
  * Please see the LICENSE file for copyright and distribution information. */
 
-#ifndef __rxml_READER__
-#define __rxml_READER__
+#ifndef __RXML_READER__
+#define __RXML_READER__
 
 extern VALUE cXMLReader;
 

data/ext/libxml/ruby_xml_relaxng.h

@@ -1,5 +1,5 @@
-#ifndef __rxml_RELAXNG__
-#define __rxml_RELAXNG__
+#ifndef __RXML_RELAXNG__
+#define __RXML_RELAXNG__
 
 #include <libxml/relaxng.h>
 

data/ext/libxml/ruby_xml_sax_parser.c

@@ -1,175 +1,175 @@
-/* $Id: ruby_xml_sax_parser.c 650 2008-11-30 03:40:22Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#include "ruby_libxml.h"
-#include "ruby_xml_sax_parser.h"
-
-/*
- * Document-class: LibXML::XML::SaxParser
- *
- * XML::SaxParser provides a callback based API for parsing documents,
- * in contrast to XML::Parser's tree based API and XML::Reader's stream
- * based API.
- *
- * Note that the XML::SaxParser API is fairly complex, not well standardized,
- * and does not directly support validation making entity, namespace and
- * base processing relatively hard.
- *
- * To use the XML::SaxParser, register a callback class via the
- * XML::SaxParser#callbacks=.  It is easiest to include the
- * XML::SaxParser::Callbacks module in your class and override
- * the methods as needed.
- *
- * Basic example:
- *
- *   class MyCallbacks
- *     include XML::SaxParser::Callbacks
- *     def on_start_element(element, attributes)
- *       puts #Element started: #{element}"
- *     end
- *   end
- *
- *   parser = XML::SaxParser.new
- *   parser.callbacks = MyCallbacks.new
- *   parser.parse
- */
-
-VALUE cXMLSaxParser;
-VALUE mXMLSaxParserCallbacks;
-
-static ID INPUT_ATTR;
-static ID CALLBACKS_ATTR;
-
-VALUE cbidOnInternalSubset;
-VALUE cbidOnIsStandalone;
-VALUE cbidOnHasInternalSubset;
-VALUE cbidOnHasExternalSubset;
-VALUE cbidOnStartDocument;
-VALUE cbidOnEndDocument;
-VALUE cbidOnStartElement;
-VALUE cbidOnEndElement;
-VALUE cbidOnReference;
-VALUE cbidOnCharacters;
-VALUE cbidOnProcessingInstruction;
-VALUE cbidOnComment;
-VALUE cbidOnXmlParserWarning;
-VALUE cbidOnXmlParserError;
-VALUE cbidOnXmlParserFatalError;
-VALUE cbidOnCdataBlock;
-VALUE cbidOnExternalSubset;
-
-#include "sax_parser_callbacks.inc"
-
-/*
- * call-seq:
- *    sax_parser.initialize -> sax_parser
- *
- * Initiliazes instance of parser.
- */
-static VALUE rxml_sax_parser_initialize(VALUE self)
-{
-  VALUE input = rb_class_new_instance(0, NULL, cXMLInput);
-  rb_iv_set(self, "@input", input);
-  return self;
-}
-
-/* Parsing data sources */
-static int rxml_sax_parser_parse_file(VALUE self, VALUE input)
-{
-  VALUE file = rb_ivar_get(input, FILE_ATTR);
-  return xmlSAXUserParseFile((xmlSAXHandlerPtr) & rxml_sax_hander_struct,
-      (void *) self, StringValuePtr(file));
-}
-
-static int rxml_sax_parser_parse_string(VALUE self, VALUE input)
-{
-  VALUE str = rb_ivar_get(input, STRING_ATTR);
-  return xmlSAXUserParseMemory((xmlSAXHandlerPtr) & rxml_sax_hander_struct,
-      (void *) self, StringValuePtr(str), RSTRING_LEN(str));
-}
-
-static int rxml_sax_parser_parse_io(VALUE self, VALUE input)
-{
-  VALUE io = rb_ivar_get(input, IO_ATTR);
-  VALUE encoding = rb_ivar_get(input, ENCODING_ATTR);
-  xmlCharEncoding xmlEncoding = NUM2INT(encoding);
-  xmlParserCtxtPtr ctxt =
-      xmlCreateIOParserCtxt((xmlSAXHandlerPtr) & rxml_sax_hander_struct,
-          (void *) self, (xmlInputReadCallback) rxml_read_callback, NULL,
-          (void *) io, xmlEncoding);
-  return xmlParseDocument(ctxt);
-}
-
-/*
- * call-seq:
- *    parser.parse -> (true|false)
- *
- * Parse the input XML, generating callbacks to the object
- * registered via the +callbacks+ attributesibute.
- */
-static VALUE rxml_sax_parser_parse(VALUE self)
-{
-  int status;
-  VALUE input = rb_ivar_get(self, INPUT_ATTR);
-
-  if (rb_ivar_get(input, FILE_ATTR) != Qnil)
-    status = rxml_sax_parser_parse_file(self, input);
-  else if (rb_ivar_get(input, STRING_ATTR) != Qnil)
-    status = rxml_sax_parser_parse_string(self, input);
-  else if (rb_ivar_get(input, IO_ATTR) != Qnil)
-    status = rxml_sax_parser_parse_io(self, input);
-  else
-    rb_raise(rb_eArgError, "You must specify a parser data source");
-
-  if (status)
-  {
-    rxml_raise(&xmlLastError);
-    return Qfalse;
-  }
-  else
-  {
-    return (Qtrue);
-  }
-}
-
-// 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_sax_parser(void)
-{
-  /* SaxParser */
-  cXMLSaxParser = rb_define_class_under(mXML, "SaxParser", rb_cObject);
-
-  /* Atributes */
-  CALLBACKS_ATTR = rb_intern("@callbacks");
-  INPUT_ATTR = rb_intern("@input");
-  rb_define_attr(cXMLSaxParser, "callbacks", 1, 1);
-  rb_define_attr(cXMLSaxParser, "input", 1, 0);
-
-  /* Instance Methods */
-  rb_define_method(cXMLSaxParser, "initialize", rxml_sax_parser_initialize, 0);
-  rb_define_method(cXMLSaxParser, "parse", rxml_sax_parser_parse, 0);
-
-  /* SaxCallbacks */
-  cbidOnInternalSubset = rb_intern("on_internal_subset");
-  cbidOnIsStandalone = rb_intern("on_is_standalone");
-  cbidOnHasInternalSubset = rb_intern("on_has_internal_subset");
-  cbidOnHasExternalSubset = rb_intern("on_has_external_subset");
-  cbidOnStartDocument = rb_intern("on_start_document");
-  cbidOnEndDocument = rb_intern("on_end_document");
-  cbidOnStartElement = rb_intern("on_start_element");
-  cbidOnEndElement = rb_intern("on_end_element");
-  cbidOnReference = rb_intern("on_reference");
-  cbidOnCharacters = rb_intern("on_characters");
-  cbidOnProcessingInstruction = rb_intern("on_processing_instruction");
-  cbidOnComment = rb_intern("on_comment");
-  cbidOnXmlParserWarning = rb_intern("on_parser_warning");
-  cbidOnXmlParserError = rb_intern("on_parser_error");
-  cbidOnXmlParserFatalError = rb_intern("on_parser_fatal_error");
-  cbidOnCdataBlock = rb_intern("on_cdata_block");
-  cbidOnExternalSubset = rb_intern("on_external_subset");
-}
+/* $Id: ruby_xml_sax_parser.c 650 2008-11-30 03:40:22Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#include "ruby_libxml.h"
+#include "ruby_xml_sax_parser.h"
+
+/*
+ * Document-class: LibXML::XML::SaxParser
+ *
+ * XML::SaxParser provides a callback based API for parsing documents,
+ * in contrast to XML::Parser's tree based API and XML::Reader's stream
+ * based API.
+ *
+ * Note that the XML::SaxParser API is fairly complex, not well standardized,
+ * and does not directly support validation making entity, namespace and
+ * base processing relatively hard.
+ *
+ * To use the XML::SaxParser, register a callback class via the
+ * XML::SaxParser#callbacks=.  It is easiest to include the
+ * XML::SaxParser::Callbacks module in your class and override
+ * the methods as needed.
+ *
+ * Basic example:
+ *
+ *   class MyCallbacks
+ *     include XML::SaxParser::Callbacks
+ *     def on_start_element(element, attributes)
+ *       puts #Element started: #{element}"
+ *     end
+ *   end
+ *
+ *   parser = XML::SaxParser.new
+ *   parser.callbacks = MyCallbacks.new
+ *   parser.parse
+ */
+
+VALUE cXMLSaxParser;
+VALUE mXMLSaxParserCallbacks;
+
+static ID INPUT_ATTR;
+static ID CALLBACKS_ATTR;
+
+VALUE cbidOnInternalSubset;
+VALUE cbidOnIsStandalone;
+VALUE cbidOnHasInternalSubset;
+VALUE cbidOnHasExternalSubset;
+VALUE cbidOnStartDocument;
+VALUE cbidOnEndDocument;
+VALUE cbidOnStartElement;
+VALUE cbidOnEndElement;
+VALUE cbidOnReference;
+VALUE cbidOnCharacters;
+VALUE cbidOnProcessingInstruction;
+VALUE cbidOnComment;
+VALUE cbidOnXmlParserWarning;
+VALUE cbidOnXmlParserError;
+VALUE cbidOnXmlParserFatalError;
+VALUE cbidOnCdataBlock;
+VALUE cbidOnExternalSubset;
+
+#include "sax_parser_callbacks.inc"
+
+/*
+ * call-seq:
+ *    sax_parser.initialize -> sax_parser
+ *
+ * Initiliazes instance of parser.
+ */
+static VALUE rxml_sax_parser_initialize(VALUE self)
+{
+  VALUE input = rb_class_new_instance(0, NULL, cXMLInput);
+  rb_iv_set(self, "@input", input);
+  return self;
+}
+
+/* Parsing data sources */
+static int rxml_sax_parser_parse_file(VALUE self, VALUE input)
+{
+  VALUE file = rb_ivar_get(input, FILE_ATTR);
+  return xmlSAXUserParseFile((xmlSAXHandlerPtr) & rxml_sax_hander_struct,
+      (void *) self, StringValuePtr(file));
+}
+
+static int rxml_sax_parser_parse_string(VALUE self, VALUE input)
+{
+  VALUE str = rb_ivar_get(input, STRING_ATTR);
+  return xmlSAXUserParseMemory((xmlSAXHandlerPtr) & rxml_sax_hander_struct,
+      (void *) self, StringValuePtr(str), RSTRING_LEN(str));
+}
+
+static int rxml_sax_parser_parse_io(VALUE self, VALUE input)
+{
+  VALUE io = rb_ivar_get(input, IO_ATTR);
+  VALUE encoding = rb_ivar_get(input, ENCODING_ATTR);
+  xmlCharEncoding xmlEncoding = NUM2INT(encoding);
+  xmlParserCtxtPtr ctxt =
+      xmlCreateIOParserCtxt((xmlSAXHandlerPtr) & rxml_sax_hander_struct,
+          (void *) self, (xmlInputReadCallback) rxml_read_callback, NULL,
+          (void *) io, xmlEncoding);
+  return xmlParseDocument(ctxt);
+}
+
+/*
+ * call-seq:
+ *    parser.parse -> (true|false)
+ *
+ * Parse the input XML, generating callbacks to the object
+ * registered via the +callbacks+ attributesibute.
+ */
+static VALUE rxml_sax_parser_parse(VALUE self)
+{
+  int status;
+  VALUE input = rb_ivar_get(self, INPUT_ATTR);
+
+  if (rb_ivar_get(input, FILE_ATTR) != Qnil)
+    status = rxml_sax_parser_parse_file(self, input);
+  else if (rb_ivar_get(input, STRING_ATTR) != Qnil)
+    status = rxml_sax_parser_parse_string(self, input);
+  else if (rb_ivar_get(input, IO_ATTR) != Qnil)
+    status = rxml_sax_parser_parse_io(self, input);
+  else
+    rb_raise(rb_eArgError, "You must specify a parser data source");
+
+  if (status)
+  {
+    rxml_raise(&xmlLastError);
+    return Qfalse;
+  }
+  else
+  {
+    return (Qtrue);
+  }
+}
+
+// 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_sax_parser(void)
+{
+  /* SaxParser */
+  cXMLSaxParser = rb_define_class_under(mXML, "SaxParser", rb_cObject);
+
+  /* Atributes */
+  CALLBACKS_ATTR = rb_intern("@callbacks");
+  INPUT_ATTR = rb_intern("@input");
+  rb_define_attr(cXMLSaxParser, "callbacks", 1, 1);
+  rb_define_attr(cXMLSaxParser, "input", 1, 0);
+
+  /* Instance Methods */
+  rb_define_method(cXMLSaxParser, "initialize", rxml_sax_parser_initialize, 0);
+  rb_define_method(cXMLSaxParser, "parse", rxml_sax_parser_parse, 0);
+
+  /* SaxCallbacks */
+  cbidOnInternalSubset = rb_intern("on_internal_subset");
+  cbidOnIsStandalone = rb_intern("on_is_standalone");
+  cbidOnHasInternalSubset = rb_intern("on_has_internal_subset");
+  cbidOnHasExternalSubset = rb_intern("on_has_external_subset");
+  cbidOnStartDocument = rb_intern("on_start_document");
+  cbidOnEndDocument = rb_intern("on_end_document");
+  cbidOnStartElement = rb_intern("on_start_element");
+  cbidOnEndElement = rb_intern("on_end_element");
+  cbidOnReference = rb_intern("on_reference");
+  cbidOnCharacters = rb_intern("on_characters");
+  cbidOnProcessingInstruction = rb_intern("on_processing_instruction");
+  cbidOnComment = rb_intern("on_comment");
+  cbidOnXmlParserWarning = rb_intern("on_parser_warning");
+  cbidOnXmlParserError = rb_intern("on_parser_error");
+  cbidOnXmlParserFatalError = rb_intern("on_parser_fatal_error");
+  cbidOnCdataBlock = rb_intern("on_cdata_block");
+  cbidOnExternalSubset = rb_intern("on_external_subset");
+}

data/ext/libxml/ruby_xml_sax_parser.h

@@ -1,9 +1,9 @@
-/* $Id: ruby_xml_sax_parser.h 616 2008-11-22 09:25:12Z cfis $ */
+/* $Id: ruby_xml_sax_parser.h 666 2008-12-07 00:16:50Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
-#ifndef __rxml_SAX_PARSER__
-#define __rxml_SAX_PARSER__
+#ifndef __RXML_SAX_PARSER__
+#define __RXML_SAX_PARSER__
 
 extern VALUE cXMLSaxParser;
 

data/ext/libxml/ruby_xml_schema.c

@@ -1,165 +1,165 @@
-#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 rxml_schema_free(xmlSchemaPtr xschema)
-{
-  xmlSchemaFree(xschema);
-}
-
-/*
- * call-seq:
- *    XML::Schema.initialize(schema_uri) -> schema
- *
- * Create a new schema from the specified URI.
- */
-static VALUE rxml_schema_init_from_uri(VALUE class, VALUE uri)
-{
-  xmlSchemaParserCtxtPtr xparser;
-  xmlSchemaPtr xschema;
-
-  Check_Type(uri, T_STRING);
-
-  xparser = xmlSchemaNewParserCtxt(StringValuePtr(uri));
-  xschema = xmlSchemaParse(xparser);
-  xmlSchemaFreeParserCtxt(xparser);
-
-  return Data_Wrap_Struct(cXMLSchema, NULL, rxml_schema_free, xschema);
-}
-
-/*
- * call-seq:
- *    XML::Schema.document(document) -> schema
- *
- * Create a new schema from the specified document.
- */
-static VALUE rxml_schema_init_from_document(VALUE class, VALUE document)
-{
-  xmlDocPtr xdoc;
-  xmlSchemaPtr xschema;
-  xmlSchemaParserCtxtPtr xparser;
-
-  Data_Get_Struct(document, xmlDoc, xdoc);
-
-  xparser = xmlSchemaNewDocParserCtxt(xdoc);
-  xschema = xmlSchemaParse(xparser);
-  xmlSchemaFreeParserCtxt(xparser);
-
-  return Data_Wrap_Struct(cXMLSchema, NULL, rxml_schema_free, xschema);
-}
-
-/*
- * call-seq:
- *    XML::Schema.string("schema_data") -> "value"
- *
- * Create a new schema using the specified string.
- */
-static VALUE rxml_schema_init_from_string(VALUE self, VALUE schema_str)
-{
-  xmlSchemaParserCtxtPtr xparser;
-  xmlSchemaPtr xschema;
-
-  Check_Type(schema_str, T_STRING);
-
-  xparser = xmlSchemaNewMemParserCtxt(StringValuePtr(schema_str), strlen(
-      StringValuePtr(schema_str)));
-  xschema = xmlSchemaParse(xparser);
-  xmlSchemaFreeParserCtxt(xparser);
-
-  return Data_Wrap_Struct(cXMLSchema, NULL, rxml_schema_free, xschema);
-}
-
-/* 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", rxml_schema_init_from_uri, 1);
-  rb_define_singleton_method(cXMLSchema, "from_string",
-      rxml_schema_init_from_string, 1);
-  rb_define_singleton_method(cXMLSchema, "document",
-      rxml_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 rxml_schema_free(xmlSchemaPtr xschema)
+{
+  xmlSchemaFree(xschema);
+}
+
+/*
+ * call-seq:
+ *    XML::Schema.initialize(schema_uri) -> schema
+ *
+ * Create a new schema from the specified URI.
+ */
+static VALUE rxml_schema_init_from_uri(VALUE class, VALUE uri)
+{
+  xmlSchemaParserCtxtPtr xparser;
+  xmlSchemaPtr xschema;
+
+  Check_Type(uri, T_STRING);
+
+  xparser = xmlSchemaNewParserCtxt(StringValuePtr(uri));
+  xschema = xmlSchemaParse(xparser);
+  xmlSchemaFreeParserCtxt(xparser);
+
+  return Data_Wrap_Struct(cXMLSchema, NULL, rxml_schema_free, xschema);
+}
+
+/*
+ * call-seq:
+ *    XML::Schema.document(document) -> schema
+ *
+ * Create a new schema from the specified document.
+ */
+static VALUE rxml_schema_init_from_document(VALUE class, VALUE document)
+{
+  xmlDocPtr xdoc;
+  xmlSchemaPtr xschema;
+  xmlSchemaParserCtxtPtr xparser;
+
+  Data_Get_Struct(document, xmlDoc, xdoc);
+
+  xparser = xmlSchemaNewDocParserCtxt(xdoc);
+  xschema = xmlSchemaParse(xparser);
+  xmlSchemaFreeParserCtxt(xparser);
+
+  return Data_Wrap_Struct(cXMLSchema, NULL, rxml_schema_free, xschema);
+}
+
+/*
+ * call-seq:
+ *    XML::Schema.string("schema_data") -> "value"
+ *
+ * Create a new schema using the specified string.
+ */
+static VALUE rxml_schema_init_from_string(VALUE self, VALUE schema_str)
+{
+  xmlSchemaParserCtxtPtr xparser;
+  xmlSchemaPtr xschema;
+
+  Check_Type(schema_str, T_STRING);
+
+  xparser = xmlSchemaNewMemParserCtxt(StringValuePtr(schema_str), strlen(
+      StringValuePtr(schema_str)));
+  xschema = xmlSchemaParse(xparser);
+  xmlSchemaFreeParserCtxt(xparser);
+
+  return Data_Wrap_Struct(cXMLSchema, NULL, rxml_schema_free, xschema);
+}
+
+/* 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", rxml_schema_init_from_uri, 1);
+  rb_define_singleton_method(cXMLSchema, "from_string",
+      rxml_schema_init_from_string, 1);
+  rb_define_singleton_method(cXMLSchema, "document",
+      rxml_schema_init_from_document, 1);
+}
+