libxml-ruby 2.9.0 → 3.0.0

data/ext/libxml/ruby_xml_parser.h

@@ -1,12 +1,12 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RXML_PARSER__
-#define __RXML_PARSER__
-
-#define MAX_LIBXML_FEATURES_LEN 50
-
-extern VALUE cXMLParser;
-
-void rxml_init_parser();
-
-#endif
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RXML_PARSER__
+#define __RXML_PARSER__
+
+#define MAX_LIBXML_FEATURES_LEN 50
+
+extern VALUE cXMLParser;
+
+void rxml_init_parser();
+
+#endif

data/ext/libxml/ruby_xml_parser_context.h

@@ -1,10 +1,10 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RXML_PARSER_CONTEXT__
-#define __RXML_PARSER_CONTEXT__
-
-extern VALUE cXMLParserContext;
-
-void rxml_init_parser_context(void);
-
-#endif
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RXML_PARSER_CONTEXT__
+#define __RXML_PARSER_CONTEXT__
+
+extern VALUE cXMLParserContext;
+
+void rxml_init_parser_context(void);
+
+#endif

data/ext/libxml/ruby_xml_parser_options.c

@@ -1,66 +1,66 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#include <stdarg.h>
-#include "ruby_libxml.h"
-
-/* Document-class: LibXML::XML::Parser::Options
- *
- * Options that control the operation of the HTMLParser.  The easiest
- * way to set a parser's options is to use the methods
- * XML::Parser.file, XML::Parser.io or XML::Parser.string.
- * For additional control, see XML::Parser::Context#options=.
-*/
-
-VALUE mXMLParserOptions;
-
-void rxml_init_parser_options(void)
-{
-  mXMLParserOptions = rb_define_module_under(cXMLParser, "Options");
-
-  /* recover on errors */  
-  rb_define_const(mXMLParserOptions, "RECOVER", INT2NUM(XML_PARSE_RECOVER));
-  /* substitute entities */
-  rb_define_const(mXMLParserOptions, "NOENT", INT2NUM(XML_PARSE_NOENT));
-  /* load the external subset */
-  rb_define_const(mXMLParserOptions, "DTDLOAD", INT2NUM(XML_PARSE_DTDLOAD));
-  /* default DTD attributes */
-  rb_define_const(mXMLParserOptions, "DTDATTR", INT2NUM(XML_PARSE_DTDATTR));
-  /* validate with the DTD */
-  rb_define_const(mXMLParserOptions, "DTDVALID", INT2NUM(XML_PARSE_DTDVALID));
-  /* suppress error reports */
-  rb_define_const(mXMLParserOptions, "NOERROR", INT2NUM(XML_PARSE_NOERROR));
-  /* suppress warning reports */
-  rb_define_const(mXMLParserOptions, "NOWARNING", INT2NUM(XML_PARSE_NOWARNING));
-  /* pedantic error reporting */
-  rb_define_const(mXMLParserOptions, "PEDANTIC", INT2NUM(XML_PARSE_PEDANTIC));
-  /* remove blank nodes */
-  rb_define_const(mXMLParserOptions, "NOBLANKS", INT2NUM(XML_PARSE_NOBLANKS));
-  /* use the SAX1 interface internally */
-  rb_define_const(mXMLParserOptions, "SAX1", INT2NUM(XML_PARSE_SAX1));
-  /* Implement XInclude substitition  */
-  rb_define_const(mXMLParserOptions, "XINCLUDE", INT2NUM(XML_PARSE_XINCLUDE));
-  /* Forbid network access */
-  rb_define_const(mXMLParserOptions, "NONET", INT2NUM(XML_PARSE_NONET));
-  /* Do not reuse the context dictionnary */
-  rb_define_const(mXMLParserOptions, "NODICT", INT2NUM(XML_PARSE_NODICT));
-  /* remove redundant namespaces declarations */
-  rb_define_const(mXMLParserOptions, "NSCLEAN", INT2NUM(XML_PARSE_NSCLEAN));
-  /* merge CDATA as text nodes */
-  rb_define_const(mXMLParserOptions, "NOCDATA", INT2NUM(XML_PARSE_NOCDATA));
-#if LIBXML_VERSION >= 20621
-  /* do not generate XINCLUDE START/END nodes */
-  rb_define_const(mXMLParserOptions, "NOXINCNODE", INT2NUM(XML_PARSE_NOXINCNODE));
-#endif
-#if LIBXML_VERSION >= 20700
-  /* compact small text nodes */
-  rb_define_const(mXMLParserOptions, "COMPACT", INT2NUM(XML_PARSE_COMPACT));
-  /* parse using XML-1.0 before update 5 */
-  rb_define_const(mXMLParserOptions, "PARSE_OLD10", INT2NUM(XML_PARSE_OLD10));
-  /* do not fixup XINCLUDE xml:base uris */
-  rb_define_const(mXMLParserOptions, "NOBASEFIX", INT2NUM(XML_PARSE_NOBASEFIX));
-#endif
-#if LIBXML_VERSION >= 20703
-  /* relax any hardcoded limit from the parser */
-  rb_define_const(mXMLParserOptions, "HUGE", INT2NUM(XML_PARSE_HUGE));
-#endif
-}
+/* Please see the LICENSE file for copyright and distribution information */
+
+#include <stdarg.h>
+#include "ruby_libxml.h"
+
+/* Document-class: LibXML::XML::Parser::Options
+ *
+ * Options that control the operation of the HTMLParser.  The easiest
+ * way to set a parser's options is to use the methods
+ * XML::Parser.file, XML::Parser.io or XML::Parser.string.
+ * For additional control, see XML::Parser::Context#options=.
+*/
+
+VALUE mXMLParserOptions;
+
+void rxml_init_parser_options(void)
+{
+  mXMLParserOptions = rb_define_module_under(cXMLParser, "Options");
+
+  /* recover on errors */  
+  rb_define_const(mXMLParserOptions, "RECOVER", INT2NUM(XML_PARSE_RECOVER));
+  /* substitute entities */
+  rb_define_const(mXMLParserOptions, "NOENT", INT2NUM(XML_PARSE_NOENT));
+  /* load the external subset */
+  rb_define_const(mXMLParserOptions, "DTDLOAD", INT2NUM(XML_PARSE_DTDLOAD));
+  /* default DTD attributes */
+  rb_define_const(mXMLParserOptions, "DTDATTR", INT2NUM(XML_PARSE_DTDATTR));
+  /* validate with the DTD */
+  rb_define_const(mXMLParserOptions, "DTDVALID", INT2NUM(XML_PARSE_DTDVALID));
+  /* suppress error reports */
+  rb_define_const(mXMLParserOptions, "NOERROR", INT2NUM(XML_PARSE_NOERROR));
+  /* suppress warning reports */
+  rb_define_const(mXMLParserOptions, "NOWARNING", INT2NUM(XML_PARSE_NOWARNING));
+  /* pedantic error reporting */
+  rb_define_const(mXMLParserOptions, "PEDANTIC", INT2NUM(XML_PARSE_PEDANTIC));
+  /* remove blank nodes */
+  rb_define_const(mXMLParserOptions, "NOBLANKS", INT2NUM(XML_PARSE_NOBLANKS));
+  /* use the SAX1 interface internally */
+  rb_define_const(mXMLParserOptions, "SAX1", INT2NUM(XML_PARSE_SAX1));
+  /* Implement XInclude substitition  */
+  rb_define_const(mXMLParserOptions, "XINCLUDE", INT2NUM(XML_PARSE_XINCLUDE));
+  /* Forbid network access */
+  rb_define_const(mXMLParserOptions, "NONET", INT2NUM(XML_PARSE_NONET));
+  /* Do not reuse the context dictionnary */
+  rb_define_const(mXMLParserOptions, "NODICT", INT2NUM(XML_PARSE_NODICT));
+  /* remove redundant namespaces declarations */
+  rb_define_const(mXMLParserOptions, "NSCLEAN", INT2NUM(XML_PARSE_NSCLEAN));
+  /* merge CDATA as text nodes */
+  rb_define_const(mXMLParserOptions, "NOCDATA", INT2NUM(XML_PARSE_NOCDATA));
+#if LIBXML_VERSION >= 20621
+  /* do not generate XINCLUDE START/END nodes */
+  rb_define_const(mXMLParserOptions, "NOXINCNODE", INT2NUM(XML_PARSE_NOXINCNODE));
+#endif
+#if LIBXML_VERSION >= 20700
+  /* compact small text nodes */
+  rb_define_const(mXMLParserOptions, "COMPACT", INT2NUM(XML_PARSE_COMPACT));
+  /* parse using XML-1.0 before update 5 */
+  rb_define_const(mXMLParserOptions, "PARSE_OLD10", INT2NUM(XML_PARSE_OLD10));
+  /* do not fixup XINCLUDE xml:base uris */
+  rb_define_const(mXMLParserOptions, "NOBASEFIX", INT2NUM(XML_PARSE_NOBASEFIX));
+#endif
+#if LIBXML_VERSION >= 20703
+  /* relax any hardcoded limit from the parser */
+  rb_define_const(mXMLParserOptions, "HUGE", INT2NUM(XML_PARSE_HUGE));
+#endif
+}

