libxslt-ruby 1.0.1-x86-mingw32 → 1.0.2-x86-mingw32

data/ext/libxslt/libxslt.h

@@ -6,17 +6,26 @@
 #define __RUBY_LIBXSLT_H__
 
 #include <ruby.h>
+#if HAVE_RUBY_IO_H
+#include <ruby/io.h>
+#else
 #include <rubyio.h>
+#endif
+
 #include <libxml/parser.h>
 #include <libxml/debugXML.h>
+#include <ruby_libxml.h>
+
 #include <libxslt/extra.h>
 #include <libxslt/xslt.h>
 #include <libxslt/xsltInternals.h>
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
+
 #include <libexslt/exslt.h>
 
 #include "ruby_xslt_stylesheet.h"
+#include "ruby_exslt.h"
 
 #include "version.h"
 
@@ -27,5 +36,6 @@
 extern VALUE cLibXSLT;
 extern VALUE cXSLT;
 extern VALUE eXSLTError;
+extern VALUE cXMLDocument;
 
 #endif

data/ext/libxslt/ruby_exslt.c

@@ -0,0 +1,148 @@
+/* http://xmlsoft.org/XSLT/html/libxslt-extensions.html */
+
+#include "libxslt.h"
+
+/* Helper method to retrieve (and possibly initialize)
+   the module function registry hash for +namespace+ */
+static VALUE
+ruby_xslt_module_function_hash(VALUE namespace) {
+  VALUE ns_hash, func_hash;
+
+  if ((ns_hash = rb_ivar_get(cXSLT, rb_intern("@module_function_registry"))) == Qnil) {
+    ns_hash = rb_ivar_set(cXSLT, rb_intern("@module_function_registry"), rb_hash_new());
+  }
+
+  if ((func_hash = rb_hash_aref(ns_hash, namespace)) == Qnil) {
+    func_hash = rb_hash_aset(ns_hash, namespace, rb_hash_new());
+  }
+
+  return func_hash;
+}
+
+/* Helper method for xsltRegisterExtModuleFunction callback */
+static void
+ruby_xslt_module_function_callback(xmlXPathParserContextPtr ctxt, int nargs) {
+  VALUE callback, args[nargs];
+  const xmlChar *namespace, *name;
+  int i;
+
+  if (ctxt == NULL || ctxt->context == NULL) {
+    return;
+  }
+
+  namespace = ctxt->context->functionURI;
+  name = ctxt->context->function;
+
+  callback = rb_hash_aref(
+    ruby_xslt_module_function_hash(rb_str_new2((char *)namespace)),
+    rb_str_new2((char *)name)
+  );
+
+  if (callback == Qnil) {
+    rb_raise(rb_eArgError, "name `%s' not registered", name);
+  }
+
+  for (i = nargs - 1; i >= 0; i--) {
+    args[i] = rxml_xpath_to_value(ctxt->context, valuePop(ctxt));
+  }
+
+  valuePush(ctxt, rxml_xpath_from_value(
+    rb_funcall2(callback, rb_intern("call"), nargs, args)
+  ));
+}
+
+/* call-seq:
+ *   XSLT.register_module_function(namespace, name) { ... } -> Proc or nil
+ *
+ * Registers +name+ as extension module function in +namespace+ with the
+ * block as callback. Returns the callback if successful, or +nil+ otherwise.
+ *
+ * The callback will be called with whatever XPath expression you pass
+ * into the function converted to a Ruby object. Its return value will
+ * be converted to an XPath expression again.
+ *
+ * Example:
+ *
+ *  # register your extension function
+ *  XSLT.register_module_function('http://ex.ns', 'ex-func') { |xp|
+ *    xp.to_a.join('|').upcase
+ *  }
+ *
+ *  # then use it in your stylesheet
+ *  <xsl:stylesheet ... xmlns:ex="http://ex.ns">
+ *    ...
+ *    <xsl:value-of select="ex:ex-func(.)" />
+ *    <!-- the current node as upper case string -->
+ *  </xsl:stylesheet>
+ */
+static VALUE
+ruby_xslt_register_module_function(VALUE class, VALUE namespace, VALUE name) {
+  VALUE callback;
+
+  if (!rb_block_given_p()) {
+    rb_raise(rb_eArgError, "no block given");
+  }
+
+  if (xsltRegisterExtModuleFunction(
+    BAD_CAST StringValuePtr(name),
+    BAD_CAST StringValuePtr(namespace),
+    ruby_xslt_module_function_callback
+  ) != 0) {
+    return Qnil;
+  }
+
+  callback = rb_block_proc();
+
+  rb_hash_aset(ruby_xslt_module_function_hash(namespace), name, callback);
+  return callback;
+}
+
+/* call-seq:
+ *   XSLT.unregister_module_function(namespace, name) -> Proc or nil
+ *
+ * Unregisters +name+ as extension module function in +namespace+.
+ * Returns the previous callback if successful, or +nil+ otherwise.
+ */
+static VALUE
+ruby_xslt_unregister_module_function(VALUE class, VALUE namespace, VALUE name) {
+  VALUE func_hash, callback;
+
+  func_hash = ruby_xslt_module_function_hash(namespace);
+
+  if ((callback = rb_hash_aref(func_hash, name)) == Qnil) {
+    return Qnil;
+  }
+
+  if (xsltUnregisterExtModuleFunction(
+    BAD_CAST StringValuePtr(name),
+    BAD_CAST StringValuePtr(namespace)
+  ) != 0) {
+    return Qnil;
+  }
+
+  rb_hash_aset(func_hash, name, Qnil);
+  return callback;
+}
+
+/* call-seq:
+ *   XSLT.registered_module_function?(namespace, name) -> true or false
+ *
+ * Returns +true+ if +name+ is currently registered as extension module
+ * function in +namespace+, or +false+ otherwise.
+ */
+static VALUE
+ruby_xslt_registered_module_function_p(VALUE class, VALUE namespace, VALUE name) {
+  return RTEST(rb_hash_aref(ruby_xslt_module_function_hash(namespace), name));
+}
+
+void
+ruby_init_exslt() {
+  /* [HACK] Enclosing classes/modules for RDoc:
+   *   cLibXSLT = rb_define_module("LibXSLT");
+   *   cXSLT = rb_define_module_under(cLibXSLT, "XSLT");
+   */
+
+  rb_define_singleton_method(cXSLT, "register_module_function", ruby_xslt_register_module_function, 2);
+  rb_define_singleton_method(cXSLT, "unregister_module_function", ruby_xslt_unregister_module_function, 2);
+  rb_define_singleton_method(cXSLT, "registered_module_function?", ruby_xslt_registered_module_function_p, 2);
+}

