libxml-ruby 0.6.0 → 0.7.0

data/ext/libxml/ruby_xml_xpath_context.h

@@ -1,20 +1,20 @@
-/* $Id: ruby_xml_xpath_context.h 207 2007-11-14 07:51:46Z danj $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_XPATH_CONTEXT__
-#define __RUBY_XML_XPATH_CONTEXT__
-
-extern VALUE cXMLXPathContext;
-
-typedef struct ruby_xml_xpath_context {
-  VALUE xd;
-  xmlXPathContextPtr ctxt;
-} ruby_xml_xpath_context;
-
-VALUE ruby_xml_xpath_context_wrap(xmlXPathContextPtr ctxt);
-VALUE ruby_xml_xpath_context_new(VALUE anode);
-VALUE ruby_xml_xpath_context_register_namespace(VALUE self, VALUE prefix, VALUE uri);
-void ruby_init_xml_xpath_context(void);
-
-#endif
+/* $Id: ruby_xml_xpath_context.h 207 2007-11-14 07:51:46Z danj $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_XPATH_CONTEXT__
+#define __RUBY_XML_XPATH_CONTEXT__
+
+extern VALUE cXMLXPathContext;
+
+typedef struct ruby_xml_xpath_context {
+  VALUE xd;
+  xmlXPathContextPtr ctxt;
+} ruby_xml_xpath_context;
+
+VALUE ruby_xml_xpath_context_wrap(xmlXPathContextPtr ctxt);
+VALUE ruby_xml_xpath_context_new(VALUE anode);
+VALUE ruby_xml_xpath_context_register_namespace(VALUE self, VALUE prefix, VALUE uri);
+void ruby_init_xml_xpath_context(void);
+
+#endif

data/ext/libxml/ruby_xml_xpath_object.c

@@ -24,8 +24,7 @@ ruby_xml_xpath_object_tabref(xmlXPathObjectPtr xpop, int apos) {
 
   switch(xpop->nodesetval->nodeTab[apos]->type) {
   case XML_ATTRIBUTE_NODE:
-    return ruby_xml_attr_wrap(cXMLAttr,
-			      (xmlAttrPtr)xpop->nodesetval->nodeTab[apos]);
+    return Qnil;//ruby_xml_attr_wrap((xmlAttrPtr)xpop->nodesetval->nodeTab[apos]);
     break;
   default:
     return ruby_xml_node2_wrap(cXMLNode,
@@ -69,12 +68,6 @@ ruby_xml_xpath_object_wrap(xmlXPathObjectPtr xpop)
                             ruby_xml_xpath_object_free,
                             xpop);
   
-    if (xpop->type == XPATH_NODESET && !((xpop->nodesetval == NULL) || (xpop->nodesetval->nodeNr == 0))) {
-      int i;
-      for (i = 0; i < xpop->nodesetval->nodeNr; i++) {
-        ruby_xml_xpath_object_tabref(xpop, i);
-      }
-    }
     break;
   case XPATH_BOOLEAN:
     if (xpop->boolval != 0)
@@ -104,7 +97,7 @@ ruby_xml_xpath_object_wrap(xmlXPathObjectPtr xpop)
 
 /*
  * call-seq:
- *    xpath_object.to_a => [node, ..., node]
+ *    xpath_object.to_a -> [node, ..., node]
  * 
  * Obtain an array of the nodes in this set.
  */
@@ -130,7 +123,7 @@ ruby_xml_xpath_object_to_a(VALUE self)
 
 /*
  * call-seq:
- *    xpath_object.set => Node::Set
+ *    xpath_object.set -> Node::Set
  * 
  * Obtain the previous type object which is really
  * just a proxy back to this object. Unless the
@@ -153,7 +146,7 @@ ruby_xml_xpath_object_set(VALUE self)
 
 /*
  * call-seq:
- *    xpath_object.empty? => (true|false)
+ *    xpath_object.empty? -> (true|false)
  *
  * Determine whether this nodeset is empty (contains no nodes).
  */
