ruby-xslt 0.9.6 → 0.9.7

data/.gitignore

@@ -0,0 +1,24 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC
+ext/xslt_lib/Makefile
+ext/xslt_lib/mkmf.log
+examples

data/AUTHORS

@@ -23,6 +23,9 @@ St
 Tom <tom@spongecell.com>
 * Found and patched some serious memory leaks
 
+Rian Bigg
+* Ruby 1.9 compatible version
+
 == Thanks to :
 
 knu <knu at freebsd dot org> for FreeBSD port (see http://www.freshports.org/textproc/ruby-xslt/)

data/ChangeLog

@@ -1,3 +1,7 @@
+0.9.7 :
+* Ruby 1.9
+* Bug correction (Issue #1)
+
 0.9.6 :
 * "found and patched some serious memory leaks" (thanks to Tom)
 

data/README.rdoc

@@ -0,0 +1,124 @@
+= Ruby/XSLT
+
+== About
+
+Ruby/XSLT is a simple XSLT class based on libxml <http://xmlsoft.org/> and libxslt <http://xmlsoft.org/XSLT/>
+
+== Licence
+
+Copyright (C) 2003-2010 Gregoire Lejeune <gregoire dot lejeune at free dot fr>
+
+Ruby/XSLT is freely distributable according to the terms of the
+GNU General Public License (see the file 'COPYING').
+
+This program is distributed without any warranty. See the file
+'COPYING' for details.
+
+== INSTALLATION
+
+  sudo gem install ruby-xslt
+  
+or 
+
+  ruby extconf.rb # see CONFIGURATION for more options
+  make
+  make test
+  make doc
+  sudo make install
+
+=== CONFIGURATION
+
+  --help                   display this help and exit
+  
+  --with-xslt-lib=PATH
+  --with-xslt-include=PATH
+  --with-xslt-dir=PATH     specify the directory name for the libxslt include 
+                           files and/or library 
+  
+  --disable-error-handler  disables the new error handler 
+  
+  --disable-exslt          disables libexslt support <http://exslt.org/>
+  
+
+== EXAMPLES
+
+=== Simple example
+  require 'xml/xslt'
+
+  xslt = XML::XSLT.new()
+  xslt.xml = "text.xml"
+  xslt.xsl = "test.xsl"
+
+  out = xslt.serve()
+  print out;
+
+=== REXML support
+  require 'rexml/document'
+  require 'xml/xslt'
+
+  xslt = XML::XSLT.new()
+
+  xslt.xml = REXML::Document.new File.read( "test.xml" )
+  xslt.xsl = REXML::Document.new File.read( "test.xsl" )
+
+  out = xslt.serve()
+  print out;
+
+=== XML::Smart support
+  require 'xml/smart'
+  require 'xml/xslt'
+
+  xslt = XML::XSLT.new()
+
+  xslt.xml = XML::Smart.open( "test.xml" )
+  xslt.xsl = XML::Smart.open( "test.xsl" )
+
+  out = xslt.serve()
+  print out;
+  
+=== Parameters support
+  require "xml/xslt"
+
+  xslt = XML::XSLT.new()
+  xslt.xsl = "parameter.xsl"
+  xslt.xml = "test.xml"
+  xslt.parameters = { "p1" => "the first parameter ...",
+                      "p2" => "'and the second one!'" }
+  xslt.save("test1.html")
+  
+  xslt.parameters = { "p1" => "Ruby...",
+                      "p2" => "'...is cool !'" }
+  xslt.save("test2.html")
+
+=== External functions support
+  require "xml/xslt"
+
+  xslt = XML::XSLT.new()
+  xslt.xsl = "functions.xsl"
+  xslt.xml = "test.xml"
+  
+  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/Rakefile

@@ -0,0 +1,52 @@
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "ruby-xslt"
+    gem.summary = %Q{Ruby/XSLT is a simple XSLT class based on libxml <http://xmlsoft.org/> and libxslt <http://xmlsoft.org/XSLT/> }
+    gem.description = gem.summary
+    gem.email = "gregoire.lejeune@free.fr"
+    gem.homepage = "http://github.com/glejeune/ruby-xslt"
+    gem.authors = ["Gregoire Lejeune"]
+    gem.extensions = FileList["ext/**/extconf.rb"].to_a
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/test_*.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
+end
+
+task :test => :check_dependencies
+
+task :default => :test
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "syncftp #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -0,0 +1 @@
+0.9.7

data/ext/xslt_lib/extconf.rb

@@ -45,6 +45,10 @@ dir_config( 'xslt' )
 have_library "xml2", "xmlParseDoc" || crash("need libxml2")
 have_library "xslt", "xsltParseStylesheetFile" || crash("need libxslt")
 
+if /^1.8/.match RUBY_VERSION
+  $CFLAGS += " -DRUBY_1_8"
+end
+
 if enable_config("exslt", true)
   have_library "exslt", "exsltRegisterAll"
   $CFLAGS += " -DUSE_EXSLT"

data/ext/xslt_lib/extfunc.c

@@ -138,7 +138,7 @@ xmlXPathObjectPtr value2xpathObj (VALUE val) {
       int i,j;
       ret = xmlXPathNewNodeSet(NULL);
 
-      for(i = RARRAY(val)->len; i > 0; i--) {
+      for(i = RARRAY_LEN(val); i > 0; i--) {
         xmlXPathObjectPtr obj = value2xpathObj( rb_ary_shift( val ) );
         if ((obj->nodesetval != NULL) && (obj->nodesetval->nodeNr != 0)) {
           for(j = 0; j < obj->nodesetval->nodeNr; j++) {

data/ext/xslt_lib/parameters.c

@@ -21,7 +21,7 @@
 /**
  * parameters support, patch from :
  * 
- * Eust�quio "TaQ" Rangel
+ * Eustáquio "TaQ" Rangel
  * eustaquiorangel@yahoo.com
  * http://beam.to/taq
  * 
@@ -39,8 +39,8 @@ VALUE process_pair( VALUE pair, VALUE rbparams ) {
   
   Check_Type( pair, T_ARRAY );
 
-  key   = RARRAY(pair)->ptr[0];
-  value = RARRAY(pair)->ptr[1];
+  key   = RARRAY_PTR(pair)[0];
+  value = rb_obj_clone( RARRAY_PTR(pair)[1] );
   
   Check_Type( key, T_STRING );
   Check_Type( value, T_STRING );

data/ext/xslt_lib/rb_utils.h

@@ -22,7 +22,11 @@
 #define __RUBY_RB_UTILS_H__
 
 #include <ruby.h>
-#include <rubyio.h>
+#ifdef RUBY_1_8
+	#include <rubyio.h>
+#else
+	#include <ruby/io.h>
+#endif
 
 #include <stdio.h>
 #include <string.h>

data/ext/xslt_lib/xslt.h

@@ -22,7 +22,11 @@
 #define __RUBY_XSLT_H__
 
 #include <ruby.h>
-#include <rubyio.h>
+#ifdef RUBY_1_8
+	#include <rubyio.h>
+#else
+	#include <ruby/io.h>
+#endif
 
 #include <string.h>
 
@@ -53,8 +57,8 @@
 #include "parameters.h"
 #include "extfunc.h"
 
-#define RUBY_XSLT_VERSION  "0.9.6"
-#define RUBY_XSLT_VERNUM   096
+#define RUBY_XSLT_VERSION  "0.9.7"
+#define RUBY_XSLT_VERNUM   097
 
 #define RUBY_XSLT_XSLSRC_TYPE_NULL     0
 #define RUBY_XSLT_XSLSRC_TYPE_STR      1

data/ext/xslt_lib/xslt_lib.c

@@ -501,7 +501,7 @@ VALUE ruby_xslt_to_s( VALUE self ) {
   if (vXSLTSheet == NULL) return Qnil;
 
   vStrOut = rb_str_new( 0, strlen(xKlassName)+1024 );
-  (void) sprintf( RSTRING(vStrOut)->ptr,
+  (void) sprintf( RSTRING_PTR(vStrOut),
          "#<%s: parent=%p,next=%p,imports=%p,docList=%p,"
          "doc=%p,stripSpaces=%p,stripAll=%d,cdataSection=%p,"
          "variables=%p,templates=%p,templatesHash=%p,"
@@ -530,7 +530,7 @@ VALUE ruby_xslt_to_s( VALUE self ) {
          vXSLTSheet->exclPrefix, vXSLTSheet->exclPrefixTab, vXSLTSheet->exclPrefixNr,
          vXSLTSheet->exclPrefixMax );
 
-  RSTRING(vStrOut)->len = strlen( RSTRING(vStrOut)->ptr );
+  vStrOut = strlen(RSTRING_PTR(vStrOut));
   if( OBJ_TAINTED(self) ) OBJ_TAINT(vStrOut);
 
   // xsltFreeStylesheet(vXSLTSheet);

data/ruby-xslt.gemspec

@@ -0,0 +1,77 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{ruby-xslt}
+  s.version = "0.9.7"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Gregoire Lejeune"]
+  s.date = %q{2010-06-28}
+  s.description = %q{Ruby/XSLT is a simple XSLT class based on libxml <http://xmlsoft.org/> and libxslt <http://xmlsoft.org/XSLT/>}
+  s.email = %q{gregoire.lejeune@free.fr}
+  s.extensions = ["ext/xslt_lib/extconf.rb"]
+  s.extra_rdoc_files = [
+    "ChangeLog",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "AUTHORS",
+     "COPYING",
+     "ChangeLog",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "ext/xslt_lib/extconf.rb",
+     "ext/xslt_lib/extfunc.c",
+     "ext/xslt_lib/extfunc.h",
+     "ext/xslt_lib/parameters.c",
+     "ext/xslt_lib/parameters.h",
+     "ext/xslt_lib/parser.c",
+     "ext/xslt_lib/parser.h",
+     "ext/xslt_lib/rb_utils.c",
+     "ext/xslt_lib/rb_utils.h",
+     "ext/xslt_lib/xslt.h",
+     "ext/xslt_lib/xslt_lib.c",
+     "lib/xml/xslt.rb",
+     "ruby-xslt.gemspec",
+     "setup.rb",
+     "test/subdir/result.xsl",
+     "test/subdir/test.xsl",
+     "test/t.xml",
+     "test/t.xsl",
+     "test/test.rb"
+  ]
+  s.homepage = %q{http://github.com/glejeune/ruby-xslt}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Ruby/XSLT is a simple XSLT class based on libxml <http://xmlsoft.org/> and libxslt <http://xmlsoft.org/XSLT/>}
+  s.test_files = [
+    "test/test.rb",
+     "examples/bug.rb",
+     "examples/fuzface.rb",
+     "examples/fuzface_data.rb",
+     "examples/fuzface_error.rb",
+     "examples/fuzface_REXML.rb",
+     "examples/fuzface_to_s.rb",
+     "examples/fuzface_XML-Simple.rb",
+     "examples/info.rb",
+     "examples/test_functions.rb",
+     "examples/test_parameters.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-xslt
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
+  hash: 53
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 7
+  version: 0.9.7
 platform: ruby
 authors: 
 - Gregoire Lejeune
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-06 00:00:00 +02:00
+date: 2010-06-28 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -20,64 +26,88 @@ executables: []
 extensions: 
 - ext/xslt_lib/extconf.rb
 extra_rdoc_files: 
-- README
 - ChangeLog
-- COPYING
-- AUTHORS
+- README.rdoc
 files: 
-- ChangeLog
-- COPYING
-- README
+- .gitignore
 - AUTHORS
-- setup.rb
-- test/subdir
-- test/subdir/result.xsl
-- test/subdir/test.xsl
-- test/t.xml
-- test/t.xsl
-- test/test.rb
-- lib/xml
-- lib/xml/xslt.rb
+- COPYING
+- ChangeLog
+- README.rdoc
+- Rakefile
+- VERSION
+- ext/xslt_lib/extconf.rb
+- ext/xslt_lib/extfunc.c
 - ext/xslt_lib/extfunc.h
+- ext/xslt_lib/parameters.c
 - ext/xslt_lib/parameters.h
+- ext/xslt_lib/parser.c
 - ext/xslt_lib/parser.h
+- ext/xslt_lib/rb_utils.c
 - ext/xslt_lib/rb_utils.h
 - ext/xslt_lib/xslt.h
-- ext/xslt_lib/extfunc.c
-- ext/xslt_lib/parameters.c
-- ext/xslt_lib/parser.c
-- ext/xslt_lib/rb_utils.c
 - ext/xslt_lib/xslt_lib.c
-- ext/xslt_lib/extconf.rb
+- lib/xml/xslt.rb
+- ruby-xslt.gemspec
+- setup.rb
+- test/subdir/result.xsl
+- test/subdir/test.xsl
+- test/t.xml
+- test/t.xsl
+- test/test.rb
+- examples/bug.rb
+- examples/fuzface.rb
+- examples/fuzface_data.rb
+- examples/fuzface_error.rb
+- examples/fuzface_REXML.rb
+- examples/fuzface_to_s.rb
+- examples/fuzface_XML-Simple.rb
+- examples/info.rb
+- examples/test_functions.rb
+- examples/test_parameters.rb
 has_rdoc: true
-homepage: http://raa.ruby-lang.org/project/ruby-xslt/
+homepage: http://github.com/glejeune/ruby-xslt
+licenses: []
+
 post_install_message: 
 rdoc_options: 
-- --title
-- Ruby/XSLT
-- --main
-- README
-- --line-numbers
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: ruby-asp
-rubygems_version: 1.1.0
+rubyforge_project: 
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
-summary: A Ruby class for processing XSLT
-test_files: []
-
+specification_version: 3
+summary: Ruby/XSLT is a simple XSLT class based on libxml <http://xmlsoft.org/> and libxslt <http://xmlsoft.org/XSLT/>
+test_files: 
+- test/test.rb
+- examples/bug.rb
+- examples/fuzface.rb
+- examples/fuzface_data.rb
+- examples/fuzface_error.rb
+- examples/fuzface_REXML.rb
+- examples/fuzface_to_s.rb
+- examples/fuzface_XML-Simple.rb
+- examples/info.rb
+- examples/test_functions.rb
+- examples/test_parameters.rb

data/README

@@ -1,132 +0,0 @@
-= Ruby/XSLT
-
-== About
-
-Ruby/XSLT is a simple XSLT class based on libxml <http://xmlsoft.org/> and libxslt <http://xmlsoft.org/XSLT/>
-
-== Licence
-
-Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Gregoire Lejeune <gregoire dot lejeune at free dot fr>
-
-Ruby/XSLT is freely distributable according to the terms of the
-GNU General Public License (see the file 'COPYING').
-
-This program is distributed without any warranty. See the file
-'COPYING' for details.
-
-=== CVS access
-The CVS repository is available at rubyforge.org[http://rubyforge.org/projects/ruby-asp]. You can browse[http://rubyforge.org/cgi-bin/viewcvs.cgi/ruby-xslt/?cvsroot=ruby-asp] it or access it via anonymous access :
-
-  cvs -d :pserver:anonymous@rubyforge.org:/var/cvs/ruby-asp login
-  cvs -d :pserver:anonymous@rubyforge.org:/var/cvs/ruby-asp checkout ruby-xslt
-
-See this page[http://rubyforge.org/scm/?group_id=423] for more informations
-
-== INSTALLATION
-
-	sudo gem install ruby-xslt
-	
-or 
-
-	ruby extconf.rb # see CONFIGURATION for more options
-	make
-	make test
-	make doc
-	sudo make install
-
-=== CONFIGURATION
-
-  --help                   display this help and exit
-  
-  --with-xslt-lib=PATH
-  --with-xslt-include=PATH
-  --with-xslt-dir=PATH     specify the directory name for the libxslt include 
-                           files and/or library 
-  
-  --disable-error-handler  disables the new error handler 
-  
-  --disable-exslt          disables libexslt support <http://exslt.org/>
-  
-
-== EXAMPLES
-
-=== Simple example
-	require 'xml/xslt'
-
-	xslt = XML::XSLT.new()
-	xslt.xml = "text.xml"
-	xslt.xsl = "test.xsl"
-
-	out = xslt.serve()
-	print out;
-
-=== REXML support
-	require 'rexml/document'
-	require 'xml/xslt'
-
-	xslt = XML::XSLT.new()
-
-	xslt.xml = REXML::Document.new File.read( "test.xml" )
-	xslt.xsl = REXML::Document.new File.read( "test.xsl" )
-
-	out = xslt.serve()
-	print out;
-
-=== XML::Smart support
-	require 'xml/smart'
-	require 'xml/xslt'
-
-	xslt = XML::XSLT.new()
-
-	xslt.xml = XML::Smart.open( "test.xml" )
-	xslt.xsl = XML::Smart.open( "test.xsl" )
-
-	out = xslt.serve()
-	print out;
-	
-=== Parameters support
-	require "xml/xslt"
-
-	xslt = XML::XSLT.new()
-	xslt.xsl = "parameter.xsl"
-	xslt.xml = "test.xml"
-	xslt.parameters = { "p1" => "the first parameter ...",
-	                    "p2" => "'and the second one!'" }
-	xslt.save("test1.html")
-	
-	xslt.parameters = { "p1" => "Ruby...",
-	                    "p2" => "'...is cool !'" }
-	xslt.save("test2.html")
-
-=== External functions support
-	require "xml/xslt"
-
-	xslt = XML::XSLT.new()
-	xslt.xsl = "functions.xsl"
-	xslt.xml = "test.xml"
-	
-	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
-	^