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

data/CHANGES

@@ -1,3 +1,33 @@
+== 1.0.2 / 2011-07-31
+
+* Added support for extension function registration.  This was adapted from
+  Gregoire Lejeune's ruby-xslt library at https://github.com/glejeune/ruby-xslt (Jens Willie).
+
+* Update to work with libxml-ruby 2.1.0 and higher (Jens Willie).
+
+* Use ENV for rake compiler task configuration (Jens Willie)
+
+* Build fixes (Charlie Savage).
+
+* Switch to using def files to control library exports (Charlie Savage).
+
+
+== 1.0.1 / 2011-04-18 Charlie Savage
+
+* Modernize gem - add gemspec file, use rake-compiler
+
+* Fix Ruby 1.9.2 compile errors
+
+* Build fixes
+
+* Update tests scripts to make testing during development easier
+
+
+== 0.9.8 / 2011-01-18 Charlie Savage
+
+* Update build environment
+
+
 == 0.9.1 / 2008-11-24 Charlie Savage
 
 * Support libxml-ruby bindings 0.9.3 and above which has a changed
@@ -13,11 +43,11 @@
 
 == 0.8.2 / 2008-07-21 Charlie Savage
 
-* To use LibXSLT you can either require 'xslt' or require 'libxslt'. 
-  The differences is that require 'xslt' mixes the LibXML and 
-  LIBXSLT modules into the global namespace, thereby allowing 
+* To use LibXSLT you can either require 'xslt' or require 'libxslt'.
+  The differences is that require 'xslt' mixes the LibXML and
+  LIBXSLT modules into the global namespace, thereby allowing
   you to write code such as:
-    stylesheet = XSLT::Stylesheet.new(XML::Document.new).  Note that 
+    stylesheet = XSLT::Stylesheet.new(XML::Document.new).  Note that
   this is different from 0.8.0 release and may require updating your code.
 
 * Support for libxml-ruby 0.8.2
@@ -41,7 +71,7 @@
 
 * Simpler api
 
-* Compatibility layer for pre-0.7.0 versions 
+* Compatibility layer for pre-0.7.0 versions
 
 * Major rewrite, resulting in significantly less code
 
@@ -54,7 +84,7 @@
 
 * Windows support (both lots of memory fixes and binaries)
 
-* New libxslt.rb ruby wrapper, so programs can simply say require 'xslt' 
+* New libxslt.rb ruby wrapper, so programs can simply say require 'xslt'
 
 
 == 0.5.0 / 2006-02-27 Ross Bamford <rosco at roscopeco.co.uk>
@@ -76,6 +106,6 @@
 
 == 0.3.0 / 2004-02-01 Martin Povolny <martin@solnet.cz>
 
-* libxslt.c: added call to ruby_init_xslt_transform_context() to make it 
+* libxslt.c: added call to ruby_init_xslt_transform_context() to make it
     work on ruby1.8
 

data/LICENSE

@@ -3,19 +3,19 @@
 Copyright (c) 2002-2006 Sean Chittenden <sean@chittenden.org> and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in 
-the Software without restriction, including without limitation the rights to 
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
 of the Software, and to permit persons to whom the Software is furnished to do
 so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

data/{README → README.rdoc}

@@ -8,7 +8,7 @@ toolkit. It is free software, released under the MIT License.
 
 == Requirements
 
-libxslt-ruby requires Ruby 1.8.4 or higher.  It is dependent on 
+libxslt-ruby requires Ruby 1.8.4 or higher.  It is dependent on
 the following libraries to function properly:
 
 * libm      (math routines: very standard)
@@ -24,7 +24,7 @@ includes an already built extension.
 
 !!!NOTE!!!  The libxml-ruby and libxslt-ruby bindings must absolutely, positively,
 without a doubt share the same libxml2 library.  This is because libxslt modifies
-XML documents created by libxml2.  If there are two copies of libxml2 on your 
+XML documents created by libxml2.  If there are two copies of libxml2 on your
 system, then when XML documents allocated in copy #1 are manipulated by copy #2,
 a segmentation fault will occur.  So make sure that your system has only one copy of libxml2
 installed.
@@ -36,13 +36,13 @@ The easiest way to install libxslt-ruby is via Ruby Gems.  To install:
 
 <tt>gem install libxslt-ruby</tt>
 
