libxml-ruby 0.9.2 → 0.9.3

data/ext/libxml/ruby_xml_node.h

@@ -1,14 +1,14 @@
-/* $Id: ruby_xml_node.h 553 2008-11-18 02:34:38Z cfis $ */
+/* $Id: ruby_xml_node.h 612 2008-11-21 08:01:29Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
-#ifndef __RUBY_XML_NODE__
-#define __RUBY_XML_NODE__
+#ifndef __rxml_NODE__
+#define __rxml_NODE__
 
 extern VALUE cXMLNode;
 
 void ruby_init_xml_node(void);
-void ruby_xml_node_mark_common(xmlNodePtr xnode);
-VALUE ruby_xml_node2_wrap(VALUE class, xmlNodePtr xnode);
+void rxml_node_mark_common(xmlNodePtr xnode);
+VALUE rxml_node2_wrap(VALUE class, xmlNodePtr xnode);
 VALUE check_string_or_symbol(VALUE val);
 #endif

data/ext/libxml/ruby_xml_ns.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_ns.c 553 2008-11-18 02:34:38Z cfis $ */
+/* $Id: ruby_xml_ns.c 614 2008-11-22 08:04:39Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -16,9 +16,9 @@ VALUE cXMLNS;
  * with an node. */
 
 
-VALUE
-ruby_xml_ns_alloc(VALUE klass) {
-  return Data_Wrap_Struct(cXMLNS, NULL, NULL, NULL);
+static VALUE
+rxml_ns_alloc(VALUE klass) {
+  return Data_Wrap_Struct(klass, NULL, NULL, NULL);
 }
 
 /*
@@ -30,8 +30,8 @@ ruby_xml_ns_alloc(VALUE klass) {
  *
  *  XML::NS.new(node, "xlink", "http://www.w3.org/1999/xlink")
  */
-VALUE
-ruby_xml_ns_initialize(VALUE self, VALUE node, VALUE href, VALUE prefix) {
+static VALUE
+rxml_ns_initialize(VALUE self, VALUE node, VALUE href, VALUE prefix) {
   xmlNodePtr xnode;
   xmlChar *xmlPrefix;
 	xmlNsPtr xns;
@@ -46,7 +46,7 @@ ruby_xml_ns_initialize(VALUE self, VALUE node, VALUE href, VALUE prefix) {
 }
 
 VALUE
-ruby_xml_ns_wrap(xmlNsPtr xns) {
+rxml_ns_wrap(xmlNsPtr xns) {
   return(Data_Wrap_Struct(cXMLNS, NULL, NULL, xns));
 }
 
@@ -57,8 +57,8 @@ ruby_xml_ns_wrap(xmlNsPtr xns) {
  * 
  * Obtain the namespace's href.
  */
-VALUE
-ruby_xml_ns_href_get(VALUE self) {
+static VALUE
+rxml_ns_href_get(VALUE self) {
   xmlNsPtr xns;
   Data_Get_Struct(self, xmlNs, xns);
   if (xns == NULL || xns->href == NULL)
@@ -74,8 +74,8 @@ ruby_xml_ns_href_get(VALUE self) {
  * 
  * Determine whether this namespace has an href.
  */
-VALUE
-ruby_xml_ns_href_q(VALUE self) {
+static VALUE
+rxml_ns_href_q(VALUE self) {
   xmlNsPtr xns;
   Data_Get_Struct(self, xmlNs, xns);
   if (xns == NULL || xns->href == NULL)
@@ -91,14 +91,14 @@ ruby_xml_ns_href_q(VALUE self) {
  * 
  * Obtain the next namespace.
  */
-VALUE
-ruby_xml_ns_next(VALUE self) {
+static VALUE
+rxml_ns_next(VALUE self) {
   xmlNsPtr xns;
   Data_Get_Struct(self, xmlNs, xns);
   if (xns == NULL || xns->next == NULL)
     return(Qnil);
   else
-    return(ruby_xml_ns_wrap(xns->next));
+    return(rxml_ns_wrap(xns->next));
 }
 
 
@@ -109,8 +109,8 @@ ruby_xml_ns_next(VALUE self) {
  * 
  * Obtain the namespace's prefix.
  */
-VALUE
-ruby_xml_ns_prefix_get(VALUE self) {
+static VALUE
+rxml_ns_prefix_get(VALUE self) {
   xmlNsPtr xns;
   Data_Get_Struct(self, xmlNs, xns);
   if (xns == NULL || xns->prefix == NULL)
@@ -126,8 +126,8 @@ ruby_xml_ns_prefix_get(VALUE self) {
  * 
  * Determine whether this namespace has a prefix.
  */
-VALUE
-ruby_xml_ns_prefix_q(VALUE self) {
+static VALUE
+rxml_ns_prefix_q(VALUE self) {
   xmlNsPtr xns;
   Data_Get_Struct(self, xmlNs, xns);
   if (xns == NULL || xns->prefix == NULL)
@@ -145,12 +145,12 @@ ruby_xml_ns_prefix_q(VALUE self) {
 void
 ruby_init_xml_ns(void) {
   cXMLNS = rb_define_class_under(mXML, "NS", rb_cObject);
-  rb_define_alloc_func(cXMLNS, ruby_xml_ns_alloc);
-  rb_define_method(cXMLNS, "initialize", ruby_xml_ns_initialize, 3);
-  rb_define_method(cXMLNS, "href", ruby_xml_ns_href_get, 0);
-  rb_define_method(cXMLNS, "href?", ruby_xml_ns_href_q, 0);
-  rb_define_method(cXMLNS, "next", ruby_xml_ns_next, 0);
-  rb_define_method(cXMLNS, "prefix", ruby_xml_ns_prefix_get, 0);
-  rb_define_method(cXMLNS, "prefix?", ruby_xml_ns_prefix_q, 0);
-  rb_define_method(cXMLNS, "to_s", ruby_xml_ns_prefix_get, 0);
+  rb_define_alloc_func(cXMLNS, rxml_ns_alloc);
+  rb_define_method(cXMLNS, "initialize", rxml_ns_initialize, 3);
+  rb_define_method(cXMLNS, "href", rxml_ns_href_get, 0);
+  rb_define_method(cXMLNS, "href?", rxml_ns_href_q, 0);
+  rb_define_method(cXMLNS, "next", rxml_ns_next, 0);
+  rb_define_method(cXMLNS, "prefix", rxml_ns_prefix_get, 0);
+  rb_define_method(cXMLNS, "prefix?", rxml_ns_prefix_q, 0);
+  rb_define_method(cXMLNS, "to_s", rxml_ns_prefix_get, 0);
 }

data/ext/libxml/ruby_xml_ns.h

@@ -1,12 +1,12 @@
-/* $Id: ruby_xml_ns.h 324 2008-07-08 23:00:02Z cfis $ */
+/* $Id: ruby_xml_ns.h 612 2008-11-21 08:01:29Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
-#ifndef __RUBY_XML_NS__
-#define __RUBY_XML_NS__
+#ifndef __rxml_NS__
+#define __rxml_NS__
 
 extern VALUE cXMLNS;
 
 void ruby_init_xml_ns(void);
-VALUE ruby_xml_ns_wrap(xmlNsPtr ns);
+VALUE rxml_ns_wrap(xmlNsPtr ns);
 #endif

data/ext/libxml/ruby_xml_parser.c

@@ -1,164 +1,151 @@
-/* $Id: ruby_xml_parser.c 604 2008-11-19 18:01:55Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#include <stdarg.h>
-#include "ruby_libxml.h"
-
-VALUE cXMLParser;
-static ID INPUT_ATTR;
-static ID CONTEXT_ATTR;
-
-/*
- * Document-class: LibXML::XML::Parser
- *
- * The XML::Parser provides a tree based API for processing
- * xml documents, in contract to XML::Reader's stream
- * based api and XML::SaxParser callback based API.
- *
- * As a result, parsing a document creates an in-memory document object
- * that consist of any number of XML::Node instances.  This is simple
- * and powerful model, but has the major limitation that the size of 
- * the document that can be processed is limited by the amount of
- * memory available.  In such cases, it is better to use the XML::Reader.
- *
- * Using the parser is simple:
- *
- *   parser = XML::Parser.new
- *   parser.file = 'my_file'
- *   doc = parser.parse
- * 
- * You can also parse strings (see XML::Parser.string) and io objects (see 
- * XML::Parser.io).
- */
-
-static int
-ctxtRead(FILE *f, char * buf, size_t len) {
-    return(rb_io_fread(buf, len, f));
-}
-
-
-/*
- * call-seq:
- *    parser.initialize -> parser
- * 
- * Initiliazes instance of parser.
- */
-VALUE
-ruby_xml_parser_initialize(VALUE self) {
-  VALUE input = rb_class_new_instance(0, NULL, cXMLInput);
-  rb_iv_set(self, "@input", input);
-  rb_iv_set(self, "@context", Qnil);
-  return self;
-}
-
-
-xmlParserCtxtPtr
-ruby_xml_parser_filename_ctxt(VALUE input) {
-  xmlParserCtxtPtr ctxt;
-  int retry_count = 0;
-  VALUE filename = rb_ivar_get(input, FILE_ATTR);
-  
-  retry:
-  ctxt = xmlCreateFileParserCtxt(StringValuePtr(filename));
-  if (ctxt == NULL) {
-    if ((errno == EMFILE || errno == ENFILE) && retry_count == 0) {
-      retry_count++;
-      rb_gc();
-      goto retry;
-    } else {
-      rb_raise(rb_eIOError, StringValuePtr(filename));
-    }
-  }
-
-  return ctxt;
-}
-
-xmlParserCtxtPtr
-ruby_xml_parser_str_ctxt(VALUE input) {
-  VALUE str = rb_ivar_get(input, STRING_ATTR);
-  return xmlCreateMemoryParserCtxt(StringValuePtr(str), RSTRING_LEN(str));
-}
-
-xmlParserCtxtPtr
-ruby_xml_parser_io_ctxt(VALUE input) {
-  VALUE io = rb_ivar_get(input, IO_ATTR);
-  VALUE encoding = rb_ivar_get(input, ENCODING_ATTR);
-  xmlCharEncoding xmlEncoding = NUM2INT(encoding);
-  OpenFile *fptr;
-  FILE *f;
-
-  GetOpenFile(io, fptr);
-  rb_io_check_readable(fptr);
-  f = GetReadFile(fptr);
-
-  return xmlCreateIOParserCtxt(NULL, NULL,
-	 			                      (xmlInputReadCallback) ctxtRead,
-				                      NULL, f, xmlEncoding);
-}
-
-
-/*
- * 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.
- */
-VALUE
-ruby_xml_parser_parse(VALUE self) {
-  xmlParserCtxtPtr ctxt;
-  VALUE context;
-  VALUE input = rb_ivar_get(self, INPUT_ATTR);
-
-  context = rb_ivar_get(self, CONTEXT_ATTR);
-  if (context != Qnil)
-    rb_raise(rb_eRuntimeError, "You cannot parse a data source twice");
-
-  if (rb_ivar_get(input, FILE_ATTR) != Qnil)
-    ctxt = ruby_xml_parser_filename_ctxt(input);
-  else if (rb_ivar_get(input, STRING_ATTR) != Qnil)
-    ctxt = ruby_xml_parser_str_ctxt(input);
-  /*else if (rb_ivar_get(input, DOCUMENT_ATTR) != Qnil)
-    ctxt = ruby_xml_parser_parse_document(input);*/
-  else if (rb_ivar_get(input, IO_ATTR) != Qnil)
-    ctxt = ruby_xml_parser_io_ctxt(input);
-  else
-    rb_raise(rb_eArgError, "You must specify a parser data source");
-  
-  if (!ctxt)
-    ruby_xml_raise(&xmlLastError);
-
-  context = ruby_xml_parser_context_wrap(ctxt);
-  rb_ivar_set(self, CONTEXT_ATTR, context);
- 
-  if (xmlParseDocument(ctxt) == -1 || !ctxt->wellFormed) {
-    xmlFreeDoc(ctxt->myDoc);
-    ruby_xml_raise(&ctxt->lastError);
-  }
-
-  return ruby_xml_document_wrap(ctxt->myDoc);
-}
-
-
-// Rdoc needs to know 
-#ifdef RDOC_NEVER_DEFINED
-  mLibXML = rb_define_module("LibXML");
-  mXML = rb_define_module_under(mLibXML, "XML");
-#endif
-
-void
-ruby_init_parser(void) {	
-  cXMLParser = rb_define_class_under(mXML, "Parser", rb_cObject);
-                 
-  /* Atributes */
-  INPUT_ATTR = rb_intern("@input");
-  CONTEXT_ATTR = rb_intern("@context");
-  rb_define_attr(cXMLParser, "input", 1, 0);
-  rb_define_attr(cXMLParser, "context", 1, 0);
-
-  /* Instance Methods */
-  rb_define_method(cXMLParser, "initialize", ruby_xml_parser_initialize, 0);
-  rb_define_method(cXMLParser, "parse", ruby_xml_parser_parse, 0);
-}
+/* $Id: ruby_xml_parser.c 613 2008-11-21 08:39:51Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#include <stdarg.h>
+#include "ruby_libxml.h"
+
+VALUE cXMLParser;
+static ID INPUT_ATTR;
+static ID CONTEXT_ATTR;
+
+/*
+ * Document-class: LibXML::XML::Parser
+ *
+ * The XML::Parser provides a tree based API for processing
+ * xml documents, in contract to XML::Reader's stream
+ * based api and XML::SaxParser callback based API.
+ *
+ * As a result, parsing a document creates an in-memory document object
+ * that consist of any number of XML::Node instances.  This is simple
+ * and powerful model, but has the major limitation that the size of 
+ * the document that can be processed is limited by the amount of
+ * memory available.  In such cases, it is better to use the XML::Reader.
+ *
+ * Using the parser is simple:
+ *
+ *   parser = XML::Parser.new
+ *   parser.file = 'my_file'
+ *   doc = parser.parse
+ * 
+ * You can also parse strings (see XML::Parser.string) and io objects (see 
+ * XML::Parser.io).
+ */
+
+/*
+ * call-seq:
+ *    parser.initialize -> parser
+ * 
+ * Initiliazes instance of parser.
+ */
+static VALUE
+rxml_parser_initialize(VALUE self) {
+  VALUE input = rb_class_new_instance(0, NULL, cXMLInput);
+  rb_iv_set(self, "@input", input);
+  rb_iv_set(self, "@context", Qnil);
+  return self;
+}
+
+static xmlParserCtxtPtr
+rxml_parser_filename_ctxt(VALUE input) {
+  xmlParserCtxtPtr ctxt;
+  int retry_count = 0;
+  VALUE filename = rb_ivar_get(input, FILE_ATTR);
+  
+  retry:
+  ctxt = xmlCreateFileParserCtxt(StringValuePtr(filename));
+  if (ctxt == NULL) {
+    if ((errno == EMFILE || errno == ENFILE) && retry_count == 0) {
+      retry_count++;
+      rb_gc();
+      goto retry;
+    } else {
+      rb_raise(rb_eIOError, StringValuePtr(filename));
+    }
+  }
+
+  return ctxt;
+}
+
+static xmlParserCtxtPtr
+rxml_parser_str_ctxt(VALUE input) {
+  VALUE str = rb_ivar_get(input, STRING_ATTR);
+  return xmlCreateMemoryParserCtxt(StringValuePtr(str), RSTRING_LEN(str));
+}
+
+static xmlParserCtxtPtr
+rxml_parser_io_ctxt(VALUE input) {
+  VALUE io = rb_ivar_get(input, IO_ATTR);
+  VALUE encoding = rb_ivar_get(input, ENCODING_ATTR);
+  xmlCharEncoding xmlEncoding = NUM2INT(encoding);
+
+  return xmlCreateIOParserCtxt(NULL, NULL,
+	 			                      (xmlInputReadCallback) rxml_read_callback,
+				                      NULL, io, xmlEncoding);
+}
+
+
+/*
+ * 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_parser_parse(VALUE self) {
+  xmlParserCtxtPtr ctxt;
+  VALUE context;
+  VALUE input = rb_ivar_get(self, INPUT_ATTR);
+
+  context = rb_ivar_get(self, CONTEXT_ATTR);
+  if (context != Qnil)
+    rb_raise(rb_eRuntimeError, "You cannot parse a data source twice");
+
+  if (rb_ivar_get(input, FILE_ATTR) != Qnil)
+    ctxt = rxml_parser_filename_ctxt(input);
+  else if (rb_ivar_get(input, STRING_ATTR) != Qnil)
+    ctxt = rxml_parser_str_ctxt(input);
+  /*else if (rb_ivar_get(input, DOCUMENT_ATTR) != Qnil)
+    ctxt = rxml_parser_parse_document(input);*/
+  else if (rb_ivar_get(input, IO_ATTR) != Qnil)
+    ctxt = rxml_parser_io_ctxt(input);
+  else
+    rb_raise(rb_eArgError, "You must specify a parser data source");
+  
+  if (!ctxt)
+    rxml_raise(&xmlLastError);
+
+  context = rxml_parser_context_wrap(ctxt);
+  rb_ivar_set(self, CONTEXT_ATTR, context);
+ 
+  if (xmlParseDocument(ctxt) == -1 || !ctxt->wellFormed) {
+    xmlFreeDoc(ctxt->myDoc);
+    rxml_raise(&ctxt->lastError);
+  }
+
+  return rxml_document_wrap(ctxt->myDoc);
+}
+
+
+// Rdoc needs to know 
+#ifdef RDOC_NEVER_DEFINED
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
+#endif
+
+void
+ruby_init_parser(void) {	
+  cXMLParser = rb_define_class_under(mXML, "Parser", rb_cObject);
+                 
+  /* Atributes */
+  INPUT_ATTR = rb_intern("@input");
+  CONTEXT_ATTR = rb_intern("@context");
+  rb_define_attr(cXMLParser, "input", 1, 0);
+  rb_define_attr(cXMLParser, "context", 1, 0);
+
+  /* Instance Methods */
+  rb_define_method(cXMLParser, "initialize", rxml_parser_initialize, 0);
+  rb_define_method(cXMLParser, "parse", rxml_parser_parse, 0);
+}