saxon-xslt 0.8.0-java → 0.8.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fa63f9f16b00b103c6b551c16bcd13cf05b9c3e
-  data.tar.gz: 70f62470e1709fa2662f3718b3a305f8e8c6fda1
+  metadata.gz: 78d51bc1d1ad929a2a3a9fdfd306d393a071b79f
+  data.tar.gz: f617460d59c5c03e8dea14b09a0b7feee40fb04b
 SHA512:
-  metadata.gz: 8c23a83bd4048fd45a9772e829d985d60fec74b5e243396c41ccb275591b3ea3c184141dac42fbff9f6e775085177f8f28cf6d2452c3611c7b2bb47e22fd9035
-  data.tar.gz: 4b0e700ce889086ebb00a234f1bba72117893ea8a86a97e051afbb4db84a5c75bf991aa9b463410d50ca04535b63309d7ed405dea627fc34320dcca721a08b2d
+  metadata.gz: 9c7936845c41ddf3bd624fcb807e552a4b5c593cb29d98fcdde11088661d976be956e2aef5d2dbc14a662ff032333f02e331daaeeef7c36cb13f791f1e592806
+  data.tar.gz: de3633e9baf0ce519f6c1888a6eb7e136d971066c1e7e8fa08481452d7ac3ad0eea469184babf28512a7730ac7bc5f12941ee3133604a49100d67e731c945a75

data/.ruby-version

@@ -1 +1 @@
-jruby-1.7.13
+jruby-9.1.15.0

data/.travis.yml

@@ -2,7 +2,7 @@ dist: trusty
 sudo: false
 language: ruby
 rvm:
-  - jruby-9.1.14.0
+  - jruby-9.1.15.0
   - jruby-1.7.27
 jdk:
   - oraclejdk8
@@ -15,5 +15,5 @@ before_script:
   - if [ "$TRAVIS_JDK_VERSION" = "$JDK_VERSION_FOR_CODECLIMATE" ]; then curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter; chmod +x ./cc-test-reporter; fi
 script:
   - bundle exec rspec
-  - if [ "$TRAVIS_PULL_REQUEST" = "false" && "$TRAVIS_JDK_VERSION" = "$JDK_VERSION_FOR_CODECLIMATE" ]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi
+  - if [[ "$TRAVIS_PULL_REQUEST" = "false" && "$TRAVIS_JDK_VERSION" = "$JDK_VERSION_FOR_CODECLIMATE" ]]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi
 

data/lib/saxon/loader.rb

@@ -39,19 +39,30 @@ module Saxon
       ([icu] + optional).compact
     end
 
+    def self.jars_not_on_classpath?
+      begin
+        Java::net.sf.saxon.s9api.Processor
+        false
+      rescue
+        true
+      end
+    end
+
     def self.load!(saxon_home = File.expand_path('../../../vendor/saxonica', __FILE__))
       return false if @saxon_loaded
       LOAD_SEMAPHORE.synchronize do
         if Saxon::S9API.const_defined?(:Processor)
           false
         else
-          saxon_home = Pathname.new(saxon_home)
-          raise NoJarsError, saxon_home unless saxon_home.directory?
-          jars = [main_jar(saxon_home)].compact
-          raise MissingJarError if jars.empty?
-          jars += extra_jars(saxon_home)
+          if jars_not_on_classpath?
+            saxon_home = Pathname.new(saxon_home)
+            raise NoJarsError, saxon_home unless saxon_home.directory?
+            jars = [main_jar(saxon_home)].compact
+            raise MissingJarError if jars.empty?
+            jars += extra_jars(saxon_home)
 
-          add_jars_to_classpath!(saxon_home, jars)
+            add_jars_to_classpath!(saxon_home, jars)
+          end
           import_classes_to_namespace!
 
           @saxon_loaded = true

data/lib/saxon/source_helper.rb

@@ -22,7 +22,7 @@ module Saxon
     # Given a File, or IO object which will return either #path or
     # #base_uri, return the #base_uri, if present, or the #path, if present, or
     # nil
-    # @param [File, IO, String] path_io_or_string A Path, File, or IO
+    # @param [File, IO, String, java.org.] path_io_or_string A Path, File, or IO
     #   object representing the input XML file or data, or a String containing
     #   the XML
     def self.to_system_id(path_io_or_string)
@@ -33,10 +33,11 @@ module Saxon
     end
 
     # Given a File, IO, or String return a Java InputStream or StringReader
-    # @param [File, IO, String] path_io_or_string input to be converted to an
-    #   input stream
+    # @param [File, IO, Stringi, org.jruby.util.IOInputStream]
+    #   path_io_or_string input to be converted to an input stream
     # @return [java.io.InputStream, java.io.StringReader] the wrapped input
     def self.to_inputstream(path_io_or_string)
