libxml-ruby 1.1.0 → 1.1.1

data/CHANGES

@@ -1,3 +1,8 @@
+== 1.1.1 / 2009-03-10 Charlie Savage
+
+* Fix - Only include extra html parser context methods for versions of libxml
+  older than 2.6.27.
+
 == 1.1.0 / 2009-03-09 Charlie Savage
 
 * Fix bug caused by the mark function being called on partially initialized

data/ext/libxml/libxml.c

@@ -1,77 +1,77 @@
-#include "ruby_libxml.h"
-
-#if RUBY_INTERN_H
-#include <ruby/util.h>
-#else
-#include <util.h>
-#endif
-
-VALUE mLibXML;
-
-static void rxml_init_memory(void)
-{
- /* Disable for now - broke attributes. 
-  xmlGcMemSetup(
-      (xmlFreeFunc)ruby_xfree,
-      (xmlMallocFunc)ruby_xmalloc,
-      (xmlMallocFunc)ruby_xmalloc,
-      (xmlReallocFunc)ruby_xrealloc,
-      (xmlStrdupFunc)ruby_strdup
-  );*/
-}
-
-#if defined(_WIN32)
-__declspec(dllexport)
-#endif
-void Init_libxml_ruby(void)
-{
-/* The libxml gem provides Ruby language bindings for GNOME's Libxml2
- * XML toolkit.  To get started you may:
- *
- *  require 'xml'
- *  document = XML::Document.new
- *
- * However, when creating an application or library you plan to
- * redistribute, it is best to not add the LibXML module to the global
- * namespace, in which case you can either write your code like this:
- *
- *  require 'libxml'
- *  document = LibXML::XML::Document.new
- *
- * Refer to the README file to get started and the LICENSE file for
- * copyright and distribution information.
- */
-  mLibXML = rb_define_module("LibXML");
-
-  rxml_init_memory();
-  rxml_init_xml();
-  rxml_init_io();
-  rxml_init_error();
-  rxml_init_encoding();
-  rxml_init_parser();
-  rxml_init_parser_context();
-  rxml_init_parser_options();
-  rxml_init_node();
-  rxml_init_attributes();
-  rxml_init_attr();
-  rxml_init_attr_decl();
-  rxml_init_document();
-  rxml_init_namespaces();
-  rxml_init_namespace();
-  rxml_init_sax_parser();
-  rxml_init_sax2_handler();
-  rxml_init_xinclude();
-  rxml_init_xpath();
-  rxml_init_xpath_object();
-  rxml_init_xpath_context();
-  rxml_init_xpath_expression();
-  rxml_init_xpointer();
-  rxml_init_html_parser();
-  rxml_init_html_parser_options();
-  rxml_init_html_parser_context();
-  rxml_init_input_callbacks();
-  rxml_init_dtd();
-  rxml_init_schema();
-  rxml_init_relaxng();
-  rxml_init_reader();
-}
+#include "ruby_libxml.h"
+
+#if RUBY_INTERN_H
+#include <ruby/util.h>
+#else
+#include <util.h>
+#endif
+
+VALUE mLibXML;
+
+static void rxml_init_memory(void)
+{
+ /* Disable for now - broke attributes. 
+  xmlGcMemSetup(
+      (xmlFreeFunc)ruby_xfree,
+      (xmlMallocFunc)ruby_xmalloc,
+      (xmlMallocFunc)ruby_xmalloc,
+      (xmlReallocFunc)ruby_xrealloc,
+      (xmlStrdupFunc)ruby_strdup
+  );*/
+}
+
+#if defined(_WIN32)
+__declspec(dllexport)
+#endif
+void Init_libxml_ruby(void)
+{
+/* The libxml gem provides Ruby language bindings for GNOME's Libxml2
+ * XML toolkit.  To get started you may:
+ *
+ *  require 'xml'
+ *  document = XML::Document.new
+ *
+ * However, when creating an application or library you plan to
+ * redistribute, it is best to not add the LibXML module to the global
+ * namespace, in which case you can either write your code like this:
+ *
+ *  require 'libxml'
+ *  document = LibXML::XML::Document.new
+ *
+ * Refer to the README file to get started and the LICENSE file for
+ * copyright and distribution information.
+ */
+  mLibXML = rb_define_module("LibXML");
+
+  rxml_init_memory();
+  rxml_init_xml();
+  rxml_init_io();
+  rxml_init_error();
+  rxml_init_encoding();
+  rxml_init_parser();
+  rxml_init_parser_context();
+  rxml_init_parser_options();
+  rxml_init_node();
+  rxml_init_attributes();
+  rxml_init_attr();
+  rxml_init_attr_decl();
+  rxml_init_document();
+  rxml_init_namespaces();
+  rxml_init_namespace();
+  rxml_init_sax_parser();
+  rxml_init_sax2_handler();
+  rxml_init_xinclude();
+  rxml_init_xpath();
+  rxml_init_xpath_object();
+  rxml_init_xpath_context();
+  rxml_init_xpath_expression();
+  rxml_init_xpointer();
+  rxml_init_html_parser();
+  rxml_init_html_parser_options();
+  rxml_init_html_parser_context();
+  rxml_init_input_callbacks();
+  rxml_init_dtd();
+  rxml_init_schema();
+  rxml_init_relaxng();
+  rxml_init_reader();
+}