-If you are running Windows, make sure to install the Win32 RubyGem which 
+If you are running Windows, make sure to install the Win32 RubyGem which
 includes an already built binary file.  The binary is built against
 libxml2 version 2.6.32, iconv version 1.11 and libxslt version 1.1.24.
 Binaries for libxml2 and iconv are provided in the libxml-ruby bindings,
-while a binary for libxslt is provided in the libxslt-ruby bindings. 
+while a binary for libxslt is provided in the libxslt-ruby bindings.
 
-The Windows binaries are biult with MingW.  The gem also includes 
+The Windows binaries are biult with MingW.  The gem also includes
 a Microsoft VC++ 2005 solution.  If you wish to run a debug version
 of libxml-ruby on Windows, then it is highly recommended
 you use VC++.
@@ -51,12 +51,12 @@ you use VC++.
 == USAGE
 
 For in-depth information about using libxslt-ruby please refer
-to its online Rdoc documentation.  
+to its online Rdoc documentation.
 
 All libxslt classes are in the LibXSLT::XSLT module. The simplest
-way to use libxslt is to require 'xslt'.  This will mixin the 
-LibXML and LibXSLT modules into the global namespace, allowing you to 
-write code like this: 
+way to use libxslt is to require 'xslt'.  This will mixin the
+LibXML and LibXSLT modules into the global namespace, allowing you to
+write code like this:
 
 require 'xslt'
 document = XML::Document.new
@@ -78,10 +78,10 @@ Given an XML file like:
 
   <?xml version="1.0" encoding="UTF-8"?>
   <?xml-stylesheet href="fuzface.xsl" type="text/xsl"?>
-  
+
   <commentary>
     <meta>
-      <author>       
+      <author>
         <first_name>Sean</first_name>
         <last_name>Chittenden</last_name>
         <email>sean@chittenden.org</email>
@@ -91,7 +91,7 @@ Given an XML file like:
       <id>$Id$</id>     <title>Fuzface...</title>
       <subtitle>The Internet's a big place and here's some proof...</subtitle>
     </meta>
-  
+
     <body>
       <para>
         I think it's a tragedy that I'm going to start off my new
@@ -111,21 +111,21 @@ And an XSLT file like this:
       <xsl:element name="head">
         <xsl:element name="title">Ramblings - <xsl:value-of select="commentary/meta/title" /> - <xsl:value-of select="commentary/meta/subtitle" /></xsl:element>
       </xsl:element>
-  
+
       <xsl:element name="body">
         <xsl:element name="h1"><xsl:value-of select="commentary/meta/title" /></xsl:element>
         <xsl:element name="h3"><xsl:value-of select="commentary/meta/subtitle" /></xsl:element>
         By: <xsl:value-of select="commentary/meta/author/first_name" /> <xsl:value-of select="commentary/meta/author/last_name" /><xsl:element name="br" />
         Date: <xsl:value-of select="commentary/meta/date" /><xsl:element name="br" />
-  
+
         <xsl:for-each select="./commentary/body">
           <xsl:apply-templates />
         </xsl:for-each>
-  
+
       </xsl:element>
     </xsl:element>
   </xsl:template>
-  
+
   <xsl:template match="para">
     <xsl:element name="p">
       <xsl:value-of select="." />
@@ -136,7 +136,7 @@ And an XSLT file like this:
 We can easily transform the XML with the following ruby code:
 
   require 'xslt'
-  
+
   # Create a new XSL Transform
   stylesheet_doc = XML::Document.file('files/fuzface.xsl')
   stylesheet = LibXSLT::Stylesheet.new(stylesheet_doc)
@@ -144,7 +144,7 @@ We can easily transform the XML with the following ruby code:
   # Transform a xml document
   xml_doc = XML::Document.file('files/fuzface.xml')
   result = stylesheet.apply(xml_doc)
-   
+
 You can then print, save or manipulate the returned document.
 
 == License
@@ -161,4 +161,4 @@ You can find the latest documentation at:
 == MORE INFORMATION
 
 For more information please refer to the documentation.  If you have any
-questions, please send email to libxml-devel@rubyforge.org.
+questions, please send email to libxml-devel@rubyforge.org.

data/Rakefile

@@ -3,7 +3,7 @@
 require "rubygems"
 require "rake/extensiontask"
 require "rake/testtask"
-require 'hanna/rdoctask'
+require 'rdoc/task'
 require "grancher/task"
 require "yaml"
 
@@ -13,19 +13,33 @@ SO_NAME  = "libxslt_ruby"
 # Read the spec file
 spec = Gem::Specification.load("#{GEM_NAME}.gemspec")
 
