libxml-ruby 0.3.8 → 0.3.8.2

data/README

@@ -119,7 +119,7 @@ structure of the document is already known.
 	puts "Elem3: #{elem3['attr']}"
 	
 	doc.find('//root_node/foo/bar').each do |node|
-	  puts "Node path: #{node.path} \t Contents: #{node}"
+	  puts "Node path: #{node.path} \t Contents: #{node.content}"
 	end
 
 And your terminal should look like:
@@ -141,4 +141,4 @@ And your terminal should look like:
 
 If you have any questions, please send email to libxml-devel@rubyforge.org.
 
-# $Id: README,v 1.5 2006/04/24 19:29:49 roscopeco Exp $
+# $Id: README,v 1.6 2006/08/15 13:49:53 roscopeco Exp $

data/Rakefile

@@ -98,7 +98,7 @@ rd = Rake::RDocTask.new(:doc) do |rdoc|
   rdoc.title    = "Libxml-Ruby API"
   rdoc.options << '--main' << 'README'
   rdoc.rdoc_files.include('README', 'LICENSE', 'TODO')
-  rdoc.rdoc_files.include('ext/xml/ruby_xml*.c', 'ext/xml/*.rb')
+  rdoc.rdoc_files.include('ext/xml/ruby_xml*.c', 'ext/xml/libxml.rb')
   rdoc.rdoc_files.include('*.rdoc')
 end
 