data/ext/libxml/ruby_xml_parser_options.h

@@ -1,12 +1,12 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RXML_PARSER_OPTIONS__
-#define __RXML_PARSER_OPTIONS__
-
-#define MAX_LIBXML_FEATURES_LEN 50
-
-extern VALUE mXMLParserOptions;
-
-void rxml_init_parser_options();
-
-#endif
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RXML_PARSER_OPTIONS__
+#define __RXML_PARSER_OPTIONS__
+
+#define MAX_LIBXML_FEATURES_LEN 50
+
+extern VALUE mXMLParserOptions;
+
+void rxml_init_parser_options();
+
+#endif

data/ext/libxml/ruby_xml_reader.c

@@ -62,8 +62,8 @@ static void rxml_reader_free(xmlTextReaderPtr xreader)
 static void rxml_reader_mark(xmlTextReaderPtr xreader)
 {
   xmlDocPtr xdoc = xmlTextReaderCurrentDoc(xreader);
-  VALUE value = rxml_lookup_doc(xdoc);
-  rb_gc_mark(value);
+  VALUE doc = (VALUE)xdoc->_private;
+  rb_gc_mark(doc);
 }
 
 static VALUE rxml_reader_wrap(xmlTextReaderPtr xreader)
@@ -311,24 +311,14 @@ static VALUE rxml_reader_move_to_attr_no(VALUE self, VALUE index)
  */
 static VALUE rxml_reader_move_to_attr(VALUE self, VALUE val)
 {
-  if (TYPE(val) == T_FIXNUM)
-  {
-    rb_warn("%s::move_to_attribute with a Fixnum argument is deprecated. "
-      "Please, consider move_to_attribute_no method instead.",
-      rb_class2name(cXMLReader));
-    return rxml_reader_move_to_attr_no(self, val);
-  }
-  else
-  {
-    int ret;
-    xmlTextReaderPtr xreader;
+  int ret;
+  xmlTextReaderPtr xreader;
 
-    xreader = rxml_text_reader_get(self);
-    ret = xmlTextReaderMoveToAttribute(xreader,
-        (const xmlChar *) StringValueCStr(val));
+  xreader = rxml_text_reader_get(self);
+  ret = xmlTextReaderMoveToAttribute(xreader,
+      (const xmlChar *) StringValueCStr(val));
 
-    return INT2FIX(ret);
-  }
+  return INT2FIX(ret);
 }
 
 /*
@@ -991,26 +981,14 @@ static VALUE rxml_reader_lookup_namespace(VALUE self, VALUE prefix)
  *    reader.expand -> node
  *
  * Returns the current node and its full subtree. Note the returned node
- * is valid ONLY until the next read call.  
+ * is valid ONLY until the next read call. If you would like to preserve
+ * the node, or search it via xpath, call reader.doc first.
  */
 static VALUE rxml_reader_expand(VALUE self)
 {
   xmlTextReaderPtr xreader = rxml_text_reader_get(self);
-  xmlNodePtr xnode = NULL;
+  xmlNodePtr xnode = xmlTextReaderExpand(xreader);
 
-  /* At this point we need to wrap the reader's document as explained above. */
-  xmlDocPtr xdoc = xmlTextReaderCurrentDoc(xreader);
-
-  if (!xdoc)
-    rb_raise(rb_eRuntimeError, "The reader does not have a document.  Did you forget to call read?");
-
-  rxml_document_wrap(xdoc);
-
-  /* And now hook in a mark function */
-  RDATA(self)->dmark = (RUBY_DATA_FUNC)rxml_reader_mark;
-
-  xnode = xmlTextReaderExpand(xreader);
-  
   if (!xnode)
   {
     return Qnil;
@@ -1021,6 +999,35 @@ static VALUE rxml_reader_expand(VALUE self)
   }
 }
 
