libxml-ruby 0.7.0-x86-mswin32-60 → 0.8.0-x86-mswin32-60

data/ext/libxml/cbg.c

@@ -1,76 +1,76 @@
-#include <string.h>
-#include <libxml/xmlIO.h>
-#include "ruby.h"
-
-/*
-int         xmlRegisterInputCallbacks       (xmlInputMatchCallback matchFunc,
-                                             xmlInputOpenCallback openFunc,
-                                             xmlInputReadCallback readFunc,
-                                             xmlInputCloseCallback closeFunc);
-
-
-int         (*xmlInputMatchCallback)        (char const *filename);
-void*       (*xmlInputOpenCallback)         (char const *filename);
-int         (*xmlInputReadCallback)         (void *context,
-                                             char *buffer,
-                                             int len);
-int         (*xmlInputCloseCallback)        (void *context);
-*/
-
-typedef struct deb_doc_context {
-    char *buffer;
-    char *bpos;
-    int remaining;
-} deb_doc_context;
-
-int deb_Match (char const *filename) {
-    fprintf( stderr, "deb_Match: %s\n", filename );
-    if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST "deb://", 6)) {
-        return(1);
-    }
-    return(0);
-}
-
-void* deb_Open (char const *filename) {
-    deb_doc_context *deb_doc;
-    VALUE res;
-
-    deb_doc = (deb_doc_context*)malloc( sizeof(deb_doc_context) );
-
-    res = rb_funcall( rb_funcall( rb_mKernel, rb_intern("const_get"), 1, rb_str_new2("DEBSystem") ),
-                      rb_intern("document_query"), 1, rb_str_new2(filename));
-    deb_doc->buffer = strdup( StringValuePtr(res) );
-    //deb_doc->buffer = strdup("<serepes>serepes</serepes>");
-
-    deb_doc->bpos = deb_doc->buffer;
-    deb_doc->remaining = strlen(deb_doc->buffer);
-    return deb_doc;
-}
-
-int deb_Read (void *context, char *buffer, int len) {
-    deb_doc_context *deb_doc;
-    int ret_len;
-    deb_doc = (deb_doc_context*)context;
-
-    if (len >= deb_doc->remaining) {
-        ret_len =  deb_doc->remaining;
-    } else {
-        ret_len = len;
-    }
-    deb_doc->remaining -= ret_len;
-    strncpy( buffer, deb_doc->bpos, ret_len );
-    deb_doc->bpos += ret_len;
-
-    return ret_len;
-}
-
-int deb_Close (void *context) {
-    free( ((deb_doc_context*)context)->buffer );
-    free( context );
-    return 1;
-}
-
-
-void deb_register_cbg() {
-    xmlRegisterInputCallbacks( deb_Match, deb_Open, deb_Read, deb_Close );
-}
+#include <string.h>
+#include <libxml/xmlIO.h>
+#include "ruby.h"
+
+/*
+int         xmlRegisterInputCallbacks       (xmlInputMatchCallback matchFunc,
+                                             xmlInputOpenCallback openFunc,
+                                             xmlInputReadCallback readFunc,
+                                             xmlInputCloseCallback closeFunc);
+
+
+int         (*xmlInputMatchCallback)        (char const *filename);
+void*       (*xmlInputOpenCallback)         (char const *filename);
+int         (*xmlInputReadCallback)         (void *context,
+                                             char *buffer,
+                                             int len);
+int         (*xmlInputCloseCallback)        (void *context);
+*/
+
+typedef struct deb_doc_context {
+    char *buffer;
+    char *bpos;
+    int remaining;
+} deb_doc_context;
+
+int deb_Match (char const *filename) {
+    fprintf( stderr, "deb_Match: %s\n", filename );
+    if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST "deb://", 6)) {
+        return(1);
+    }
+    return(0);
+}
+
+void* deb_Open (char const *filename) {
+    deb_doc_context *deb_doc;
+    VALUE res;
+
+    deb_doc = (deb_doc_context*)malloc( sizeof(deb_doc_context) );
+
+    res = rb_funcall( rb_funcall( rb_mKernel, rb_intern("const_get"), 1, rb_str_new2("DEBSystem") ),
+                      rb_intern("document_query"), 1, rb_str_new2(filename));
+    deb_doc->buffer = strdup( StringValuePtr(res) );
+    //deb_doc->buffer = strdup("<serepes>serepes</serepes>");
+
+    deb_doc->bpos = deb_doc->buffer;
+    deb_doc->remaining = strlen(deb_doc->buffer);
+    return deb_doc;
+}
+
+int deb_Read (void *context, char *buffer, int len) {
+    deb_doc_context *deb_doc;
+    int ret_len;
+    deb_doc = (deb_doc_context*)context;
+
+    if (len >= deb_doc->remaining) {
+        ret_len =  deb_doc->remaining;
+    } else {
+        ret_len = len;
+    }
+    deb_doc->remaining -= ret_len;
+    strncpy( buffer, deb_doc->bpos, ret_len );
+    deb_doc->bpos += ret_len;
+
+    return ret_len;
+}
+
+int deb_Close (void *context) {
+    free( ((deb_doc_context*)context)->buffer );
+    free( context );
+    return 1;
+}
+
+
+void deb_register_cbg() {
+    xmlRegisterInputCallbacks( deb_Match, deb_Open, deb_Read, deb_Close );
+}