@@ -171,7 +164,7 @@ ruby_xml_xpath_object_empty_q(VALUE self) {
 
 /*
  * call-seq:
- *    xpath_object.each { |node| ... } => self
+ *    xpath_object.each { |node| ... } -> self
  * 
  * Call the supplied block for each node in this set.
  */
@@ -194,7 +187,7 @@ ruby_xml_xpath_object_each(VALUE self)
 
 /*
  * call-seq:
- *    xpath_object.first => node
+ *    xpath_object.first -> node
  *
  * Returns the first node in this node set, or nil if none exist.
  */
@@ -208,7 +201,7 @@ ruby_xml_xpath_object_first(VALUE self) {
 
 /*
  * call-seq:
- * xpath_object[i] => node
+ * xpath_object[i] -> node
  *
  * array index into set of nodes
  */
@@ -223,7 +216,7 @@ ruby_xml_xpath_object_aref(VALUE self, VALUE aref) {
 
 /*
  * call-seq:
- *    xpath_object.length => num
+ *    xpath_object.length -> num
  * 
  * Obtain the length of the nodesetval node list.
  */
@@ -231,7 +224,7 @@ VALUE
 ruby_xml_xpath_object_length(VALUE self) {
   xmlXPathObjectPtr xpop;
 
-  if ( ruby_xml_xpath_object_empty_q(self) == Qtrue )
+  if (ruby_xml_xpath_object_empty_q(self) == Qtrue)
     return INT2FIX(0);
 
   Data_Get_Struct(self,xmlXPathObject,xpop);

data/ext/libxml/ruby_xml_xpath_object.h

@@ -9,20 +9,14 @@ typedef struct ruby_xml_xpath_object_s {
   xmlXPathObjectPtr xpop;
 } ruby_xml_xpath_object;
 
+void ruby_init_xml_xpath_object(void);
 VALUE ruby_xml_xpath_object_wrap(xmlXPathObjectPtr xpop);
-VALUE ruby_xml_xpath_object_to_a(VALUE self);
+
 VALUE ruby_xml_xpath_object_first(VALUE self);
-VALUE ruby_xml_xpath_object_set(VALUE self);
-VALUE ruby_xml_xpath_object_empty_q(VALUE self);
+VALUE ruby_xml_xpath_object_to_a(VALUE self);
 VALUE ruby_xml_xpath_object_each(VALUE self);
+VALUE ruby_xml_xpath_object_empty_q(VALUE self);
 VALUE ruby_xml_xpath_object_first(VALUE self);
 VALUE ruby_xml_xpath_object_length(VALUE self);
-VALUE ruby_xml_xpath_object_set_type(VALUE self);
-VALUE ruby_xml_xpath_object_string(VALUE self);
-
-void ruby_xml_xpath_object_mark(xmlXPathObjectPtr xpop);
-void ruby_xml_xpath_object_free(xmlXPathObjectPtr xpop);
-
-void ruby_init_xml_xpath_object(void);
 
 #endif

data/ext/libxml/ruby_xml_xpointer.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpointer.c 300 2008-07-01 19:14:15Z cfis $ */
+/* $Id: ruby_xml_xpointer.c 351 2008-07-09 19:55:21Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -11,7 +11,7 @@ VALUE eXMLXPointerInvalidExpression;
 VALUE
 ruby_xml_xpointer_point(VALUE class, VALUE rnode, VALUE xptr_str) {
 #ifdef LIBXML_XPTR_ENABLED
-  ruby_xml_node *node;
+  xmlNodePtr xnode;
   xmlXPathContextPtr ctxt;
   VALUE rxptr_xpth_ctxt, rxxp;
   xmlXPathObjectPtr xpath;
@@ -20,10 +20,10 @@ ruby_xml_xpointer_point(VALUE class, VALUE rnode, VALUE xptr_str) {
   if (rb_obj_is_kind_of(rnode, cXMLNode) == Qfalse)
     rb_raise(rb_eTypeError, "require an XML::Node object");
 
-  Data_Get_Struct(rnode, ruby_xml_node, node);
+  Data_Get_Struct(rnode, xmlNode, xnode);
 
   rxptr_xpth_ctxt =
-    ruby_xml_xpath_context_wrap(ctxt=xmlXPtrNewContext(node->node->doc, node->node, NULL));
+    ruby_xml_xpath_context_wrap(ctxt=xmlXPtrNewContext(xnode->doc, xnode, NULL));
 
   if (NIL_P(rxptr_xpth_ctxt))
     return(Qnil);
@@ -49,7 +49,7 @@ ruby_xml_xpointer_point2(VALUE node, VALUE xptr_str) {
 
 /*
  * call-seq:
- *    XML::XPointer.range(start_node, end_node) => xpath
+ *    XML::XPointer.range(start_node, end_node) -> xpath
  * 
  * Create an xpath representing the range between the supplied
  * start and end node.
@@ -57,7 +57,7 @@ ruby_xml_xpointer_point2(VALUE node, VALUE xptr_str) {
 VALUE
 ruby_xml_xpointer_range(VALUE class, VALUE rstart, VALUE rend) {
 #ifdef LIBXML_XPTR_ENABLED
-  ruby_xml_node *start, *end;
+  xmlNodePtr start, end;
   VALUE rxxp;
   xmlXPathObjectPtr xpath;
 
@@ -66,15 +66,15 @@ ruby_xml_xpointer_range(VALUE class, VALUE rstart, VALUE rend) {
   if (rb_obj_is_kind_of(rend, cXMLNode) == Qfalse)
     rb_raise(rb_eTypeError, "require an XML::Node object as an ending point");
 
-  Data_Get_Struct(rstart, ruby_xml_node, start);
-  if (start->node == NULL)
+  Data_Get_Struct(rstart, xmlNode, start);
+  if (start == NULL)
     return(Qnil);
 
-  Data_Get_Struct(rend, ruby_xml_node, end);
-  if (end->node == NULL)
+  Data_Get_Struct(rend, xmlNode, end);
+  if (end == NULL)
     return(Qnil);
 
-  xpath = xmlXPtrNewRangeNodes(start->node, end->node);
+  xpath = xmlXPtrNewRangeNodes(start, end);
   if (xpath == NULL)
     rb_fatal("You shouldn't be able to have this happen");
 

data/ext/libxml/ruby_xml_xpointer.h

@@ -1,27 +1,27 @@
-/* $Id: ruby_xml_xpointer.h 39 2006-02-21 20:40:16Z roscopeco $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_XPOINTER__
-#define __RUBY_XML_XPOINTER__
-
-extern VALUE cXMLXPointer;
-extern VALUE eXMLXPointerInvalidExpression;
-
-typedef struct ruby_xml_xpointer {
-  VALUE xd;
-  VALUE ctxt;
-  /*
-   * This needs to go into a xpointer data struct:
-   *
-   * xmlLocationSetPtr xptr;
-   *
-   * I also need an xpointer data struct type.
-  */
-} ruby_xml_xpointer;
-
-VALUE ruby_xml_xpointer_point(VALUE class, VALUE node, VALUE xptr_string);
-VALUE ruby_xml_xpointer_point2(VALUE node, VALUE xptr_string);
-void ruby_init_xml_xpointer(void);
-
-#endif
+/* $Id: ruby_xml_xpointer.h 39 2006-02-21 20:40:16Z roscopeco $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_XPOINTER__
+#define __RUBY_XML_XPOINTER__
+
+extern VALUE cXMLXPointer;
+extern VALUE eXMLXPointerInvalidExpression;
+
+typedef struct ruby_xml_xpointer {
+  VALUE xd;
+  VALUE ctxt;
+  /*
+   * This needs to go into a xpointer data struct:
+   *
+   * xmlLocationSetPtr xptr;
+   *
+   * I also need an xpointer data struct type.
+  */
+} ruby_xml_xpointer;
+
+VALUE ruby_xml_xpointer_point(VALUE class, VALUE node, VALUE xptr_string);
+VALUE ruby_xml_xpointer_point2(VALUE node, VALUE xptr_string);
+void ruby_init_xml_xpointer(void);
+
+#endif

data/ext/libxml/ruby_xml_xpointer_context.h

@@ -1,18 +1,18 @@
-/* $Id: ruby_xml_xpointer_context.h 39 2006-02-21 20:40:16Z roscopeco $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_XPOINTER_CONTEXT__
-#define __RUBY_XML_XPOINTER_CONTEXT__
-
-extern VALUE cXMLXPointerContext;
-extern VALUE eXMLXPointerContextInvalidPath;
-
-typedef struct ruby_xml_xpointer_context {
-  VALUE xd;
-  xmlXPathContextPtr ctxt;
-} ruby_xml_xpointer_context;
-
-void ruby_init_xml_xpointer_context(void);
-
-#endif
+/* $Id: ruby_xml_xpointer_context.h 39 2006-02-21 20:40:16Z roscopeco $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_XPOINTER_CONTEXT__
+#define __RUBY_XML_XPOINTER_CONTEXT__
+
+extern VALUE cXMLXPointerContext;
+extern VALUE eXMLXPointerContextInvalidPath;
+
+typedef struct ruby_xml_xpointer_context {
+  VALUE xd;
+  xmlXPathContextPtr ctxt;
+} ruby_xml_xpointer_context;
+
+void ruby_init_xml_xpointer_context(void);
+
+#endif

data/ext/libxml/version.h

@@ -1,9 +1,9 @@
 /* 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.6.0"
+#define RUBY_LIBXML_VERSION  "0.7.0"
 #define RUBY_LIBXML_VERNUM   0
 #define RUBY_LIBXML_VER_MAJ   0
-#define RUBY_LIBXML_VER_MIN   6
+#define RUBY_LIBXML_VER_MIN   7
 #define RUBY_LIBXML_VER_MIC   0
 #define RUBY_LIBXML_VER_PATCH 0

data/lib/libxml.rb

@@ -1,125 +1,134 @@
-# $Id: libxml.rb 291 2008-07-01 08:04:25Z cfis $ 
-# Please see the LICENSE file for copyright and distribution information 
-
-require 'libxml_ruby.so'
-
-module XML::XMLParserOptions
-  XML_PARSE_RECOVER = 1 # recover on errors
-  XML_PARSE_NOENT = 2 # substitute entities
-  XML_PARSE_DTDLOAD = 4 # load the external subset
-  XML_PARSE_DTDATTR = 8 # default DTD attributes
-  XML_PARSE_DTDVALID = 16 # validate with the DTD
-  XML_PARSE_NOERROR = 32 # suppress error reports
-  XML_PARSE_NOWARNING = 64 # suppress warning reports
-  XML_PARSE_PEDANTIC = 128 # pedantic error reporting
-  XML_PARSE_NOBLANKS = 256 # remove blank nodes
-  XML_PARSE_SAX1 = 512 # use the SAX1 interface internally
-  XML_PARSE_XINCLUDE = 1024 # Implement XInclude substitition
-  XML_PARSE_NONET = 2048 # Forbid network access
-  XML_PARSE_NODICT = 4096 # Do not reuse the context dictionnary
-  XML_PARSE_NSCLEAN = 8192 # remove redundant namespaces declarations
-  XML_PARSE_NOCDATA = 16384 # merge CDATA as text nodes
-  XML_PARSE_NOXINCNODE = 32768 # do not generate XINCLUDE START/END nodes
-  XML_PARSE_COMPACT = 65536 # compact small text nodes; no modification of the tree allowed afterwards (will possibly crash if you try to modify the tree)
-end
-
-class XML::Document
-  include Enumerable
-
-  # maybe, maybe not...
-  def each(&blk)
-    find('//*').each(&blk)
-  end
-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) 
-    if count
-      to_a[i,count]
-    else
-      to_a[i]
-    end
-  end
-
-  def to_s #:nodoc:
-    to_a.to_s
-  end
-end
-
-module XML::SiblingEnum
-  private 
-  
-  # Iterates nodes and attributes
-  def siblings(node, &blk)
-    if n = node
-      loop do
-        blk.call(n)
-        break unless n = n.next
-      end
-    end 
-  end
-end
-
-class XML::Node
-  include XML::SiblingEnum
-  include Enumerable
-  include Comparable
-  
-  # maybe these don't belong on all nodes...
-  def each_child(&blk)
-    siblings(child, &blk)   
-  end
-
-  def each_attr(&blk)
-    siblings(properties, &blk)
-  end
-
-  # all siblings INCLUDING self
-  def each_sibling(&blk)
-    siblings(self, &blk)
-  end
-  
-  # I guess this is what you'd expect?
-  alias :each :each_child
-
-  def to_a
-    inject([]) { |ary,n| ary << n }
-  end
-  
-  def <=>(other)
-    to_s <=> other.to_s
-  end  
-
-  def clone
-    copy(false)
-  end
-end
-
-class XML::Attr 
-  include XML::SiblingEnum
-  include Enumerable
-
-  def each_sibling(&blk)
-    siblings(self,&blk)
-  end
-  
-  alias :each_attr :each_sibling
-  alias :each :each_sibling
-  
-  def to_h
-    inject({}) do |h,a| h[a.name] = a.value; h end
-  end
-
-  def to_a
-    inject([]) do |ary,a| ary << [a.name, a.value] end
-  end
-  
-  def to_s
-    "#{name} = #{value}"
-  end
-end
-
+# $Id: libxml.rb 326 2008-07-08 23:00:50Z cfis $ 
+# Please see the LICENSE file for copyright and distribution information 
+
+require 'libxml_ruby.so'
+
+module XML::XMLParserOptions
+  XML_PARSE_RECOVER = 1 # recover on errors
+  XML_PARSE_NOENT = 2 # substitute entities
+  XML_PARSE_DTDLOAD = 4 # load the external subset
+  XML_PARSE_DTDATTR = 8 # default DTD attributes
+  XML_PARSE_DTDVALID = 16 # validate with the DTD
+  XML_PARSE_NOERROR = 32 # suppress error reports
+  XML_PARSE_NOWARNING = 64 # suppress warning reports
+  XML_PARSE_PEDANTIC = 128 # pedantic error reporting
+  XML_PARSE_NOBLANKS = 256 # remove blank nodes
+  XML_PARSE_SAX1 = 512 # use the SAX1 interface internally
+  XML_PARSE_XINCLUDE = 1024 # Implement XInclude substitition
+  XML_PARSE_NONET = 2048 # Forbid network access
+  XML_PARSE_NODICT = 4096 # Do not reuse the context dictionnary
+  XML_PARSE_NSCLEAN = 8192 # remove redundant namespaces declarations
+  XML_PARSE_NOCDATA = 16384 # merge CDATA as text nodes
+  XML_PARSE_NOXINCNODE = 32768 # do not generate XINCLUDE START/END nodes
+  XML_PARSE_COMPACT = 65536 # compact small text nodes; no modification of the tree allowed afterwards (will possibly crash if you try to modify the tree)
+end
+
+class XML::Document
+  include Enumerable
+
+  # maybe, maybe not...
+  def each(&blk)
+    find('//*').each(&blk)
+  end
+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) 
+    if count
+      to_a[i,count]
+    else
+      to_a[i]
+    end
+  end
+
+  def to_s #:nodoc:
+    to_a.to_s
+  end
+end
+
+module XML::SiblingEnum
+  def length
+    inject(0) do |result, node| 
+      result + 1
+    end
+  end
+  
+  private 
+  
+  # Iterates nodes and attributes
+  def siblings(node, &blk)
+    if n = node
+      loop do
+        blk.call(n)
+        break unless n = n.next
+      end
+    end 
+  end
+end
+
+class XML::Node
+  include XML::SiblingEnum
+  include Enumerable
+  
+  # maybe these don't belong on all nodes...
+  def each_child(&blk)
+    siblings(child, &blk)   
+  end
+
+  def each_attr(&blk)
+    siblings(properties, &blk)
+  end
+
+  # all siblings INCLUDING self
+  def each_sibling(&blk)
+    siblings(self, &blk)
+  end
+  
+  # I guess this is what you'd expect?
+  alias :each :each_child
+
+  def to_a
+    inject([]) do |ary,n|
+      ary << n
+      ary
+    end
+  end
+
+  def clone
+    copy(false)
+  end
+end
+
+class XML::Attr 
+  include XML::SiblingEnum
+  include Enumerable
+
+  def each_sibling(&blk)
+    siblings(self,&blk)
+  end
+  
+  alias :each_attr :each_sibling
+  alias :each :each_sibling
+  
+  def to_h
+    inject({}) do |h,a|
+      h[a.name] = a.value
+      h
+    end
+  end
+
+  def to_a
+    inject([]) do |ary,a| 
+      ary << [a.name, a.value]
+      ary
+    end
+  end
+  
+  def to_s
+    "#{name} = #{value}"
+  end
+end