+/*
+* call-seq:
+*    reader.document -> doc
+*
+* Hacking interface that provides access to the current document being accessed by the
+* reader. NOTE: as a result of this call, the reader will not destroy the associated XML
+* document. Instead, it will be destroyed when the returned document goes out of scope.
+*
+* Returns:	document
+*/
+static VALUE rxml_reader_doc(VALUE self)
+{
+  VALUE result = Qnil;
+  xmlTextReaderPtr xreader = rxml_text_reader_get(self);
+  xmlDocPtr xdoc = xmlTextReaderCurrentDoc(xreader);
+
+  if (!xdoc)
+    rb_raise(rb_eRuntimeError, "The reader does not have a document.  Did you forget to call read?");
+
+  result = rxml_document_wrap(xdoc);
+
+  // And now hook in a mark function to keep the document alive as long as the reader is valid
+  RDATA(self)->dmark = (RUBY_DATA_FUNC)rxml_reader_mark;
+
+  return result;
+}
+
+
+
 #if LIBXML_VERSION >= 20618
 /*
  * call-seq:
@@ -1140,6 +1147,7 @@ void rxml_init_reader(void)
   rb_define_method(cXMLReader, "column_number", rxml_reader_column_number, 0);
 #endif
   rb_define_method(cXMLReader, "depth", rxml_reader_depth, 0);
+  rb_define_method(cXMLReader, "doc", rxml_reader_doc, 0);
   rb_define_method(cXMLReader, "encoding", rxml_reader_encoding, 0);
   rb_define_method(cXMLReader, "expand", rxml_reader_expand, 0);
   rb_define_method(cXMLReader, "get_attribute", rxml_reader_get_attribute, 1);
@@ -1151,12 +1159,12 @@ void rxml_init_reader(void)
   rb_define_method(cXMLReader, "line_number", rxml_reader_line_number, 0);
 #endif
   rb_define_method(cXMLReader, "local_name", rxml_reader_local_name, 0);
-  rb_define_method(cXMLReader, "lookup_namespace",       rxml_reader_lookup_namespace, 1);
+  rb_define_method(cXMLReader, "lookup_namespace", rxml_reader_lookup_namespace, 1);
   rb_define_method(cXMLReader, "move_to_attribute", rxml_reader_move_to_attr, 1);
   rb_define_method(cXMLReader, "move_to_attribute_no", rxml_reader_move_to_attr_no, 1);
   rb_define_method(cXMLReader, "move_to_attribute_ns", rxml_reader_move_to_attr_ns, 2);
-  rb_define_method(cXMLReader, "move_to_first_attribute",       rxml_reader_move_to_first_attr, 0);
-  rb_define_method(cXMLReader, "move_to_next_attribute",       rxml_reader_move_to_next_attr, 0);
+  rb_define_method(cXMLReader, "move_to_first_attribute", rxml_reader_move_to_first_attr, 0);
+  rb_define_method(cXMLReader, "move_to_next_attribute", rxml_reader_move_to_next_attr, 0);
   rb_define_method(cXMLReader, "move_to_element", rxml_reader_move_to_element,       0);
   rb_define_method(cXMLReader, "name", rxml_reader_name, 0);
   rb_define_method(cXMLReader, "namespace_uri", rxml_reader_namespace_uri, 0);
@@ -1173,7 +1181,7 @@ void rxml_init_reader(void)
   rb_define_method(cXMLReader, "read_outer_xml", rxml_reader_read_outer_xml, 0);
   rb_define_method(cXMLReader, "read_state", rxml_reader_read_state, 0);
   rb_define_method(cXMLReader, "read_string", rxml_reader_read_string, 0);
-  rb_define_method(cXMLReader, "relax_ng_validate",       rxml_reader_relax_ng_validate, 1);
+  rb_define_method(cXMLReader, "relax_ng_validate", rxml_reader_relax_ng_validate, 1);
   rb_define_method(cXMLReader, "standalone", rxml_reader_standalone, 0);
 #if LIBXML_VERSION >= 20620
   rb_define_method(cXMLReader, "schema_validate", rxml_reader_schema_validate, 1);

data/ext/libxml/ruby_xml_reader.h

@@ -1,17 +1,17 @@
-/* Copyright (c) 2006 Apple Computer Inc.
- * Please see the LICENSE file for copyright and distribution information. */
-
-#ifndef __RXML_READER__
-#define __RXML_READER__
-
-#include <libxml/xmlreader.h>
-#include <libxml/xmlschemas.h>
-
-extern VALUE cXMLReader;
-
-void rxml_init_reader(void);
-
-/* Exported to be used by XML::Document#reader */
-VALUE rxml_reader_new_walker(VALUE self, VALUE doc);
-
-#endif /* __rxml_READER__ */
+/* Copyright (c) 2006 Apple Computer Inc.
+ * Please see the LICENSE file for copyright and distribution information. */
+
+#ifndef __RXML_READER__
+#define __RXML_READER__
+
+#include <libxml/xmlreader.h>
+#include <libxml/xmlschemas.h>
+
+extern VALUE cXMLReader;
+
+void rxml_init_reader(void);
+
+/* Exported to be used by XML::Document#reader */
+VALUE rxml_reader_new_walker(VALUE self, VALUE doc);
+
+#endif /* __rxml_READER__ */

