libxml-ruby 0.3.8.2 → 0.3.8.4

data/Rakefile

@@ -120,13 +120,14 @@ end
 task :update_version do
   unless PKG_VERSION == CURRENT_VERSION
     File.open('ext/xml/libxml.h.new','w+') do |f|      
-    maj, min, mic = /(\d+)\.(\d+)(?:\.(\d+))?/.match(PKG_VERSION).captures
+    maj, min, mic, patch = /(\d+)\.(\d+)(?:\.(\d+))?(?:\.(\d+))?/.match(PKG_VERSION).captures
       f << File.read('ext/xml/libxml.h').
            gsub(/RUBY_LIBXML_VERSION\s+"(\d.+)"/) { "RUBY_LIBXML_VERSION  \"#{PKG_VERSION}\"" }.
            gsub(/RUBY_LIBXML_VERNUM\s+\d+/) { "RUBY_LIBXML_VERNUM   #{PKG_VERSION.tr('.','').sub(/^0*/,'')}" }.
-           gsub(/RUBY_LIBXML_VER_MAJ\s+\d+/) { "RUBY_LIBXML_VER_MAJ   #{maj}" }.
-           gsub(/RUBY_LIBXML_VER_MIN\s+\d+/) { "RUBY_LIBXML_VER_MIN   #{min}" }.
-           gsub(/RUBY_LIBXML_VER_MIC\s+\d+/) { "RUBY_LIBXML_VER_MIC   #{mic || 0}" }           
+           gsub(/RUBY_LIBXML_VER_MAJ\s+\d+/) { "RUBY_LIBXML_VER_MAJ     #{maj}" }.
+           gsub(/RUBY_LIBXML_VER_MIN\s+\d+/) { "RUBY_LIBXML_VER_MIN     #{min}" }.
+           gsub(/RUBY_LIBXML_VER_MIC\s+\d+/) { "RUBY_LIBXML_VER_MIC     #{mic || 0}" }. 
+           gsub(/RUBY_LIBXML_VER_PATCH\s+\d+/) { "RUBY_LIBXML_VER_PATCH   #{patch || 0}" }           
     end
     mv('ext/xml/libxml.h.new', 'ext/xml/libxml.h')     
   end

data/ext/xml/libxml.c

@@ -1,4 +1,4 @@
-/* $Id: libxml.c,v 1.3 2006/11/20 01:22:07 roscopeco Exp $ */
+/* $Id: libxml.c,v 1.3.2.1 2006/11/26 12:37:41 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -39,6 +39,7 @@
 #define RubyMemStrdup   ruby_strdup
 
 VALUE mXML;
+VALUE eXMLError;
 
 static xmlFreeFunc freeFunc = NULL;
 static xmlMallocFunc mallocFunc = NULL;
@@ -59,6 +60,7 @@ Init_libxml_so(void) {
   xmlInitParser();
 
   mXML = rb_define_module("XML");
+  eXMLError = rb_define_class_under(mXML, "Error", rb_eRuntimeError);
 
   rb_define_const(mXML, "XML_NAMESPACE", rb_str_new2((const char*)XML_XML_NAMESPACE));
 
@@ -77,9 +79,9 @@ Init_libxml_so(void) {
   ruby_init_xml_xpath_context();
   ruby_init_xml_xpointer();
   ruby_init_xml_xpointer_context();
-  ruby_init_input_callbacks(); /* MUFF */
-  ruby_init_xml_dtd();         /* MUFF */
-  ruby_init_xml_schema();      /* MUFF */
+  ruby_init_input_callbacks(); 
+  ruby_init_xml_dtd();         
+  ruby_init_xml_schema();      
 
   ruby_xml_parser_default_substitute_entities_set(cXMLParser, Qtrue);
   ruby_xml_parser_default_load_external_dtd_set(cXMLParser, Qtrue);

data/ext/xml/libxml.h

@@ -6,11 +6,12 @@
 /* Don't nuke this block!  It is used for automatically updating the
  * versions below. VERSION = string formatting, VERNUM = numbered
  * version for inline testing: increment both or none at all. */