data/ext/libxml/libxml.c

@@ -1,9 +1,10 @@
-/* $Id: libxml.c 323 2008-07-08 22:59:23Z cfis $ */
+/* $Id: libxml.c 462 2008-07-15 21:52:47Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
 #include "ruby_libxml.h"
 
+VALUE mLibXML;
 VALUE mXML;
 VALUE eXMLError;
 
@@ -26,7 +27,8 @@ Init_libxml_ruby(void) {
     rb_fatal("could not install the memory handlers for libxml");
 #endif
 
-  mXML = rb_define_module("XML");
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
   eXMLError = rb_define_class_under(mXML, "Error", rb_eRuntimeError);
 
   rb_define_const(mXML, "XML_NAMESPACE", rb_str_new2((const char*)XML_XML_NAMESPACE));
@@ -41,7 +43,6 @@ Init_libxml_ruby(void) {
   ruby_init_xml_node_set();
   ruby_init_xml_ns();
   ruby_init_xml_sax_parser();
-  ruby_init_xml_tree();
   ruby_init_xml_xinclude();
   ruby_init_xml_xpath();
   ruby_init_xml_xpath_context();

data/ext/libxml/ruby_libxml.h

@@ -72,7 +72,6 @@ typedef struct rx_xpath_data {
 #include "ruby_xml_parser.h"
 #include "ruby_xml_parser_context.h"
 #include "ruby_xml_sax_parser.h"
-#include "ruby_xml_tree.h"
 #include "ruby_xml_xinclude.h"
 #include "ruby_xml_xpath.h"
 #include "ruby_xml_xpath_context.h"
@@ -85,6 +84,7 @@ typedef struct rx_xpath_data {
 #include "ruby_xml_html_parser.h"
 #include "ruby_xml_reader.h"
 
+extern VALUE mLibXML;
 extern VALUE mXML;
 extern VALUE eXMLError;
 

data/ext/libxml/ruby_xml_attr.c

@@ -1,9 +1,9 @@
-/* $Id: ruby_xml_attr.c 351 2008-07-09 19:55:21Z cfis $ */
+/* $Id: ruby_xml_attr.c 461 2008-07-15 21:35:56Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
 /*
-* Document-class: XML::Attr
+* Document-class: LibXML::XML::Attr
 *
 * Provides access to an single element attribute.  Accessed by
 * calling XML::Node#attributes method.
@@ -463,7 +463,8 @@ ruby_xml_attr_value_set(VALUE self, VALUE val) {
 
 // Rdoc needs to know 
 #ifdef RDOC_NEVER_DEFINED
-  mXML = rb_define_module("XML");
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
 #endif
 
 void

data/ext/libxml/ruby_xml_attr.h

@@ -1,16 +1,16 @@
-/* $Id: ruby_xml_attr.h 351 2008-07-09 19:55:21Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_ATTR__
-#define __RUBY_XML_ATTR__
-
-extern VALUE cXMLAttr;
-
-void ruby_init_xml_attr(void);
-VALUE ruby_xml_attr_new(xmlAttrPtr xattr);
-VALUE ruby_xml_attr_value_get(VALUE self);
-VALUE ruby_xml_attr_value_set(VALUE self, VALUE val);
-void ruby_xml_attr_free(xmlAttrPtr xattr);
-VALUE ruby_xml_attr_wrap(xmlAttrPtr xattr);
-#endif
+/* $Id: ruby_xml_attr.h 351 2008-07-09 19:55:21Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_ATTR__
+#define __RUBY_XML_ATTR__
+
+extern VALUE cXMLAttr;
+
+void ruby_init_xml_attr(void);
+VALUE ruby_xml_attr_new(xmlAttrPtr xattr);
+VALUE ruby_xml_attr_value_get(VALUE self);
+VALUE ruby_xml_attr_value_set(VALUE self, VALUE val);
+void ruby_xml_attr_free(xmlAttrPtr xattr);
+VALUE ruby_xml_attr_wrap(xmlAttrPtr xattr);
+#endif

data/ext/libxml/ruby_xml_attributes.c

@@ -1,268 +1,269 @@
-/* $Id: ruby_xml_attributes.c 300 2008-07-01 19:14:15Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-/*
-* Document-class: XML::Attributes
-*
-* Provides access to an elements attributes (XML::Attr).
-*
-* Basic Usage:
-*  require 'libxml'
-*
-*  doc = XML::Document.new(<some_file>)
-*  attributes = doc.root.attributes
-*
-*  attributes.each do |attribute|
-*    ..
-*  end
-* 
-*  attributes['foo'] = 'bar'
-*  attribute = attributes.get_attribute['foo']
-*  attribute.value == 'foo'
-*
-* To access a namespaced attribute:
-*
-*  XLINK_URI = 'http://www.w3.org/1999/xlink'
-*
-*  attribute = attributes.get_attribute_ns(XLINK_URI, 'title')
-*  attribute.value = 'My title'
-*/
-
-#include "ruby_libxml.h"
-#include "ruby_xml_attributes.h"
-
-VALUE cXMLAttributes;
-
-void
-ruby_xml_attributes_mark(xmlNodePtr xnode) {
-  ruby_xml_node_mark_common(xnode);
-}
-
-/*
- * Creates a  new attributes instance.  Not exposed to ruby.
- */
-VALUE
-ruby_xml_attributes_new(xmlNodePtr xnode)
-{
-  return Data_Wrap_Struct(cXMLAttributes,
-                          ruby_xml_attributes_mark, NULL,
-                          xnode);
-}
-
-/*
- * call-seq:
- *   attributes.node -> XML::Node
- * 
- * Return the node that owns this attributes list.
- *
- *  doc.root.attributes.node == doc.root
- */
-VALUE
-ruby_xml_attributes_node_get(VALUE self) {
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-  return(ruby_xml_node2_wrap(cXMLNode, xnode));
-}
-
-
-/*
- * call-seq:
- *    attributes.get_attribute("name") -> XML::Attr
- * 
- * Returns the specified attribute.
- * 
- * name: The name of the attribute, not including a namespace.
- *
- *  doc.root.attributes.get_attribute("foo")
- */
-VALUE
-ruby_xml_attributes_get_attribute(VALUE self, VALUE name) {
-  xmlNodePtr xnode;
-  xmlAttrPtr xattr;
-
-  name = check_string_or_symbol(name);
-  
-  Data_Get_Struct(self, xmlNode, xnode);
-  
-  xattr = xmlHasProp(xnode, (xmlChar*)StringValuePtr(name));
-  
-  if (xattr)
-    return(ruby_xml_attr_wrap(xattr));
-  else
-    return(Qnil);
-}
-
-/*
- * call-seq:
- *    attributes.get_attribute_ns("namespace", "name") -> XML::Attr
- * 
- * Returns the specified attribute.
- * 
- * namespace: The URI of the attribute's namespace.
- * name: The name of the attribute, not including a namespace.
- *
- *  doc.root.attributes.get_attribute_ns('http://www.w3.org/1999/xlink', 'href')
- */
-VALUE
-ruby_xml_attributes_get_attribute_ns(VALUE self, VALUE namespace, VALUE name) {
-  xmlNodePtr xnode;
-  xmlAttrPtr xattr;
-
-  name = check_string_or_symbol(name);
-  
-  Data_Get_Struct(self, xmlNode, xnode);
-  
-  xattr = xmlHasNsProp(xnode, (xmlChar*)StringValuePtr(name), (xmlChar*)StringValuePtr(namespace));
-  
-  if (xattr)
-    return(ruby_xml_attr_wrap(xattr));
-  else
-    return(Qnil);
-}
-
-/*
- * call-seq:
- *    attributes["name"] -> String
- * 
- * Fetches an attribute value. If you want to access the underlying
- * Attribute itself use get_attribute.  
- *
- * name: The name of the attribute, not including any namespaces.
- *  
- *  doc.root.attributes['att'] -> 'some value'
- */
-VALUE
-ruby_xml_attributes_attribute_get(VALUE self, VALUE name) {
-  VALUE xattr = ruby_xml_attributes_get_attribute(self, name);
-  if NIL_P(xattr)
-    return(Qnil);
-  else
-    return ruby_xml_attr_value_get(xattr);
-}  
-
-/*
- * call-seq:
- *    attributes["name"] = "value"
- * 
- * Sets an attribute value. If you want to get the Attribute itself,
- * use get_attribute.  
- *
- * name: The name of the attribute, not including any namespaces.
- * value: The new value of the namespace.
- *  
- *  doc.root.attributes['att'] = 'some value'
- */
-VALUE
-ruby_xml_attributes_attribute_set(VALUE self, VALUE name, VALUE value) {
-  VALUE xattr = ruby_xml_attributes_get_attribute(self, name);
-  if NIL_P(xattr)
-  {
-    VALUE args[3];
-
-    args[0] = ruby_xml_attributes_node_get(self);
-    args[1] = name;
-    args[2] = value;
-
-    return rb_class_new_instance(sizeof(args)/sizeof(VALUE), args, cXMLAttr);
-  }
-  else
-  {
-    return ruby_xml_attr_value_set(xattr, value);
-  }
-}  
-
-
-/*
- * call-seq:
- *    attributes.each {block} -> XML::Attr
- * 
- * Iterates over each attribute.
- *  
- *  doc.root.attributes.each {|attribute| puts attribute.name}
- */
-VALUE
-ruby_xml_attributes_each(VALUE self) {
-  xmlNodePtr xnode;
-  xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlNode, xnode);
-
-  xattr = xnode->properties;
-
-  while (xattr)
-  {
-     VALUE attr = ruby_xml_attr_wrap(xattr);
-     rb_yield(attr);
-     xattr = xattr->next;
-  }
-  
-  return self;
-}  
-  
-/*
- * call-seq:
- *    attributes.length -> Integer
- * 
- * Returns the number of attributes.
- *
- *  doc.root.attributes.length
- */
-VALUE
-ruby_xml_attributes_length(VALUE self) {
-  int length = 0;
-  xmlNodePtr xnode;
-  xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlNode, xnode);
-
-  xattr = xnode->properties;
-
-  while (xattr)
-  {
-     length++;
-     xattr = xattr->next;
-  }
-  
-  return INT2NUM(length);
-}  
-
-/*
- * call-seq:
- *    attributes.first -> XML::Attr
- * 
- * Returns the first attribute.
- *
- *  doc.root.attributes.first
- */
-VALUE
-ruby_xml_attributes_first(VALUE self) {
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-
-  if (xnode->type == XML_ELEMENT_NODE) {
-    xmlAttrPtr xattr = xnode->properties;
-    
-    if (xattr) {
-      return(ruby_xml_attr_wrap(xattr));
-    }
-  } 
-  return(Qnil);
-}
-
-// Rdoc needs to know 
+/* $Id: ruby_xml_attributes.c 300 2008-07-01 19:14:15Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+/*
+* Document-class: LibXML::XML::Attributes
+*
+* Provides access to an elements attributes (XML::Attr).
+*
+* Basic Usage:
+*  require 'libxml'
+*
+*  doc = XML::Document.new(<some_file>)
+*  attributes = doc.root.attributes
+*
+*  attributes.each do |attribute|
+*    ..
+*  end
+* 
+*  attributes['foo'] = 'bar'
+*  attribute = attributes.get_attribute['foo']
+*  attribute.value == 'foo'
+*
+* To access a namespaced attribute:
+*
+*  XLINK_URI = 'http://www.w3.org/1999/xlink'
+*
+*  attribute = attributes.get_attribute_ns(XLINK_URI, 'title')
+*  attribute.value = 'My title'
+*/
+
+#include "ruby_libxml.h"
+#include "ruby_xml_attributes.h"
+
+VALUE cXMLAttributes;
+
+void
+ruby_xml_attributes_mark(xmlNodePtr xnode) {
+  ruby_xml_node_mark_common(xnode);
+}
+
+/*
+ * Creates a  new attributes instance.  Not exposed to ruby.
+ */
+VALUE
+ruby_xml_attributes_new(xmlNodePtr xnode)
+{
+  return Data_Wrap_Struct(cXMLAttributes,
+                          ruby_xml_attributes_mark, NULL,
+                          xnode);
+}
+
+/*
+ * call-seq:
+ *   attributes.node -> XML::Node
+ * 
+ * Return the node that owns this attributes list.
+ *
+ *  doc.root.attributes.node == doc.root
+ */
+VALUE
+ruby_xml_attributes_node_get(VALUE self) {
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  return(ruby_xml_node2_wrap(cXMLNode, xnode));
+}
+
+
+/*
+ * call-seq:
+ *    attributes.get_attribute("name") -> XML::Attr
+ * 
+ * Returns the specified attribute.
+ * 
+ * name: The name of the attribute, not including a namespace.
+ *
+ *  doc.root.attributes.get_attribute("foo")
+ */
+VALUE
+ruby_xml_attributes_get_attribute(VALUE self, VALUE name) {
+  xmlNodePtr xnode;
+  xmlAttrPtr xattr;
+
+  name = check_string_or_symbol(name);
+  
+  Data_Get_Struct(self, xmlNode, xnode);
+  
+  xattr = xmlHasProp(xnode, (xmlChar*)StringValuePtr(name));
+  
+  if (xattr)
+    return(ruby_xml_attr_wrap(xattr));
+  else
+    return(Qnil);
+}
+
+/*
+ * call-seq:
+ *    attributes.get_attribute_ns("namespace", "name") -> XML::Attr
+ * 
+ * Returns the specified attribute.
+ * 
+ * namespace: The URI of the attribute's namespace.
+ * name: The name of the attribute, not including a namespace.
+ *
+ *  doc.root.attributes.get_attribute_ns('http://www.w3.org/1999/xlink', 'href')
+ */
+VALUE
+ruby_xml_attributes_get_attribute_ns(VALUE self, VALUE namespace, VALUE name) {
+  xmlNodePtr xnode;
+  xmlAttrPtr xattr;
+
+  name = check_string_or_symbol(name);
+  
+  Data_Get_Struct(self, xmlNode, xnode);
+  
+  xattr = xmlHasNsProp(xnode, (xmlChar*)StringValuePtr(name), (xmlChar*)StringValuePtr(namespace));
+  
+  if (xattr)
+    return(ruby_xml_attr_wrap(xattr));
+  else
+    return(Qnil);
+}
+
+/*
+ * call-seq:
+ *    attributes["name"] -> String
+ * 
+ * Fetches an attribute value. If you want to access the underlying
+ * Attribute itself use get_attribute.  
+ *
+ * name: The name of the attribute, not including any namespaces.
+ *  
+ *  doc.root.attributes['att'] -> 'some value'
+ */
+VALUE
+ruby_xml_attributes_attribute_get(VALUE self, VALUE name) {
+  VALUE xattr = ruby_xml_attributes_get_attribute(self, name);
+  if NIL_P(xattr)
+    return(Qnil);
+  else
+    return ruby_xml_attr_value_get(xattr);
+}  
+
+/*
+ * call-seq:
+ *    attributes["name"] = "value"
+ * 
+ * Sets an attribute value. If you want to get the Attribute itself,
+ * use get_attribute.  
+ *
+ * name: The name of the attribute, not including any namespaces.
+ * value: The new value of the namespace.
+ *  
+ *  doc.root.attributes['att'] = 'some value'
+ */
+VALUE
+ruby_xml_attributes_attribute_set(VALUE self, VALUE name, VALUE value) {
+  VALUE xattr = ruby_xml_attributes_get_attribute(self, name);
+  if NIL_P(xattr)
+  {
+    VALUE args[3];
+
+    args[0] = ruby_xml_attributes_node_get(self);
+    args[1] = name;
+    args[2] = value;
+
+    return rb_class_new_instance(sizeof(args)/sizeof(VALUE), args, cXMLAttr);
+  }
+  else
+  {
+    return ruby_xml_attr_value_set(xattr, value);
+  }
+}  
+
+
+/*
+ * call-seq:
+ *    attributes.each {block} -> XML::Attr
+ * 
+ * Iterates over each attribute.
+ *  
+ *  doc.root.attributes.each {|attribute| puts attribute.name}
+ */
+VALUE
+ruby_xml_attributes_each(VALUE self) {
+  xmlNodePtr xnode;
+  xmlAttrPtr xattr;
+  Data_Get_Struct(self, xmlNode, xnode);
+
+  xattr = xnode->properties;
+
+  while (xattr)
+  {
+     VALUE attr = ruby_xml_attr_wrap(xattr);
+     rb_yield(attr);
+     xattr = xattr->next;
+  }
+  
+  return self;
+}  
+  
+/*
+ * call-seq:
+ *    attributes.length -> Integer
+ * 
+ * Returns the number of attributes.
+ *
+ *  doc.root.attributes.length
+ */
+VALUE
+ruby_xml_attributes_length(VALUE self) {
+  int length = 0;
+  xmlNodePtr xnode;
+  xmlAttrPtr xattr;
+  Data_Get_Struct(self, xmlNode, xnode);
+
+  xattr = xnode->properties;
+
+  while (xattr)
+  {
+     length++;
+     xattr = xattr->next;
+  }
+  
+  return INT2NUM(length);
+}  
+
+/*
+ * call-seq:
+ *    attributes.first -> XML::Attr
+ * 
+ * Returns the first attribute.
+ *
+ *  doc.root.attributes.first
+ */
+VALUE
+ruby_xml_attributes_first(VALUE self) {
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+
+  if (xnode->type == XML_ELEMENT_NODE) {
+    xmlAttrPtr xattr = xnode->properties;
+    
+    if (xattr) {
+      return(ruby_xml_attr_wrap(xattr));
+    }
+  } 
+  return(Qnil);
+}
+
+// Rdoc needs to know 
 #ifdef RDOC_NEVER_DEFINED
