libxslt-ruby 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: 1c764755769750edd73117a1209a5eea3555cc60
-  data.tar.gz: d876c538407812ef4f4182e8dd97bc831dbdb75f
-!binary "U0hBNTEy":
-  metadata.gz: 782aed33b1170a1a786353e20e9f6374c561da521d027db5cc33d33400060eea7c1300e0b747bc5f783a82b782267840e6b13a14ac7db8bb07aa1347189e3c23
-  data.tar.gz: f1f7d033f52c7dde655f08ad324b995d232ed2e36d81baf497161c9ad4f24bd3d2ce25a15551a84007422d1ddfb244499ebde21569b616e39d9dddc7a9b3ed85
+SHA1:
+  metadata.gz: 20cac3cd9b87d3ca87f9ce387708f6b23360512f
+  data.tar.gz: 257a96d52ada6a45bf21a36795044d0a5bcbdcfd
+SHA512:
+  metadata.gz: cf874474b474d45ef7da41b4a94d4325f126b32cceae6519289181e867dbd78cbb28c2ab7e569a729baf32b09eb95bb4e04cb1adf15e3d42905e769fbfb0ad70
+  data.tar.gz: b26f0ce01488b7946f08c1b1b1c80a28140c3bd67c3363febd761125ca164a3039a306a40f96012326f200eceb7a0b101529e4b7c2e32241ee9dbd95fe15537a

data/CHANGES

@@ -1,6 +1,13 @@
+== 1.1.1 / 2014-03-16 Charlie Savage
+
+* Adds output and transform methods that respect the <xsl:output> options in stylesheets (Rick Frankel)
+* Update included binaries
+* Update extconf.rb to remove warnings
+
 == 1.1.0 / 2013-01-06 Charlie Savage
 
-* Remove dependency on DL which causes a warning on Ruby 2.0.0
+* Update dependency to latest libxml-ruby version  (Charlie Savage)
+* Remove dependency on dl which causes warning in Ruby 2.0.0 (Charlie Savage)
 
 == 1.0.9 / 2012-03-17 Charlie Savage
 

data/README.rdoc

@@ -36,16 +36,12 @@ 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 Mingw64 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.
+libxml2 version 2.9.1, iconv version 1.14 and libxslt version 1.1.28.
 Binaries for libxml2 and iconv are provided in the libxml-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
-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++.
+while binaries for libxslt and libexslt areprovided in the
+libxslt-ruby bindings.
 
 
 == USAGE

data/Rakefile

@@ -1,13 +1,13 @@
 #!/usr/bin/env ruby
 
-require "rubygems"
-require "rake/extensiontask"
-require "rake/testtask"
+require 'rubygems'
+require 'rake/extensiontask'
+require 'rake/testtask'
 require 'rdoc/task'
-require "yaml"
+require 'yaml'
 
-GEM_NAME = "libxslt-ruby"
-SO_NAME  = "libxslt_ruby"
+GEM_NAME = 'libxslt-ruby'
+SO_NAME  = 'libxslt_ruby'
 
 # Read the spec file
 spec = Gem::Specification.load("#{GEM_NAME}.gemspec")
@@ -22,11 +22,11 @@ Rake::ExtensionTask.new do |ext|
   ext.name = SO_NAME
   ext.ext_dir = "ext/libxslt"
   ext.lib_dir = "lib/#{RUBY_VERSION.sub(/\.\d$/, '')}"
-
-  ext.config_options << "--with-zlib-dir=C:/MinGW/local"
-  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"
+  
+  ext.config_options << "--with-zlib-dir=C:/MinGW64/local"
+  ext.config_options << "--with-xml2-include=C:/MinGW64/local/include/libxml2"
+  ext.config_options << "--with-xslt-include=C:/MinGW64/local/include/libxslt"
+  ext.config_options << "--with-exslt-include=C:/MinGW64/local/include/libexslt"
 
   ENV.each do |key, val|
     next unless key =~ /\Awith_(\w+)\z/i

data/ext/libxslt/extconf.rb

@@ -8,7 +8,7 @@ require 'rbconfig'
 require 'rubygems'
 $preload = nil
 $INCFLAGS << " -I/usr/local/include"
-$LIBPATH.push(Config::CONFIG['libdir'])
+$LIBPATH.push(RbConfig::CONFIG['libdir'])
 
 def crash(str)
   print(" extconf failure: %s\n", str)
@@ -131,19 +131,19 @@ paths = ["#{gem_spec.full_gem_path}/lib",
          "#{gem_spec.full_gem_path}/ext/libxml"]
 
 # No need to link xml_ruby on OS X