data/ext/libxml/ruby_xml_attr.c

@@ -1,352 +1,352 @@
-/* $Id: ruby_xml_attr.c 758 2009-01-25 20:36:03Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-/*
- * Document-class: LibXML::XML::Attr
- *
- * Provides access to an attribute defined on an element.
- *
- * Basic Usage:
- *
- *  require 'xml'
- *
- *  doc = XML::Document.new(<some_file>)
- *  attribute = doc.root.attributes.get_attribute_ns('http://www.w3.org/1999/xlink', 'href')
- *  attribute.name == 'href'
- *  attribute.value == 'http://www.mydocument.com'
- *  attribute.remove!
- */
-
-#include "ruby_libxml.h"
-#include "ruby_xml_attr.h"
-
-VALUE cXMLAttr;
-
-void rxml_attr_free(xmlAttrPtr xattr)
-{
-  if (!xattr)
-    return;
-
-  xattr->_private = NULL;
-
-  if (xattr->parent == NULL && xattr->doc == NULL)
-  {
-    xmlFreeProp(xattr);
-  }
-}
-
-void rxml_attr_mark(xmlAttrPtr xattr)
-{
-  /* This can happen if Ruby does a GC run after creating the
-     new attribute but before initializing it. */
-  if (xattr == NULL)
-    return;
-
-  if (xattr->_private == NULL)
-  {
-    rb_warning("XmlAttr is not bound! (%s:%d)", __FILE__, __LINE__);
-    return;
-  }
-
-  rxml_node_mark_common((xmlNodePtr) xattr);
-}
-
-VALUE rxml_attr_wrap(xmlAttrPtr xattr)
-{
-  VALUE result;
-
-  /* Check if the node is already wrapped. */
-  if (xattr->_private != NULL)
-    return (VALUE) xattr->_private;
-
-  result = Data_Wrap_Struct(cXMLAttr, rxml_attr_mark, rxml_attr_free, xattr);
-  xattr->_private = (void*) result;
-  
-  return result;
-}
-
-static VALUE rxml_attr_alloc(VALUE klass)
-{
-  return Data_Wrap_Struct(klass, rxml_attr_mark, rxml_attr_free, NULL);
-}
-
-/*
- * call-seq:
- *    attr.initialize(node, "name", "value")
- *
- * Creates a new attribute for the node.
- *
- * node: The XML::Node that will contain the attribute
- * name: The name of the attribute
- * value: The value of the attribute
- *
- *  attr = XML::Attr.new(doc.root, 'name', 'libxml')
- */
-static VALUE rxml_attr_initialize(int argc, VALUE *argv, VALUE self)
-{
-  VALUE node = argv[0];
-  VALUE name = argv[1];
-  VALUE value = argv[2];
-  VALUE ns = (argc == 4 ? argv[3] : Qnil);
-
-  xmlNodePtr xnode;
-  xmlAttrPtr xattr;
-
-  if (argc < 3 || argc > 4)
-    rb_raise(rb_eArgError, "Wrong number of arguments (3 or 4)");
-
-  Check_Type(name, T_STRING);
-  Check_Type(value, T_STRING);
-
-  Data_Get_Struct(node, xmlNode, xnode);
-
-  if (xnode->type != XML_ELEMENT_NODE)
-    rb_raise(rb_eArgError, "Attributes can only be created on element nodes.");
-
-  if (NIL_P(ns))
-  {
-    xattr = xmlNewProp(xnode, (xmlChar*)StringValuePtr(name), (xmlChar*)StringValuePtr(value));
-  }
-  else
-  {
-    xmlNsPtr xns;
-    Data_Get_Struct(ns, xmlNs, xns);
-    xattr = xmlNewNsProp(xnode, xns, (xmlChar*)StringValuePtr(name), (xmlChar*)StringValuePtr(value));
-  }
-
-  if (!xattr)
-    rb_raise(rb_eRuntimeError, "Could not create attribute.");
-
-  xattr->_private = (void *) self;
-  DATA_PTR( self) = xattr;
-  return self;
-}
-
-/*
- * call-seq:
- *    attr.child -> node
- *
- * Obtain this attribute's child attribute(s).
- */
-static VALUE rxml_attr_child_get(VALUE self)
-{
-  xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
-  if (xattr->children == NULL)
-    return Qnil;
-  else
-    return rxml_node_wrap((xmlNodePtr) xattr->children);
-}
-
-
-/*
- * call-seq:
- *    attr.doc -> XML::Document
- *
- * Returns this attribute's document.
- *
- *  doc.root.attributes.get_attribute('name').doc == doc
- */
-static VALUE rxml_attr_doc_get(VALUE self)
-{
-  xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
-  if (xattr->doc == NULL)
-    return Qnil;
-  else
-    return rxml_document_wrap(xattr->doc);
-}
-
-/*
- * call-seq:
- *    attr.last -> node
- *
- * Obtain the last attribute.
- */
-static VALUE rxml_attr_last_get(VALUE self)
-{
-  xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
-  if (xattr->last == NULL)
-    return Qnil;
-  else
-    return rxml_node_wrap(xattr->last);
-}
-
-/*
- * call-seq:
- *    attr.name -> "name"
- *
- * Obtain this attribute's name.
- */
-static VALUE rxml_attr_name_get(VALUE self)
-{
-  xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
-
-  if (xattr->name == NULL)
-    return Qnil;
-  else
-    return rb_str_new2((const char*) xattr->name);
-}
-
-/*
- * call-seq:
- *    attr.next -> node
- *
- * Obtain the next attribute.
- */
-static VALUE rxml_attr_next_get(VALUE self)
-{
-  xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
-  if (xattr->next == NULL)
-    return Qnil;
-  else
-    return rxml_attr_wrap(xattr->next);
-}
-
-/*
- * call-seq:
- *    attr.node_type -> num
- *
- * Obtain this node's type identifier.
- */
-static VALUE rxml_attr_node_type(VALUE self)
-{
-  xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
-  return INT2NUM(xattr->type);
-}
-
-/*
- * call-seq:
- *    attr.ns -> namespace
- *
- * Obtain this attribute's associated XML::NS, if any.
- */
-static VALUE rxml_attr_ns_get(VALUE self)
-{
-  xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
-  if (xattr->ns == NULL)
-    return Qnil;
-  else
-    return rxml_namespace_wrap(xattr->ns, NULL);
-}
-
-/*
- * call-seq:
- *    attr.parent -> node
- *
- * Obtain this attribute node's parent.
- */
-static VALUE rxml_attr_parent_get(VALUE self)
-{
-  xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
-  if (xattr->parent == NULL)
-    return Qnil;
-  else
-    return rxml_node_wrap(xattr->parent);
-}
-
-/*
- * call-seq:
- *    attr.prev -> node
- *
- * Obtain the previous attribute.
- */
-static VALUE rxml_attr_prev_get(VALUE self)
-{
-  xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
-  if (xattr->prev == NULL)
-    return Qnil;
-  else
-    return rxml_attr_wrap(xattr->prev);
-}
-
-/*
- * call-seq:
- *     node.remove! -> nil
- *
- * Removes this attribute from it's parent.
- */
-static VALUE rxml_attr_remove_ex(VALUE self)
-{
-  xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
-
-  if (xattr->_private == NULL)
-    xmlRemoveProp(xattr);
-  else
-    xmlUnlinkNode((xmlNodePtr) xattr);
-
-  return Qnil;;
-}
-
-/*
- * call-seq:
- *    attr.value -> "value"
- *
- * Obtain the value of this attribute.
- */
-VALUE rxml_attr_value_get(VALUE self)
-{
-  xmlAttrPtr xattr;
-  xmlChar *value;
-  VALUE result = Qnil;
-
-  Data_Get_Struct(self, xmlAttr, xattr);
-  value = xmlNodeGetContent((xmlNodePtr)xattr);
-
-  if (value != NULL)
-  {
-    result = rb_str_new2((const char*) value);
-    xmlFree(value);
-  }
-  return result;
-}
-
-/*
- * call-seq:
- *    attr.value = "value"
- *
- * Sets the value of this attribute.
- */
-VALUE rxml_attr_value_set(VALUE self, VALUE val)
-{
-  xmlAttrPtr xattr;
-
-  Check_Type(val, T_STRING);
-  Data_Get_Struct(self, xmlAttr, xattr);
-
-  if (xattr->ns)
-    xmlSetNsProp(xattr->parent, xattr->ns, xattr->name,
-        (xmlChar*) StringValuePtr(val));
-  else
-    xmlSetProp(xattr->parent, xattr->name, (xmlChar*) StringValuePtr(val));
-
-  return (self);
-}
-
-void rxml_init_attr(void)
-{
-  cXMLAttr = rb_define_class_under(mXML, "Attr", rb_cObject);
-  rb_define_alloc_func(cXMLAttr, rxml_attr_alloc);
-  rb_define_method(cXMLAttr, "initialize", rxml_attr_initialize, -1);
-  rb_define_method(cXMLAttr, "child", rxml_attr_child_get, 0);
-  rb_define_method(cXMLAttr, "doc", rxml_attr_doc_get, 0);
-  rb_define_method(cXMLAttr, "last", rxml_attr_last_get, 0);
-  rb_define_method(cXMLAttr, "name", rxml_attr_name_get, 0);
-  rb_define_method(cXMLAttr, "next", rxml_attr_next_get, 0);
-  rb_define_method(cXMLAttr, "node_type", rxml_attr_node_type, 0);
-  rb_define_method(cXMLAttr, "ns", rxml_attr_ns_get, 0);
-  rb_define_method(cXMLAttr, "parent", rxml_attr_parent_get, 0);
-  rb_define_method(cXMLAttr, "prev", rxml_attr_prev_get, 0);
-  rb_define_method(cXMLAttr, "remove!", rxml_attr_remove_ex, 0);
-  rb_define_method(cXMLAttr, "value", rxml_attr_value_get, 0);
-  rb_define_method(cXMLAttr, "value=", rxml_attr_value_set, 1);
-}
+/* $Id: ruby_xml_attr.c 831 2009-03-09 17:46:16Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+/*
+ * Document-class: LibXML::XML::Attr
+ *
+ * Provides access to an attribute defined on an element.
+ *
+ * Basic Usage:
+ *
+ *  require 'xml'
+ *
+ *  doc = XML::Document.new(<some_file>)
+ *  attribute = doc.root.attributes.get_attribute_ns('http://www.w3.org/1999/xlink', 'href')
+ *  attribute.name == 'href'
+ *  attribute.value == 'http://www.mydocument.com'
+ *  attribute.remove!
+ */
+
+#include "ruby_libxml.h"
+#include "ruby_xml_attr.h"
+
+VALUE cXMLAttr;
+
+void rxml_attr_free(xmlAttrPtr xattr)
+{
+  if (!xattr)
+    return;
+
+  xattr->_private = NULL;
+
+  if (xattr->parent == NULL && xattr->doc == NULL)
+  {
+    xmlFreeProp(xattr);
+  }
+}
+
+void rxml_attr_mark(xmlAttrPtr xattr)
+{
+  /* This can happen if Ruby does a GC run after creating the
+     new attribute but before initializing it. */
+  if (xattr == NULL)
+    return;
+
+  if (xattr->_private == NULL)
+  {
+    rb_warning("XmlAttr is not bound! (%s:%d)", __FILE__, __LINE__);
+    return;
+  }
+
+  rxml_node_mark_common((xmlNodePtr) xattr);
+}
+
+VALUE rxml_attr_wrap(xmlAttrPtr xattr)
+{
+  VALUE result;
+
+  /* Check if the node is already wrapped. */
+  if (xattr->_private != NULL)
+    return (VALUE) xattr->_private;
+
+  result = Data_Wrap_Struct(cXMLAttr, rxml_attr_mark, rxml_attr_free, xattr);
+  xattr->_private = (void*) result;
+  
+  return result;
+}
+
+static VALUE rxml_attr_alloc(VALUE klass)
+{
+  return Data_Wrap_Struct(klass, rxml_attr_mark, rxml_attr_free, NULL);
+}
+
+/*
+ * call-seq:
+ *    attr.initialize(node, "name", "value")
+ *
+ * Creates a new attribute for the node.
+ *
+ * node: The XML::Node that will contain the attribute
+ * name: The name of the attribute
+ * value: The value of the attribute
+ *
+ *  attr = XML::Attr.new(doc.root, 'name', 'libxml')
+ */
+static VALUE rxml_attr_initialize(int argc, VALUE *argv, VALUE self)
+{
+  VALUE node = argv[0];
+  VALUE name = argv[1];
+  VALUE value = argv[2];
+  VALUE ns = (argc == 4 ? argv[3] : Qnil);
+
+  xmlNodePtr xnode;
+  xmlAttrPtr xattr;
+
+  if (argc < 3 || argc > 4)
+    rb_raise(rb_eArgError, "Wrong number of arguments (3 or 4)");
+
+  Check_Type(name, T_STRING);
+  Check_Type(value, T_STRING);
+
+  Data_Get_Struct(node, xmlNode, xnode);
+
+  if (xnode->type != XML_ELEMENT_NODE)
+    rb_raise(rb_eArgError, "Attributes can only be created on element nodes.");
+
+  if (NIL_P(ns))
+  {
+    xattr = xmlNewProp(xnode, (xmlChar*)StringValuePtr(name), (xmlChar*)StringValuePtr(value));
+  }
+  else
+  {
+    xmlNsPtr xns;
+    Data_Get_Struct(ns, xmlNs, xns);
+    xattr = xmlNewNsProp(xnode, xns, (xmlChar*)StringValuePtr(name), (xmlChar*)StringValuePtr(value));
+  }
+
+  if (!xattr)
+    rb_raise(rb_eRuntimeError, "Could not create attribute.");
+
+  xattr->_private = (void *) self;
+  DATA_PTR( self) = xattr;
+  return self;
+}
+
+/*
+ * call-seq:
+ *    attr.child -> node
+ *
+ * Obtain this attribute's child attribute(s).
+ */
+static VALUE rxml_attr_child_get(VALUE self)
+{
+  xmlAttrPtr xattr;
+  Data_Get_Struct(self, xmlAttr, xattr);
+  if (xattr->children == NULL)
+    return Qnil;
+  else
+    return rxml_node_wrap((xmlNodePtr) xattr->children);
+}
+
+
+/*
+ * call-seq:
+ *    attr.doc -> XML::Document
+ *
+ * Returns this attribute's document.
+ *
+ *  doc.root.attributes.get_attribute('name').doc == doc
+ */
+static VALUE rxml_attr_doc_get(VALUE self)
+{
+  xmlAttrPtr xattr;
+  Data_Get_Struct(self, xmlAttr, xattr);
+  if (xattr->doc == NULL)
+    return Qnil;
+  else
+    return rxml_document_wrap(xattr->doc);
+}
+
+/*
+ * call-seq:
+ *    attr.last -> node
+ *
+ * Obtain the last attribute.
+ */
+static VALUE rxml_attr_last_get(VALUE self)
+{
+  xmlAttrPtr xattr;
+  Data_Get_Struct(self, xmlAttr, xattr);
+  if (xattr->last == NULL)
+    return Qnil;
+  else
+    return rxml_node_wrap(xattr->last);
+}
+
+/*
+ * call-seq:
+ *    attr.name -> "name"
+ *
+ * Obtain this attribute's name.
+ */
+static VALUE rxml_attr_name_get(VALUE self)
+{
+  xmlAttrPtr xattr;
+  Data_Get_Struct(self, xmlAttr, xattr);
+
+  if (xattr->name == NULL)
+    return Qnil;
+  else
+    return rb_str_new2((const char*) xattr->name);
+}
+
+/*
+ * call-seq:
+ *    attr.next -> node
+ *
+ * Obtain the next attribute.
+ */
+static VALUE rxml_attr_next_get(VALUE self)
+{
+  xmlAttrPtr xattr;
+  Data_Get_Struct(self, xmlAttr, xattr);
+  if (xattr->next == NULL)
+    return Qnil;
+  else
+    return rxml_attr_wrap(xattr->next);
+}
+
+/*
+ * call-seq:
+ *    attr.node_type -> num
+ *
+ * Obtain this node's type identifier.
+ */
+static VALUE rxml_attr_node_type(VALUE self)
+{
+  xmlAttrPtr xattr;
+  Data_Get_Struct(self, xmlAttr, xattr);
+  return INT2NUM(xattr->type);
+}
+
+/*
+ * call-seq:
+ *    attr.ns -> namespace
+ *
+ * Obtain this attribute's associated XML::NS, if any.
+ */
+static VALUE rxml_attr_ns_get(VALUE self)
+{
+  xmlAttrPtr xattr;
+  Data_Get_Struct(self, xmlAttr, xattr);
+  if (xattr->ns == NULL)
+    return Qnil;
+  else
+    return rxml_namespace_wrap(xattr->ns, NULL);
+}
+
+/*
+ * call-seq:
+ *    attr.parent -> node
+ *
+ * Obtain this attribute node's parent.
+ */
+static VALUE rxml_attr_parent_get(VALUE self)
+{
+  xmlAttrPtr xattr;
+  Data_Get_Struct(self, xmlAttr, xattr);
+  if (xattr->parent == NULL)
+    return Qnil;
+  else
+    return rxml_node_wrap(xattr->parent);
+}
+
+/*
+ * call-seq:
+ *    attr.prev -> node
+ *
+ * Obtain the previous attribute.
+ */
+static VALUE rxml_attr_prev_get(VALUE self)
+{
+  xmlAttrPtr xattr;
+  Data_Get_Struct(self, xmlAttr, xattr);
+  if (xattr->prev == NULL)
+    return Qnil;
+  else
+    return rxml_attr_wrap(xattr->prev);
+}
+
+/*
+ * call-seq:
+ *     node.remove! -> nil
+ *
+ * Removes this attribute from it's parent.
+ */
+static VALUE rxml_attr_remove_ex(VALUE self)
+{
+  xmlAttrPtr xattr;
+  Data_Get_Struct(self, xmlAttr, xattr);
+
+  if (xattr->_private == NULL)
+    xmlRemoveProp(xattr);
+  else
+    xmlUnlinkNode((xmlNodePtr) xattr);
+
+  return Qnil;;
+}
+
+/*
+ * call-seq:
+ *    attr.value -> "value"
+ *
+ * Obtain the value of this attribute.
+ */
+VALUE rxml_attr_value_get(VALUE self)
+{
+  xmlAttrPtr xattr;
+  xmlChar *value;
+  VALUE result = Qnil;
+
+  Data_Get_Struct(self, xmlAttr, xattr);
+  value = xmlNodeGetContent((xmlNodePtr)xattr);
+
+  if (value != NULL)
+  {
+    result = rb_str_new2((const char*) value);
+    xmlFree(value);
+  }
+  return result;
+}
+
+/*
+ * call-seq:
+ *    attr.value = "value"
+ *
+ * Sets the value of this attribute.
+ */
+VALUE rxml_attr_value_set(VALUE self, VALUE val)
+{
+  xmlAttrPtr xattr;
+
+  Check_Type(val, T_STRING);
+  Data_Get_Struct(self, xmlAttr, xattr);
+
+  if (xattr->ns)
+    xmlSetNsProp(xattr->parent, xattr->ns, xattr->name,
+        (xmlChar*) StringValuePtr(val));
+  else
+    xmlSetProp(xattr->parent, xattr->name, (xmlChar*) StringValuePtr(val));
+
+  return (self);
+}
+
+void rxml_init_attr(void)
+{
+  cXMLAttr = rb_define_class_under(mXML, "Attr", rb_cObject);
+  rb_define_alloc_func(cXMLAttr, rxml_attr_alloc);
+  rb_define_method(cXMLAttr, "initialize", rxml_attr_initialize, -1);
+  rb_define_method(cXMLAttr, "child", rxml_attr_child_get, 0);
+  rb_define_method(cXMLAttr, "doc", rxml_attr_doc_get, 0);
+  rb_define_method(cXMLAttr, "last", rxml_attr_last_get, 0);
+  rb_define_method(cXMLAttr, "name", rxml_attr_name_get, 0);
+  rb_define_method(cXMLAttr, "next", rxml_attr_next_get, 0);
+  rb_define_method(cXMLAttr, "node_type", rxml_attr_node_type, 0);
+  rb_define_method(cXMLAttr, "ns", rxml_attr_ns_get, 0);
+  rb_define_method(cXMLAttr, "parent", rxml_attr_parent_get, 0);
+  rb_define_method(cXMLAttr, "prev", rxml_attr_prev_get, 0);
+  rb_define_method(cXMLAttr, "remove!", rxml_attr_remove_ex, 0);
+  rb_define_method(cXMLAttr, "value", rxml_attr_value_get, 0);
+  rb_define_method(cXMLAttr, "value=", rxml_attr_value_set, 1);
+}

