libxml-ruby 0.9.5-x86-mswin32-60 → 0.9.6-x86-mswin32-60

data/ext/libxml/ruby_xml_html_parser.h

@@ -1,9 +1,9 @@
-/* $Id: ruby_xml_html_parser.h 612 2008-11-21 08:01:29Z cfis $ */
+/* $Id: ruby_xml_html_parser.h 666 2008-12-07 00:16:50Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
-#ifndef __rxml_HTML_PARSER__
-#define __rxml_HTML_PARSER__
+#ifndef __RXML_HTML_PARSER__
+#define __RXML_HTML_PARSER__
 
 extern int rxml_html_parser_count;
 extern VALUE cXMLHTMLParser;

data/ext/libxml/ruby_xml_input.c

@@ -90,7 +90,7 @@ int rxml_read_callback(void *context, char *buffer, int len)
  * Converts an encoding contstant defined on the XML::Input
  * class to its text representation.
  */
-VALUE rxml_input_encoding_to_s(VALUE self, VALUE encoding)
+VALUE rxml_input_encoding_to_s(VALUE klass, VALUE encoding)
 {
   char* encodingStr = NULL;
 
@@ -168,6 +168,8 @@ VALUE rxml_input_encoding_to_s(VALUE self, VALUE encoding)
   case XML_CHAR_ENCODING_ASCII:
     encodingStr = "ASCII";
     break;
+  default:
+    rb_raise(rb_eArgError, "Unknown encoding.");
   }
 
   return rb_str_new2(encodingStr);
@@ -181,6 +183,7 @@ VALUE rxml_input_encoding_to_s(VALUE self, VALUE encoding)
  */
 static VALUE rxml_input_initialize(VALUE self)
 {
+  rb_ivar_set(self, BASE_URL_ATTR, Qnil);
   rb_ivar_set(self, ENCODING_ATTR, INT2NUM(XML_CHAR_ENCODING_UTF8));
   return self;
 }
@@ -285,21 +288,20 @@ void ruby_init_xml_input(void)
   READ_METHOD = rb_intern("read");
 
   cXMLInput = rb_define_class_under(mXML, "Input", rb_cObject);
-  rb_define_singleton_method(cXMLInput, "encoding_to_s",
-      rxml_input_encoding_to_s, 1);
+  rb_define_singleton_method(cXMLInput, "encoding_to_s", rxml_input_encoding_to_s, 1);
 
   rb_define_const(cXMLInput, "UNDEFINED", INT2NUM(XPATH_UNDEFINED));
   rb_define_const(cXMLInput, "ERROR", INT2NUM(XML_CHAR_ENCODING_ERROR)); /* No char encoding detected */
   rb_define_const(cXMLInput, "NONE", INT2NUM(XML_CHAR_ENCODING_NONE)); /* No char encoding detected */
-  rb_define_const(cXMLInput, "UTF8", INT2NUM(XML_CHAR_ENCODING_UTF8)); /* UTF-8 */
-  rb_define_const(cXMLInput, "UTF16LE", INT2NUM(XML_CHAR_ENCODING_UTF16LE)); /* UTF-16 little endian */
-  rb_define_const(cXMLInput, "UTF16BE", INT2NUM(XML_CHAR_ENCODING_UTF16BE)); /* UTF-16 big endian */
-  rb_define_const(cXMLInput, "UCS4LE", INT2NUM(XML_CHAR_ENCODING_UCS4LE)); /* UCS-4 little endian */
-  rb_define_const(cXMLInput, "UCS4BE", INT2NUM(XML_CHAR_ENCODING_UCS4BE)); /* UCS-4 big endian */
+  rb_define_const(cXMLInput, "UTF_8", INT2NUM(XML_CHAR_ENCODING_UTF8)); /* UTF-8 */
+  rb_define_const(cXMLInput, "UTF_16LE", INT2NUM(XML_CHAR_ENCODING_UTF16LE)); /* UTF-16 little endian */
+  rb_define_const(cXMLInput, "UTF_16BE", INT2NUM(XML_CHAR_ENCODING_UTF16BE)); /* UTF-16 big endian */
+  rb_define_const(cXMLInput, "UCS_4LE", INT2NUM(XML_CHAR_ENCODING_UCS4LE)); /* UCS-4 little endian */
+  rb_define_const(cXMLInput, "UCS_4BE", INT2NUM(XML_CHAR_ENCODING_UCS4BE)); /* UCS-4 big endian */
   rb_define_const(cXMLInput, "EBCDIC", INT2NUM(XML_CHAR_ENCODING_EBCDIC)); /* EBCDIC uh! */
