ruby-xslt 0.9.2 → 0.9.3

data/AUTHORS

@@ -14,6 +14,9 @@ Brendan Taylor <whateley at gmail dot com>
 <kiyoya at gmail dot com>
 * Add definitions for some error classes and sets libxml error function
 
+Pau Garcia i Quiles <pgquiles at elpauer dot org>
+* gemspec
+
 == Thanks to :
 
 knu <knu at freebsd dot org> for FreeBSD port (see http://www.freshports.org/textproc/ruby-xslt/)

data/ChangeLog

@@ -1,3 +1,11 @@
+0.9.3 :
+* Due to recent changes in Gentoo Linux's install system, ruby-xslt no longer installs correctly. Brendan fixed this.
+* Cleaned up extconf.rb
+* Removed unused debugging code (memwatch)
+* Moved some things out of C into Ruby
+* Made error handling much more useful
+* Added some unit tests
+
 0.9.2 :
 * Changes to the way XSLT files are loaded, so that we can keep their base URI straight - Sorry Brendan !!!
 * Major corrections

data/README

@@ -17,9 +17,10 @@ This program is distributed without any warranty. See the file
 == DOWNLOAD
 
 === Last version
-* version 0.9.2[http://gregoire.lejeune.free.fr/ruby-xslt_0.9.2.tar.gz]
+* version 0.9.3[http://gregoire.lejeune.free.fr/ruby-xslt_0.9.3.tar.gz]
 
 === Old versions
+* version 0.9.2[http://gregoire.lejeune.free.fr/ruby-xslt_0.9.2.tar.gz]
 * version 0.9.1[http://gregoire.lejeune.free.fr/ruby-xslt_0.9.1.tar.gz] 
 * version 0.8.2[http://gregoire.lejeune.free.fr/ruby-xslt_0.8.2.tar.gz]
 * version 0.8.1[http://gregoire.lejeune.free.fr/ruby-xslt_0.8.1.tar.gz]
@@ -57,14 +58,10 @@ See this page[http://rubyforge.org/scm/?group_id=423] for more informations
   --with-xslt-dir=PATH     specify the directory name for the libxslt include 
                            files and/or library 
   
-  --enable-error-handler   enables a VERY crude error handler. Error messages 
-                           are appended to the class variable XML::XSLT and can
-                           be accessed with the class method XML::XSLT.errors 
-                           (will change in a future version)
+  --disable-error-handler  disables the new error handler 
+  
   --disable-exslt          disables libexslt support <http://exslt.org/>
   
-  --enable-debug           compile with memwatch 
-                           <http://www.linkdata.se/sourcecode.html>
 
 == EXAMPLES
 
@@ -84,8 +81,8 @@ See this page[http://rubyforge.org/scm/?group_id=423] for more informations
 
 	xslt = XML::XSLT.new()
 
-	xslt.xml = REXML::Document.new File.open( "test.xml" )
-	xslt.xsl = REXML::Document.new File.open( "test.xsl" )
+	xslt.xml = REXML::Document.new File.read( "test.xml" )
+	xslt.xsl = REXML::Document.new File.read( "test.xsl" )
 
 	out = xslt.serve()
 	print out;
@@ -119,19 +116,32 @@ See this page[http://rubyforge.org/scm/?group_id=423] for more informations
 === External functions support
 	require "xml/xslt"
 
-	class XML::XSLT
-	  def round_trip( arg )
-	    arg
-	  end
-	  def type( arg )
-	    arg.class.to_s
-	  end
-	end
-
 	xslt = XML::XSLT.new()
 	xslt.xsl = "functions.xsl"
 	xslt.xml = "test.xml"
-	XML::XSLT.extFunction("round-trip", "http://test.none", xslt)
-	XML::XSLT.extFunction("type", "http://test.none", xslt)
+	
+	XML::XSLT.registerExtFunc("http://test.none", "round-trip") do |arg|
+	  arg
+	end
+
+	XML::XSLT.registerExtFunc("http://test.none", "type") do |arg|
+	  arg.class.to_s
+	end
 
 	print xslt.serve
+
+=== Error handling
+
+	XML::XSLT.registerErrorHandler { |string| puts string }
+
+	xslt = XML::XSLT.new
+	xslt.xml = "not xml"
+
+This fragment would print:
+
+	Entity: line 1: 
+	parser 
+	error : 
+	Start Tag expected, '<' not found
+	not xml
+	^

data/examples/fuzface.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-require '../xslt'
+require 'xml/xslt'
 
 xslt = XML::XSLT.new()
 xslt.xmlfile = "fuzface.xml"

data/examples/fuzface_REXML.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 require 'rexml/document'
-require '../xslt'
+require 'xml/xslt'
 
 xslt = XML::XSLT.new()
 
@@ -8,4 +8,4 @@ xslt.xml = REXML::Document.new File.open( "fuzface.xml" )
 xslt.xsl = REXML::Document.new File.open( "fuzface.xsl" )
 
 out = xslt.serve()
-puts out
+puts out

data/examples/fuzface_XML-Simple.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby -w
 
 require 'xml/smart'
-require '../xslt'
+require 'xml/xslt'
 
 xslt = XML::XSLT.new()
 

data/examples/fuzface_data.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-require '../xslt'
+require 'xml/xslt'
 
 xslt = XML::XSLT.new()
 xslt.xml = IO::readlines( "fuzface.xml" ).join

data/examples/fuzface_error.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-require '../xslt'
+require 'xml/xslt'
 
 xslt = XML::XSLT.new()
 

data/examples/fuzface_to_s.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-require '../xslt'
+require 'xml/xslt'
 
 xslt = XML::XSLT.new()
 xslt.xsl = "fuzface.xsl"

data/examples/info.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/ruby
-require "../xslt"
+require "xml/xslt"
 
 print "MAX_DEPTH = ", XML::XSLT::MAX_DEPTH, "\n"
 print "MAX_SORT = ", XML::XSLT::MAX_SORT, "\n"

data/examples/test_functions.rb

@@ -1,4 +1,4 @@
-require "../xslt"
+require "xml/xslt"
 
 class XML::XSLT
 	def round_trip( arg )

data/examples/test_parameters.rb

@@ -1,4 +1,4 @@
-require "../xslt"
+require "xml/xslt"
 
 xslt = XML::XSLT.new()
 xslt.xsl = "test.xsl"

data/extconf.rb

@@ -17,98 +17,63 @@ Configuration:
   --with-xslt-dir=PATH     specify the directory name for the libxslt include 
                            files and/or library 
   
-  --enable-error-handler   enables a VERY crude error handler. Error messages 
-                           are appended to the class variable XML::XSLT and can
-                           be accessed with the class method XML::XSLT.errors 
-                           (will change in a future version)
-  --disable-exslt          disables libexslt support <http://exslt.org/>
+  --disable-error-handler  disables the new error handler
   
-  --enable-debug           compile with memwatch 
-                           <http://www.linkdata.se/sourcecode.html>
-
+  --disable-exslt          disables libexslt support <http://exslt.org/>
 HELP
 end
 
-if ARGV.include?( "--help" )
+if ARGV.include?( "--help" ) or ARGV.include?( "-h" )
   help()
   exit 0
 end
 
-if enable_config("debug", false)
-  File.symlink( "debug/memwatch.h", "memwatch.h" ) if( ! File.exist?("memwatch.h") )
-  File.symlink( "debug/memwatch.c", "memwatch.c" ) if( ! File.exist?("memwatch.c") )
-  $CFLAGS += " -DMEMWATCH -D__DEBUG__"
-end
-
-if enable_config("error-handler", false)
+if enable_config("error-handler", true)
   $CFLAGS += " -DUSE_ERROR_HANDLER"
 end
 
-$LIBPATH.push(Config::CONFIG['libdir'])
+#$LIBPATH.push(Config::CONFIG['libdir'])
 
 def crash(str)
   printf(" extconf failure: %s\n", str)
   exit 1
 end
 
-#unless have_library("z", "inflate")
-#  crash("need zlib")
-#else
-#  $defs.push('-DHAVE_ZLIB_H')
-#end
-
-if dir_config( "xslt" ) != [nil, nil]
-   inc, lib = dir_config( 'xslt' ) 
-   $LDFLAGS << " -L#{lib} -lxslt -lxml2 -lz -lpthread -liconv -lm"
-   $CFLAGS << " -I#{inc}"
-elsif ex = find_executable( "xslt-config" )
-   $LDFLAGS << ' ' + `#{ex} --libs`.chomp
-   $CFLAGS << ' ' + `#{ex} --cflags`.chomp
-else
-  crash(<<EOL)
-need libxslt.
+dir_config( 'xml2' ) 
+dir_config( 'xslt' ) 
 
-        Install the library or try one of the following options to extconf.rb:
-
-        --with-xslt-lib=/path/to/libxslt/lib
-        --with-xslt-include=/path/to/libxslt/include
-EOL
-end
+have_library "xml2", "xmlParseDoc" || crash("need libxml2")
+have_library "xslt", "xsltParseStylesheetFile" || crash("need libxslt")
 
 if enable_config("exslt", true)
-  $LDFLAGS << " -lexslt"
+  have_library "exslt", "exsltRegisterAll"
   $CFLAGS += " -DUSE_EXSLT"
 end
 
-$CFLAGS = '-g -Wall ' + $CFLAGS
-
-puts "compile with : "
-puts "  CFLAGS = #{$CFLAGS}"
-puts "  LDFLAGS = #{$LDFLAGS}"
-puts
+$CFLAGS = '-g -Wall ' + `xml2-config --cflags`.chomp + " " + `xslt-config --cflags`.chomp + " " + $CFLAGS
 
 create_header()
-create_makefile("xml/xslt")
+create_makefile("xml/xslt_lib")
 
-######  Modify Makefile: #######
 File.rename( "Makefile", "Makefile.orig" )
-oldmkfl = File.open( "Makefile.orig" )
-newmkfl = File.open( "Makefile", "w" )
-oldmkfl.each_line{ |line|
-   case(line)
-   when /^all:/
-      newmkfl.puts(line)
-      newmkfl.puts("")        
-      newmkfl.puts("test: all")            # insert the "test" target
-      newmkfl.puts("\t\t@cd tests && ruby test.rb && cd ..")
-      newmkfl.puts("doc: all")            # insert the "doc" target
-      newmkfl.puts("\t\t@rdoc -S -t \"Ruby/XSLT Documentation\" README AUTHORS ChangeLog xslt.c")
-   when /^distclean:/
-      newmkfl.puts(line)
-      newmkfl.puts("\t\t@-$(RM) memwatch.h memwatch.c Makefile.orig")
-      newmkfl.puts("\t\t@-$(RM)r doc")
-   else
-      newmkfl.puts(line)
-   end
-}
-newmkfl.close
+File.open( "Makefile.orig" ) do |oldmkfl|
+File.open( "Makefile", "w" ) do |newmkfl|
+  oldmkfl.each_line do |line|
+     case(line)
+     when /^all:/
+        newmkfl.puts(line)
+        newmkfl.puts("")        
+        newmkfl.puts("test: all")            # insert the "test" target
+        newmkfl.puts("\t\t@cd tests && ruby test.rb && cd ..")
+        newmkfl.puts("doc: all")            # insert the "doc" target
+        newmkfl.puts("\t\t@rdoc -S -t \"Ruby/XSLT Documentation\" README AUTHORS ChangeLog xslt_lib.c lib/xslt.rb")
+     when /^distclean:/
+        newmkfl.puts(line)
+        newmkfl.puts("\t\t@-$(RM) Makefile.orig")
+        newmkfl.puts("\t\t@-$(RM)r doc")
+     else
+        newmkfl.puts(line)
+     end
+  end
+end
+end

data/extfunc.c

@@ -175,42 +175,34 @@ xmlXPathObjectPtr value2xpathObj (VALUE val) {
  */
 void xmlXPathFuncCallback( xmlXPathParserContextPtr ctxt, int nargs) {
   VALUE result, arguments[nargs];
-  VALUE ns_hash, func_hash, object;
-  const xmlChar *namespace;
-  char *rb_func, *chr;
+  VALUE ns_hash, func_hash, block;
+  const xmlChar *namespace, *name;
   xmlXPathObjectPtr obj;
   int i;
 
   if (ctxt == NULL || ctxt->context == NULL)
     return;
 
-  rb_func = strdup((char *)ctxt->context->function);
+  name = ctxt->context->function;
   namespace = ctxt->context->functionURI;
 
   ns_hash = rb_cvar_get(cXSLT, rb_intern("@@extFunctions"));
-
+  
   func_hash = rb_hash_aref(ns_hash, rb_str_new2((char *)namespace));
 
   if(func_hash == Qnil) {
-    rb_warning( "xmlXPathFuncCallback: namespace %s not found!\n", namespace );
+    rb_warning( "xmlXPathFuncCallback: namespace %s not registered!\n", namespace );
   }
 
-  object = rb_hash_aref(func_hash, rb_str_new2((char *)rb_func));
+  block = rb_hash_aref(func_hash, rb_str_new2((char *)name));
 
   for (i = nargs - 1; i >= 0; i--) {
     obj = valuePop(ctxt);
     arguments[i] = xpathObj2value(obj, ctxt->context->doc);
   }
   
-  /* -s are common in XSLT function names, but illegal for Ruby method names */
-  while( (chr = strchr(rb_func, '-')) != NULL ) {
-    chr[0] = '_'; /* so we pretend the - was a _ all along */
-  }
-
-  result = rb_funcall2( object, rb_intern(rb_func), nargs, arguments);
+  result = rb_funcall2( block, rb_intern("call"), nargs, arguments);
   
-  free( rb_func );
-
   obj = value2xpathObj(result);
   valuePush(ctxt, obj);
 }

data/parser.c

@@ -24,11 +24,6 @@ extern VALUE cXSLT;
 xmlDocPtr parse_xml( char* xml, int iXmlType ) {
   xmlDocPtr tXMLDocument = NULL;
   
-#ifdef USE_ERROR_HANDLER
-  VALUE error_arr = rb_cvar_get(cXSLT, rb_intern("@@errors"));
-  int iInitialNumberOfErrors = RARRAY(error_arr)->len;
-#endif
-  
   /** Act: Parse XML */
   if( iXmlType == RUBY_XSLT_XMLSRC_TYPE_STR ) {
     tXMLDocument = xmlParseMemory( xml, strlen( xml ) );
@@ -41,12 +36,6 @@ xmlDocPtr parse_xml( char* xml, int iXmlType ) {
     return( NULL );
   }
 
-#ifdef USE_ERROR_HANDLER
-	if(RARRAY(error_arr)->len > iInitialNumberOfErrors) {
-	  rb_raise( eXSLTTransformationError, "Stylesheet transformation error" );
-	}
-#endif
-  
   return( tXMLDocument );
 }
 
@@ -58,11 +47,6 @@ xsltStylesheetPtr parse_xsl( char* xsl, int iXslType ) {
   xmlCharEncodingHandlerPtr encoder = NULL;
   const xmlChar *encoding = NULL;
   
-#ifdef USE_ERROR_HANDLER
-  VALUE error_arr = rb_cvar_get(cXSLT, rb_intern("@@errors"));
-  int iInitialNumberOfErrors = RARRAY(error_arr)->len;
-#endif
-  
   /** Act: Encoding support */
   xmlInitCharEncodingHandlers( );
 
@@ -95,12 +79,6 @@ xsltStylesheetPtr parse_xsl( char* xsl, int iXslType ) {
     }
   }
   
-#ifdef USE_ERROR_HANDLER
-	if(RARRAY(error_arr)->len > iInitialNumberOfErrors) {
-	  rb_raise( eXSLTTransformationError, "Stylesheet transformation error" );
-	}
-#endif
-
   return( tParsedXslt );
 }
 
@@ -113,11 +91,6 @@ char* parse( xsltStylesheetPtr tParsedXslt, xmlDocPtr tXMLDocument, char **pxPar
   xmlChar *tXMLDocumentResultString;
   int tXMLDocumentResultLenght;
 
-#ifdef USE_ERROR_HANDLER
-  VALUE error_arr = rb_cvar_get(cXSLT, rb_intern("@@errors"));
-  int iInitialNumberOfErrors = RARRAY(error_arr)->len;
-#endif
-
   tXMLDocumentResult = xsltApplyStylesheet( tParsedXslt, tXMLDocument, (const char**) pxParams );
   if( tXMLDocumentResult == NULL ) {
     rb_raise( eXSLTTransformationError, "Stylesheet transformation error" );
@@ -128,12 +101,6 @@ char* parse( xsltStylesheetPtr tParsedXslt, xmlDocPtr tXMLDocument, char **pxPar
 
   xmlFreeDoc(tXMLDocumentResult);
   
-#ifdef USE_ERROR_HANDLER
-	if(RARRAY(error_arr)->len > iInitialNumberOfErrors) {
-	  rb_raise( eXSLTTransformationError, "Stylesheet transformation error" );
-	}
-#endif
-
   return((char*)tXMLDocumentResultString);
 }
 

data/ruby-xslt.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name = %q{ruby-xslt}
-  s.version = "0.9.2"
+  s.version = "0.9.3"
   s.date = %q{2005-11-17}
   s.summary = %q{A Ruby class for processing XSLT}
-  s.email = %q{greg@webtime-project.net}
+  s.email = %q{gregoire.lejeune@free.fr}
   s.homepage = %q{http://raa.ruby-lang.org/project/ruby-xslt/}
   s.description = %q{Ruby/XSLT is a simple XSLT class based on libxml <http://xmlsoft.org/> and libxslt <http://xmlsoft.org/XSLT/>}
   s.has_rdoc = true
@@ -16,4 +16,4 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--title", "Ruby/XSLT", "--main", "README", "--line-numbers"]
   s.extra_rdoc_files = ["README", "AUTHORS", "COPYING", "ChangeLog"]
   s.extensions = ["extconf.rb"]
-end
+end

data/tests/test.rb

@@ -1,32 +1,57 @@
 #!ruby
 
 require "test/unit"
-require "../xslt"
 
-# Test::Unit suite for flattenx extension
-#
-# $Id: test.rb,v 1.4 2005/11/14 00:22:27 whateley Exp $
-# $Author: whateley $
+$LOAD_PATH << '..'
+
+# this is ugly, but it's the only way I can think of
+#  (lib/xslt.rb requires xml/xslt_lib.so, so we copy it and delete when done)
+require "ftools"
+Dir.mkdir "../xml"
+
+begin
+  File.copy "../xslt_lib.so", "../xml"
+rescue
+  begin
+    File.copy "../xslt_lib.bundle", "../xml"
+  rescue
+    raise
+  end
+end
+
+require "lib/xslt"
+begin
+  File.delete "../xml/xslt_lib.so"
+rescue
+  begin
+    File.delete "../xml/xslt_lib.bundle"
+  rescue
+    raise
+  end
+end
+Dir.rmdir "../xml"
+
+EXT_FUNC_XSL =<<END
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:ext="http://necronomicorp.com/nil"
+  version="1.0">
+
+<xsl:template match="/">
+  <xsl:value-of select="ext:foo()"/>
+</xsl:template>
+
+</xsl:stylesheet>
+END
 
 class XsltTest < Test::Unit::TestCase
   def setup 
-    if @xslt.nil? == true
-      @xslt = XML::XSLT.new( )
-      @testOut = "<?xml version=\"1.0\"?>\nThis is a test file\n"
-      @xml_simple = true
-      begin
-        require "xml/simple"
-      rescue LoadError => e
-        @xml_simple = false
-      end
-      
-      @xml_smart = true
-      begin
-        require "xml/smart"
-      rescue LoadError => e
-        @xml_smart = false
-      end
-    end
+    @xslt = XML::XSLT.new( )
+  
+    @testOut = "<?xml version=\"1.0\"?>\nThis is a test file\n"
+    
+    @errors = []
+    XML::XSLT.registerErrorHandler { |s| @errors << s }
   end
   
   def test_instance
@@ -36,72 +61,128 @@ class XsltTest < Test::Unit::TestCase
   def test_from_file
     @xslt.xml = "t.xml"
     @xslt.xsl = "t.xsl"
+   
     out = @xslt.serve
     assert_equal( @testOut, out )
+    assert_equal( [], @errors )
   end
 
   def test_from_data
-    @xslt.xml = IO::readlines( "t.xml" ).join
-    @xslt.xsl = IO::readlines( "t.xsl" ).join
+    @xslt.xml = File.read( "t.xml" )
+    @xslt.xsl = File.read( "t.xsl" )
+   
     out = @xslt.serve
     assert_equal( @testOut, out )
+    assert_equal( [], @errors )
   end
   
   def test_from_simple
-    if @xml_simple
-      require 'xml/simple'
+    begin
+      require "xml/simple"
+      
       @xslt.xml = XML::Simple.open( "t.xml" )
       @xslt.xsl = XML::Simple.open( "t.xsl" )
+      
       out = @xslt.serve()
       assert_equal( @testOut, out )
-    else
-      assert( true )
+      assert_equal( [], @errors )
+    rescue LoadError => e
+      # just skip it
     end
   end
 
   def test_from_smart
-    if @xml_smart
-      require 'xml/smart'
+    begin
+      require "xml/smart"
+      
       @xslt.xml = XML::Smart.open( "t.xml" )
       @xslt.xsl = XML::Smart.open( "t.xsl" )
+      
       out = @xslt.serve()
       assert_equal( @testOut, out )
-    else
-      assert( true ) 
+      assert_equal( [], @errors )
+    rescue LoadError => e
+      # just skip it
     end
   end
 
   def test_from_rexml
     require 'rexml/document'
-    @xslt.xml = REXML::Document.new File.open( "t.xml" )
-    @xslt.xsl = REXML::Document.new File.open( "t.xsl" )
+    @xslt.xml = REXML::Document.new File.read( "t.xml" )
+    @xslt.xsl = REXML::Document.new File.read( "t.xsl" )
+    
     out = @xslt.serve()
+    assert_equal( [], @errors )
     assert_equal( @testOut, out )
   end
 
   def test_error_1
-    begin
+    assert_raises(XML::XSLT::ParsingError) do
       @xslt.xsl = "nil"
-    rescue => e
-      assert_instance_of( XML::XSLT::ParsingError, e )
     end
+    
+    errors = ["Entity: line 1: ",
+              "parser ",
+              "error : ",
+              "Start tag expected, '<' not found\n",
+              "nil\n",
+              "^\n"] 
+  
+    assert_equal( errors, @errors )
   end
 
   def test_error_2
-    begin
+    assert_raises(XML::XSLT::ParsingError) do
       @xslt.xml = "nil"
-    rescue => e
-      assert_instance_of( XML::XSLT::ParsingError, e )
     end
+    
+    errors = ["Entity: line 1: ",
+              "parser ",
+              "error : ",
+              "Start tag expected, '<' not found\n",
+              "nil\n",
+              "^\n"] 
+  
+    assert_equal( errors, @errors )
   end
 
+# this test fails (any reason that it *should* raise an error?)
+=begin
   def test_error_3
-    begin
+    assert_raises(XML::XSLT::ParsingError) do
       @xslt.xml = "t.xsl"
-    rescue => e
-      assert_instance_of( XML::XSLT::ParsingError, e )
     end
   end
+=end
+
+  def test_transformation_error
+    @xslt.xml = "<test/>"
+    # substitute so that the function is guaranteed to not be registered
+    @xslt.xsl = EXT_FUNC_XSL.sub( /foo/, "bar")
+
+    assert_raises(XML::XSLT::TransformationError) do
+      @xslt.serve
+    end
+
+    errors = ["xmlXPathCompOpEval: function bar not found\n",
+              "Unregistered function\n",
+              "xmlXPathCompiledEval: evaluation failed\n",
+              "runtime error: element value-of\n",
+              "xsltValueOf: text copy failed\n"]
+    assert_equal(errors, @errors)
+  end
+
+  def test_external_function
+    @xslt.xml = "<test/>"
+    @xslt.xsl = EXT_FUNC_XSL
+
+    XML::XSLT.registerExtFunc("http://necronomicorp.com/nil", "foo") do
+      "success!"
+    end
+
+    assert_equal("<?xml version=\"1.0\"?>\nsuccess!\n", @xslt.serve())
+    assert_equal([], @errors)
+  end
 
   def test_base_uri_1
     @xslt.xml = "<test/>"
@@ -111,6 +192,8 @@ class XsltTest < Test::Unit::TestCase
     assert_nothing_raised( XML::XSLT::ParsingError ) do
       @xslt.xsl = xsl
     end
+    
+    assert_equal( [], @errors )
   end
 
   def test_base_uri_2
@@ -121,5 +204,19 @@ class XsltTest < Test::Unit::TestCase
     assert_raises( XML::XSLT::ParsingError ) do
       @xslt.xsl = xsl
     end
+
+    errors = ["I/O ",
+              "warning : ",
+              "failed to load external entity \"result.xsl\"\n",
+              "compilation error: element import\n",
+              "xsl:import : unable to load result.xsl\n"]
+
+    assert_equal( errors, @errors )
+  end
+  
+  def test_alias
+    assert_nothing_raised do
+      XML::XSLT.register_ext_func("http://necronomicorp.com/nil", "nil") {}
+    end
   end
 end

data/xslt.h

@@ -53,8 +53,8 @@
 #include "parameters.h"
 #include "extfunc.h"
 
-#define RUBY_XSLT_VERSION  "0.9.2"
-#define RUBY_XSLT_VERNUM   092
+#define RUBY_XSLT_VERSION  "0.9.3"
+#define RUBY_XSLT_VERNUM   093
 
 #define RUBY_XSLT_XSLSRC_TYPE_NULL     0
 #define RUBY_XSLT_XSLSRC_TYPE_STR      1

data/{xslt.c → xslt_lib.c}

@@ -358,27 +358,22 @@ VALUE ruby_xslt_save( VALUE self, VALUE xOutFilename ) {
  * Brendan Taylor 
  * whateley@gmail.com
  */
-/**
- * error_ary = XML::XSLT::errors( )
- *
- * Return an Array containing all the xml errors
+/*
+ * libxml2/libxslt error handling function
  *
- * This method is only available if Ruby/XSLT has been configured with --enable-error-handler option
+ * converts the error to a String and passes it off to a block
+ * registered using XML::XSLT.register_error_handler
  */
-VALUE rb_xslt_errors(VALUE class) {
-  return rb_cvar_get(class, rb_intern("@@errors"));
-}
-
-void xsltErrorFuncHandler(void *ctx, const char *msg, ...) {
+void ruby_xslt_error_handler(void *ctx, const char *msg, ...) {
   va_list ap;
   char *str;
   char *larger;
   int chars;
   int size = 150;
 
-  VALUE error_arr = rb_cvar_get(cXSLT, rb_intern("@@errors"));
+  VALUE block = rb_cvar_get(cXSLT, rb_intern("@@error_handler"));
 
-  /* this is taken verbatim from the libxslt python bindings */
+  /* the following was cut&pasted from the libxslt python bindings */
   str = (char *) xmlMalloc(150);
   if (str == NULL)
     return;
@@ -400,7 +395,7 @@ void xsltErrorFuncHandler(void *ctx, const char *msg, ...) {
     str = larger;
   }
 
-  rb_ary_push(error_arr, rb_str_new2(str));
+  rb_funcall( block, rb_intern("call"), 1, rb_str_new2(str));
 }
 #endif
 
@@ -473,27 +468,10 @@ VALUE ruby_xslt_media_type( VALUE self ) {
  */
 
 /**
- * XML::XSLT::extFunction( "round-trip", "http://test.none", rbObj )
- * registers an extension function "round-trip" in the namespace "http://test.none"
- *
- * when XPath like ex:round-trip(arg) is encountered in the XSLT it will call the method "round_trip" on the rbObj object with the argument arg
+ * internal use only.
  */
- VALUE ruby_xslt_ext_function( VALUE class, VALUE name, VALUE ns_uri, VALUE receiver ) {
-   VALUE ns_hash, func_hash;
-
-   ns_hash = rb_cvar_get(cXSLT, rb_intern("@@extFunctions"));
-
-   func_hash = rb_hash_aref(ns_hash, ns_uri);
-
-   if(func_hash == Qnil) {
-     /* we've seen no reference to this URI, so create one */
-     func_hash = rb_hash_new();
-     rb_hash_aset(ns_hash, ns_uri, func_hash);
-   }
-
-   rb_hash_aset(func_hash, name, receiver); 
-
-   xsltRegisterExtModuleFunction( BAD_CAST STR2CSTR(name), BAD_CAST STR2CSTR(ns_uri), xmlXPathFuncCallback );
+ VALUE ruby_xslt_reg_function( VALUE class, VALUE namespace, VALUE name ) {
+   xsltRegisterExtModuleFunction( BAD_CAST STR2CSTR(name), BAD_CAST STR2CSTR(namespace), xmlXPathFuncCallback );
 
    return Qnil;
  }
@@ -555,7 +533,7 @@ VALUE ruby_xslt_to_s( VALUE self ) {
  * ----------------------------------------------------------------------------
  */
 
-void Init_xslt( void ) {
+void Init_xslt_lib( void ) {
   mXML  = rb_define_module( "XML" );
   cXSLT = rb_define_class_under( mXML, "XSLT", rb_cObject );
 
@@ -581,11 +559,7 @@ void Init_xslt( void ) {
   rb_define_const( cXSLT, "RUBY_XSLT_VERSION",    rb_str_new2(RUBY_XSLT_VERSION) );
 
   rb_define_singleton_method( cXSLT, "new", ruby_xslt_new, 0 );
-  rb_define_singleton_method( cXSLT, "extFunction", ruby_xslt_ext_function, 3);
-
-  /* a hash of hashes. might be more elegant if it were its own class */
-  /* keeps track of what functions are registered in what namespaces */
-  rb_define_class_variable( cXSLT, "@@extFunctions", rb_hash_new());
+  rb_define_singleton_method( cXSLT, "registerFunction", ruby_xslt_reg_function, 2);
 
   rb_define_method( cXSLT, "serve",       ruby_xslt_serve,          0 );
   rb_define_method( cXSLT, "save",        ruby_xslt_save,           1 );
@@ -606,11 +580,8 @@ void Init_xslt( void ) {
   rb_define_method( cXSLT, "mediaType",   ruby_xslt_media_type,     0 );
 
 #ifdef USE_ERROR_HANDLER
-  /* this is really quite inelegant */
-  xmlSetGenericErrorFunc( NULL, xsltErrorFuncHandler );
-  xsltSetGenericErrorFunc( NULL, xsltErrorFuncHandler );
-  rb_define_class_variable( cXSLT, "@@errors", rb_ary_new());
-  rb_define_singleton_method( cXSLT, "errors", rb_xslt_errors, 0 );
+  xmlSetGenericErrorFunc( NULL, ruby_xslt_error_handler );
+  xsltSetGenericErrorFunc( NULL, ruby_xslt_error_handler );
 #endif
 
 #ifdef USE_EXSLT

metadata

@@ -3,12 +3,12 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ruby-xslt
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 date: 2005-11-17 00:00:00 +01:00
 summary: A Ruby class for processing XSLT
 require_paths: 
 - lib
-email: greg@webtime-project.net
+email: gregoire.lejeune@free.fr
 homepage: http://raa.ruby-lang.org/project/ruby-xslt/
 rubyforge_project: 
 description: Ruby/XSLT is a simple XSLT class based on libxml <http://xmlsoft.org/> and libxslt <http://xmlsoft.org/XSLT/>
@@ -37,6 +37,7 @@ files:
 - ./extconf.rb
 - ./extfunc.c
 - ./extfunc.h
+- ./lib
 - ./parameters.c
 - ./parameters.h
 - ./parser.c
@@ -44,10 +45,10 @@ files:
 - ./rb_utils.c
 - ./rb_utils.h
 - ./README
+- ./ruby-xslt.gemspec
 - ./tests
-- ./xslt.c
 - ./xslt.h
-- ./ruby-xslt.gemspec
+- ./xslt_lib.c
 - debug/memwatch.c
 - debug/memwatch.h
 - examples/commentary.dtd