-# Setup compile tasks
+# Setup compile tasks.  Configuration can be passed via EVN.
+# Example:
+#  rake compile with_xml2_include=C:/MinGW/local/include/libxml2
+#               with_xslt_include=C:/MinGW/local/include/libxslt
+#               with_exslt_include=C:/MinGW/local/include/libexslt
 Rake::ExtensionTask.new do |ext|
   ext.gem_spec = spec
   ext.name = SO_NAME
   ext.ext_dir = "ext/libxslt"
   ext.lib_dir = "lib/#{RUBY_VERSION.sub(/\.\d$/, '')}"
-  ext.config_options << "--with-xml2-include=C:/MinGW/local/include/libxml2"
-  ext.config_options << "--with-xslt-include=C:/MinGW/local/include/libxslt"
-  ext.config_options << "--with-exslt-include=C:/MinGW/local/include/libexslt"
+
+  ENV.each do |key, val|
+    next unless key =~ /\Awith_(\w+)\z/i
+    puts key
+    puts val
+    opt = $1.downcase.tr('_', '-')
+
+    if File.directory?(path = File.expand_path(val))
+      ext.config_options << "--with-#{opt}=#{path}"
+    else
+      warn "No such directory: #{opt}: #{path}"
+    end
+  end
 end
 
 # Setup generic gem
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   pkg.package_dir = 'pkg'
   pkg.need_tar    = false
 end
@@ -39,12 +53,13 @@ if RUBY_PLATFORM.match(/win32|mingw32/)
   win_spec = spec.clone
   win_spec.platform = Gem::Platform::CURRENT
   win_spec.files += binaries.to_a
+  win_spec.instance_variable_set(:@cache_file, nil)
 
   # Unset extensions
   win_spec.extensions = nil
 
   # Rake task to build the windows package
-  Rake::GemPackageTask.new(win_spec) do |pkg|
+  Gem::PackageTask.new(win_spec) do |pkg|
     pkg.package_dir = 'pkg'
     pkg.need_tar = false
   end
@@ -52,11 +67,11 @@ end
 
 # RDoc Task
 desc "Generate rdoc documentation"
-Rake::RDocTask.new("rdoc") do |rdoc|
+RDoc::Task.new("rdoc") do |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "libxml-xslt"
   # Show source inline with line numbers