-  rb_define_const(cXMLInput, "UCS4_2143", INT2NUM(XML_CHAR_ENCODING_UCS4_2143)); /* UCS-4 unusual ordering */
-  rb_define_const(cXMLInput, "UCS4_3412", INT2NUM(XML_CHAR_ENCODING_UCS4_3412)); /* UCS-4 unusual ordering */
-  rb_define_const(cXMLInput, "UCS2", INT2NUM(XML_CHAR_ENCODING_UCS2)); /* UCS-2 */
+  rb_define_const(cXMLInput, "UCS_4_2143", INT2NUM(XML_CHAR_ENCODING_UCS4_2143)); /* UCS-4 unusual ordering */
+  rb_define_const(cXMLInput, "UCS_4_3412", INT2NUM(XML_CHAR_ENCODING_UCS4_3412)); /* UCS-4 unusual ordering */
+  rb_define_const(cXMLInput, "UCS_2", INT2NUM(XML_CHAR_ENCODING_UCS2)); /* UCS-2 */
   rb_define_const(cXMLInput, "ISO_8859_1", INT2NUM(XML_CHAR_ENCODING_8859_1)); /* ISO-8859-1 ISO Latin 1 */
   rb_define_const(cXMLInput, "ISO_8859_2", INT2NUM(XML_CHAR_ENCODING_8859_2)); /* ISO-8859-2 ISO Latin 2 */
   rb_define_const(cXMLInput, "ISO_8859_3", INT2NUM(XML_CHAR_ENCODING_8859_3)); /* ISO-8859-3 */

data/ext/libxml/ruby_xml_input.h

@@ -2,8 +2,8 @@
 
 /* Please see the LICENSE file for copyright and distribution information */
 
-#ifndef __rxml_INPUT__
-#define __rxml_INPUT__
+#ifndef __RXML_INPUT__
+#define __RXML_INPUT__
 
 extern VALUE cXMLInput;
 
@@ -15,6 +15,6 @@ extern ID STRING_ATTR;
 
 void ruby_init_xml_input();
 int rxml_read_callback(void *context, char *buffer, int len);
-VALUE rxml_input_encoding_to_s(VALUE self, VALUE encoding);
+VALUE rxml_input_encoding_to_s(VALUE klass, VALUE encoding);
 
 #endif

data/ext/libxml/ruby_xml_input_cbg.c

