@@ -14,4 +14,5 @@ mkmf.log cross tags stash +.rake_tasks .gitignore @@ -34,7 +34,13 @@ else '/opt/local/lib', '/usr/local/lib', '/usr/lib' - ) + ) + find_library('exslt', 'exsltFuncRegister', + LIBDIR, + '/opt/local/lib', + '/usr/local/lib', + '/usr/lib' + ) end @@ -70,6 +76,14 @@ else ) abort "need libxslt" end + unless find_header('libexslt/exslt.h', + INCLUDEDIR, + '/usr/include', + '/opt/local/include', + '/usr/local/include' + ) + abort "need libxslt" + end version = try_constant('LIBXML_VERSION', 'libxml/xmlversion.h') end ext/nokogiri/extconf.rb @@ -3,6 +3,7 @@ #include <libxslt/xsltInternals.h> #include <libxslt/xsltutils.h> #include <libxslt/transform.h> +#include <libexslt/exslt.h> static void dealloc(xsltStylesheetPtr doc) { @@ -22,6 +23,7 @@ static VALUE parse_stylesheet_doc(VALUE klass, VALUE xmldocobj) xmlDocPtr xml ; xsltStylesheetPtr ss ; Data_Get_Struct(xmldocobj, xmlDoc, xml); + exsltRegisterAll(); ss = xsltParseStylesheetDoc(xmlCopyDoc(xml, 1)); /* 1 => recursive */ return Data_Wrap_Struct(klass, NULL, dealloc, ss); } ext/nokogiri/xslt_stylesheet.c @@ -12,6 +12,8 @@ module Nokogiri ASSETS_DIR = File.join(File.dirname(__FILE__), 'files') XML_FILE = File.join(ASSETS_DIR, 'staff.xml') XSLT_FILE = File.join(ASSETS_DIR, 'staff.xslt') + EXSLT_FILE = File.join(ASSETS_DIR, 'exslt.xslt') + EXML_FILE = File.join(ASSETS_DIR, 'exslt.xml') HTML_FILE = File.join(ASSETS_DIR, 'tlm.html') unless RUBY_VERSION >= '1.9' test/helper.rb @@ -26,4 +26,19 @@ class TestXsltTransforms < Nokogiri::TestCase assert result = style.apply_to(doc) assert_match %r{<h1></h1>}, result end + + def test_exslt + assert doc = Nokogiri::XML.parse(File.read(EXML_FILE)) + assert doc.xml? + + assert style = Nokogiri::XSLT.parse(File.read(EXSLT_FILE)) + result_doc = Nokogiri::XML.parse(style.apply_to(doc)) + + assert_equal 'func-result', result_doc.at('/root/function').content + assert_equal 3, result_doc.at('/root/max').content.to_i + assert_match( + /\d{4}-\d\d-\d\d-\d\d:\d\d/, + result_doc.at('/root/date').content + ) + end end test/test_xslt_transforms.rb db4ab120bdef14ec09c5dd61247e860492a9afc7 Rick Frankel rick@RafBook.local http://github.com/tenderlove/nokogiri/commit/00ce67a6dc3b0fe1015033aa18616440cdf804d9 00ce67a6dc3b0fe1015033aa18616440cdf804d9 2008-12-16T16:11:22-08:00 2008-12-12T18:58:48-08:00 add exslt support 86a456676b6703b35a6711263d2d6274e75f0b42 Mike Dalessio mike@csa.net