@@ -133,6 +133,7 @@ task :update_version do
 end
 
 PKG_FILES = FileList[
+  'ext/xml/*.rb',
   'ext/xml/extconf.rb',
   '[A-Z]*',
   'ext/xml/*.c',
@@ -163,7 +164,7 @@ else
     s.files = PKG_FILES.to_a
 
     #### Load-time details
-    s.require_path = 'ext'
+    s.require_path = 'lib'
     
     #### Documentation and testing.
     s.has_rdoc = true

data/ext/xml/extconf.rb

@@ -36,13 +36,15 @@ unless have_library('m', 'atan')
   $CFLAGS = saveflags
 end
 
-unless have_library('z', 'inflate')
+unless have_library('z', 'inflate') or
+       have_library('zlib1', 'inflate')
   crash('need zlib')
 else
   $defs.push('-DHAVE_ZLIB_H')
 end
 
 unless have_library('iconv','iconv_open') or 
+       have_library('iconv','libiconv_open') or
        have_library('c','iconv_open') or
        have_library('recode','iconv_open') or
        have_library('iconv')
@@ -59,9 +61,11 @@ EOL
 end
 
 unless (have_library('xml2', 'xmlParseDoc') or
+        have_library('libxml2', 'xmlParseDoc') or
         find_library('xml2', '/opt/lib', '/usr/local/lib', '/usr/lib')) and 
        (have_header('libxml/xmlversion.h') or
-        find_header('libxml/xmlversion.h', 
+        find_header('libxml/xmlversion.h',
+        						"#{CONFIG['prefix']}/include", 
                     '/opt/include/libxml2', 
                     '/usr/local/include/libxml2', 
                     '/usr/include/libxml2'))
@@ -89,7 +93,7 @@ if try_compile('int main() { return 0; }','-Wall')
 end
 
 $CFLAGS << ' ' << $INCFLAGS
-$INSTALLFILES = [["../xml/libxml.rb", "$(RUBYLIBDIR)", "../xml"]]
+$INSTALLFILES = [["libxml.rb", "$(RUBYLIBDIR)", "../xml"]]
 
 create_header()
 create_makefile('xml/libxml_so')

data/ext/xml/libxml.c

@@ -1,4 +1,4 @@
-/* $Id: libxml.c,v 1.2 2006/04/17 13:30:22 roscopeco Exp $ */
+/* $Id: libxml.c,v 1.3 2006/11/20 01:22:07 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -62,7 +62,7 @@ Init_libxml_so(void) {
 
   rb_define_const(mXML, "XML_NAMESPACE", rb_str_new2((const char*)XML_XML_NAMESPACE));
 
-  ruby_init_parser();
+  ruby_init_parser();  
   ruby_init_xml_parser_context();
   ruby_init_xml_attr();
   ruby_init_xml_attribute();

data/ext/xml/libxml.h

@@ -6,8 +6,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  "0.3.8"
-#define RUBY_LIBXML_VERNUM   38
+#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

data/ext/xml/libxml.rb

@@ -1,13 +1,13 @@
-# $Id: libxml.rb,v 1.1 2006/04/17 13:30:22 roscopeco Exp $ 
+# $Id: libxml.rb,v 1.5 2006/10/29 19:42:45 roscopeco Exp $ 
 # Please see the LICENSE file for copyright and distribution information 
 require 'xml/libxml_so'
 
 class XML::Node::Set
-  def empty? #:nodoc:
+  def empty?
   	self.length <= 0
   end
   
-  def first #:nodoc:
+  def first 
   	self.each { |n| return n }
   end
 end
@@ -16,7 +16,7 @@ class XML::Document
   include Enumerable
 
   # maybe, maybe not...
-  def each(&blk) #:nodoc:
+  def each(&blk)
     find('//*').each(&blk)
   end
 end
@@ -24,7 +24,7 @@ end
 class XML::Node::Set 
   # inefficient, but maybe can find a way to cache the
   # ary and dump on change?
-  def [](i, count = nil) #:nodoc:
+  def [](i, count = nil) 
     if count
       to_a[i,count]
     else
@@ -37,7 +37,7 @@ class XML::Node::Set
   end
 end
 
-module XML::SiblingEnum #:nodoc:all
+module XML::SiblingEnum
   private 
   
   # Iterates nodes and attributes
@@ -57,27 +57,27 @@ class XML::Node
   include Comparable
   
   # maybe these don't belong on all nodes...
-  def each_child(&blk) #:nodoc:
+  def each_child(&blk)
     siblings(child, &blk)   
   end
 
-  def each_attr(&blk) #:nodoc:
+  def each_attr(&blk)
     siblings(properties, &blk)
   end
 
   # all siblings INCLUDING self
-  def each_sibling(&blk) #:nodoc:
+  def each_sibling(&blk)
     siblings(self, &blk)
   end
   
   # I guess this is what you'd expect?
   alias :each :each_child
 
-  def to_a #:nodoc:
+  def to_a
     inject([]) { |ary,n| ary << n }
   end
   
-  def <=>(other) #:nodoc:
+  def <=>(other)
     to_s <=> other.to_s
   end  
 end
@@ -86,22 +86,22 @@ class XML::Attr
   include XML::SiblingEnum
   include Enumerable
 
-  def each_sibling(&blk) #:nodoc:
+  def each_sibling(&blk)
     siblings(self,&blk)
   end
   
   alias :each_attr :each_sibling
   alias :each :each_sibling
   
-  def to_h #:nodoc:
+  def to_h
     inject({}) do |h,a| h[a.name] = a.value end
   end
 
-  def to_a #:nodoc:
+  def to_a
     inject([]) do |ary,a| ary << [a.name, a.value] end
   end
   
-  def to_s #:nodoc:
+  def to_s
     "#{name} = #{value}"
   end
 end

data/ext/xml/ruby_xml_attr.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_attr.c,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_attr.c,v 1.2 2006/11/20 01:22:07 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -9,12 +9,19 @@ VALUE cXMLAttr;
 
 void
 ruby_xml_attr_free(ruby_xml_attr *rxa) {
-  if (rxa->attr != NULL && !rxa->is_ptr) {
-    xmlUnlinkNode((xmlNodePtr)rxa->attr);
-    xmlFreeNode((xmlNodePtr)rxa->attr);
-    rxa->attr = NULL;
+  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) {
+      // is null or last reference, 
+      xmlFreeNode((xmlNodePtr)rxa->attr);  
+    } else {
+      // other pointers remain
+      rxa->attr->_private--;    
+    }    
   }
 
+  rxa->attr = NULL;
   free(rxa);
 }
 
@@ -32,7 +39,7 @@ ruby_xml_attr_child_get(VALUE self) {
   if (rxa->attr->children == NULL)
     return(Qnil);
   else
-    return(ruby_xml_node_new2(cXMLNode, rxa->xd, rxa->attr->children));
+    return(ruby_xml_node_new_ptr(cXMLNode, rxa->xd, rxa->attr->children));
 }
 
 
@@ -102,7 +109,7 @@ ruby_xml_attr_last_get(VALUE self) {
   if (rxa->attr->last == NULL)
     return(Qnil);
   else
-    return(ruby_xml_node_new2(cXMLNode, rxa->xd, rxa->attr->last));
+    return(ruby_xml_node_new_ptr(cXMLNode, rxa->xd, rxa->attr->last));
 }
 
 
@@ -150,14 +157,7 @@ ruby_xml_attr_name_get(VALUE self) {
 
 VALUE
 ruby_xml_attr_new(VALUE class, VALUE xd, xmlAttrPtr attr) {
-  ruby_xml_attr *rxa;
-
-  rxa = ALLOC(ruby_xml_attr);
-  rxa->attr = attr;
-  rxa->xd = xd;
-  rxa->is_ptr = 0;
-  return(Data_Wrap_Struct(class, ruby_xml_attr_mark,
-			  ruby_xml_attr_free, rxa));
+  return(ruby_xml_attr_new2(class, xd, attr));
 }
 
 
@@ -166,9 +166,26 @@ ruby_xml_attr_new2(VALUE class, VALUE xd, xmlAttrPtr attr) {
   ruby_xml_attr *rxa;
 
   rxa = ALLOC(ruby_xml_attr);
-  rxa->attr = xmlCopyProp(attr->parent, attr);
-  rxa->xd = xd;
-  rxa->is_ptr = 0;
+
+  rxa->attr = attr;
+  if (attr->_private) {
+    attr->_private++;            
+  } else {
+    attr->_private = (void*)1;
+  }
+    
+  if (NIL_P(xd)) {
+    rxa->xd = Qnil;
+    rxa->attr->doc = NULL;
+  } else {
+    /* Have to set node->doc too so we don't doublefree this node */
+    ruby_xml_document *xdoc;
+    Data_Get_Struct(xd, ruby_xml_document, xdoc);
+      
+    rxa->xd = xd;
+    rxa->attr->doc = xdoc->doc;
+  }
+
   return(Data_Wrap_Struct(class, ruby_xml_attr_mark,
 			  ruby_xml_attr_free, rxa));
 }