data/ext/libxslt/ruby_exslt.h

@@ -0,0 +1,8 @@
+#ifndef __RUBY_EXSLT__
+#define __RUBY_EXSLT__
+
+#include <libxslt/extensions.h>
+
+void ruby_init_exslt(void);
+
+#endif

data/ext/libxslt/ruby_xslt_stylesheet.c

@@ -3,25 +3,18 @@
 /* See the LICENSE file for copyright and distribution information. */
 
 #include "libxslt.h"
-#include "ruby_xslt_stylesheet.h"
 
 /*
  * Document-class: LibXSLT::XSLT::Stylesheet
- * 
+ *
  * The XSLT::Stylesheet represents a XSL stylesheet that
  * can be used to transform an XML document.  For usage information
  * refer to XSLT::Stylesheet#apply
  *
-*/
+ */
 
 VALUE cXSLTStylesheet;
 
-static VALUE
-ruby_xslt_stylesheet_document_klass() {
-  VALUE mXML = rb_const_get(rb_cObject, rb_intern("XML"));
-  return rb_const_get(mXML, rb_intern("Document"));
-}
-
 void
 ruby_xslt_stylesheet_free(xsltStylesheetPtr xstylesheet) {
   xsltFreeStylesheet(xstylesheet);
@@ -33,11 +26,11 @@ ruby_xslt_stylesheet_alloc(VALUE klass) {
                           NULL, ruby_xslt_stylesheet_free,
                           NULL);
 }