-  rdoc.options << "--inline-source" << "--line-numbers"
+  rdoc.options << "--line-numbers"
   # Make the readme file the start page for the generated html
   rdoc.options << '--main' << 'README'
   rdoc.rdoc_files.include('doc/*.rdoc',
@@ -70,5 +85,6 @@ end
 # Test Task
 Rake::TestTask.new do |t|
   t.libs << "test"
+  t.test_files = FileList['test/test*.rb'].exclude('test/test_suite.rb')
   t.verbose = true
 end

data/ext/libxslt/extconf.h

@@ -1,8 +1,8 @@
-#ifndef EXTCONF_H
-#define EXTCONF_H
-#define HAVE_ZLIB_H 1
-#define HAVE_LIBXML_XMLVERSION_H 1
-#define HAVE_XSLT_H 1
-#define HAVE_EXSLT_H 1
-#define HAVE_LIBXML_RUBY_LIBXML_H 1
-#endif
+#ifndef EXTCONF_H
+#define EXTCONF_H
+#define HAVE_RUBY_IO_H 1
+#define HAVE_ZLIB_H 1
+#define HAVE_LIBXML_XMLVERSION_H 1
+#define HAVE_XSLT_H 1
+#define HAVE_EXSLT_H 1
+#endif

data/ext/libxslt/extconf.rb

@@ -21,7 +21,9 @@ dir_config('zlib')
 dir_config('xml2')
 dir_config('xslt')
 dir_config('exslt')
-dir_config('libxml-ruby')
+
+# Ruby 1.9 has ruby/io.h instead of rubyio.h
+have_header('ruby/io.h')
 
 # First get zlib
 unless have_library('z', 'inflate') or
@@ -109,38 +111,47 @@ unless (have_library('exslt','exsltRegisterAll') or
 end
 
 # Figure out where libxml-ruby is installed
-gem_specs = Gem.source_index.find_name('libxml-ruby')
-if gem_specs.empty?
+unless gem_spec = Gem::Specification.find_by_name('libxml-ruby')
   crash(<<-EOL)
     libxml-ruby bindings must be installed
   EOL
 end
 
-gem_specs = gem_specs.sort_by {|spec| spec.version}.reverse
-libxml_ruby_path = gem_specs.first.full_gem_path
-
-$INCFLAGS += " -I#{libxml_ruby_path}/ext"
-
-unless have_header('libxml/ruby_libxml.h') 
+unless find_header("ruby_libxml.h", "#{gem_spec.full_gem_path}/ext/libxml")
   crash(<<-EOL)
     Need headers for libxml-ruby.
   EOL
 end
 
-if RUBY_PLATFORM.match(/win32|mingw32/)
-  RUBY_VERSION =~ /(\d+.\d+)/
-  $LIBPATH << File.join(libxml_ruby_path, "lib")
-  $LIBPATH << File.join(libxml_ruby_path, "lib", $1)
-
-  headers = ['iconv.h', 'libxml/ruby_libxml.h']
-  unless have_library(':libxml_ruby.so', 'Init_libxml_ruby', headers)
-    crash(<<-EOL)
-      Need libxml-ruby
-      Please install libxml-ruby or specify the path to the gem via:
-        --with-libxml-ruby=/path/to/libxml-ruby gem
-    EOL
-  end
+
+RUBY_VERSION =~ /(\d+.\d+)/
+minor_version = $1
+headers = ['iconv.h', 'libxml/ruby_libxml.h']
+paths = ["#{gem_spec.full_gem_path}/lib", "#{gem_spec.full_gem_path}/lib/#{minor_version}"]
+
+unless find_library("xml_ruby", "Init_libxml_ruby", *paths) or
+       find_library(":libxml_ruby.so", "Init_libxml_ruby", *paths)
+  crash(<<-EOL)
+    Need libxml-ruby
+    Please install libxml-ruby or specify the path to the gem via:
+      --with-libxml-ruby=/path/to/libxml-ruby gem
+  EOL
 end
 
+#if RUBY_PLATFORM.match(/win32|mingw32/)
+#  RUBY_VERSION =~ /(\d+.\d+)/
+#  $LIBPATH << File.join(libxml_ruby_path, "lib")
+#  $LIBPATH << File.join(libxml_ruby_path, "lib", $1)
+#
+#  headers = ['iconv.h', 'libxml/ruby_libxml.h']
+#  unless have_library(':libxml_ruby.so', 'Init_libxml_ruby', headers)
+#    crash(<<-EOL)
+#      Need libxml-ruby
+#      Please install libxml-ruby or specify the path to the gem via:
+#        --with-libxml-ruby=/path/to/libxml-ruby gem
+    #EOL
+#  end
+#end
+
 create_header()
 create_makefile("libxslt_ruby")

data/ext/libxslt/libxslt.c

@@ -11,7 +11,7 @@ VALUE eXSLTError;
 
 /*
  * Document-class: LibXSLT::XSLT
- * 
+ *
  * The libxslt gem provides Ruby language bindings for GNOME's Libxslt
  * toolkit. It is free software, released under the MIT License.
  *
@@ -22,26 +22,24 @@ VALUE eXSLTError;
  *
  *  xml_doc = XML::Document.file('xml_file')
  *  result = stylesheet.apply(xml_doc)
- * 
  *
-*/
+ */
 
 #ifdef RDOC_NEVER_DEFINED
   cLibXSLT = rb_define_module("XSLT");
 #endif
 
 
-#if defined(_WIN32)
-__declspec(dllexport) 
-#endif
-
 void
 Init_libxslt_ruby(void) {
   LIBXML_TEST_VERSION;
-  
+
   cLibXSLT = rb_define_module("LibXSLT");
   cXSLT = rb_define_module_under(cLibXSLT, "XSLT");
 
+  cXMLDocument = rb_const_get(rb_const_get(rb_const_get(rb_cObject,
+    rb_intern("LibXML")), rb_intern("XML")), rb_intern("Document"));
+
   rb_define_const(cXSLT, "MAX_DEPTH", INT2NUM(xsltMaxDepth));
   rb_define_const(cXSLT, "MAX_SORT", INT2NUM(XSLT_MAX_SORT));
   rb_define_const(cXSLT, "ENGINE_VERSION", rb_str_new2(xsltEngineVersion));
@@ -60,6 +58,7 @@ Init_libxslt_ruby(void) {
   eXSLTError = rb_define_class_under(cLibXSLT, "XSLTError", rb_eRuntimeError);
 
   ruby_init_xslt_stylesheet();
+  ruby_init_exslt();
 
   /* Now load exslt. */
   exsltRegisterAll();