-#define RUBY_LIBXML_VERSION  "0.3.8.2"
-#define RUBY_LIBXML_VERNUM   382
-#define RUBY_LIBXML_VER_MAJ   0
-#define RUBY_LIBXML_VER_MIN   3
-#define RUBY_LIBXML_VER_MIC   8
+#define RUBY_LIBXML_VERSION  "0.3.8.4"
+#define RUBY_LIBXML_VERNUM   384
+#define RUBY_LIBXML_VER_MAJ     0
+#define RUBY_LIBXML_VER_MIN     3
+#define RUBY_LIBXML_VER_MIC     8
+#define RUBY_LIBXML_VER_PATCH   4
 
 #include <ruby.h>
 #include <rubyio.h>
@@ -75,6 +76,7 @@ typedef struct rx_xpath_data {
 #include "ruby_xml_schema.h"
 
 extern VALUE mXML;
+extern VALUE eXMLError;
 
 void ruby_init_parser(void);
 void ruby_xml_parser_free(ruby_xml_parser *rxp);

data/ext/xml/libxml.rb

@@ -1,17 +1,7 @@
-# $Id: libxml.rb,v 1.5 2006/10/29 19:42:45 roscopeco Exp $ 
+# $Id: libxml.rb,v 1.5.2.1 2006/11/26 12:37:42 roscopeco Exp $ 
 # Please see the LICENSE file for copyright and distribution information 
 require 'xml/libxml_so'
 
-class XML::Node::Set
-  def empty?
-  	self.length <= 0
-  end
-  
-  def first 
-  	self.each { |n| return n }
-  end
-end
-
 class XML::Document
   include Enumerable
 
@@ -22,6 +12,8 @@ class XML::Document
 end
 
 class XML::Node::Set 
+  include Enumerable
+  
   # inefficient, but maybe can find a way to cache the
   # ary and dump on change?
   def [](i, count = nil) 

data/ext/xml/ruby_xml_attr.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_attr.c,v 1.2 2006/11/20 01:22:07 roscopeco Exp $ */
+/* $Id: ruby_xml_attr.c,v 1.2.2.1 2006/11/26 12:29:57 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -12,7 +12,7 @@ ruby_xml_attr_free(ruby_xml_attr *rxa) {
   if (rxa->attr != NULL &&            // got an attr?
       rxa->attr->parent == NULL &&    // unparented (otherwise, it gets freed with parent)
       rxa->attr->doc == NULL) {       // No document? (otherwise, freed with doc)
-    if ((int)rxa->attr->_private <= 1) {
+    if (rxa->attr->_private <= (void*)1) {
       // is null or last reference, 
       xmlFreeNode((xmlNodePtr)rxa->attr);  
     } else {
@@ -169,7 +169,7 @@ ruby_xml_attr_new2(VALUE class, VALUE xd, xmlAttrPtr attr) {
 
   rxa->attr = attr;
   if (attr->_private) {
-    attr->_private++;            
+    attr->_private++;
   } else {
     attr->_private = (void*)1;
   }

data/ext/xml/ruby_xml_document.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_document.c,v 1.3 2006/11/20 01:22:07 roscopeco Exp $ */
+/* $Id: ruby_xml_document.c,v 1.3.2.1 2006/11/26 12:37:41 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -1118,8 +1118,8 @@ ruby_init_xml_document(void) {
   rb_define_singleton_method(cXMLDocument, "new", ruby_xml_document_initialize, -1);
 
   //rb_raise(eXMLNodeFailedModify, "unable to add a child to the document");
-  //eDTDValidityWarning = rb_define_class_under(cXMLNode, "ValidityWarning", rb_eException);
-  //eDTDValidityError   = rb_define_class_under(cXMLNode, "ValidityWarning", rb_eException);
+  //eDTDValidityWarning = rb_define_class_under(cXMLNode, "ValidityWarning", eXMLError);
+  //eDTDValidityError   = rb_define_class_under(cXMLNode, "ValidityWarning", eXMLError);
   rb_define_method(cXMLDocument, "[]", ruby_xml_document_property_get, 1);
   rb_define_method(cXMLDocument, "[]=", ruby_xml_document_property_set, 2);
   rb_define_method(cXMLDocument, "child", ruby_xml_document_child_get, 0);

data/ext/xml/ruby_xml_input_cbg.c

@@ -32,11 +32,6 @@ void* ic_open (char const *filename) {
         if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST scheme->scheme_name, scheme->name_len)) {
           ic_doc = (ic_doc_context*)malloc( sizeof(ic_doc_context) );
 
-// MUFF         res = rb_funcall( 
-//                  rb_funcall( rb_mKernel, 
-//                              rb_intern("const_get"), 1, 
-//                              rb_str_new2(scheme->class) ),
-//                  rb_intern("document_query"), 1, rb_str_new2(filename) );
           res = rb_funcall( scheme->class,
                             rb_intern("document_query"), 
                             1, 
@@ -86,13 +81,11 @@ input_callbacks_add_scheme (VALUE self, VALUE scheme_name, VALUE class) {
   ic_scheme *scheme;
 
   Check_Type(scheme_name, T_STRING);
-  //MUFF Check_Type(class, 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);
-  //MUFF scheme->class       = strdup(StringValuePtr(class));        /* TODO alloc, dealloc */
   scheme->class       = class;        /* TODO alloc, dealloc */
 
   //fprintf( stderr, "registered: %s, %d, %s\n", scheme->scheme_name, scheme->name_len, scheme->class );
@@ -126,7 +119,6 @@ input_callbacks_remove_scheme (VALUE self, VALUE scheme_name) {
         save_scheme = first_scheme->next_scheme;
 
         free(first_scheme->scheme_name);
-        //MUFF free(first_scheme->class);
         free(first_scheme);
 
         first_scheme = save_scheme;
@@ -139,7 +131,6 @@ input_callbacks_remove_scheme (VALUE self, VALUE scheme_name) {
             save_scheme = scheme->next_scheme->next_scheme;
             
             free(scheme->next_scheme->scheme_name);
-            //MUFF free(scheme->next_scheme->class);
             free(scheme->next_scheme);
 
             scheme->next_scheme = save_scheme;

data/ext/xml/ruby_xml_input_cbg.h

@@ -11,7 +11,6 @@ typedef struct ic_doc_context {
 
 typedef struct ic_scheme {
     char *scheme_name;
-    //MUFF char *class;
     VALUE class;
     int name_len;
 

data/ext/xml/ruby_xml_node.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_node.c,v 1.9 2006/11/20 01:22:07 roscopeco Exp $ */
+/* $Id: ruby_xml_node.c,v 1.9.2.3 2006/11/27 10:32:01 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -707,12 +707,12 @@ void ruby_xml_node_free(ruby_xml_node *rxn) {
   if (rxn->node != NULL &&            // got a node?
       rxn->node->parent == NULL &&    // unparented (otherwise, it gets freed with parent)
       rxn->node->doc == NULL) {       // No document? (otherwise, freed with doc)
-    if ((int)rxn->node->_private <= 1) {
+    if (rxn->node->_private <= (void*)1) {
       // is null or last reference, 
       xmlFreeNode(rxn->node);  
     } else {
       // other pointers remain
-      rxn->node->_private--;    
+      rxn->node->_private--;
     }    
   }
 
@@ -1907,9 +1907,12 @@ ruby_xml_node_property_set(VALUE self, VALUE key, VALUE val) {
 
 /*
  * call-seq:
- *    node.properties => attributes
+ *    node.properties => attributes or nil
  * 
- * Returns the +XML::Attr+ for this node. 
+ * Returns the first +XML::Attr+ for this node. Use the
+ * +name+ and +value+ methods to obtain the attribute's
+ * data, and the +prev+ and +next+ methods to 
+ * navigate the property list.
  */
 VALUE
 ruby_xml_node_properties_get(VALUE self) {
@@ -1920,7 +1923,12 @@ ruby_xml_node_properties_get(VALUE self) {
 
   if (node->node->type == XML_ELEMENT_NODE) {
     attr = node->node->properties;
-    return(ruby_xml_attr_new2(cXMLAttr, node->xd, attr));
+    
+  	if (attr == NULL) {
+	    return(Qnil);
+    } else {
+      return(ruby_xml_attr_new2(cXMLAttr, node->xd, attr));
+    }
   } else {
     return(Qnil);
   }
@@ -2230,7 +2238,7 @@ ruby_xml_node_xinclude_start_q(VALUE self) {
  * Create a copy of this node.
  */
 VALUE
-ruby_xml_node_copy(VALUE self, VALUE deep) {   /* MUFF */
+ruby_xml_node_copy(VALUE self, VALUE deep) {
   ruby_xml_node *rxn;
   xmlNode *copy;
   
@@ -2254,9 +2262,9 @@ ruby_xml_node_copy(VALUE self, VALUE deep) {   /* MUFF */
 void
 ruby_init_xml_node(void) {
   cXMLNode = rb_define_class_under(mXML, "Node", rb_cObject);
-  eXMLNodeSetNamespace = rb_define_class_under(cXMLNode, "SetNamespace", rb_eException);
-  eXMLNodeFailedModify = rb_define_class_under(cXMLNode, "FailedModify", rb_eException);
-  eXMLNodeUnknownType = rb_define_class_under(cXMLNode, "UnknownType", rb_eException);
+  eXMLNodeSetNamespace = rb_define_class_under(cXMLNode, "SetNamespace", eXMLError);
+  eXMLNodeFailedModify = rb_define_class_under(cXMLNode, "FailedModify", eXMLError);
+  eXMLNodeUnknownType = rb_define_class_under(cXMLNode, "UnknownType", eXMLError);
 
   rb_define_const(cXMLNode, "SPACE_DEFAULT", INT2NUM(0));
   rb_define_const(cXMLNode, "SPACE_PRESERVE", INT2NUM(1));

data/ext/xml/ruby_xml_node_set.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_node_set.c,v 1.4 2006/11/20 01:22:07 roscopeco Exp $ */
+/* $Id: ruby_xml_node_set.c,v 1.4.2.1 2006/11/26 12:37:42 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -150,7 +150,7 @@ ruby_xml_node_set_length(VALUE self) {
   ruby_xml_node_set *rxnset;
   Data_Get_Struct(self, ruby_xml_node_set, rxnset);
   if (rxnset->node_set == NULL)
-    return(Qnil);
+    return(INT2FIX(0));
   else
     return(INT2NUM(rxnset->node_set->nodeNr));
 }
@@ -240,6 +240,7 @@ ruby_init_xml_node_set(void) {
   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",

data/ext/xml/ruby_xml_xpath.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpath.c,v 1.2 2006/04/14 14:45:25 roscopeco Exp $ */
+/* $Id: ruby_xml_xpath.c,v 1.2.4.1 2006/11/26 12:37:41 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -337,8 +337,7 @@ ruby_init_xml_xpath(void) {
   cXMLXPath = rb_define_class_under(mXML, "XPath", rb_cObject);
   rb_include_module(cXMLNode, rb_const_get(rb_cObject, rb_intern("Enumerable")));
 
-  eXMLXPathInvalidPath = rb_define_class_under(cXMLXPath,
-					       "InvalidPath", rb_eException);
+  eXMLXPathInvalidPath = rb_define_class_under(cXMLXPath, "InvalidPath", eXMLError);
 
   rb_define_const(cXMLXPath, "UNDEFINED", INT2NUM(XPATH_UNDEFINED));
   rb_define_const(cXMLXPath, "NODESET", INT2NUM(XPATH_NODESET));

data/ext/xml/ruby_xml_xpointer.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpointer.c,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_xpointer.c,v 1.1.4.1 2006/11/26 12:37:42 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -94,7 +94,7 @@ ruby_xml_xpointer_range(VALUE class, VALUE rstart, VALUE rend) {
 void
 ruby_init_xml_xpointer(void) {
   cXMLXPointer = rb_define_class_under(mXML, "XPointer", rb_cObject);
-  eXMLXPointerInvalidExpression = rb_define_class_under(cXMLXPointer, "InvalidExpression", rb_eException);
+  eXMLXPointerInvalidExpression = rb_define_class_under(cXMLXPointer, "InvalidExpression", eXMLError);
 
   rb_define_singleton_method(cXMLXPointer, "range", ruby_xml_xpointer_range, 2);
 }

data/ext/xml/ruby_xml_xpointer_context.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpointer_context.c,v 1.2 2006/02/27 12:55:32 roscopeco Exp $ */
+/* $Id: ruby_xml_xpointer_context.c,v 1.2.4.1 2006/11/26 12:37:42 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -17,5 +17,5 @@ VALUE eXMLXPointerContextInvalidPath;
 void
 ruby_init_xml_xpointer_context(void) {
   cXMLXPointerContext = rb_define_class_under(cXMLXPointer, "Context", cXMLXPathContext);
-  eXMLXPointerContextInvalidPath = rb_define_class_under(cXMLXPointerContext, "InvalidPath", rb_eException);
+  eXMLXPointerContextInvalidPath = rb_define_class_under(cXMLXPointerContext, "InvalidPath", eXMLError);
 }

data/ext/xml/sax_parser_callbacks.inc

@@ -1,4 +1,4 @@
-/* $Id: sax_parser_callbacks.inc,v 1.1 2006/04/14 14:50:58 roscopeco Exp $ */
+/* $Id: sax_parser_callbacks.inc,v 1.1.4.1 2006/11/26 12:45:14 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -121,13 +121,23 @@ static void comment_func(ruby_xml_sax_parser_callbacks *cbp,
   }    
 }
 
-// TODO these next three should actually be formatting messages.
+#define FORMAT_AND_CALL() \
+  do { \
+    va_list args; \
+    char buf[1024]; \
+    va_start(args, msg); \
+    vsnprintf(buf, sizeof buf, msg, args); \
+    rb_funcall(handler,callsym,1,rb_str_new2(buf)); \
+    va_end(args); \
+  } \
+  while (0)
+
 static void warning_func(ruby_xml_sax_parser_callbacks *cbp, 
        const char *msg, ...) {
   VALUE handler = cbp->xmlParserWarning;
   
   if (handler && handler != Qnil) {
-    rb_funcall(handler,callsym,1,rb_str_new2(msg));
+    FORMAT_AND_CALL();
   }    
 }
 
@@ -136,7 +146,7 @@ static void error_func(ruby_xml_sax_parser_callbacks *cbp,
   VALUE handler = cbp->xmlParserError;
   
   if (handler && handler != Qnil) {
-    rb_funcall(handler,callsym,1,rb_str_new2(msg));
+    FORMAT_AND_CALL();
   }    
 }
 
@@ -145,7 +155,7 @@ static void fatal_error_func(ruby_xml_sax_parser_callbacks *cbp,
   VALUE handler = cbp->xmlParserFatalError;
   
   if (handler && handler != Qnil) {
-    rb_funcall(handler,callsym,1,rb_str_new2(msg));
+    FORMAT_AND_CALL();
   }    
 }
 

data/tests/tc_xml_node7.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_node7.rb,v 1.2 2006/11/20 01:22:08 roscopeco Exp $
+# $Id: tc_xml_node7.rb,v 1.2.2.1 2006/11/27 10:32:01 roscopeco Exp $
 require "libxml_test"
 require 'test/unit'
 
@@ -25,4 +25,12 @@ class TC_XML_Node7 < Test::Unit::TestCase
     assert_equal 'foo', prop.name
     assert_equal 'bar', prop.value    
   end
+  
+  def test_xml_node_properties_when_no_attributes
+    xp = XML::Parser.string("<root></root>")
+    doc = xp.parse
+    root = doc.root
+    
+    assert_nil root.properties
+  end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: libxml-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.3.8.2
-date: 2006-11-22 00:00:00 +00:00
+  version: 0.3.8.4
+date: 2006-12-02 00:00:00 +00:00
 summary: LibXML2 bindings for Ruby
 require_paths: 
 - lib