-                          
+
 
 /* call-seq:
  *    XSLT::Stylesheet.new(document) -> XSLT::Stylesheet
- * 
+ *
  * Creates a new XSLT stylesheet based on the specified document.
  * For memory management reasons, a copy of the specified document
  * will be made, so its best to create a single copy of a stylesheet
@@ -53,24 +46,24 @@ ruby_xslt_stylesheet_initialize(VALUE self, VALUE document) {
   xmlDocPtr xcopy;
   xsltStylesheetPtr xstylesheet;
 
-  if (!rb_obj_is_kind_of(document, ruby_xslt_stylesheet_document_klass()))
+  if (!rb_obj_is_kind_of(document, cXMLDocument))
     rb_raise(rb_eTypeError, "Must pass in an XML::Document instance.");
-    
-  /* NOTE!! Since the stylesheet own the specified document, the easiest 
-  *  thing to do from a memory standpoint is too copy it and not expose
-  *  the copy to Ruby.  The other solution is expose a memory management
-  *  API on the document object for taking ownership of the document
-  *  and specifying when it has been freed.  Then the document class
-  *  has to be updated to always check and see if the document is 
-  *  still valid.  That's all doable, but seems like a pain, so 
-  *  just copy the document for now. */
+
+  /* NOTE!! Since the stylesheet own the specified document, the easiest
+   * thing to do from a memory standpoint is too copy it and not expose
+   * the copy to Ruby.  The other solution is expose a memory management
+   * API on the document object for taking ownership of the document
+   * and specifying when it has been freed.  Then the document class
+   * has to be updated to always check and see if the document is
+   * still valid.  That's all doable, but seems like a pain, so
+   * just copy the document for now. */
   Data_Get_Struct(document, xmlDoc, xdoc);
   xcopy = xmlCopyDoc(xdoc, 1);
   xstylesheet = xsltParseStylesheetDoc(xcopy);
   xstylesheet->_private = (void *)self;
   DATA_PTR(self) = xstylesheet;
-  
-  /* Save a reference to the document as an attribute accessable to ruby*/
+
+  /* Save a reference to the document as an attribute accessable to ruby */
   return self;
 }
 
@@ -91,18 +84,17 @@ ruby_xslt_coerce_params(VALUE params) {
     memset(result[i], 0, strLen + 1);
     strncpy(result[i], RSTRING_PTR(str), strLen);
   }
-  
+
   /* Null terminate the array - need to empty elements */
   result[i] = NULL;
   result[i+1] = NULL;
-  
+
   return result;
-}  
-   
+}
 
-/* call-seq: 
+/* call-seq:
  *   stylesheet.apply(document, {params}) -> XML::Document
- * 
+ *
  * Apply this stylesheet transformation to the provided document.
  * This method may be invoked multiple times.
  *
@@ -111,7 +103,7 @@ ruby_xslt_coerce_params(VALUE params) {
  * *  params - An optional hash table that specifies the values for xsl:param values embedded in the stylesheet.
  *
  * Example:
- * 
+ *
  *  stylesheet_doc = XML::Document.file('stylesheet_file')
  *  stylesheet = XSLT::Stylesheet.new(stylesheet_doc)
  *
@@ -127,15 +119,15 @@ ruby_xslt_stylesheet_apply(int argc, VALUE *argv, VALUE self) {
   VALUE document;
   VALUE params;
   int i;
-  
+
   char** pParams;
 
   if (argc > 2 || argc < 1)
     rb_raise(rb_eArgError, "wrong number of arguments (need 1 or 2)");
-    
+
   document = argv[0];
-  
-  if (!rb_obj_is_kind_of(document, ruby_xslt_stylesheet_document_klass()))
+
+  if (!rb_obj_is_kind_of(document, cXMLDocument))
     rb_raise(rb_eTypeError, "Must pass in an XML::Document instance.");
 
   /* Make sure params is a flat array */
@@ -143,29 +135,29 @@ ruby_xslt_stylesheet_apply(int argc, VALUE *argv, VALUE self) {
   params = rb_Array(params);
   rb_funcall(params, rb_intern("flatten!"), 0);
   pParams = ruby_xslt_coerce_params(params);
-  
+
   Data_Get_Struct(document, xmlDoc, xdoc);
   Data_Get_Struct(self, xsltStylesheet, xstylesheet);
-  
+
   result = xsltApplyStylesheet(xstylesheet, xdoc, (const char**)pParams);
-  
+
   if (!result)
     rb_raise(eXSLTError, "Transformation failed");
-  
+
   /* Free allocated array of *chars.  Note we don't have to
      free the last array item since its set to NULL. */
   for (i=0; i<RARRAY_LEN(params); i++) {
     ruby_xfree(pParams[i]);
   }
   ruby_xfree(pParams);
-    
+
   return rxml_document_wrap(result);
 }
 
 
-/* call-seq: 
+/* call-seq:
  *   sheet.debug(to = $stdout) => (true|false)
- * 
+ *
  * Output a debug dump of this stylesheet to the specified output
  * stream (an instance of IO, defaults to $stdout). Requires
  * libxml/libxslt be compiled with debugging enabled. If this
@@ -214,12 +206,12 @@ ruby_xslt_stylesheet_debug(int argc, VALUE *argv, VALUE self) {
 }
 */
 