-unless Config::CONFIG['host_os'].match(/darwin/)
+unless RbConfig::CONFIG['host_os'].match(/darwin/)
   # Hack to make sure ruby library is *after* xml_ruby library
   $LIBS = "#{$LIBRUBYARG_STATIC} #{$LIBS}"
 
   libraries = ["xml_ruby", # Linux
                ":libxml_ruby.so",  # mingw
-               "libxml_ruby-#{Config::CONFIG["arch"]}"] # mswin
+               "libxml_ruby-#{RbConfig::CONFIG["arch"]}"] # mswin
 
-  library = libraries.detect do |library|
+  libxml_library = libraries.detect do |library|
     find_library(library, "Init_libxml_ruby", *paths)
   end
 
-  unless library
+  unless libxml_library
     crash(<<-EOL)
       Need libxml-ruby
       Please install libxml-ruby or specify the path to the gem via:

data/ext/libxslt/libxslt.c

@@ -9,6 +9,7 @@ VALUE cXMLDocument;
 VALUE cLibXSLT;
 VALUE cXSLT;
 VALUE eXSLTError;
+VALUE eXMLXSLTStylesheetRequireParsedDoc;
 
 /*
  * Document-class: LibXSLT::XSLT
@@ -58,6 +59,7 @@ Init_libxslt_ruby(void) {
   rb_define_const(cXSLT, "NAMESPACE_XALAN", rb_str_new2((const char*)XSLT_XALAN_NAMESPACE));
 
   eXSLTError = rb_define_class_under(cLibXSLT, "XSLTError", rb_eRuntimeError);
+  eXMLXSLTStylesheetRequireParsedDoc = rb_define_class_under(cLibXSLT, "ResultError", rb_eRuntimeError);
 
   ruby_init_xslt_stylesheet();
   ruby_init_exslt();

data/ext/libxslt/libxslt.h

@@ -32,5 +32,6 @@
 
 extern VALUE cXSLT;
 extern VALUE eXSLTError;
+extern VALUE eXMLXSLTStylesheetRequireParsedDoc;
 
 #endif

data/ext/libxslt/ruby_xslt_stylesheet.c

@@ -3,7 +3,6 @@
 /* See the LICENSE file for copyright and distribution information. */
 
 #include "libxslt.h"
-
 /*
  * Document-class: LibXSLT::XSLT::Stylesheet
  *
@@ -254,6 +253,39 @@ ruby_xslt_stylesheet_print(int argc, VALUE *argv, VALUE self) {
   return(INT2NUM(bytes));
 }*/
 
+/* call-seq:
+ *   stylesheet.output(doc) => string
+ *
+ * Output an xml document, usually the result of an xslt
+ * transformation, and return the result as a string.  Output will be
+ * done according to the output specification in the xslt
+ * stylesheet. Note that this includes the encoding of the string.
+ */
+VALUE
+ruby_xslt_stylesheet_output(VALUE self, VALUE document) {
+// FIXME: set string encoding in ruby 1.9?
+  xmlDocPtr xdoc;
+  xsltStylesheetPtr xstylesheet;
+  xmlChar *result = NULL;
+  int len = 0, bytes = 0;
+  VALUE rresult;
+
+  if (!rb_obj_is_kind_of(document, cXMLDocument))
+    rb_raise(rb_eTypeError, "Must pass in an XML::Document instance.");
+
+  Data_Get_Struct(document, xmlDoc, xdoc);
+  Data_Get_Struct(self, xsltStylesheet, xstylesheet);
+
+  bytes = xsltSaveResultToString(&result, &len,
+				 xdoc, xstylesheet);
+  if ( bytes == -1 ) {
+    rb_raise(rb_eRuntimeError, "error dumping document");
+  }
+
+  rresult=rb_str_new((const char*)result,len);
+  xmlFree(result);
+  return rresult;
+}
 
 #ifdef RDOC_NEVER_DEFINED
   cLibXSLT = rb_define_module("LibXSLT");
@@ -266,4 +298,5 @@ ruby_init_xslt_stylesheet(void) {
   rb_define_alloc_func(cXSLTStylesheet, ruby_xslt_stylesheet_alloc);
   rb_define_method(cXSLTStylesheet, "initialize", ruby_xslt_stylesheet_initialize, 1);
   rb_define_method(cXSLTStylesheet, "apply", ruby_xslt_stylesheet_apply, -1);
+  rb_define_method(cXSLTStylesheet, "output", ruby_xslt_stylesheet_output, 1);
 }

data/ext/libxslt/version.h

