libxslt-ruby 1.0.5-x86-mingw32 → 1.0.6-x86-mingw32

data/CHANGES

@@ -1,3 +1,8 @@
+== 1.0.6 / 2011-08-14
+
+* Fix compilation with Microsoft Visual Studio 2010 (Charlie Savage)
+
+
 == 1.0.5 / 2011-08-09
 
 * Fix Ruby 1.9.3-preview1 libxml 2.7.3 (OS X Lion) conflicting OnigUChar redefinition (Travis Warlick).

data/Rakefile

@@ -85,6 +85,5 @@ 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,7 +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
-#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

@@ -126,14 +126,24 @@ end
 
 RUBY_VERSION =~ /(\d+.\d+)/
 minor_version = $1
-paths = ["#{gem_spec.full_gem_path}/lib", "#{gem_spec.full_gem_path}/lib/#{minor_version}"]
+paths = ["#{gem_spec.full_gem_path}/lib", 
+         "#{gem_spec.full_gem_path}/lib/#{minor_version}",
+         "#{gem_spec.full_gem_path}/ext/libxml"]
 
 # No need to link xml_ruby on OS X
 unless Config::CONFIG['host_os'].match(/darwin/)
   # Hack to make sure ruby library is *after* xml_ruby library
   $LIBS += " #{$LIBRUBYARG_STATIC}"
-  unless find_library("xml_ruby", "Init_libxml_ruby", *paths) or
-         find_library(":libxml_ruby.so", "Init_libxml_ruby", *paths)
+
+  libraries = ["xml_ruby", # Linux
+               ":libxml_ruby.so",  # mingw
+               "libxml_ruby-#{Config::CONFIG["arch"]}"] # mswin
+
+  library = libraries.detect do |library|
+    find_library(library, "Init_libxml_ruby", *paths)
+  end
+
+  unless library
     crash(<<-EOL)
       Need libxml-ruby
       Please install libxml-ruby or specify the path to the gem via:

data/ext/libxslt/libxslt.h

@@ -30,13 +30,7 @@
 
 #include "version.h"
 
-/*#if ((RUBY_LIBXML_VER_MAJ != RUBY_LIBXSLT_VER_MAJ) || (RUBY_LIBXML_VER_MIN != RUBY_LIBXSLT_VER_MIN))
-#error "Incompatible LibXML-Ruby headers - please install same major/micro version"
-#endif*/
-
-extern VALUE cLibXSLT;
 extern VALUE cXSLT;
 extern VALUE eXSLTError;
-extern VALUE cXMLDocument;
 
 #endif

data/ext/libxslt/ruby_exslt.c

@@ -22,7 +22,8 @@ ruby_xslt_module_function_hash(VALUE namespace) {
 /* Helper method for xsltRegisterExtModuleFunction callback */
 static void
 ruby_xslt_module_function_callback(xmlXPathParserContextPtr ctxt, int nargs) {
-  VALUE callback, args[nargs];
+  VALUE callback;
+  VALUE* args = ALLOCA_N(VALUE, nargs);
   const xmlChar *namespace, *name;
   int i;
 

data/ext/libxslt/ruby_xslt_stylesheet.h

@@ -5,8 +5,6 @@
 #ifndef __RUBY_LIBXSLT_STYLESHEET__
 #define __RUBY_LIBXSLT_STYLESHEET__
 
-extern VALUE cXSLTStylesheet;
-
 void ruby_init_xslt_stylesheet(void);
 
 #endif

data/ext/libxslt/version.h

@@ -1,5 +1,5 @@
-#define RUBY_LIBXSLT_VERSION  "1.0.5"
+#define RUBY_LIBXSLT_VERSION  "1.0.6"
 #define RUBY_LIBXSLT_VERNUM   1
 #define RUBY_LIBXSLT_VER_MAJ  0
-#define RUBY_LIBXSLT_VER_MIN  5
+#define RUBY_LIBXSLT_VER_MIN  6
 #define RUBY_LIBXSLT_VER_MIC  0

data/libxslt-ruby.gemspec

@@ -43,7 +43,7 @@ Gem::Specification.new do |spec|
   spec.bindir = "bin"
   spec.extensions = ["ext/libxslt/extconf.rb"]
   spec.files = FILES.to_a
-  spec.test_files = Dir.glob("test/tc_*.rb")
+  spec.test_files = Dir.glob("test/test_*.rb")
 
   spec.required_ruby_version = '>= 1.8.6'
   spec.date = DateTime.now

data/test/test_deprecated.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
-require 'test/unit'
 require './test_helper'
+require 'test/unit'
 
 class TestDeprecated < Test::Unit::TestCase
   def setup()

data/test/test_helper.rb

@@ -1,5 +1,4 @@
 # encoding: UTF-8
-
 # To make testing/debugging easier, test within this source tree versus an installed gem
 
 dir = File.dirname(__FILE__)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: libxslt-ruby
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: x86-mingw32
 authors: 
 - Charlie Savage
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-09 00:00:00 Z
+date: 2011-08-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: libxml-ruby
@@ -114,5 +114,10 @@ rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Ruby libxslt bindings
-test_files: []
-
+test_files: 
+- test/test_deprecated.rb
+- test/test_exslt.rb
+- test/test_helper.rb
+- test/test_libxslt.rb
+- test/test_stylesheet.rb
+- test/test_suite.rb