data/ext/libxml/ruby_xml_html_parser_context.c

@@ -20,7 +20,7 @@ static ID IO_ATTR;
    htmlNewParserCtxt (or htmlInitParserCtxt which it uses) method.  htmlNewParserCtxt
    wasn't added to the libxml2 header files until 2.6.27.  So the next two 
    methods are simply copied from a newer version of libxml2 (2.7.2). */
-#if LIBXML_VERSION <= 20627
+#if LIBXML_VERSION < 20627
 #define XML_CTXT_FINISH_DTD_0 0xabcd1234
 static int htmlInitParserCtxt(htmlParserCtxtPtr ctxt)
 {

data/ext/libxml/ruby_xml_version.h

@@ -1,8 +1,8 @@
 /* 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  "1.1.0"
-#define RUBY_LIBXML_VERNUM   110
+#define RUBY_LIBXML_VERSION  "1.1.1"
+#define RUBY_LIBXML_VERNUM   111
 #define RUBY_LIBXML_VER_MAJ   1
 #define RUBY_LIBXML_VER_MIN   1
 #define RUBY_LIBXML_VER_MIC   0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: libxml-ruby
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Charlie Savage
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-09 00:00:00 -06:00
+date: 2009-03-10 00:00:00 -06:00
 default_executable: 
 dependencies: []