@@ -1,5 +1,5 @@
-#define RUBY_LIBXSLT_VERSION  "1.1.0"
+#define RUBY_LIBXSLT_VERSION  "1.1.1"
 #define RUBY_LIBXSLT_VERNUM   1
 #define RUBY_LIBXSLT_VER_MAJ  1
-#define RUBY_LIBXSLT_VER_MIN  0
+#define RUBY_LIBXSLT_VER_MIN  1
 #define RUBY_LIBXSLT_VER_MIC  0

data/lib/libxslt.rb

@@ -13,3 +13,4 @@ end
 
 # And add support for deprecated functions
 require 'libxslt/deprecated'
+require 'libxslt/stylesheet'

data/lib/libxslt/stylesheet.rb

@@ -0,0 +1,30 @@
+module LibXSLT
+  module XSLT
+    class Stylesheet
+      # options to be used for parsing stylesheets
+      PARSE_OPTIONS = LibXML::XML::Parser::Options::NOCDATA | LibXML::XML::Parser::Options::NOENT
+      class << self
+        # create a xslt stylesheet from a string
+        def string(xml)
+          doc = LibXML::XML::Parser.string(xml, :options => PARSE_OPTIONS).parse
+          return new(doc)
+        end
+        # create a xslt stylesheet from a file specified by its filename
+        def file(filename)
+          doc = LibXML::XML::Parser.file(filename, :options => PARSE_OPTIONS).parse
+          return new(doc)
+        end
+        # create a xslt stylesheet from an io object
+        def io(io_object)
+          doc = LibXML::XML::Parser.io(io_object, :options => PARSE_OPTIONS).parse
+          return new(doc)
+        end
+      end
+      # transform a xml to a string
+      def transform(doc)
+        return output(apply(doc))
+      end
+      # transform a xml to a file (specified by an output stream)
+    end
+  end
+end

data/libxslt-ruby.gemspec

@@ -36,7 +36,8 @@ Gem::Specification.new do |spec|
                          'ext/vc/*.vcxproj',
                          'test/**/*'])
   spec.test_files = Dir.glob("test/test_*.rb")
-  spec.required_ruby_version = '>= 1.8.6'
+  spec.add_development_dependency 'rake-compiler'
+  spec.required_ruby_version = '>= 1.9.3'
   spec.date = DateTime.now
   spec.rubyforge_project = 'libxslt-ruby'
 end

data/test/test_deprecated.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require './test_helper'
+require 'test_helper'
 require 'test/unit'
 
 class TestDeprecated < Test::Unit::TestCase

data/test/test_exslt.rb

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

data/test/test_libxslt.rb

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

data/test/test_stylesheet.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 require 'test/unit'
-require './test_helper'
+require 'test_helper'
 
 class TestStylesheet < Test::Unit::TestCase
   def setup
@@ -103,4 +103,112 @@ class TestStylesheet < Test::Unit::TestCase
       GC.start
     end
   end