+      return path_io_or_string if org.jruby.util.IOInputStream === path_io_or_string
       return path_io_or_string.to_inputstream if path_io_or_string.respond_to?(:read)
       return java.io.StringReader.new(path_io_or_string)
     end

data/lib/saxon/xslt/version.rb

@@ -1,5 +1,5 @@
 module Saxon
   module XSLT
-    VERSION = "0.8.0"
+    VERSION = "0.8.1"
   end
 end

data/saxon-xslt.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.version       = Saxon::XSLT::VERSION
   gem.authors       = ["Matt Patterson"]
   gem.email         = ["matt@reprocessed.org"]
-  gem.description   = %q{Wraps the Saxon 9.5 HE XSLT 2.0 processor so that you can transform XSLT 2 stylesheets in JRuby. Sticks closely to the Nokogiri API}
-  gem.summary       = %q{Saxon 9.5 HE XSLT 2.0 for JRuby with Nokogiri's API}
+  gem.description   = %q{Wraps the Saxon 9.8 HE XSLT 2.0 processor so that you can transform XSLT 2 stylesheets in JRuby. Sticks closely to the Nokogiri API}
+  gem.summary       = %q{Saxon 9.8 HE XSLT 2.0 for JRuby with Nokogiri's API}
   gem.homepage      = "https://github.com/fidothe/saxon-xslt"
   gem.licenses      = ["MIT", "MPL-1.0"]
   gem.platform      = 'java'
@@ -24,6 +24,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('vcr', '~> 2.9.2')
   gem.add_development_dependency('addressable', '~> 2.4.0')
   gem.add_development_dependency('webmock', '~> 1.18.0')
-  gem.add_development_dependency('yard', '~> 0.8.7')
+  gem.add_development_dependency('yard', '~> 0.9.12')
   gem.add_development_dependency('simplecov', '~> 0.13')
 end

data/spec/saxon/source_helper_spec.rb

@@ -52,6 +52,15 @@ describe Saxon::SourceHelper do
         expect(source).to respond_to(:system_id)
         expect(source.input_stream.to_io.read).to eq(expected)
       end
+
+      it "copes with a directly created JRuby util IOInputStream" do
+        path = fixture_path('eg.xml')
+        input_stream = org.jruby.util.IOInputStream.new(File.open(path))
+        source = Saxon::SourceHelper.to_stream_source(input_stream)
+
+        expect(source).to respond_to(:system_id)
+        expect(source.input_stream.to_io.read).to eq(File.read(path))
+      end
     end
 
     context "StreamSource systemId" do

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: saxon-xslt
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: java
 authors:
 - Matt Patterson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-12-07 00:00:00.000000000 Z
+date: 2018-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
   name: rake
@@ -21,13 +21,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   name: rspec
@@ -35,13 +35,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.9.2
   name: vcr
@@ -49,13 +49,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.9.2
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
   name: addressable
@@ -63,13 +63,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.18.0
   name: webmock
@@ -77,27 +77,27 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.18.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.12
   name: yard
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.12
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
   name: simplecov
@@ -105,20 +105,21 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
-description: Wraps the Saxon 9.5 HE XSLT 2.0 processor so that you can transform XSLT 2 stylesheets in JRuby. Sticks closely to the Nokogiri API
+description: Wraps the Saxon 9.8 HE XSLT 2.0 processor so that you can transform XSLT
+  2 stylesheets in JRuby. Sticks closely to the Nokogiri API
 email:
 - matt@reprocessed.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -164,20 +165,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.6.14
 signing_key:
 specification_version: 4
-summary: Saxon 9.5 HE XSLT 2.0 for JRuby with Nokogiri's API
+summary: Saxon 9.8 HE XSLT 2.0 for JRuby with Nokogiri's API
 test_files:
 - spec/fixtures/cassettes/Saxon_SourceHelper/returning_a_StreamSource/StreamSource_systemId/for_inputs_where_we_can_infer_the_path_or_URI/is_set_to_an_open-uri_d_URI_s_URI.yml
 - spec/fixtures/cassettes/Saxon_SourceHelper/returning_a_StreamSource/StreamSource_systemId/for_inputs_where_we_can_infer_the_path_or_URI/overrides_the_inferred_system_ID_if_set_explicitly.yml
@@ -193,4 +194,3 @@ test_files:
 - spec/saxon/xml_spec.rb
 - spec/saxon/xslt_spec.rb
 - spec/spec_helper.rb
-has_rdoc: