libxml-ruby 0.9.7 → 0.9.8

data/ext/libxml/ruby_libxml.h

@@ -7,7 +7,6 @@
 
 #include <ruby.h>
 #include <rubyio.h>
-#include <util.h>
 #include <libxml/parser.h>
 #include <libxml/parserInternals.h>
 #include <libxml/debugXML.h>
@@ -60,17 +59,24 @@
 #include <libxml/xpointer.h>
 #endif
 
+#include "ruby_xml_io.h"
 #include "ruby_xml_error.h"
-#include "ruby_xml_input.h"
+#include "ruby_xml_encoding.h"
 #include "ruby_xml_state.h"
 #include "ruby_xml_attributes.h"
 #include "ruby_xml_attr.h"
+#include "ruby_xml_attr_decl.h"
 #include "ruby_xml_document.h"
 #include "ruby_xml_node.h"
 #include "ruby_xml_namespace.h"
 #include "ruby_xml_namespaces.h"
 #include "ruby_xml_parser.h"
+#include "ruby_xml_parser_options.h"
 #include "ruby_xml_parser_context.h"
+#include "ruby_xml_html_parser.h"
+#include "ruby_xml_html_parser_options.h"
+#include "ruby_xml_html_parser_context.h"
+#include "ruby_xml_reader.h"
 #include "ruby_xml_sax2_handler.h"
 #include "ruby_xml_sax_parser.h"
 #include "ruby_xml_xinclude.h"
@@ -83,8 +89,6 @@
 #include "ruby_xml_dtd.h"
 #include "ruby_xml_schema.h"
 #include "ruby_xml_relaxng.h"
-#include "ruby_xml_html_parser.h"
-#include "ruby_xml_reader.h"
 
 extern VALUE mLibXML;
 extern VALUE mXML;

data/ext/libxml/ruby_xml_attr.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_attr.c 666 2008-12-07 00:16:50Z cfis $ */
+/* $Id: ruby_xml_attr.c 739 2009-01-23 03:42:09Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -28,26 +28,16 @@ void rxml_attr_free(xmlAttrPtr xattr)
   if (!xattr)
     return;
 
-  if (xattr != NULL)
-  {
-    xattr->_private = NULL;
-    if (xattr->parent == NULL && xattr->doc == NULL)
-    {
-#ifdef NODE_DEBUG
-      fprintf(stderr,"ruby_xfree rxn=0x%x xn=0x%x o=0x%x\n",(long)rxn,(long)rxn->node,(long)rxn->node->_private);
-#endif
-      xmlFreeProp(xattr);
-    }
+  xattr->_private = NULL;
 
-    xattr = NULL;
+  if (xattr->parent == NULL && xattr->doc == NULL)
+  {
+    xmlFreeProp(xattr);
   }
 }
 
 void rxml_attr_mark(xmlAttrPtr xattr)
 {
-  if (xattr == NULL)
-    return;
-
   if (xattr->_private == NULL)
   {
     rb_warning("XmlAttr is not bound! (%s:%d)", __FILE__, __LINE__);
@@ -60,16 +50,14 @@ void rxml_attr_mark(xmlAttrPtr xattr)
 VALUE rxml_attr_wrap(xmlAttrPtr xattr)
 {
   VALUE result;
-  // This node is already wrapped
+
+  /* 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;
-#ifdef NODE_DEBUG
-  fprintf(stderr,"wrap rxn=0x%x xn=0x%x o=0x%x\n",(long)rxn,(long)xnode,(long)obj);
-#endif
+  
   return result;
 }
 
@@ -141,26 +129,11 @@ static VALUE rxml_attr_child_get(VALUE self)
   xmlAttrPtr xattr;
   Data_Get_Struct(self, xmlAttr, xattr);
   if (xattr->children == NULL)
-    return (Qnil);
+    return Qnil;
   else
-    return (rxml_node_wrap(cXMLNode, (xmlNodePtr) xattr->children));
+    return rxml_node_wrap((xmlNodePtr) xattr->children);
 }
 
-/*
- * call-seq:
- *    attr.child? -> (true|false)
- *
- * Returns whether this attribute has child attributes.
- */
-static VALUE rxml_attr_child_q(VALUE self)
-{
-  xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
-  if (xattr->children == NULL)
-    return (Qfalse);
-  else
-    return (Qtrue);
-}
 
 /*
  * call-seq:
@@ -175,26 +148,9 @@ 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.doc? -> (true|false)
- *
- * Determine whether this attribute is associated with an
- * XML::Document.
- */
-static VALUE rxml_attr_doc_q(VALUE self)
-{
-  xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
-  if (xattr->doc == NULL)
-    return (Qfalse);
+    return Qnil;
   else
-    return (Qtrue);
+    return rxml_document_wrap(xattr->doc);
 }
 
 /*
@@ -208,25 +164,9 @@ static VALUE rxml_attr_last_get(VALUE self)
   xmlAttrPtr xattr;
   Data_Get_Struct(self, xmlAttr, xattr);
   if (xattr->last == NULL)
-    return (Qnil);
+    return Qnil;
   else
-    return (rxml_node_wrap(cXMLNode, xattr->last));
-}
-
-/*
- * call-seq:
- *    attr.last? -> (true|false)
- *
- * Determine whether this is the last attribute.
- */
-static VALUE rxml_attr_last_q(VALUE self)
-{
-  xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
-  if (xattr->last == NULL)
-    return (Qfalse);
-  else
-    return (Qtrue);
+    return rxml_node_wrap(xattr->last);
 }
 
 /*
@@ -241,9 +181,9 @@ static VALUE rxml_attr_name_get(VALUE self)
   Data_Get_Struct(self, xmlAttr, xattr);
 
   if (xattr->name == NULL)
-    return (Qnil);
+    return Qnil;
   else
-    return (rb_str_new2((const char*) xattr->name));
+    return rb_str_new2((const char*) xattr->name);
 }
 
 /*
@@ -257,36 +197,22 @@ static VALUE rxml_attr_next_get(VALUE self)
   xmlAttrPtr xattr;
   Data_Get_Struct(self, xmlAttr, xattr);
   if (xattr->next == NULL)
-    return (Qnil);
+    return Qnil;
   else
-    return (rxml_attr_wrap(xattr->next));
+    return rxml_attr_wrap(xattr->next);
 }
 
 /*
  * call-seq:
- *    attr.next? -> (true|false)
+ *    attr.node_type -> num
  *
- * Determine whether there is a next attribute.
+ * Obtain this node's type identifier.
  */
-static VALUE rxml_attr_next_q(VALUE self)
+static VALUE rxml_attr_node_type(VALUE self)
 {
   xmlAttrPtr xattr;
   Data_Get_Struct(self, xmlAttr, xattr);
-  if (xattr->next == NULL)
-    return (Qfalse);
-  else
-    return (Qtrue);
-}
-
-/*
- * call-seq:
- *    attr.type_name -> "attribute"
- *
- * Obtain this attribute node's type name.
- */
-static VALUE rxml_attr_node_type_name(VALUE self)
-{
-  return (rb_str_new2("attribute"));
+  return INT2NUM(xattr->type);
 }
 
 /*
@@ -300,26 +226,9 @@ static VALUE rxml_attr_ns_get(VALUE self)
   xmlAttrPtr xattr;
   Data_Get_Struct(self, xmlAttr, xattr);
   if (xattr->ns == NULL)
-    return (Qnil);
+    return Qnil;
   else
-    return (rxml_namespace_wrap(xattr->ns));
-}
-
-/*
- * call-seq:
- *    attr.ns? -> (true|false)
- *
- * Determine whether this attribute has an associated
- * namespace.
- */
-static VALUE rxml_attr_ns_q(VALUE self)
-{
-  xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
-  if (xattr->ns == NULL)
-    return (Qfalse);
-  else
-    return (Qtrue);
+    return rxml_namespace_wrap(xattr->ns, NULL);
 }
 
 /*
@@ -333,25 +242,9 @@ 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(cXMLNode, xattr->parent));
-}
-
-/*
- * call-seq:
- *    attr.parent? -> (true|false)
- *
- * Determine whether this attribute has a parent.
- */
-static VALUE rxml_attr_parent_q(VALUE self)
-{
-  xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
-  if (xattr->parent == NULL)
-    return (Qfalse);
+    return Qnil;
   else
-    return (Qtrue);
+    return rxml_node_wrap(xattr->parent);
 }
 
 /*
@@ -365,25 +258,9 @@ static VALUE rxml_attr_prev_get(VALUE self)
   xmlAttrPtr xattr;
   Data_Get_Struct(self, xmlAttr, xattr);
   if (xattr->prev == NULL)
-    return (Qnil);
+    return Qnil;
   else
-    return (rxml_attr_wrap(xattr->prev));
-}
-
-/*
- * call-seq:
- *    attr.prev? -> (true|false)
- *
- * Determine whether there is a previous attribute.
- */
-static VALUE rxml_attr_prev_q(VALUE self)
-{
-  xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
-  if (xattr->prev == NULL)
-    return (Qfalse);
-  else
-    return (Qtrue);
+    return rxml_attr_wrap(xattr->prev);
 }
 
 /*
@@ -402,7 +279,7 @@ static VALUE rxml_attr_remove_ex(VALUE self)
   else
     xmlUnlinkNode((xmlNodePtr) xattr);
 
-  return (Qnil);
+  return Qnil;;
 }
 
 /*
@@ -418,16 +295,14 @@ VALUE rxml_attr_value_get(VALUE self)
   VALUE result = Qnil;
 
   Data_Get_Struct(self, xmlAttr, xattr);
-  if (rxml_attr_parent_q(self) == Qtrue)
+  value = xmlNodeGetContent((xmlNodePtr)xattr);
+
+  if (value != NULL)
   {
-    value = xmlGetProp(xattr->parent, xattr->name);
-    if (value != NULL)
-    {
-      result = rb_str_new2((const char*) value);
-      xmlFree(value);
-    }
+    result = rb_str_new2((const char*) value);
+    xmlFree(value);
   }
-  return (result);
+  return result;
 }
 
 /*
@@ -464,21 +339,14 @@ void ruby_init_xml_attr(void)
   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, "child?", rxml_attr_child_q, 0);
   rb_define_method(cXMLAttr, "doc", rxml_attr_doc_get, 0);
-  rb_define_method(cXMLAttr, "doc?", rxml_attr_doc_q, 0);
   rb_define_method(cXMLAttr, "last", rxml_attr_last_get, 0);
-  rb_define_method(cXMLAttr, "last?", rxml_attr_last_q, 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, "next?", rxml_attr_next_q, 0);
-  rb_define_method(cXMLAttr, "node_type_name", rxml_attr_node_type_name, 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, "ns?", rxml_attr_ns_q, 0);
   rb_define_method(cXMLAttr, "parent", rxml_attr_parent_get, 0);
-  rb_define_method(cXMLAttr, "parent?", rxml_attr_parent_q, 0);
   rb_define_method(cXMLAttr, "prev", rxml_attr_prev_get, 0);
-  rb_define_method(cXMLAttr, "prev?", rxml_attr_prev_q, 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_attr.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_attr.h 666 2008-12-07 00:16:50Z cfis $ */
+/* $Id: ruby_xml_attr.h 712 2009-01-20 08:08:52Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -8,9 +8,7 @@
 extern VALUE cXMLAttr;
 
 void ruby_init_xml_attr(void);
-VALUE rxml_attr_new(xmlAttrPtr xattr);
+VALUE rxml_attr_wrap(xmlAttrPtr xattr);
 VALUE rxml_attr_value_get(VALUE self);
 VALUE rxml_attr_value_set(VALUE self, VALUE val);
-void rxml_attr_free(xmlAttrPtr xattr);
-VALUE rxml_attr_wrap(xmlAttrPtr xattr);
 #endif

data/ext/libxml/ruby_xml_attr_decl.c

@@ -0,0 +1,177 @@
+/* $Id: ruby_xml_attr.c 666 2008-12-07 00:16:50Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+/*
+ * Document-class: LibXML::XML::AttrDecl
+ *
+ * At attribute declaration is used in XML::Dtds to define 
+ * what attributes are allowed on an element.  An attribute
+ * declaration defines an attribues name, data type and default
+ *  value (if any).
+ */
+
+#include "ruby_libxml.h"
+
+VALUE cXMLAttrDecl;
+
+void rxml_attr_decl_mark(xmlAttributePtr xattribute)
+{
+  if (xattribute->_private == NULL)
+  {
+    rb_warning("AttrDecl is not bound! (%s:%d)", __FILE__, __LINE__);
+    return;
+  }
+
+  rxml_node_mark_common((xmlNodePtr) xattribute);
+}
+
+VALUE rxml_attr_decl_wrap(xmlAttributePtr xattribute)
+{
+  VALUE result;
+
+  // This node is already wrapped
+  if (xattribute->_private != NULL)
+    return (VALUE) xattribute->_private;
+
+  result = Data_Wrap_Struct(cXMLAttrDecl, rxml_attr_decl_mark, NULL, xattribute);
+
+  xattribute->_private = (void*) result;
+
+  return result;
+}
+
+/*
+ * call-seq:
+ *    attr_decl.doc -> XML::Document
+ *
+ * Returns this attribute declaration's document.
+ */
+static VALUE rxml_attr_decl_doc_get(VALUE self)
+{
+  xmlAttributePtr xattribute;
+  Data_Get_Struct(self, xmlAttribute, xattribute);
+  if (xattribute->doc == NULL)
+    return Qnil;
+  else
+    return rxml_document_wrap(xattribute->doc);
+}
+
+
+/*
+ * call-seq:
+ *    attr_decl.name -> "name"
+ *
+ * Obtain this attribute declaration's name.
+ */
+static VALUE rxml_attr_decl_name_get(VALUE self)
+{
+  xmlAttributePtr xattribute;
+  Data_Get_Struct(self, xmlAttribute, xattribute);
+
+  if (xattribute->name == NULL)
+    return Qnil;
+  else
+    return rb_str_new2((const char*) xattribute->name);
+}
+
+/*
+ * call-seq:
+ *    attr_decl.next -> XML::AttrDecl
+ *
+ * Obtain the next attribute declaration.
+ */
+static VALUE rxml_attr_decl_next_get(VALUE self)
+{
+  xmlAttributePtr xattribute;
+  Data_Get_Struct(self, xmlAttribute, xattribute);
+  if (xattribute->next == NULL)
+    return Qnil;
+  else
+    return rxml_attr_decl_wrap((xmlAttributePtr)xattribute->next);
+}
+
+/*
+ * call-seq:
+ *    attr_decl.type -> num
+ *
+ * Obtain this attribute declaration's type node type.
+ */
+static VALUE rxml_attr_decl_node_type(VALUE self)
+{
+  xmlAttrPtr xattr;
+  Data_Get_Struct(self, xmlAttr, xattr);
+  return INT2NUM(xattr->type);
+}
+
+/*
+ * call-seq:
+ *    attr_decl.parent -> XML::Dtd
+ *
+ * Obtain this attribute declaration's parent which
+ * is an instance of a XML::DTD.
+ */
+static VALUE rxml_attr_decl_parent_get(VALUE self)
+{
+  xmlAttributePtr xattribute;
+  Data_Get_Struct(self, xmlAttribute, xattribute);
+
+  if (xattribute->parent == NULL)
+    return Qnil;
+  else
+    return rxml_dtd_wrap(xattribute->parent);
+}
+
+/*
+ * call-seq:
+ *    attr_decl.prev -> (XML::AttrDecl | XML::ElementDecl)
+ *
+ * Obtain the previous attribute declaration or the owning
+ * element declration (not implemented).
+ */
+static VALUE rxml_attr_decl_prev_get(VALUE self)
+{
+  xmlAttributePtr xattribute;
+  Data_Get_Struct(self, xmlAttribute, xattribute);
+
+  if (xattribute->prev == NULL)
+    return Qnil;
+  else
+    return rxml_attr_decl_wrap((xmlAttributePtr)xattribute->prev);
+}
+
+/*
+ * call-seq:
+ *    attr_decl.value -> "value"
+ *
+ * Obtain the default value of this attribute declaration.
+ */
+VALUE rxml_attr_decl_value_get(VALUE self)
+{
+  xmlAttributePtr xattribute;
+
+  Data_Get_Struct(self, xmlAttribute, xattribute);
+
+  if (xattribute->defaultValue)
+    return rb_str_new2((const char *)xattribute->defaultValue);
+  else
+    return Qnil;
+}
+
+// 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_attr_decl(void)
+{
+  cXMLAttrDecl = rb_define_class_under(mXML, "AttrDecl", rb_cObject);
+  rb_define_method(cXMLAttrDecl, "doc", rxml_attr_decl_doc_get, 0);
+  rb_define_method(cXMLAttrDecl, "name", rxml_attr_decl_name_get, 0);
+  rb_define_method(cXMLAttrDecl, "next", rxml_attr_decl_next_get, 0);
+  rb_define_method(cXMLAttrDecl, "node_type", rxml_attr_decl_node_type, 0);
+  rb_define_method(cXMLAttrDecl, "parent", rxml_attr_decl_parent_get, 0);
+  rb_define_method(cXMLAttrDecl, "prev", rxml_attr_decl_prev_get, 0);
+  rb_define_method(cXMLAttrDecl, "value", rxml_attr_decl_value_get, 0);
+}