@@ -216,7 +233,6 @@ ruby_xml_attr_next_q(VALUE self) {
  */
 VALUE
 ruby_xml_attr_node_type_name(VALUE self) {
-  /* I think libxml2's naming convention blows monkey ass */
   return(rb_str_new2("attribute"));
 }
 
@@ -269,7 +285,7 @@ ruby_xml_attr_parent_get(VALUE self) {
   if (rxa->attr->parent == NULL)
     return(Qnil);
   else
-    return(ruby_xml_node_new2(cXMLNode, rxa->xd, rxa->attr->parent));
+    return(ruby_xml_node_new_ptr(cXMLNode, rxa->xd, rxa->attr->parent));
 }
 
 

data/ext/xml/ruby_xml_attr.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_attr.h,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_attr.h,v 1.2 2006/11/20 01:22:07 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -10,7 +10,7 @@ extern VALUE cXMLAttr;
 typedef struct ruby_xml_attr {
   xmlAttrPtr attr;
   VALUE xd;
-  int is_ptr;
+  //int is_ptr;
 } ruby_xml_attr;
 
 void ruby_xml_attr_free(ruby_xml_attr *rxn);

data/ext/xml/ruby_xml_attribute.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_attribute.c,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_attribute.c,v 1.2 2006/11/20 01:22:07 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -16,7 +16,7 @@ ruby_xml_attribute_child_get(VALUE self) {
   if (rxa->attribute->children == NULL)
     return(Qnil);
   else
-    return(ruby_xml_node_new2(cXMLNode, rxa->xd, rxa->attribute->children));
+    return(ruby_xml_node_new_ptr(cXMLNode, rxa->xd, rxa->attribute->children));
 }
 
 
@@ -74,7 +74,7 @@ ruby_xml_attribute_last_get(VALUE self) {
   if (rxa->attribute->last == NULL)
     return(Qnil);
   else
-    return(ruby_xml_node_new2(cXMLNode, rxa->xd, rxa->attribute->last));
+    return(ruby_xml_node_new_ptr(cXMLNode, rxa->xd, rxa->attribute->last));
 }
 
 
@@ -147,7 +147,7 @@ ruby_xml_attribute_next_get(VALUE self) {
   if (rxa->attribute->next == NULL)
     return(Qnil);
   else
-    return(ruby_xml_node_new2(cXMLNode, rxa->xd, rxa->attribute->next));
+    return(ruby_xml_node_new_ptr(cXMLNode, rxa->xd, rxa->attribute->next));
 }
 
 
@@ -187,7 +187,7 @@ ruby_xml_attribute_prev_get(VALUE self) {
   if (rxa->attribute->prev == NULL)
     return(Qnil);
   else
-    return(ruby_xml_node_new2(cXMLNode, rxa->xd, rxa->attribute->prev));
+    return(ruby_xml_node_new_ptr(cXMLNode, rxa->xd, rxa->attribute->prev));
 }
 
 VALUE

data/ext/xml/ruby_xml_document.c

@@ -1,7 +1,8 @@
-/* $Id: ruby_xml_document.c,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_document.c,v 1.3 2006/11/20 01:22:07 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
+#include <stdarg.h>
 #include "libxml.h"
 #include "ruby_xml_document.h"
 
@@ -104,7 +105,7 @@ ruby_xml_document_child_get(VALUE self) {
   if (rxd->doc->children == NULL)
     return(Qnil);
 
-  node = ruby_xml_node_new2(cXMLNode, self, rxd->doc->children);
+  node = ruby_xml_node_new_ptr(cXMLNode, self, rxd->doc->children);
   Data_Get_Struct(node, ruby_xml_node, rxn);
   rxn->xd = self;
   return(node);
@@ -493,7 +494,7 @@ ruby_xml_document_last_get(VALUE self) {
   if (rxd->doc->last == NULL)
     return(Qnil);
 
-  node = ruby_xml_node_new2(cXMLNode, self, rxd->doc->last);
+  node = ruby_xml_node_new_ptr(cXMLNode, self, rxd->doc->last);
   Data_Get_Struct(node, ruby_xml_node, rxn);
   rxn->xd = self;
   return(node);
@@ -622,7 +623,7 @@ ruby_xml_document_next_get(VALUE self) {
   if (rxd->doc->next == NULL)
     return(Qnil);
 
-  node = ruby_xml_node_new2(cXMLNode, self, rxd->doc->next);
+  node = ruby_xml_node_new_ptr(cXMLNode, self, rxd->doc->next);
   Data_Get_Struct(node, ruby_xml_node, rxn);
   rxn->xd = self;
   return(node);
@@ -664,7 +665,7 @@ ruby_xml_document_parent_get(VALUE self) {
   if (rxd->doc->parent == NULL)
     return(Qnil);
 
-  node = ruby_xml_node_new2(cXMLNode, self, rxd->doc->parent);
+  node = ruby_xml_node_new_ptr(cXMLNode, self, rxd->doc->parent);
   Data_Get_Struct(node, ruby_xml_node, rxn);
   rxn->xd = self;
   return(node);
@@ -706,7 +707,7 @@ ruby_xml_document_prev_get(VALUE self) {
   if (rxd->doc->prev == NULL)
     return(Qnil);
 
-  node = ruby_xml_node_new2(cXMLNode, self, rxd->doc->prev);
+  node = ruby_xml_node_new_ptr(cXMLNode, self, rxd->doc->prev);
   Data_Get_Struct(node, ruby_xml_node, rxn);
   rxn->xd = self;
   return(node);
@@ -764,7 +765,6 @@ ruby_xml_document_property_set(VALUE self, VALUE key, VALUE val) {
 VALUE
 ruby_xml_document_root_get(VALUE self) {
   ruby_xml_document *rxd;
-  ruby_xml_node *rxn;
   VALUE node;
   xmlNodePtr root;
 
@@ -774,9 +774,7 @@ ruby_xml_document_root_get(VALUE self) {
   if (root == NULL)
     return(Qnil);
 
-  node = ruby_xml_node_new2(cXMLNode, self, root);
-  Data_Get_Struct(node, ruby_xml_node, rxn);
-  rxn->xd = self;
+  node = ruby_xml_node_new_ptr(cXMLNode, self, root);
   return(node);
 }
 
@@ -804,7 +802,7 @@ ruby_xml_document_root_set(VALUE self, VALUE node) {
   if (root == NULL)
     return(Qnil);
 
-  retnode = ruby_xml_node_new2(cXMLNode, self, root);
+  retnode = ruby_xml_node_new_ptr(cXMLNode, self, root);
   return(retnode);
 }