libxml-ruby 0.9.4 → 0.9.5

data/ext/libxml/ruby_xml_node.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_node.h 612 2008-11-21 08:01:29Z cfis $ */
+/* $Id: ruby_xml_node.h 649 2008-11-30 03:15:57Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -9,6 +9,6 @@ extern VALUE cXMLNode;
 
 void ruby_init_xml_node(void);
 void rxml_node_mark_common(xmlNodePtr xnode);
-VALUE rxml_node2_wrap(VALUE class, xmlNodePtr xnode);
+VALUE rxml_node_wrap(VALUE class, xmlNodePtr xnode);
 VALUE check_string_or_symbol(VALUE val);
 #endif

data/ext/libxml/ruby_xml_ns.c

@@ -1,156 +1,150 @@
-/* $Id: ruby_xml_ns.c 614 2008-11-22 08:04:39Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#include "ruby_libxml.h"
-#include "ruby_xml_ns.h"
-
-VALUE cXMLNS;
-
-
-/* Document-class: LibXML::XML::NS
- * 
- * The NS class is used to query information about
- * xml namespaces associated with particular nodes.
- * It can also be used to associate new namespaces
- * with an node. */
-
-
-static VALUE
-rxml_ns_alloc(VALUE klass) {
-  return Data_Wrap_Struct(klass, NULL, NULL, NULL);
-}
-
-/*
- * call-seq:
- *    initialize(node, "href", "prefix")
- * 
- * Create a new namespace attached to the specified node with the
- * give prefix and namespace.
- *
- *  XML::NS.new(node, "xlink", "http://www.w3.org/1999/xlink")
- */
-static VALUE
-rxml_ns_initialize(VALUE self, VALUE node, VALUE href, VALUE prefix) {
-  xmlNodePtr xnode;
-  xmlChar *xmlPrefix;
-	xmlNsPtr xns;
-
-  Data_Get_Struct(node, xmlNode, xnode);
-	/* Prefix can be null - that means its the default namespace */
-	xmlPrefix = NIL_P(prefix) ? NULL : StringValuePtr(prefix);
-	xns = xmlNewNs(xnode, (xmlChar*)StringValuePtr(href), xmlPrefix);
-
-  DATA_PTR(self) = xns;
-  return self;  
-}
-
-VALUE
-rxml_ns_wrap(xmlNsPtr xns) {
-  return(Data_Wrap_Struct(cXMLNS, NULL, NULL, xns));
-}
-
-
-/*
- * call-seq:
- *    ns.href -> "href"
- * 
- * Obtain the namespace's href.
- */
-static VALUE
-rxml_ns_href_get(VALUE self) {
-  xmlNsPtr xns;
-  Data_Get_Struct(self, xmlNs, xns);
-  if (xns == NULL || xns->href == NULL)
-    return(Qnil);
-  else
-    return(rb_str_new2((const char*)xns->href));
-}
-
-
-/*
- * call-seq:
- *    ns.href? -> (true|false)
- * 
- * Determine whether this namespace has an href.
- */
-static VALUE
-rxml_ns_href_q(VALUE self) {
-  xmlNsPtr xns;
-  Data_Get_Struct(self, xmlNs, xns);
-  if (xns == NULL || xns->href == NULL)
-    return(Qfalse);
-  else
-    return(Qtrue);
-}
-
-
-/*
- * call-seq:
- *    ns.next -> ns
- * 
- * Obtain the next namespace.
- */
-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(rxml_ns_wrap(xns->next));
-}
-
-
-/*
- * call-seq:
- *    ns.prefix -> "prefix"
- *    ns.to_s   -> "prefix"
- * 
- * Obtain the namespace's prefix.
- */
-static VALUE
-rxml_ns_prefix_get(VALUE self) {
-  xmlNsPtr xns;
-  Data_Get_Struct(self, xmlNs, xns);
-  if (xns == NULL || xns->prefix == NULL)
-    return(Qnil);
-  else
-    return(rb_str_new2((const char*)xns->prefix));
-}
-
-
-/*
- * call-seq:
- *    ns.prefix? -> (true|false)
- * 
- * Determine whether this namespace has a prefix.
- */
-static VALUE
-rxml_ns_prefix_q(VALUE self) {
-  xmlNsPtr xns;
-  Data_Get_Struct(self, xmlNs, xns);
-  if (xns == NULL || xns->prefix == NULL)
-    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_ns(void) {
-  cXMLNS = rb_define_class_under(mXML, "NS", rb_cObject);
-  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);
-}
+/* $Id: ruby_xml_ns.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_ns.h"
+
+VALUE cXMLNS;
+
+/* Document-class: LibXML::XML::NS
+ *
+ * The NS class is used to query information about
+ * xml namespaces associated with particular nodes.
+ * It can also be used to associate new namespaces
+ * with an node. */
+
+static VALUE rxml_ns_alloc(VALUE klass)
+{
+  return Data_Wrap_Struct(klass, NULL, NULL, NULL);
+}
+
+/*
+ * call-seq:
+ *    initialize(node, "href", "prefix")
+ *
+ * Create a new namespace attached to the specified node with the
+ * give prefix and namespace.
+ *
+ *  XML::NS.new(node, "xlink", "http://www.w3.org/1999/xlink")
+ */
+static VALUE rxml_ns_initialize(VALUE self, VALUE node, VALUE href,
+    VALUE prefix)
+{
+  xmlNodePtr xnode;
+  xmlChar *xmlPrefix;
+  xmlNsPtr xns;
+
+  Data_Get_Struct(node, xmlNode, xnode);
+  /* Prefix can be null - that means its the default namespace */
+  xmlPrefix = NIL_P(prefix) ? NULL : StringValuePtr(prefix);
+  xns = xmlNewNs(xnode, (xmlChar*) StringValuePtr(href), xmlPrefix);
+
+  DATA_PTR( self) = xns;
+  return self;
+}
+
+VALUE rxml_ns_wrap(xmlNsPtr xns)
+{
+  return (Data_Wrap_Struct(cXMLNS, NULL, NULL, xns));
+}
+
+/*
+ * call-seq:
+ *    ns.href -> "href"
+ *
+ * Obtain the namespace's href.
+ */
+static VALUE rxml_ns_href_get(VALUE self)
+{
+  xmlNsPtr xns;
+  Data_Get_Struct(self, xmlNs, xns);
+  if (xns == NULL || xns->href == NULL)
+    return (Qnil);
+  else
+    return (rb_str_new2((const char*) xns->href));
+}
+
+/*
+ * call-seq:
+ *    ns.href? -> (true|false)
+ *
+ * Determine whether this namespace has an href.
+ */
+static VALUE rxml_ns_href_q(VALUE self)
+{
+  xmlNsPtr xns;
+  Data_Get_Struct(self, xmlNs, xns);
+  if (xns == NULL || xns->href == NULL)
+    return (Qfalse);
+  else
+    return (Qtrue);
+}
+
+/*
+ * call-seq:
+ *    ns.next -> ns
+ *
+ * Obtain the next namespace.
+ */
+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 (rxml_ns_wrap(xns->next));
+}
+
+/*
+ * call-seq:
+ *    ns.prefix -> "prefix"
+ *    ns.to_s   -> "prefix"
+ *
+ * Obtain the namespace's prefix.
+ */
+static VALUE rxml_ns_prefix_get(VALUE self)
+{
+  xmlNsPtr xns;
+  Data_Get_Struct(self, xmlNs, xns);
+  if (xns == NULL || xns->prefix == NULL)
+    return (Qnil);
+  else
+    return (rb_str_new2((const char*) xns->prefix));
+}
+
+/*
+ * call-seq:
+ *    ns.prefix? -> (true|false)
+ *
+ * Determine whether this namespace has a prefix.
+ */
+static VALUE rxml_ns_prefix_q(VALUE self)
+{
+  xmlNsPtr xns;
+  Data_Get_Struct(self, xmlNs, xns);
+  if (xns == NULL || xns->prefix == NULL)
+    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_ns(void)
+{
+  cXMLNS = rb_define_class_under(mXML, "NS", rb_cObject);
+  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_parser.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_parser.c 630 2008-11-24 06:53:01Z cfis $ */
+/* $Id: ruby_xml_parser.c 650 2008-11-30 03:40:22Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -18,7 +18,7 @@ static ID CONTEXT_ATTR;
  *
  * 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 
+ * 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.
  *
@@ -27,39 +27,42 @@ static ID CONTEXT_ATTR;
  *   parser = XML::Parser.new
  *   parser.file = 'my_file'
  *   doc = parser.parse
- * 
- * You can also parse strings (see XML::Parser.string) and io objects (see 
+ *
+ * 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) {
+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) {
+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: ctxt = xmlCreateFileParserCtxt(StringValuePtr(filename));
+  if (ctxt == NULL)
+  {
+    if ((errno == EMFILE || errno == ENFILE) && retry_count == 0)
+    {
       retry_count++;
       rb_gc();
       goto retry;
-    } else {
+    }
+    else
+    {
       rb_raise(rb_eIOError, StringValuePtr(filename));
     }
   }
@@ -67,34 +70,32 @@ rxml_parser_filename_ctxt(VALUE input) {
   return ctxt;
 }
 
-static xmlParserCtxtPtr
-rxml_parser_str_ctxt(VALUE input) {
+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) {
+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, (void *)io, xmlEncoding);
+      (xmlInputReadCallback) rxml_read_callback, NULL, (void *) 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) {
+static VALUE rxml_parser_parse(VALUE self)
+{
   xmlParserCtxtPtr ctxt;
   VALUE context;
   VALUE input = rb_ivar_get(self, INPUT_ATTR);
@@ -108,19 +109,20 @@ rxml_parser_parse(VALUE self) {
   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);*/
+   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) {
+
+  if (xmlParseDocument(ctxt) == -1 || !ctxt->wellFormed)
+  {
     xmlFreeDoc(ctxt->myDoc);
     rxml_raise(&ctxt->lastError);
   }
@@ -128,17 +130,16 @@ rxml_parser_parse(VALUE self) {
   return rxml_document_wrap(ctxt->myDoc);
 }
 
-
-// Rdoc needs to know 
+// Rdoc needs to know
 #ifdef RDOC_NEVER_DEFINED
-  mLibXML = rb_define_module("LibXML");
-  mXML = rb_define_module_under(mLibXML, "XML");
+mLibXML = rb_define_module("LibXML");
+mXML = rb_define_module_under(mLibXML, "XML");
 #endif
 
-void
-ruby_init_parser(void) {	
+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");