data/ext/libxml/ruby_xml_relaxng.h

@@ -1,10 +1,10 @@
-#ifndef __RXML_RELAXNG__
-#define __RXML_RELAXNG__
-
-#include <libxml/relaxng.h>
-
-extern VALUE cXMLRelaxNG;
-
-void  rxml_init_relaxng(void);
-#endif
-
+#ifndef __RXML_RELAXNG__
+#define __RXML_RELAXNG__
+
+#include <libxml/relaxng.h>
+
+extern VALUE cXMLRelaxNG;
+
+void  rxml_init_relaxng(void);
+#endif
+

data/ext/libxml/ruby_xml_sax2_handler.c

@@ -184,8 +184,8 @@ static void start_document_callback(void *ctx)
 
 static void start_element_ns_callback(void *ctx, 
                                       const xmlChar *xlocalname, const xmlChar *xprefix, const xmlChar *xURI,
-                            		  int nb_namespaces, const xmlChar **xnamespaces,
-					                  int nb_attributes, int nb_defaulted, const xmlChar **xattributes)
+                                		  int nb_namespaces, const xmlChar **xnamespaces,
+					                            int nb_attributes, int nb_defaulted, const xmlChar **xattributes)
 {
   VALUE handler = (VALUE) ctx;
   VALUE attributes = rb_hash_new();
@@ -201,7 +201,7 @@ static void start_element_ns_callback(void *ctx,
     for (i = 0;i < nb_attributes * 5; i+=5) 
     {
       VALUE attrName = rxml_new_cstr(xattributes[i+0], NULL);
-      long attrLen = xattributes[i+4] - xattributes[i+3];
+      long attrLen = (long)(xattributes[i+4] - xattributes[i+3]);
       VALUE attrValue = rxml_new_cstr_len(xattributes[i+3], attrLen, NULL);
       rb_hash_aset(attributes, attrName, attrValue);
     }

data/ext/libxml/ruby_xml_sax2_handler.h

@@ -1,10 +1,10 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RXML_SAX2_HANDLER__
-#define __RXML_SAX2_HANDLER__
-
-extern xmlSAXHandler rxml_sax_handler;
-
-void rxml_init_sax2_handler(void);
-
-#endif
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RXML_SAX2_HANDLER__
+#define __RXML_SAX2_HANDLER__
+
+extern xmlSAXHandler rxml_sax_handler;
+
+void rxml_init_sax2_handler(void);
+
+#endif

data/ext/libxml/ruby_xml_sax_parser.c

@@ -1,120 +1,116 @@
-/* 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.
- *
- * 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.string(my_string)
- *   parser.callbacks = MyCallbacks.new
- *   parser.parse
- *
- * You can also parse strings (see XML::SaxParser.string) and
- * io objects (see XML::SaxParser.io).
- */
-
-VALUE cXMLSaxParser;
-static ID CALLBACKS_ATTR;
-static ID CONTEXT_ATTR;
-
-
-/* ======  Parser  =========== */
-
-/*
- * call-seq:
- *    parser.initialize(context) -> XML::Parser
- *
- * Creates a new XML::Parser from the specified 
- * XML::Parser::Context.
- */
-static VALUE rxml_sax_parser_initialize(int argc, VALUE *argv, VALUE self)
-{
-  VALUE context = Qnil;
-
-  rb_scan_args(argc, argv, "01", &context);
-
-  if (context == Qnil)
-  {
-    rb_warn("Passing no parameters to XML::SaxParser.new is deprecated.  Pass an instance of XML::Parser::Context instead.");
-    context = rb_class_new_instance(0, NULL, cXMLParserContext);
-  }
-
-  rb_ivar_set(self, CONTEXT_ATTR, context);
-  return self;
-}
-
-/*
- * 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 context = rb_ivar_get(self, CONTEXT_ATTR);
-  xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(context, xmlParserCtxt, ctxt);
-
-  ctxt->sax2 = 1;
-	ctxt->userData = (void*)rb_ivar_get(self, CALLBACKS_ATTR);
-
-  if (ctxt->sax != (xmlSAXHandlerPtr) &xmlDefaultSAXHandler)
-    xmlFree(ctxt->sax);
-    
-  ctxt->sax = (xmlSAXHandlerPtr) xmlMalloc(sizeof(rxml_sax_handler));
-  if (ctxt->sax == NULL)
-    rb_fatal("Not enough memory.");
-  memcpy(ctxt->sax, &rxml_sax_handler, sizeof(rxml_sax_handler));
-    
-  status = xmlParseDocument(ctxt);
-
-  /* Now check the parsing result*/
-  if (status == -1 || !ctxt->wellFormed)
-  {
-    if (ctxt->myDoc)
-      xmlFreeDoc(ctxt->myDoc);
-
-    rxml_raise(&ctxt->lastError);
-  }
-  return Qtrue;
-}
-
-void rxml_init_sax_parser(void)
-{
-  /* SaxParser */
-  cXMLSaxParser = rb_define_class_under(mXML, "SaxParser", rb_cObject);
-
-  /* Atributes */
-  CALLBACKS_ATTR = rb_intern("@callbacks");
-  CONTEXT_ATTR = rb_intern("@context");
-  rb_define_attr(cXMLSaxParser, "callbacks", 1, 1);
-
-  /* Instance Methods */
-  rb_define_method(cXMLSaxParser, "initialize", rxml_sax_parser_initialize, -1);
-  rb_define_method(cXMLSaxParser, "parse", rxml_sax_parser_parse, 0);
-}
+/* 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.
+ *
+ * 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.string(my_string)
+ *   parser.callbacks = MyCallbacks.new
+ *   parser.parse
+ *
+ * You can also parse strings (see XML::SaxParser.string) and
+ * io objects (see XML::SaxParser.io).
+ */
+
+VALUE cXMLSaxParser;
+static ID CALLBACKS_ATTR;
+static ID CONTEXT_ATTR;
+
+
+/* ======  Parser  =========== */
+
+/*
+ * call-seq:
+ *    parser.initialize(context) -> XML::Parser
+ *
+ * Creates a new XML::Parser from the specified 
+ * XML::Parser::Context.
+ */
+static VALUE rxml_sax_parser_initialize(int argc, VALUE *argv, VALUE self)
+{
+  VALUE context = Qnil;
+
+  rb_scan_args(argc, argv, "01", &context);
+
+  if (context == Qnil)
+  {
+    rb_raise(rb_eArgError, "An instance of a XML::Parser::Context must be passed to XML::SaxParser.new");
+  }
+
+  rb_ivar_set(self, CONTEXT_ATTR, context);
+  return self;
+}
+
+/*
+ * 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 context = rb_ivar_get(self, CONTEXT_ATTR);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(context, xmlParserCtxt, ctxt);
+
+  ctxt->sax2 = 1;
+	ctxt->userData = (void*)rb_ivar_get(self, CALLBACKS_ATTR);
+
+  if (ctxt->sax != (xmlSAXHandlerPtr) &xmlDefaultSAXHandler)
+    xmlFree(ctxt->sax);
+    
+  ctxt->sax = (xmlSAXHandlerPtr) xmlMalloc(sizeof(rxml_sax_handler));
+  if (ctxt->sax == NULL)
+    rb_fatal("Not enough memory.");
+  memcpy(ctxt->sax, &rxml_sax_handler, sizeof(rxml_sax_handler));
+    
+  status = xmlParseDocument(ctxt);
+
+  /* Now check the parsing result*/
+  if (status == -1 || !ctxt->wellFormed)
+  {
+    rxml_raise(&ctxt->lastError);
+  }
+  return Qtrue;
+}
+
+void rxml_init_sax_parser(void)
+{
+  /* SaxParser */
+  cXMLSaxParser = rb_define_class_under(mXML, "SaxParser", rb_cObject);
+
+  /* Atributes */
+  CALLBACKS_ATTR = rb_intern("@callbacks");
+  CONTEXT_ATTR = rb_intern("@context");
+  rb_define_attr(cXMLSaxParser, "callbacks", 1, 1);
+
+  /* Instance Methods */
+  rb_define_method(cXMLSaxParser, "initialize", rxml_sax_parser_initialize, -1);
+  rb_define_method(cXMLSaxParser, "parse", rxml_sax_parser_parse, 0);
+}