libxml-ruby 0.9.5 → 0.9.6

data/ext/libxml/ruby_xml_document.h

@@ -1,9 +1,9 @@
-/* $Id: ruby_xml_document.h 614 2008-11-22 08:04:39Z cfis $ */
+/* $Id: ruby_xml_document.h 666 2008-12-07 00:16:50Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
-#ifndef __rxml_DOCUMENT__
-#define __rxml_DOCUMENT__
+#ifndef __RXML_DOCUMENT__
+#define __RXML_DOCUMENT__
 
 extern VALUE cXMLDocument;
 

data/ext/libxml/ruby_xml_dtd.c

@@ -1,119 +1,119 @@
-#include "ruby_libxml.h"
-#include "ruby_xml_dtd.h"
-
-/*
- * Document-class: LibXML::XML::Dtd
- *
- * The XML::Dtd class is used to prepare DTD's for validation of xml
- * documents.
- *
- * DTDs can be created from a string or a pair of public and system identifiers.
- * Once a Dtd object is instantiated, an XML document can be validated by the
- * XML::Document#validate method providing the XML::Dtd object as parameeter.
- * The method will raise an exception if the document is
- * not valid.
- *
- * Basic usage:
- *
- *  # parse DTD
- *  dtd = XML::Dtd.new(<<EOF)
- *  <!ELEMENT root (item*) >
- *  <!ELEMENT item (#PCDATA) >
- *  EOF
- *
- *  # parse xml document to be validated
- *  instance = XML::Document.file('instance.xml')
- *
- *  # validate
- *  instance.validate(dtd)
- */
-
-VALUE cXMLDtd;
-
-void rxml_dtd_free(xmlDtdPtr xdtd)
-{
-  xmlFreeDtd(xdtd);
-}
-
-static VALUE rxml_dtd_alloc(VALUE klass)
-{
-  return Data_Wrap_Struct(klass, NULL, rxml_dtd_free, NULL);
-}
-
-/*
- * 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.
- */
-static VALUE rxml_dtd_initialize(int argc, VALUE *argv, VALUE self)
-{
-  VALUE external, system, dtd_string;
-  xmlParserInputBufferPtr buffer;
-  xmlCharEncoding enc = XML_CHAR_ENCODING_NONE;
-  xmlChar *new_string;
-  xmlDtdPtr xdtd;
-
-  // 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);
-
-    xdtd = xmlParseDTD((xmlChar*) StringValuePtr(external),
-        (xmlChar*) StringValuePtr(system));
-
-    if (xdtd == NULL)
-      rxml_raise(&xmlLastError);
-
-    DATA_PTR( self) = xdtd;
-
-    xmlSetTreeDoc((xmlNodePtr) xdtd, NULL);
-    break;
-
-  case 1:
-    rb_scan_args(argc, argv, "10", &dtd_string);
-    Check_Type(dtd_string, T_STRING);
-
-    /* Note that buffer is freed by xmlParserInputBufferPush*/
-    buffer = xmlAllocParserInputBuffer(enc);
-    new_string = xmlStrdup((xmlChar*) StringValuePtr(dtd_string));
-    xmlParserInputBufferPush(buffer, xmlStrlen(new_string),
-        (const char*) new_string);
-
-    xdtd = xmlIOParseDTD(NULL, buffer, enc);
-
-    if (xdtd == NULL)
-      rxml_raise(&xmlLastError);
-
-    xmlFree(new_string);
-
-    DATA_PTR( self) = xdtd;
-    break;
-
-  default:
-    rb_raise(rb_eArgError, "wrong number of arguments (need 1 or 2)");
-  }
-
-  return self;
-}
-
-// 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()
-{
-  cXMLDtd = rb_define_class_under(mXML, "Dtd", rb_cObject);
-  rb_define_alloc_func(cXMLDtd, rxml_dtd_alloc);
-  rb_define_method(cXMLDtd, "initialize", rxml_dtd_initialize, -1);
-}
-
+#include "ruby_libxml.h"
+#include "ruby_xml_dtd.h"
+
+/*
+ * Document-class: LibXML::XML::Dtd
+ *
+ * The XML::Dtd class is used to prepare DTD's for validation of xml
+ * documents.
+ *
+ * DTDs can be created from a string or a pair of public and system identifiers.
+ * Once a Dtd object is instantiated, an XML document can be validated by the
+ * XML::Document#validate method providing the XML::Dtd object as parameeter.
+ * The method will raise an exception if the document is
+ * not valid.
+ *
+ * Basic usage:
+ *
+ *  # parse DTD
+ *  dtd = XML::Dtd.new(<<EOF)
+ *  <!ELEMENT root (item*) >
+ *  <!ELEMENT item (#PCDATA) >
+ *  EOF
+ *
+ *  # parse xml document to be validated
+ *  instance = XML::Document.file('instance.xml')
+ *
+ *  # validate
+ *  instance.validate(dtd)
+ */
+
+VALUE cXMLDtd;
+
+void rxml_dtd_free(xmlDtdPtr xdtd)
+{
+  xmlFreeDtd(xdtd);
+}
+
+static VALUE rxml_dtd_alloc(VALUE klass)
+{
+  return Data_Wrap_Struct(klass, NULL, rxml_dtd_free, NULL);
+}
+
+/*
+ * 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.
+ */
+static VALUE rxml_dtd_initialize(int argc, VALUE *argv, VALUE self)
+{
+  VALUE external, system, dtd_string;
+  xmlParserInputBufferPtr buffer;
+  xmlCharEncoding enc = XML_CHAR_ENCODING_NONE;
+  xmlChar *new_string;
+  xmlDtdPtr xdtd;
+
+  // 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);
+
+    xdtd = xmlParseDTD((xmlChar*) StringValuePtr(external),
+        (xmlChar*) StringValuePtr(system));
+
+    if (xdtd == NULL)
+      rxml_raise(&xmlLastError);
+
+    DATA_PTR( self) = xdtd;
+
+    xmlSetTreeDoc((xmlNodePtr) xdtd, NULL);
+    break;
+
+  case 1:
+    rb_scan_args(argc, argv, "10", &dtd_string);
+    Check_Type(dtd_string, T_STRING);
+
+    /* Note that buffer is freed by xmlParserInputBufferPush*/
+    buffer = xmlAllocParserInputBuffer(enc);
+    new_string = xmlStrdup((xmlChar*) StringValuePtr(dtd_string));
+    xmlParserInputBufferPush(buffer, xmlStrlen(new_string),
+        (const char*) new_string);
+
+    xdtd = xmlIOParseDTD(NULL, buffer, enc);
+
+    if (xdtd == NULL)
+      rxml_raise(&xmlLastError);
+
+    xmlFree(new_string);
+
+    DATA_PTR( self) = xdtd;
+    break;
+
+  default:
+    rb_raise(rb_eArgError, "wrong number of arguments (need 1 or 2)");
+  }
+
+  return self;
+}
+
+// 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()
+{
+  cXMLDtd = rb_define_class_under(mXML, "Dtd", rb_cObject);
+  rb_define_alloc_func(cXMLDtd, rxml_dtd_alloc);
+  rb_define_method(cXMLDtd, "initialize", rxml_dtd_initialize, -1);
+}
+