+
+  #RAF#
+  def test_stylesheet_string
+    filename = File.join(File.dirname(__FILE__), 'files/params.xsl')
+    style = File.open(filename).readline(nil)
+    stylesheet = XSLT::Stylesheet.string(style)
+    assert_instance_of(XSLT::Stylesheet, stylesheet)
+  end
+
+  def test_stylesheet_file
+    filename = File.join(File.dirname(__FILE__), 'files/params.xsl')
+    stylesheet = XSLT::Stylesheet.file(filename)
+    assert_instance_of(XSLT::Stylesheet, stylesheet)
+  end
+
+  def test_stylesheet_io
+    filename = File.join(File.dirname(__FILE__), 'files/params.xsl')
+    stylesheet = XSLT::Stylesheet.io(File.open(filename))
+    assert_instance_of(XSLT::Stylesheet, stylesheet)
+  end
+
+  def test_output
+    filename = File.join(File.dirname(__FILE__), 'files/fuzface.xsl')
+    sdoc = XML::Document.file(filename)
+    stylesheet = XSLT::Stylesheet.new(sdoc)
+
+    rdoc = stylesheet.apply(doc)
+
+    xml = stylesheet.output(rdoc)
+
+    # output method is html -> no xml decl, empty tags not closed...
+    assert xml =~ /^<html>/
+    assert xml =~ /<meta http-equiv="Content-Type" content="text\/html; charset=UTF-8">\n<title>/
+  end
+
+  def test_transform
+    filename = File.join(File.dirname(__FILE__), 'files/fuzface.xsl')
+    sdoc = XML::Document.file(filename)
+    stylesheet = XSLT::Stylesheet.new(sdoc)
+
+    xml = stylesheet.transform(doc)
+
+    assert xml =~ /<meta http-equiv="Content-Type" content="text\/html; charset=UTF-8">\n<title>/
+  end
+
+  def test_entities
+    style = <<EOF
+<!DOCTYPE xsl:stylesheet [
+<!ENTITY foo 'bar'>
+]>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:template match="a">
+    <out><xsl:text>&foo;</xsl:text>
+    <xsl:apply-templates/></out>
+  </xsl:template>
+</xsl:stylesheet>
+EOF
+
+    styledoc = LibXML::XML::Parser.string(style, :options => XSLT::Stylesheet::PARSE_OPTIONS).parse
+    stylesheet = XSLT::Stylesheet.new(styledoc)
+
+    xml = "<!DOCTYPE a [<!ENTITY bla 'fasel'>]><a>&bla;</a>"
+    doc = XML::Parser.string(xml, :options => XSLT::Stylesheet::PARSE_OPTIONS).parse
+
+    out = stylesheet.apply( doc )
+    dump = stylesheet.output( out )
+    assert_match( /<out>barfasel<\/out>/, dump)
+
+    # no entity replacement in document
+    doc = XML::Parser.string(xml, :options => 0).parse
+    out = stylesheet.apply( doc )
+    dump = stylesheet.output( out )
+
+    assert_match(/<out>bar<\/out>/, dump) # entity content is missing
+
+    # note: having entities in your stylesheet that are not replaced during
+    # parse, will crash libxslt (segfault)
+    # seems to be a libxslt problem; you should not do that anyway
+    # styledoc = LibXML::XML::Parser.string(style, : options => 0).parse
+    # stylesheet = XSLT::Stylesheet.new(styledoc)
+  end
+
+  def test_cdatasection
+    doc = XML::Parser.string("<a/>").parse
+
+    style = <<EOF
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:template match="a">
+    <out><xsl:text disable-output-escaping="yes"><![CDATA[<>]]></xsl:text></out>
+  </xsl:template>
+</xsl:stylesheet>
+EOF
+
+    styledoc = LibXML::XML::Parser.string(style, :options => XSLT::Stylesheet::PARSE_OPTIONS).parse
+    stylesheet = XSLT::Stylesheet.new(styledoc)
+
+    out = stylesheet.apply( doc )
+    dump = stylesheet.output( out )
+    assert_match( /<out><><\/out>/, dump)
+
+    # without propper parse options (result is wrong from an xml/xslt point of view)
+    styledoc = LibXML::XML::Parser.string(style).parse
+    stylesheet = XSLT::Stylesheet.new(styledoc)
+
+    out = stylesheet.apply( doc )
+    dump = stylesheet.output( out )
+    assert_match( /<out>&lt;&gt;<\/out>/, dump)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libxslt-ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-06 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |2
       The Libxslt-Ruby project provides Ruby language bindings for the GNOME
       XSLT C library.  It is free software, released under the MIT License.
@@ -35,23 +49,24 @@ extra_rdoc_files: []
 files:
 - CHANGES
 - LICENSE
-- Rakefile
 - README.rdoc
-- libxslt-ruby.gemspec
-- setup.rb
-- lib/libxslt/deprecated.rb
-- lib/libxslt.rb
-- lib/xslt.rb
-- ext/libxslt/extconf.h
+- Rakefile
+- ext/libxslt/extconf.rb
+- ext/libxslt/libxslt.c
 - ext/libxslt/libxslt.h
+- ext/libxslt/ruby_exslt.c
 - ext/libxslt/ruby_exslt.h
+- ext/libxslt/ruby_xslt_stylesheet.c
 - ext/libxslt/ruby_xslt_stylesheet.h
 - ext/libxslt/version.h
-- ext/libxslt/libxslt.c
-- ext/libxslt/ruby_exslt.c
-- ext/libxslt/ruby_xslt_stylesheet.c
 - ext/vc/libxslt_ruby.sln
 - ext/vc/libxslt_ruby.vcxproj
+- lib/libxslt.rb
+- lib/libxslt/deprecated.rb
+- lib/libxslt/stylesheet.rb
+- lib/xslt.rb
+- libxslt-ruby.gemspec
+- setup.rb
 - test/files/commentary.dtd
 - test/files/fuzface.xml
 - test/files/fuzface.xsl
@@ -64,7 +79,6 @@ files:
 - test/test_libxslt.rb
 - test/test_stylesheet.rb
 - test/test_suite.rb
-- ext/libxslt/extconf.rb
 homepage: http://libxslt.rubyforge.org/
 licenses: []
 metadata: {}
@@ -77,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.6
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -85,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: libxslt-ruby
-rubygems_version: 2.0.0.preview3.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby libxslt bindings

data/ext/libxslt/extconf.h

@@ -1,8 +0,0 @@
-#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