-  mXML = rb_define_module("XML");
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
 #endif
-    
-void
-ruby_init_xml_attributes(void) {
-  cXMLAttributes = rb_define_class_under(mXML, "Attributes", rb_cObject);
-  rb_include_module(cXMLAttributes, rb_const_get(rb_cObject, rb_intern("Enumerable")));
-  rb_define_method(cXMLAttributes, "node", ruby_xml_attributes_node_get, 0);
-  rb_define_method(cXMLAttributes, "get_attribute", ruby_xml_attributes_get_attribute, 1);
-  rb_define_method(cXMLAttributes, "get_attribute_ns", ruby_xml_attributes_get_attribute_ns, 2);
-  rb_define_method(cXMLAttributes, "[]", ruby_xml_attributes_attribute_get, 1);
-  rb_define_method(cXMLAttributes, "[]=", ruby_xml_attributes_attribute_set, 2);
-  rb_define_method(cXMLAttributes, "each", ruby_xml_attributes_each, 0);
-  rb_define_method(cXMLAttributes, "length", ruby_xml_attributes_length, 0);
-  rb_define_method(cXMLAttributes, "first", ruby_xml_attributes_first, 0);
-}
+    
+void
+ruby_init_xml_attributes(void) {
+  cXMLAttributes = rb_define_class_under(mXML, "Attributes", rb_cObject);
+  rb_include_module(cXMLAttributes, rb_mEnumerable);
+  rb_define_method(cXMLAttributes, "node", ruby_xml_attributes_node_get, 0);
+  rb_define_method(cXMLAttributes, "get_attribute", ruby_xml_attributes_get_attribute, 1);
+  rb_define_method(cXMLAttributes, "get_attribute_ns", ruby_xml_attributes_get_attribute_ns, 2);
+  rb_define_method(cXMLAttributes, "[]", ruby_xml_attributes_attribute_get, 1);
+  rb_define_method(cXMLAttributes, "[]=", ruby_xml_attributes_attribute_set, 2);
+  rb_define_method(cXMLAttributes, "each", ruby_xml_attributes_each, 0);
+  rb_define_method(cXMLAttributes, "length", ruby_xml_attributes_length, 0);
+  rb_define_method(cXMLAttributes, "first", ruby_xml_attributes_first, 0);
+}