@@ -1,197 +1,197 @@
-/* Author: Martin Povolny (xpovolny@fi.muni.cz) */
-
-#include "ruby_libxml.h"
-#include "ruby_xml_input_cbg.h"
-
-/* Document-class: LibXML::XML::InputCallbacks
- *
- * Support for adding custom scheme handlers. */
-
-static ic_scheme *first_scheme = 0;
-
-int ic_match(char const *filename)
-{
-  ic_scheme *scheme;
-
-  //fprintf( stderr, "ic_match: %s\n", filename );
-
-  scheme = first_scheme;
-  while (0 != scheme)
-  {
-    if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST scheme->scheme_name, scheme->name_len))
-    {
-      return 1;
-    }
-    scheme = scheme->next_scheme;
-  }
-  return 0;
-}
-
-void* ic_open(char const *filename)
-{
-  ic_doc_context *ic_doc;
-  ic_scheme *scheme;
-  VALUE res;
-
-  scheme = first_scheme;
-  while (0 != scheme)
-  {
-    if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST scheme->scheme_name, scheme->name_len))
-    {
-      ic_doc = (ic_doc_context*) malloc(sizeof(ic_doc_context));
-
-      res = rb_funcall(scheme->class, rb_intern("document_query"), 1,
-          rb_str_new2(filename));
-
-      ic_doc->buffer = strdup(StringValuePtr(res));
-
-      ic_doc->bpos = ic_doc->buffer;
-      ic_doc->remaining = strlen(ic_doc->buffer);
-      return ic_doc;
-    }
-    scheme = scheme->next_scheme;
-  }
-  return 0;
-}
-
-int ic_read(void *context, char *buffer, int len)
-{
-  ic_doc_context *ic_doc;
-  int ret_len;
-  ic_doc = (ic_doc_context*) context;
-
-  if (len >= ic_doc->remaining)
-  {
-    ret_len = ic_doc->remaining;
-  }
-  else
-  {
-    ret_len = len;
-  }
-  ic_doc->remaining -= ret_len;
-  strncpy(buffer, ic_doc->bpos, ret_len);
-  ic_doc->bpos += ret_len;
-
-  return ret_len;
-}
-
-int ic_close(void *context)
-{
-  ruby_xfree(((ic_doc_context*) context)->buffer);
-  ruby_xfree(context);
-  return 1;
-}
-
-/*
- * call-seq:
- *    register
- *
- * Register a new set of I/O callback for handling parser input.
- */
-static VALUE input_callbacks_register_input_callbacks()
-{
-  xmlRegisterInputCallbacks(ic_match, ic_open, ic_read, ic_close);
-  return (Qtrue);
-}
-
-/*
- * call-seq:
- *    add_scheme
- *
- * No documentation available.
- */
-static VALUE input_callbacks_add_scheme(VALUE self, VALUE scheme_name,
-    VALUE class)
-{
-  ic_scheme *scheme;
-
-  Check_Type(scheme_name, T_STRING);
-
-  scheme = (ic_scheme*) malloc(sizeof(ic_scheme));
-  scheme->next_scheme = 0;
-  scheme->scheme_name = strdup(StringValuePtr(scheme_name)); /* TODO alloc, dealloc */
-  scheme->name_len = strlen(scheme->scheme_name);
-  scheme->class = class; /* TODO alloc, dealloc */
-
-  //fprintf( stderr, "registered: %s, %d, %s\n", scheme->scheme_name, scheme->name_len, scheme->class );
-
-  if (0 == first_scheme)
-    first_scheme = scheme;
-  else
-  {
-    ic_scheme *pos;
-    pos = first_scheme;
-    while (0 != pos->next_scheme)
-      pos = pos->next_scheme;
-    pos->next_scheme = scheme;
-  }
-
-  return (Qtrue);
-}
-
-/*
- * call-seq:
- *    remove_scheme
- *
- * No documentation available.
- */
-static VALUE input_callbacks_remove_scheme(VALUE self, VALUE scheme_name)
-{
-  char *name;
-  ic_scheme *save_scheme, *scheme;
-
-  Check_Type(scheme_name, T_STRING);
-  name = StringValuePtr(scheme_name);
-
-  if (0 == first_scheme)
-    return Qfalse;
-
-  if (!strncmp(name, first_scheme->scheme_name, first_scheme->name_len))
-  {
-    save_scheme = first_scheme->next_scheme;
-
-    ruby_xfree(first_scheme->scheme_name);
-    ruby_xfree(first_scheme);
-
-    first_scheme = save_scheme;
-    return Qtrue;
-  }
-
-  scheme = first_scheme;
-  while (0 != scheme->next_scheme)
-  {
-    if (!strncmp(name, scheme->next_scheme->scheme_name,
-        scheme->next_scheme->name_len))
-    {
-      save_scheme = scheme->next_scheme->next_scheme;
-
-      ruby_xfree(scheme->next_scheme->scheme_name);
-      ruby_xfree(scheme->next_scheme);
-
-      scheme->next_scheme = save_scheme;
-      return Qtrue;
-    }
-    scheme = scheme->next_scheme;
-  }
-  return Qfalse;
-}
-
-// Rdoc needs to know
-#ifdef RDOC_NEVER_DEFINED
-mLibXML = rb_define_module("LibXML");
-mXML = rb_define_module_under(mLibXML, "XML");
-#endif
-
-void ruby_init_input_callbacks(void)
-{
-  VALUE cInputCallbacks;
-  cInputCallbacks = rb_define_class_under(mXML, "InputCallbacks", rb_cObject);
-
-  /* Class Methods */
-  rb_define_singleton_method(cInputCallbacks, "register",
-      input_callbacks_register_input_callbacks, 0);
-  rb_define_singleton_method(cInputCallbacks, "add_scheme",
-      input_callbacks_add_scheme, 2);
-  rb_define_singleton_method(cInputCallbacks, "remove_scheme",
-      input_callbacks_remove_scheme, 1);
-}
+/* Author: Martin Povolny (xpovolny@fi.muni.cz) */
+
+#include "ruby_libxml.h"
+#include "ruby_xml_input_cbg.h"
+
+/* Document-class: LibXML::XML::InputCallbacks
+ *
+ * Support for adding custom scheme handlers. */
+
+static ic_scheme *first_scheme = 0;
+
+int ic_match(char const *filename)
+{
+  ic_scheme *scheme;
+
+  //fprintf( stderr, "ic_match: %s\n", filename );
+
+  scheme = first_scheme;
+  while (0 != scheme)
+  {
+    if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST scheme->scheme_name, scheme->name_len))
+    {
+      return 1;
+    }
+    scheme = scheme->next_scheme;
+  }
+  return 0;
+}
+
+void* ic_open(char const *filename)
+{
+  ic_doc_context *ic_doc;
+  ic_scheme *scheme;
+  VALUE res;
+
+  scheme = first_scheme;
+  while (0 != scheme)
+  {
+    if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST scheme->scheme_name, scheme->name_len))
+    {
+      ic_doc = (ic_doc_context*) malloc(sizeof(ic_doc_context));
+
+      res = rb_funcall(scheme->class, rb_intern("document_query"), 1,
+          rb_str_new2(filename));
+
+      ic_doc->buffer = strdup(StringValuePtr(res));
+
+      ic_doc->bpos = ic_doc->buffer;
+      ic_doc->remaining = strlen(ic_doc->buffer);
+      return ic_doc;
+    }
+    scheme = scheme->next_scheme;
+  }
+  return 0;
+}
+
+int ic_read(void *context, char *buffer, int len)
+{
+  ic_doc_context *ic_doc;
+  int ret_len;
+  ic_doc = (ic_doc_context*) context;
+
+  if (len >= ic_doc->remaining)
+  {
+    ret_len = ic_doc->remaining;
+  }
+  else
+  {
+    ret_len = len;
+  }
+  ic_doc->remaining -= ret_len;
+  strncpy(buffer, ic_doc->bpos, ret_len);
+  ic_doc->bpos += ret_len;
+
+  return ret_len;
+}
+
+int ic_close(void *context)
+{
+  ruby_xfree(((ic_doc_context*) context)->buffer);
+  ruby_xfree(context);
+  return 1;
+}
+
+/*
+ * call-seq:
+ *    register
+ *
+ * Register a new set of I/O callback for handling parser input.
+ */
+static VALUE input_callbacks_register_input_callbacks()
+{
+  xmlRegisterInputCallbacks(ic_match, ic_open, ic_read, ic_close);
+  return (Qtrue);
+}
+
+/*
+ * call-seq:
+ *    add_scheme
+ *
+ * No documentation available.
+ */
+static VALUE input_callbacks_add_scheme(VALUE self, VALUE scheme_name,
+    VALUE class)
+{
+  ic_scheme *scheme;
+
+  Check_Type(scheme_name, T_STRING);
+
+  scheme = (ic_scheme*) malloc(sizeof(ic_scheme));
+  scheme->next_scheme = 0;
+  scheme->scheme_name = strdup(StringValuePtr(scheme_name)); /* TODO alloc, dealloc */
+  scheme->name_len = strlen(scheme->scheme_name);
+  scheme->class = class; /* TODO alloc, dealloc */
+
+  //fprintf( stderr, "registered: %s, %d, %s\n", scheme->scheme_name, scheme->name_len, scheme->class );
+
+  if (0 == first_scheme)
+    first_scheme = scheme;
+  else
+  {
+    ic_scheme *pos;
+    pos = first_scheme;
+    while (0 != pos->next_scheme)
+      pos = pos->next_scheme;
+    pos->next_scheme = scheme;
+  }
+
+  return (Qtrue);
+}
+
+/*
+ * call-seq:
+ *    remove_scheme
+ *
+ * No documentation available.
+ */
+static VALUE input_callbacks_remove_scheme(VALUE self, VALUE scheme_name)
+{
+  char *name;
+  ic_scheme *save_scheme, *scheme;
+
+  Check_Type(scheme_name, T_STRING);
+  name = StringValuePtr(scheme_name);
+
+  if (0 == first_scheme)
+    return Qfalse;
+
+  if (!strncmp(name, first_scheme->scheme_name, first_scheme->name_len))
+  {
+    save_scheme = first_scheme->next_scheme;
+
+    ruby_xfree(first_scheme->scheme_name);
+    ruby_xfree(first_scheme);
+
+    first_scheme = save_scheme;
+    return Qtrue;
+  }
+
+  scheme = first_scheme;
+  while (0 != scheme->next_scheme)
+  {
+    if (!strncmp(name, scheme->next_scheme->scheme_name,
+        scheme->next_scheme->name_len))
+    {
+      save_scheme = scheme->next_scheme->next_scheme;
+
+      ruby_xfree(scheme->next_scheme->scheme_name);
+      ruby_xfree(scheme->next_scheme);
+
+      scheme->next_scheme = save_scheme;
+      return Qtrue;
+    }
+    scheme = scheme->next_scheme;
+  }
+  return Qfalse;
+}
+
+// Rdoc needs to know
+#ifdef RDOC_NEVER_DEFINED
+mLibXML = rb_define_module("LibXML");
+mXML = rb_define_module_under(mLibXML, "XML");
+#endif
+
+void ruby_init_input_callbacks(void)
+{
+  VALUE cInputCallbacks;
+  cInputCallbacks = rb_define_class_under(mXML, "InputCallbacks", rb_cObject);
+
+  /* Class Methods */
+  rb_define_singleton_method(cInputCallbacks, "register",
+      input_callbacks_register_input_callbacks, 0);
+  rb_define_singleton_method(cInputCallbacks, "add_scheme",
+      input_callbacks_add_scheme, 2);
+  rb_define_singleton_method(cInputCallbacks, "remove_scheme",
+      input_callbacks_remove_scheme, 1);
+}