libxml-ruby 0.3.8 → 0.3.8.2

data/ext/xml/ruby_xml_node.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_node.h,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_node.h,v 1.3 2006/11/20 01:22:07 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -13,14 +13,15 @@ extern VALUE eXMLNodeUnknownType;
 typedef struct ruby_xml_node {
   xmlNodePtr node;
   VALUE xd;
-  int is_ptr;
+  //int is_ptr;
 } ruby_xml_node;
 
 void ruby_xml_node_free(ruby_xml_node *rxn);
 void ruby_init_xml_node(void);
 VALUE ruby_xml_node_child_set(VALUE self, VALUE obj);
 VALUE ruby_xml_node_new(VALUE class, xmlNodePtr node);
-VALUE ruby_xml_node_new2(VALUE class, VALUE xd, xmlNodePtr node);
+VALUE ruby_xml_node_new_ptr(VALUE class, VALUE xd, xmlNodePtr node);
+VALUE ruby_xml_node_new3(VALUE class, VALUE xd, xmlNodePtr node, int ptr);
 VALUE ruby_xml_node_name_get(VALUE self);
 VALUE ruby_xml_node_property_get(VALUE self, VALUE key);
 VALUE ruby_xml_node_property_set(VALUE self, VALUE key, VALUE val);

data/ext/xml/ruby_xml_node_set.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_node_set.c,v 1.3 2006/04/14 14:45:25 roscopeco Exp $ */
+/* $Id: ruby_xml_node_set.c,v 1.4 2006/11/20 01:22:07 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -32,7 +32,7 @@ ruby_xml_node_set_to_a(VALUE self) {
   set_ary = rb_ary_new();
   if (!((rxnset->node_set == NULL) || (rxnset->node_set->nodeNr == 0))) {
     for (i = 0; i < rxnset->node_set->nodeNr; i++) {
-      nodeobj = ruby_xml_node_new2(cXMLNode, rxnset->xd, rxnset->node_set->nodeTab[i]);
+      nodeobj = ruby_xml_node_new_ptr(cXMLNode, rxnset->xd, rxnset->node_set->nodeTab[i]);
       rb_ary_push(set_ary, nodeobj);
     }
   }
@@ -64,7 +64,7 @@ ruby_xml_node_set_each(VALUE self) {
       nodeobj = ruby_xml_attr_new2(cXMLAttr, rxnset->xd, (xmlAttrPtr)rxnset->node_set->nodeTab[i]);
       break;
     default:
-      nodeobj = ruby_xml_node_new2(cXMLNode, rxnset->xd, rxnset->node_set->nodeTab[i]);
+      nodeobj = ruby_xml_node_new_ptr(cXMLNode, rxnset->xd, rxnset->node_set->nodeTab[i]);
     }
 
     rb_yield(nodeobj);
@@ -108,7 +108,7 @@ ruby_xml_node_set_first(VALUE self) {
       nodeobj = ruby_xml_attr_new2(cXMLAttr, rxnset->xd, (xmlAttrPtr)rxnset->node_set->nodeTab[0]);
       break;
     default:
-      nodeobj = ruby_xml_node_new2(cXMLNode, rxnset->xd, rxnset->node_set->nodeTab[0]);
+      nodeobj = ruby_xml_node_new_ptr(cXMLNode, rxnset->xd, rxnset->node_set->nodeTab[0]);
   }
 
   return(nodeobj);

data/ext/xml/ruby_xml_parser.c

@@ -1,7 +1,9 @@
-/* $Id: ruby_xml_parser.c,v 1.3 2006/03/27 20:49:19 roscopeco Exp $ */
+/* $Id: ruby_xml_parser.c,v 1.5 2006/11/20 01:22:07 roscopeco Exp $ */
+/* $Id: ruby_xml_parser.c,v 1.5 2006/11/20 01:22:07 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
+#include <stdarg.h>
 #include "libxml.h"
 
 static VALUE libxml_xmlRubyErrorProc = Qnil;
@@ -1283,12 +1285,11 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx, const char *msg, ...)
 #endif
 
 void
-ruby_init_parser(void) {
-	
+ruby_init_parser(void) {	
   cXMLParser = rb_define_class_under(mXML, "Parser", rb_cObject);
   eXMLParserParseError = rb_define_class_under(cXMLParser, "ParseError",
 					       rb_eRuntimeError);
-
+                 
   /* Constants */
   rb_define_const(cXMLParser, "LIBXML_VERSION",
 		  rb_str_new2(LIBXML_DOTTED_VERSION));