data/ext/libxml/ruby_xml_dtd.h

@@ -1,5 +1,5 @@
-#ifndef __rxml_DTD__
-#define __rxml_DTD__
+#ifndef __RXML_DTD__
+#define __RXML_DTD__
 
 extern VALUE cXMLDtd;
 

data/ext/libxml/ruby_xml_error.c

@@ -21,7 +21,7 @@ static ID ERROR_HANDLER_ID;
  *
  * To disable this output you can install the quiet handler:
  *
- *   XML::Error.set_handler(&XML::Error::QUITE_HANDLER)
+ *   XML::Error.set_handler(&XML::Error::QUIET_HANDLER)
  *
  * Install your own handler:
  *

data/ext/libxml/ruby_xml_error.h

@@ -2,8 +2,8 @@
 
 /* Please see the LICENSE file for copyright and distribution information */
 
-#ifndef __rxml_ERROR__
-#define __rxml_ERROR__
+#ifndef __RXML_ERROR__
+#define __RXML_ERROR__
 
 extern VALUE eXMLError;
 

data/ext/libxml/ruby_xml_html_parser.c

@@ -1,119 +1,119 @@
-/* $Id: ruby_xml_html_parser.c 650 2008-11-30 03:40:22Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#include "ruby_libxml.h"
-
-VALUE cXMLHTMLParser;
-static ID INPUT_ATTR;
-
-/*
- * Document-class: LibXML::XML::HTMLParser
- *
- * The HTML parser implements an HTML 4.0 non-verifying parser with an API
- * compatible with the XML::Parser.  In contrast with the XML::Parser,
- * it can parse "real world" HTML, even if it severely broken from a
- * specification point of view. */
-
-/*
- * call-seq:
- *    XML::HTMLParser.initialize -> parser
- *
- * Initializes a new parser instance with no pre-determined source.
- */
-static VALUE rxml_html_parser_initialize(VALUE self)
-{
-  VALUE input = rb_class_new_instance(0, NULL, cXMLInput);
-  rb_iv_set(self, "@input", input);
-  return self;
-}
-
-static htmlDocPtr rxml_html_parser_read_file(VALUE input)
-{
-  VALUE file = rb_ivar_get(input, FILE_ATTR);
-  VALUE encoding = rb_ivar_get(input, ENCODING_ATTR);
-  VALUE encoding_str = rxml_input_encoding_to_s(Qnil, encoding);
-  char *xencoding_str = (encoding_str == Qnil ? NULL : StringValuePtr(
-      encoding_str));
-  int options = 0;
-
-  return htmlReadFile(StringValuePtr(file), xencoding_str, options);
-}
-
-static htmlDocPtr rxml_html_parser_read_string(VALUE input)
-{
-  VALUE string = rb_ivar_get(input, STRING_ATTR);
-  VALUE base_url = rb_ivar_get(input, BASE_URL_ATTR);
-  char *xbase_url = (base_url == Qnil ? NULL : StringValuePtr(base_url));
-  VALUE encoding = rb_ivar_get(input, ENCODING_ATTR);
-  VALUE encoding_str = rxml_input_encoding_to_s(Qnil, encoding);
-  char *xencoding_str = (encoding_str == Qnil ? NULL : StringValuePtr(
-      encoding_str));
-  int options = 0;
-
-  return htmlReadMemory(StringValuePtr(string), RSTRING_LEN(string),
-  xbase_url, xencoding_str, options);
-}
-
-static htmlDocPtr rxml_html_parser_read_io(VALUE input)
-{
-  VALUE io = rb_ivar_get(input, IO_ATTR);
-  VALUE base_url = rb_ivar_get(input, BASE_URL_ATTR);
-  char *xbase_url = (base_url == Qnil ? NULL : StringValuePtr(base_url));
-  VALUE encoding = rb_ivar_get(input, ENCODING_ATTR);
-  VALUE encoding_str = rxml_input_encoding_to_s(Qnil, encoding);
-  char *xencoding_str = (encoding_str == Qnil ? NULL : StringValuePtr(
-      encoding_str));
-  int options = 0;
-
-  return htmlReadIO((xmlInputReadCallback) rxml_read_callback, NULL,
-      (void *) io, xbase_url, xencoding_str, options);
-}
-
-/*
- * call-seq:
- *    parser.parse -> document
- *
- * Parse the input XML and create an XML::Document with
- * it's content. If an error occurs, XML::Parser::ParseError
- * is thrown.
- */
-static VALUE rxml_html_parser_parse(VALUE self)
-{
-  VALUE input = rb_ivar_get(self, INPUT_ATTR);
-  htmlDocPtr xdoc;
-
-  if (rb_ivar_get(input, FILE_ATTR) != Qnil)
-    xdoc = rxml_html_parser_read_file(input);
-  else if (rb_ivar_get(input, STRING_ATTR) != Qnil)
-    xdoc = rxml_html_parser_read_string(input);
-  else if (rb_ivar_get(input, IO_ATTR) != Qnil)
-    xdoc = rxml_html_parser_read_io(input);
-  else
-    rb_raise(rb_eArgError, "You must specify a parser data source");
-
-  if (!xdoc)
-    rxml_raise(&xmlLastError);
-
-  return rxml_document_wrap(xdoc);
-}
-
-// Rdoc needs to know
-#ifdef RDOC_NEVER_DEFINED
-mLibXML = rb_define_module("LibXML");
-mXML = rb_define_module_under(mLibXML, "XML");
-#endif
-
-void ruby_init_html_parser(void)
-{
-  INPUT_ATTR = rb_intern("@input");
-
-  cXMLHTMLParser = rb_define_class_under(mXML, "HTMLParser", rb_cObject);
-
-  /* Atributes */
-  rb_define_attr(cXMLHTMLParser, "input", 1, 0);
-
-  /* Instance methods */
-  rb_define_method(cXMLHTMLParser, "initialize", rxml_html_parser_initialize, 0);
-  rb_define_method(cXMLHTMLParser, "parse", rxml_html_parser_parse, 0);
-}
+/* $Id: ruby_xml_html_parser.c 665 2008-12-06 07:52:49Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#include "ruby_libxml.h"
+
+VALUE cXMLHTMLParser;
+static ID INPUT_ATTR;
+
+/*
+ * Document-class: LibXML::XML::HTMLParser
+ *
+ * The HTML parser implements an HTML 4.0 non-verifying parser with an API
+ * compatible with the XML::Parser.  In contrast with the XML::Parser,
+ * it can parse "real world" HTML, even if it severely broken from a
+ * specification point of view. */
+
+/*
+ * call-seq:
+ *    XML::HTMLParser.initialize -> parser
+ *
+ * Initializes a new parser instance with no pre-determined source.
+ */
+static VALUE rxml_html_parser_initialize(VALUE self)
+{
+  VALUE input = rb_class_new_instance(0, NULL, cXMLInput);
+  rb_iv_set(self, "@input", input);
+  return self;
+}
+
+static htmlDocPtr rxml_html_parser_read_file(VALUE input)
+{
+  VALUE file = rb_ivar_get(input, FILE_ATTR);
+  VALUE encoding = rb_ivar_get(input, ENCODING_ATTR);
+  VALUE encoding_str = rxml_input_encoding_to_s(cXMLInput, encoding);
+  char *xencoding_str = (encoding_str == Qnil ? NULL : StringValuePtr(
+      encoding_str));
+  int options = 0;
+
+  return htmlReadFile(StringValuePtr(file), xencoding_str, options);
+}
+
+static htmlDocPtr rxml_html_parser_read_string(VALUE input)
+{
+  VALUE string = rb_ivar_get(input, STRING_ATTR);
+  VALUE base_url = rb_ivar_get(input, BASE_URL_ATTR);
+  char *xbase_url = (base_url == Qnil ? NULL : StringValuePtr(base_url));
+  VALUE encoding = rb_ivar_get(input, ENCODING_ATTR);
+  VALUE encoding_str = rxml_input_encoding_to_s(cXMLInput, encoding);
+  char *xencoding_str = (encoding_str == Qnil ? NULL : StringValuePtr(
+      encoding_str));
+  int options = 0;
+
+  return htmlReadMemory(StringValuePtr(string), RSTRING_LEN(string),
+                        xbase_url, xencoding_str, options);
+}
+
+static htmlDocPtr rxml_html_parser_read_io(VALUE input)
+{
+  VALUE io = rb_ivar_get(input, IO_ATTR);
+  VALUE base_url = rb_ivar_get(input, BASE_URL_ATTR);
+  char *xbase_url = (base_url == Qnil ? NULL : StringValuePtr(base_url));
+  VALUE encoding = rb_ivar_get(input, ENCODING_ATTR);
+  VALUE encoding_str = rxml_input_encoding_to_s(cXMLInput, encoding);
+  char *xencoding_str = (encoding_str == Qnil ? NULL : StringValuePtr(
+      encoding_str));
+  int options = 0;
+
+  return htmlReadIO((xmlInputReadCallback) rxml_read_callback, NULL,
+      (void *) io, xbase_url, xencoding_str, options);
+}
+
+/*
+ * call-seq:
+ *    parser.parse -> document
+ *
+ * Parse the input XML and create an XML::Document with
+ * it's content. If an error occurs, XML::Parser::ParseError
+ * is thrown.
+ */
+static VALUE rxml_html_parser_parse(VALUE self)
+{
+  VALUE input = rb_ivar_get(self, INPUT_ATTR);
+  htmlDocPtr xdoc;
+
+  if (rb_ivar_get(input, FILE_ATTR) != Qnil)
+    xdoc = rxml_html_parser_read_file(input);
+  else if (rb_ivar_get(input, STRING_ATTR) != Qnil)
+    xdoc = rxml_html_parser_read_string(input);
+  else if (rb_ivar_get(input, IO_ATTR) != Qnil)
+    xdoc = rxml_html_parser_read_io(input);
+  else
+    rb_raise(rb_eArgError, "You must specify a parser data source");
+
+  if (!xdoc)
+    rxml_raise(&xmlLastError);
+
+  return rxml_document_wrap(xdoc);
+}
+
+// Rdoc needs to know
+#ifdef RDOC_NEVER_DEFINED
+mLibXML = rb_define_module("LibXML");
+mXML = rb_define_module_under(mLibXML, "XML");
+#endif
+
+void ruby_init_html_parser(void)
+{
+  INPUT_ATTR = rb_intern("@input");
+
+  cXMLHTMLParser = rb_define_class_under(mXML, "HTMLParser", rb_cObject);
+
+  /* Atributes */
+  rb_define_attr(cXMLHTMLParser, "input", 1, 0);
+
+  /* Instance methods */
+  rb_define_method(cXMLHTMLParser, "initialize", rxml_html_parser_initialize, 0);
+  rb_define_method(cXMLHTMLParser, "parse", rxml_html_parser_parse, 0);
+}