libxml-ruby 0.8.1 → 0.8.2

data/ext/libxml/ruby_xml_input_cbg.c

@@ -1,165 +1,165 @@
-
-/* ruby support for custom scheme handlers      */
-/* Author: Martin Povolny (xpovolny@fi.muni.cz) */
-
-#include "ruby_libxml.h"
-#include "ruby_xml_input_cbg.h"
-
-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.
- */
-VALUE input_callbacks_register_input_callbacks() {
-    xmlRegisterInputCallbacks( ic_match, ic_open, ic_read, ic_close );
-    return(Qtrue);
-}
-
-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);
-}
-
-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;
-    
-    /* check the first one */
-    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);
-}
+
+/* ruby support for custom scheme handlers      */
+/* Author: Martin Povolny (xpovolny@fi.muni.cz) */
+
+#include "ruby_libxml.h"
+#include "ruby_xml_input_cbg.h"
+
+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.
+ */
+VALUE input_callbacks_register_input_callbacks() {
+    xmlRegisterInputCallbacks( ic_match, ic_open, ic_read, ic_close );
+    return(Qtrue);
+}
+
+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);
+}
+
+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;
+    
+    /* check the first one */
+    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);
+}

data/ext/libxml/ruby_xml_node.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_node.c 461 2008-07-15 21:35:56Z cfis $ */
+/* $Id: ruby_xml_node.c 497 2008-07-22 01:33:51Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/libxml/ruby_xml_node_set.c

@@ -1,172 +1,172 @@
-/* $Id: ruby_xml_node_set.c 461 2008-07-15 21:35:56Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#include "ruby_libxml.h"
-#include "ruby_xml_node_set.h"
-
-/*
- * Document-class: LibXML::XML::Node::Set
- * 
- * Includes Enumerable.
- */
-VALUE cXMLNodeSet;
-
-// TODO maybe we should support [] on nodeset?
-//      Would also give us on xpath too...
-
-/*
- * call-seq:
- *    nodeset.to_a -> [node, ..., node]
- * 
- * Obtain an array of the nodes in this set.
- */
-VALUE
-ruby_xml_node_set_to_a(VALUE self) {
-  ruby_xml_node_set *rxnset;
-  VALUE r;
-
-  Data_Get_Struct(self, ruby_xml_node_set, rxnset);
-  r=ruby_xml_xpath_object_to_a(rxnset->rxpop);
-#ifdef NODE_DEBUG
-  fprintf(stderr,"node_set_to_a %s\n",rb_str2cstr(rb_ary_to_s(r),0));
-#endif
-  return r;
-}
-
-
-/*
- * call-seq:
- *    nodeset.each { |node| ... } -> self
- * 
- * Call the supplied block for each node in this set.
- */
-VALUE
-ruby_xml_node_set_each(VALUE self) {
-  ruby_xml_node_set *rxnset;
-
-  Data_Get_Struct(self, ruby_xml_node_set, rxnset);
-  return ruby_xml_xpath_object_each(rxnset->rxpop);
-}
-
-
-/*
- * call-seq:
- *    nodeset.empty? -> (true|false)
- *
- * Determine whether this nodeset is empty (contains no nodes).
- */
-VALUE
-ruby_xml_node_set_empty_q(VALUE self) {
-  ruby_xml_node_set *rxnset;
-
-  Data_Get_Struct(self, ruby_xml_node_set, rxnset);
-  return ruby_xml_xpath_object_empty_q(rxnset->rxpop);
-}
-
-
-/*
- * call-seq:
- *    nodeset.first -> node
- *
- * Returns the first node in this node set, or nil if none exist.
- */
-VALUE
-ruby_xml_node_set_first(VALUE self) {
-  ruby_xml_node_set *rxnset;
-
-  Data_Get_Struct(self, ruby_xml_node_set, rxnset);
-  return ruby_xml_xpath_object_first(rxnset->rxpop);
-}
-
-/*
- * call-seq:
- *    nodeset.length -> num
- * 
- * Obtain the length of this nodeset.
- */
-VALUE
-ruby_xml_node_set_length(VALUE self) {
-  ruby_xml_node_set *rxnset;
-
-  Data_Get_Struct(self, ruby_xml_node_set, rxnset);
-  return ruby_xml_xpath_object_length(rxnset->rxpop);
-}
-
-
-static void
-ruby_xml_node_set_mark(ruby_xml_node_set *rxnset) {
-  if (!NIL_P(rxnset->rxpop))
-    rb_gc_mark(rxnset->rxpop);
-}
-
-static void
-ruby_xml_node_set_free(ruby_xml_node_set *rxnset) {
-  ruby_xfree(rxnset);
-}
-
-VALUE
-ruby_xml_node_set_new(VALUE class, VALUE rxpop)
-{
-  ruby_xml_node_set *rxnset;
-  rxnset = ALLOC(ruby_xml_node_set);
-  rxnset->rxpop=rxpop;
-  return Data_Wrap_Struct(class,
-			  ruby_xml_node_set_mark,
-			  ruby_xml_node_set_free,
-			  rxnset);
-}
-
-VALUE
-ruby_xml_node_set_new2(VALUE rxpop)
-{
-  return ruby_xml_node_set_new(cXMLNodeSet,rxpop);
-}
-
-/*
- * call-seq:
- *    nodeset.xpath -> xpath
- * 
- * Obtain the xpath corresponding to this nodeset, if any.
- */
-VALUE
-ruby_xml_node_set_xpath_get(VALUE self) {
-  rb_raise(rb_eRuntimeError,"xpath retrival is no longer supported");
-}
-
-
-/*
- * call-seq:
- *    nodeset.xpath_ctxt -> context
- * 
- * Return the xpath context corresponding to this nodeset,
- * if any.
- */
-VALUE
-ruby_xml_node_set_xpath_data_get(VALUE self) {
-  rb_raise(rb_eRuntimeError,"xpath data retrival is no longer supported");
-}
-
-// Rdoc needs to know 
-#ifdef RDOC_NEVER_DEFINED
-  mLibXML = rb_define_module("LibXML");
-  mXML = rb_define_module_under(mLibXML, "XML");
-  cXMLNode = rb_define_class_under(mXML, "Node", rb_cObject);
-#endif
-
-void
-ruby_init_xml_node_set(void) {
-  cXMLNodeSet = rb_define_class_under(cXMLNode, "Set", rb_cObject);  
-  rb_include_module(cXMLNodeSet, rb_mEnumerable);
-
-  rb_define_method(cXMLNodeSet, "each", ruby_xml_node_set_each, 0);
-  rb_define_method(cXMLNodeSet, "empty?", ruby_xml_node_set_empty_q, 0);
-  rb_define_method(cXMLNodeSet, "first", ruby_xml_node_set_first, 0);
-  rb_define_method(cXMLNodeSet, "length", ruby_xml_node_set_length, 0);
-  rb_define_method(cXMLNodeSet, "size", ruby_xml_node_set_length, 0);
-  rb_define_method(cXMLNodeSet, "to_a", ruby_xml_node_set_to_a, 0);
-  rb_define_method(cXMLNodeSet, "xpath", ruby_xml_node_set_xpath_get, 0);
-  rb_define_method(cXMLNodeSet, "xpath_ctxt",
-		   ruby_xml_node_set_xpath_data_get, 0);
-       
-}
+/* $Id: ruby_xml_node_set.c 461 2008-07-15 21:35:56Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#include "ruby_libxml.h"
+#include "ruby_xml_node_set.h"
+
+/*
+ * Document-class: LibXML::XML::Node::Set
+ * 
+ * Includes Enumerable.
+ */
+VALUE cXMLNodeSet;
+
+// TODO maybe we should support [] on nodeset?
+//      Would also give us on xpath too...
+
+/*
+ * call-seq:
+ *    nodeset.to_a -> [node, ..., node]
+ * 
+ * Obtain an array of the nodes in this set.
+ */
+VALUE
+ruby_xml_node_set_to_a(VALUE self) {
+  ruby_xml_node_set *rxnset;
+  VALUE r;
+
+  Data_Get_Struct(self, ruby_xml_node_set, rxnset);
+  r=ruby_xml_xpath_object_to_a(rxnset->rxpop);
+#ifdef NODE_DEBUG
+  fprintf(stderr,"node_set_to_a %s\n",rb_str2cstr(rb_ary_to_s(r),0));
+#endif
+  return r;
+}
+
+
+/*
+ * call-seq:
+ *    nodeset.each { |node| ... } -> self
+ * 
+ * Call the supplied block for each node in this set.
+ */
+VALUE
+ruby_xml_node_set_each(VALUE self) {
+  ruby_xml_node_set *rxnset;
+
+  Data_Get_Struct(self, ruby_xml_node_set, rxnset);
+  return ruby_xml_xpath_object_each(rxnset->rxpop);
+}
+
+
+/*
+ * call-seq:
+ *    nodeset.empty? -> (true|false)
+ *
+ * Determine whether this nodeset is empty (contains no nodes).
+ */
+VALUE
+ruby_xml_node_set_empty_q(VALUE self) {
+  ruby_xml_node_set *rxnset;
+
+  Data_Get_Struct(self, ruby_xml_node_set, rxnset);
+  return ruby_xml_xpath_object_empty_q(rxnset->rxpop);
+}
+
+
+/*
+ * call-seq:
+ *    nodeset.first -> node
+ *
+ * Returns the first node in this node set, or nil if none exist.
+ */
+VALUE
+ruby_xml_node_set_first(VALUE self) {
+  ruby_xml_node_set *rxnset;
+
+  Data_Get_Struct(self, ruby_xml_node_set, rxnset);
+  return ruby_xml_xpath_object_first(rxnset->rxpop);
+}
+
+/*
+ * call-seq:
+ *    nodeset.length -> num
+ * 
+ * Obtain the length of this nodeset.
+ */
+VALUE
+ruby_xml_node_set_length(VALUE self) {
+  ruby_xml_node_set *rxnset;
+
+  Data_Get_Struct(self, ruby_xml_node_set, rxnset);
+  return ruby_xml_xpath_object_length(rxnset->rxpop);
+}
+
+
+static void
+ruby_xml_node_set_mark(ruby_xml_node_set *rxnset) {
+  if (!NIL_P(rxnset->rxpop))
+    rb_gc_mark(rxnset->rxpop);
+}
+
+static void
+ruby_xml_node_set_free(ruby_xml_node_set *rxnset) {
+  ruby_xfree(rxnset);
+}
+
+VALUE
+ruby_xml_node_set_new(VALUE class, VALUE rxpop)
+{
+  ruby_xml_node_set *rxnset;
+  rxnset = ALLOC(ruby_xml_node_set);
+  rxnset->rxpop=rxpop;
+  return Data_Wrap_Struct(class,
+			  ruby_xml_node_set_mark,
+			  ruby_xml_node_set_free,
+			  rxnset);
+}
+
+VALUE
+ruby_xml_node_set_new2(VALUE rxpop)
+{
+  return ruby_xml_node_set_new(cXMLNodeSet,rxpop);
+}
+
+/*
+ * call-seq:
+ *    nodeset.xpath -> xpath
+ * 
+ * Obtain the xpath corresponding to this nodeset, if any.
+ */
+VALUE
+ruby_xml_node_set_xpath_get(VALUE self) {
+  rb_raise(rb_eRuntimeError,"xpath retrival is no longer supported");
+}
+
+
+/*
+ * call-seq:
+ *    nodeset.xpath_ctxt -> context
+ * 
+ * Return the xpath context corresponding to this nodeset,
+ * if any.
+ */
+VALUE
+ruby_xml_node_set_xpath_data_get(VALUE self) {
+  rb_raise(rb_eRuntimeError,"xpath data retrival is no longer supported");
+}
+
+// Rdoc needs to know 
+#ifdef RDOC_NEVER_DEFINED
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
+  cXMLNode = rb_define_class_under(mXML, "Node", rb_cObject);
+#endif
+
+void
+ruby_init_xml_node_set(void) {
+  cXMLNodeSet = rb_define_class_under(cXMLNode, "Set", rb_cObject);  
+  rb_include_module(cXMLNodeSet, rb_mEnumerable);
+
+  rb_define_method(cXMLNodeSet, "each", ruby_xml_node_set_each, 0);
+  rb_define_method(cXMLNodeSet, "empty?", ruby_xml_node_set_empty_q, 0);
+  rb_define_method(cXMLNodeSet, "first", ruby_xml_node_set_first, 0);
+  rb_define_method(cXMLNodeSet, "length", ruby_xml_node_set_length, 0);
+  rb_define_method(cXMLNodeSet, "size", ruby_xml_node_set_length, 0);
+  rb_define_method(cXMLNodeSet, "to_a", ruby_xml_node_set_to_a, 0);
+  rb_define_method(cXMLNodeSet, "xpath", ruby_xml_node_set_xpath_get, 0);
+  rb_define_method(cXMLNodeSet, "xpath_ctxt",
+		   ruby_xml_node_set_xpath_data_get, 0);
+       
+}