@@ -1413,5 +1414,10 @@ ruby_init_parser(void) {
   // set up error handling
   xmlSetGenericErrorFunc(NULL, libxml_xmlErrorFuncHandler);
   xmlThrDefSetGenericErrorFunc(NULL, libxml_xmlErrorFuncHandler);
+
+  // Ruby needs to know about this even though it's not exported, otherwise
+  // our error proc might get garbage collected.
+  rb_global_variable(&libxml_xmlRubyErrorProc);             
+
   id_call = rb_intern("call");
 }

data/ext/xml/ruby_xml_parser_context.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_parser_context.c,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_parser_context.c,v 1.2 2006/11/20 01:22:07 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -330,7 +330,7 @@ ruby_xml_parser_context_node_get(VALUE self) {
   if (rxpc->ctxt->node == NULL)
     return(Qnil);
   else
-    return(ruby_xml_node_new2(cXMLNode,
+    return(ruby_xml_node_new_ptr(cXMLNode,
 			      ruby_xml_document_new(cXMLDocument, rxpc->ctxt->myDoc),
 			      rxpc->ctxt->node));
 }

data/ext/xml/ruby_xml_sax_parser.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_sax_parser.c,v 1.4 2006/04/14 23:46:06 roscopeco Exp $ */
+/* $Id: ruby_xml_sax_parser.c,v 1.6 2006/08/15 13:53:45 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -39,6 +39,14 @@ ruby_xml_sax_parser_mark(ruby_xml_sax_parser *rxsp) {
   mark_handler(rxsp, xmlParserError);
   mark_handler(rxsp, xmlParserFatalError);
   mark_handler(rxsp, cdataBlock);
+  
+  if (rxsp->filename && (rxsp->filename != Qnil)) {
+    rb_gc_mark(rxsp->filename);    
+  }
+  
+  if (rxsp->str && (rxsp->str != Qnil)) {
+    rb_gc_mark(rxsp->str);    
+  }
 }
 
 
@@ -97,8 +105,8 @@ ruby_xml_sax_parser_filename_set(VALUE self, VALUE filename) {
 
 #define set_handler(self, argc, argv, handler)      \
   VALUE proc;                                       \
-  rb_scan_args(argc, argv, "0&", &proc);            \
   ruby_xml_sax_parser *rxsp;                        \
+  rb_scan_args(argc, argv, "0&", &proc);            \
   Data_Get_Struct(self, ruby_xml_sax_parser, rxsp); \
   rxsp->cbp->handler = proc;                        \
   return(Qnil);

data/tests/copy_bug.rb

@@ -5,7 +5,7 @@ def test( doc2 )
   doc = XML::Document.new('1.0')
   doc.root = XML::Node.new("ccc")
   doc.root['aaa'] = 'aaa'
-  #doc.root << doc2.root # BUG!
+  doc.root << doc2.root # BUG!
   doc.root << doc2.root.copy(true)
   return doc
 end

data/tests/copy_bug2.rb

@@ -0,0 +1,32 @@
+#!/usr/bin/ruby -w -I.
+require "libxml_test"
+
+$FAILS = []
+
+def test( doc, doc2, iter )
+  doc.root = XML::Node.new("ccc")
+  iter.times { |i|
+    doc.root << doc2.root
+    doc.root << doc2.root.copy(true)
+  }
+  return doc
+end
+
+def test2(iter)
+  doc = XML::Document.new('1.0')
+  doc2 = XML::Document.new('1.0')
+  doc2.root = XML::Node.new("aaa")
+  ret = test( doc, doc2, iter )
+
+  $FAILS << iter unless ret.find('*/aaa').length == iter
+end
+
+1000.times do |i| 
+  puts i.to_s
+  test2(i)
+end
+
+puts "#{$FAILS.length} failures"
+p $FAILS
+
+

data/tests/libxml_test.rb

@@ -1,2 +1,3 @@
 $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../ext")
 require "xml/libxml_so" unless defined?(XML)
+puts "VERSION: #{XML::Parser::VERSION}"

data/tests/merge_bug.rb

@@ -0,0 +1,56 @@
+#!/usr/local/bin/ruby
+
+require 'libxml_test'
+require 'xml/libxml' # needs the ruby code too
+
+class XML::Node
+  def first_child_element
+    result = nil
+    if self.children?
+      self.each_child{|node_child| result = node_child if ((result.nil?) && node_child.element?) }
+    end
+    result
+  end
+end
+
+#
+# Method which generates crash
+#
+def merge(forms)
+  starting_form = forms.shift
+  forms.inject(starting_form) do |master_form,form| 
+    master_form.find("//body").first << form.find("//body").first.first_child_element
+    master_form
+  end
+end
+
+#
+# Run
+#  Must tell it how many times to merge a document
+#  On my linux box, it takes about 350 to crash it
+#  On my OS X box, it takes about 150
+#
+
+if (ARGV[0].to_i > 0)
+  count = ARGV[0].to_i 
+else
+  count = 500
+end
+
+
+merge_list = []
+
+count.times do
+  merge_list << XML::Parser.string(File.read(File.join(File.dirname(__FILE__), 'model', 'merge_bug_data.xml'))).parse
+end
+
+result = merge(merge_list)
+puts "Merged!"
+
+#File.open(File.join(File.dirname(__FILE__), 'model', '/generated_form.xml'), "w") do |f|
+#  puts "Trying to write to file" 
+#  f << result
+#  puts "After trying to write to file"
+#end
+
+puts "nothing left to do but print this message"

data/tests/model/merge_bug_data.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<template>
+  <body>
+    <section>
+      <txt>Some Preset Data Here</txt>
+      <txt>Some Preset Data Here</txt>
+      <txt>name: quack!</txt>
+      <txt>Some Preset Data Here</txt>
+      <txt>Some Preset Data Here</txt>
+      <txt>Some Preset Data Here</txt>
+      <txt>Some Preset Data Here</txt>
+      <txt>city: quack!</txt>
+      <txt>Some Preset Data Here</txt>
+      <txt>Some Preset Data Here</txt>
+      <txt>Some Preset Data Here</txt>
+      <txt>Some Preset Data Here</txt>
+      <txt>state: quack!</txt>
+      <txt>Some Preset Data Here</txt>
+      <txt>Some Preset Data Here</txt>
+      <txt>Some Preset Data Here</txt>
+      <txt>Some Preset Data Here</txt>
+      <row>
+        <txt>year: Vroom!</txt>
+        <txt>make: Vroom!</txt>
+        <txt>model: Vroom!</txt>
+      </row>
+      <row>
+        <txt>year: Vroom!</txt>
+        <txt>make: Vroom!</txt>
+        <txt>model: Vroom!</txt>
+      </row>
+      <row>
+        <txt>year: Vroom!</txt>
+        <txt>make: Vroom!</txt>
+        <txt>model: Vroom!</txt>
+      </row>
+      <txt>Some Preset Data Here</txt>
+      <txt>Some Preset Data Here</txt>
+      <row>
+        <txt>year: Vroom!</txt>
+        <txt>make: Vroom!</txt>
+        <txt>model: Vroom!</txt>
+      </row>
+      <row>
+        <txt>year: Vroom!</txt>
+        <txt>make: Vroom!</txt>
+        <txt>model: Vroom!</txt>
+      </row>
+      <row>
+        <txt>year: Vroom!</txt>
+        <txt>make: Vroom!</txt>
+        <txt>model: Vroom!</txt>
+      </row>
+      <txt>Some Preset Data Here</txt>
+      <txt>Some Preset Data Here</txt>
+    </section>
+  </body>
+</template>

data/tests/tc_xml_document_write3.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_document_write3.rb,v 1.3 2006/04/17 13:30:22 roscopeco Exp $
+# $Id: tc_xml_document_write3.rb,v 1.4 2006/11/20 01:22:08 roscopeco Exp $
 require "libxml_test"
 require 'test/unit'
 
@@ -30,7 +30,7 @@ class TC_XML_Document_Write3 < Test::Unit::TestCase
     xml << "</rubynet>\n"
     pkg = @doc.root.child = XML::Node.new('pkg')
     meta = pkg.child = XML::Node.new('meta')
-    pkgname = meta << XML::Node.new('pkgname')
+    assert_equal meta, meta << (pkgname = XML::Node.new('pkgname'))
     pkgname << 'libxml'
     assert_equal(xml, @doc.to_s)
   end

data/tests/tc_xml_node3.rb

@@ -1,8 +1,8 @@
-# $Id: tc_xml_node3.rb,v 1.2 2006/04/17 13:30:22 roscopeco Exp $
+# $Id: tc_xml_node3.rb,v 1.3 2006/11/20 01:22:08 roscopeco Exp $
 require "libxml_test"
 require 'test/unit'
 
-class TC_XML_Node2 < Test::Unit::TestCase
+class TC_XML_Node3 < Test::Unit::TestCase
   def setup()
     xp = XML::Parser.new()
     str = '<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>'

data/tests/tc_xml_node4.rb

@@ -1,8 +1,8 @@
-# $Id: tc_xml_node4.rb,v 1.2 2006/04/17 13:30:19 roscopeco Exp $
+# $Id: tc_xml_node4.rb,v 1.3 2006/05/10 18:02:51 roscopeco Exp $
 require "libxml_test"
 require 'test/unit'
 
-class TC_XML_Node2 < Test::Unit::TestCase
+class TC_XML_Node4 < Test::Unit::TestCase
   def setup()
     xp = XML::Parser.new()
     str = '<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>'

data/tests/tc_xml_node5.rb

@@ -0,0 +1,53 @@
+# $Id: tc_xml_node5.rb,v 1.1 2006/05/10 18:03:57 roscopeco Exp $
+require "libxml_test"
+require 'test/unit'
+
+class TC_XML_Node5 < Test::Unit::TestCase
+  def setup()
+    xp = XML::Parser.new()
+    str = '<test><num>one</num><num>two</num><num>three</num></test>'
+    assert_equal(str, xp.string = str)
+    @doc = xp.parse
+    assert_instance_of(XML::Document, @doc)
+    @root = @doc.root
+    @num1 = @root.child
+    @num2 = @num1.next
+    @num3 = @num2.next
+  end
+  
+  def test_libxml_node_add_next_01
+    @num1.next = XML::Node.new('num', 'one-and-a-half')
+    assert_equal '<test><num>one</num><num>one-and-a-half</num><num>two</num><num>three</num></test>',
+      @root.to_s.gsub(/\n\s*/,'')
+  end
+  
+  def test_libxml_node_add_next_02
+    @num2.next = XML::Node.new('num', 'two-and-a-half')
+    assert_equal '<test><num>one</num><num>two</num><num>two-and-a-half</num><num>three</num></test>',
+      @root.to_s.gsub(/\n\s*/,'')
+  end
+  
+  def test_libxml_node_add_next_03
+    @num3.next = XML::Node.new('num', 'four')
+    assert_equal '<test><num>one</num><num>two</num><num>three</num><num>four</num></test>',
+      @root.to_s.gsub(/\n\s*/,'')
+  end
+  
+  def test_libxml_node_add_prev_01
+    @num1.prev = XML::Node.new('num', 'half')
+    assert_equal '<test><num>half</num><num>one</num><num>two</num><num>three</num></test>',
+      @root.to_s.gsub(/\n\s*/,'')
+  end
+  
+  def test_libxml_node_add_prev_02
+    @num2.prev = XML::Node.new('num', 'one-and-a-half')
+    assert_equal '<test><num>one</num><num>one-and-a-half</num><num>two</num><num>three</num></test>',
+      @root.to_s.gsub(/\n\s*/,'')
+  end
+  
+  def test_libxml_node_add_prev_03
+    @num3.prev = XML::Node.new('num', 'two-and-a-half')
+    assert_equal '<test><num>one</num><num>two</num><num>two-and-a-half</num><num>three</num></test>',
+      @root.to_s.gsub(/\n\s*/,'')
+  end  
+end

data/tests/tc_xml_node6.rb

@@ -0,0 +1,28 @@
+# $Id: tc_xml_node6.rb,v 1.2 2006/05/31 17:26:43 roscopeco Exp $
+require "libxml_test"
+require 'test/unit'
+
+class TC_XML_Node6 < Test::Unit::TestCase
+  def setup()
+    xp = XML::Parser.string('<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>')
+    doc = xp.parse
+    @root = doc.root
+    assert_equal 'bar', @root['foo']
+  end
+
+  def teardown()
+    @root = nil
+  end
+
+  def test_xml_node_prop_get_str_sym()
+    assert_equal @root['foo'], @root[:foo]
+    assert_equal @root['uga'], @root[:uga]
+  end
+
+  def test_xml_node_prop_set_str_sym()
+    @root[:foo] = 'boo'
+    @root[:uga] = 'zoo'
+    assert_equal 'boo', @root['foo']
+    assert_equal 'zoo', @root['uga']
+  end
+end

data/tests/tc_xml_node7.rb

@@ -0,0 +1,28 @@
+# $Id: tc_xml_node7.rb,v 1.2 2006/11/20 01:22:08 roscopeco Exp $
+require "libxml_test"
+require 'test/unit'
+
+class TC_XML_Node7 < Test::Unit::TestCase
+  def setup()
+    xp = XML::Parser.string('<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>')
+    doc = xp.parse
+    @root = doc.root
+    assert_equal 'bar', @root['foo']
+  end
+
+  def teardown()
+    @root = nil
+  end
+
+  def test_xml_node_properties_traversal_bug()
+    prop = @root.properties
+    assert_instance_of XML::Attr, prop
+    assert_equal 'uga', prop.name
+    assert_equal 'booga', prop.value
+    
+    prop = prop.next
+    assert_instance_of XML::Attr, prop
+    assert_equal 'foo', prop.name
+    assert_equal 'bar', prop.value    
+  end
+end