-// TODO should this automatically apply the sheet if not already,
-//      given that we're unlikely to do much else with it?
+/* TODO should this automatically apply the sheet if not already,
+       given that we're unlikely to do much else with it? */
 
-/* call-seq: 
+/* call-seq:
  *   sheet.print(to = $stdout) => number_of_bytes
- * 
+ *
  * Output the result of the transform to the specified output
  * stream (an IO instance, defaults to $stdout). You *must* call
  * +apply+ before this method or an exception will be raised.

data/ext/libxslt/ruby_xslt_stylesheet.h

@@ -5,10 +5,6 @@
 #ifndef __RUBY_LIBXSLT_STYLESHEET__
 #define __RUBY_LIBXSLT_STYLESHEET__
 
-// Includes from libxml-ruby
-#include <libxml/ruby_libxml.h>
-#include <libxml/ruby_xml_document.h>
-
 extern VALUE cXSLTStylesheet;
 
 void ruby_init_xslt_stylesheet(void);

data/ext/libxslt/version.h

@@ -1,5 +1,5 @@
-#define RUBY_LIBXSLT_VERSION  "1.0.1"
+#define RUBY_LIBXSLT_VERSION  "1.0.2"
 #define RUBY_LIBXSLT_VERNUM   1
 #define RUBY_LIBXSLT_VER_MAJ  0
-#define RUBY_LIBXSLT_VER_MIN  1
+#define RUBY_LIBXSLT_VER_MIN  2
 #define RUBY_LIBXSLT_VER_MIC  0

data/lib/libxslt/deprecated.rb

@@ -1,11 +1,11 @@
 # encoding: UTF-8
 # :enddoc:
-# These classes provide provide backwards compatibility with 
+# These classes provide provide backwards compatibility with
 # versions of libxslt-ruby prior to version 0.7.0
 
 module LibXML
   module XML
-    module XSLT 
+    module XSLT
       MAX_DEPTH            = LibXSLT::XSLT::MAX_DEPTH
       MAX_SORT             = LibXSLT::XSLT::MAX_SORT
       ENGINE_VERSION       = LibXSLT::XSLT::ENGINE_VERSION

data/lib/xslt.rb

@@ -5,7 +5,7 @@
 # It is recommend that you only load this file for libs
 # that do not have their own namespace, eg. administrative
 # scripts, personal programs, etc. For other applications
-# require 'libxslt' instead and include LibXSLT into your 
+# require 'libxslt' instead and include LibXSLT into your
 # app/libs namespace.
 
 require 'libxslt'

data/libxslt-ruby.gemspec

@@ -7,7 +7,7 @@ FILES = FileList[
   'CHANGES',
   'LICENSE',
   'Rakefile',
-  'README',
+  'README.rdoc',
   'libxslt-ruby.gemspec',
   'setup.rb',
   'doc/**/*',
@@ -22,11 +22,11 @@ FILES = FileList[
 # Default GEM Specification
 Gem::Specification.new do |spec|
   spec.name = "libxslt-ruby"
-  
+
   spec.homepage = "http://libxslt.rubyforge.org/"
   spec.summary = "Ruby libxslt bindings"
   spec.description = <<-EOF
-    The Libxslt-Ruby project provides Ruby language bindings for the GNOME  
+    The Libxslt-Ruby project provides Ruby language bindings for the GNOME
     XSLT C library.  It is free software, released under the MIT License.
   EOF
 
@@ -34,16 +34,16 @@ Gem::Specification.new do |spec|
   spec.version = version
   spec.author = "Charlie Savage"
   spec.email = "libxml-devel@rubyforge.org"
-  spec.add_dependency('libxml-ruby','>=2.0.2')
+  spec.add_dependency('libxml-ruby','>=2.1.1')
   spec.platform = Gem::Platform::RUBY
-  spec.require_paths = ["lib", "ext/libxslt"] 
- 
+  spec.require_paths = ["lib", "ext/libxslt"]
+
   spec.bindir = "bin"
   spec.extensions = ["ext/libxslt/extconf.rb"]
   spec.files = FILES.to_a
   spec.test_files = Dir.glob("test/tc_*.rb")
-  
-  spec.required_ruby_version = '>= 1.8.4'
+
+  spec.required_ruby_version = '>= 1.8.6'
   spec.date = DateTime.now
   spec.rubyforge_project = 'libxslt-ruby'
-end
+end