saxon-rb 0.7.2-java → 0.8.3-java

data/.rspec-jar-loading

@@ -0,0 +1,2 @@
+--format progress
+--color

data/.ruby-version

@@ -1 +1 @@
-jruby-9.2.9.0
+jruby-9.2.13.0

data/README.md

@@ -15,7 +15,7 @@ Parameter creation and passing, are richer and more expressive; results from
 XSLT, or XPath, that aren't just result trees can be worked with directly in
 Ruby.
 
-[![Gem Version](https://badge.fury.io/rb/saxon.svg)](http://badge.fury.io/rb/saxon)
+[![Gem Version](https://badge.fury.io/rb/saxon-rb.svg)](http://badge.fury.io/rb/saxon-rb)
 [![Code Climate](https://codeclimate.com/github/fidothe/saxon-rb/badges/gpa.svg)](https://codeclimate.com/github/fidothe/saxon-rb)
 [![Test Coverage](https://codeclimate.com/github/fidothe/saxon-rb/badges/coverage.svg)](https://codeclimate.com/github/fidothe/saxon-rb/coverage)
 [![CircleCI](https://circleci.com/gh/fidothe/saxon-rb.svg?style=svg)](https://circleci.com/gh/fidothe/saxon-rb)

data/Rakefile

@@ -25,7 +25,7 @@ task :circleci do
       end
     end
     def jruby_image_tags
-      %w{9.2.9.0 9.1.17.0 9.2.10.0-SNAPSHOT-latest}
+      %w{9.2.9.0 9.1.17.0 9.2.10.0 9.2.11.1 9.2.12.0 9.2.13.0-SNAPSHOT-latest}
     end
 
     def jdk_image_tags
@@ -38,7 +38,8 @@ task :circleci do
 
     def alt_saxon_urls
       {
-        "https://sourceforge.net/projects/saxon/files/Saxon-HE/9.8/SaxonHE9-8-0-15J.zip" => "Saxon HE 9.8"
+        "https://sourceforge.net/projects/saxon/files/Saxon-HE/9.8/SaxonHE9-8-0-15J.zip" => "saxon-he-9.8",
+        "https://sourceforge.net/projects/saxon/files/Saxon-HE/10/Java/SaxonHE10-2J.zip" => "saxon-he-10.2"
       }
     end
 
@@ -51,7 +52,7 @@ task :circleci do
 
     def codeclimate_jobs
       (alt_saxon_urls.keys << nil).map { |alt_saxon_url|
-        ["9.2.9.0", "8-jdk-slim", alt_saxon_url]
+        ["9.2.12.0", "8-jdk-slim", alt_saxon_url]
       }
     end
 
@@ -190,12 +191,19 @@ task :circleci do
     def run_tests_step(opts)
       command = [
         "mkdir -p /tmp/test-results",
-        "bundle exec rspec spec --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress"
+        "VERIFY_SAXON_LAZY_LOADING=1 bundle exec rspec spec/jar_loading_spec.rb --options .rspec-jar-loading --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec-jar-loading.xml"
       ]
+      cc_suffix = opts.fetch(:alt_saxon_url) ? "-alt-#{alt_saxon_urls[opts.fetch(:alt_saxon_url)]}" : ''
       if opts.fetch(:run_codeclimate)
         command.prepend("./cc-test-reporter before-build")
-        command.append("if [ $? -eq 0 ]; then ./cc-test-reporter format-coverage -t simplecov -o \"cc-coverage#{"-alt-saxon" if opts.fetch(:alt_saxon_url)}.json\"; fi")
+        command.append("if [ $? -eq 0 ]; then ./cc-test-reporter format-coverage -t simplecov -o \"cc-coverage-jar-loading#{cc_suffix}.json\"; fi")
       end
+      command.append("rm -rf coverage")
+      command.append("bundle exec rspec spec --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress")
+      if opts.fetch(:run_codeclimate)
+        command.append("if [ $? -eq 0 ]; then ./cc-test-reporter format-coverage -t simplecov -o \"cc-coverage-main#{cc_suffix}.json\"; fi")
+      end
+
       {
         "run" => {
           "name" => "Run the tests" + (opts.fetch(:run_codeclimate) ? ", and upload coverage data to Code Climate" : ""),

data/lib/saxon-rb.rb

@@ -0,0 +1 @@
+require 'saxon'

data/lib/saxon-rb_jars.rb

@@ -2,9 +2,9 @@
 begin
   require 'jar_dependencies'
 rescue LoadError
-  require 'net/sf/saxon/Saxon-HE/9.9.1-6/Saxon-HE-9.9.1-6.jar'
+  require 'net/sf/saxon/Saxon-HE/9.9.1-7/Saxon-HE-9.9.1-7.jar'
 end
 
 if defined? Jars
-  require_jar 'net.sf.saxon', 'Saxon-HE', '9.9.1-6'
+  require_jar 'net.sf.saxon', 'Saxon-HE', '9.9.1-7'
 end

data/lib/saxon/feature_flags/version.rb

@@ -72,10 +72,7 @@ module Saxon
       #
       # @return [Saxon::Version::Library] the constraint version
       def constraint_version
-        @constraint_version ||= begin
-          components = version_string.split('.').map { |n| Integer(n, 10) }
-          Saxon::Version::Library.new(version_string, components, 'HE')
-        end
+        @constraint_version ||= Saxon::Version::Library.new(version_string, 'HE')
       end
 
       private

data/lib/saxon/jruby_bug_6197_workaround.rb

@@ -0,0 +1,5 @@
+unless Java::net::sf::saxon::s9api::Xslt30Transformer.instance_methods.include?(:setInitialMode)
+  class Java::net::sf::saxon::s9api::Xslt30Transformer
+    java_alias :setInitialMode, :setInitialMode, [Java::net::sf::saxon::s9api::QName]
+  end
+end

data/lib/saxon/loader.rb

@@ -38,60 +38,73 @@ module Saxon
       end
     end
 
-    # @param saxon_home [String, Pathname] the path to the dir containing
-    #   Saxon's .jars. Defaults to the vendored Saxon HE
-    # @return [true, false] Returns true if Saxon had not been loaded and
-    #   is now, and false if Saxon was already loaded
-    def self.load!(saxon_home = nil)
-      return false if instance_variable_defined?(:@saxon_loaded) && @saxon_loaded
-      LOAD_SEMAPHORE.synchronize do
-        if Saxon::S9API.const_defined?(:Processor)
+    class << self
+      # Are the Saxon jars missing from the Classpath?
+      # @return [Boolean] true if the Jars are not on the Classpath
+      def jars_not_on_classpath?
+        begin
+          Java::net.sf.saxon.s9api.Processor
           false
-        else
-          if jars_not_on_classpath?
-            if saxon_home.nil?
-              require 'saxon-rb_jars'
-            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)
+        rescue
+          true
+        end
+      end
+
+      # Are the Saxon JARs on the Classpath?
+      # @return [Boolean] whether the Jars are on the Classpath already
+      def jars_on_classpath?
+        !jars_not_on_classpath?
+      end
+
+      # @param saxon_home [String, Pathname] the path to the dir containing
+      #   Saxon's .jars. Defaults to the vendored Saxon HE
+      # @return [true, false] Returns true if Saxon had not been loaded and
+      #   is now, and false if Saxon was already loaded
+      def load!(saxon_home = nil)
+        return false if instance_variable_defined?(:@saxon_loaded) && @saxon_loaded
+        LOAD_SEMAPHORE.synchronize do
+          if Saxon::S9API.const_defined?(:Processor)
+            false
+          else
+            if jars_not_on_classpath?
+              if saxon_home.nil?
+                require 'saxon-rb_jars'
+              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)
 
-              add_jars_to_classpath!(saxon_home, jars)
+                add_jars_to_classpath!(saxon_home, jars)
+              end
             end
-          end
 
-          @saxon_loaded = true
-          true
+            require_relative 'jruby_bug_6197_workaround'
+            @saxon_loaded = true
+            true
+          end
         end
       end
-    end
 
-    private
-
-    def self.main_jar(path)
-      ['saxon9he.jar', 'saxon9pe.jar', 'saxon9ee.jar'].map { |jar| path.join(jar) }.find { |jar| jar.file? }
-    end
+      private
 
-    def self.extra_jars(path)
-      optional = ['saxon9-unpack.jar', 'saxon9-sql.jar'].map { |jar| path.join(jar) }.select { |jar| jar.file? }
-      icu = path.children.find { |jar| jar.extname == '.jar' && !jar.basename.to_s.match(/^saxon-icu|^icu4j/).nil? }
-      ([icu] + optional).compact
-    end
+      def main_jar(path)
+        path.children.find { |jar|
+          !jar.basename.to_s.match(/^saxon(?:9[hpe]e\.jar|-[hpe]e-10\.[0-9]+\.jar)$/).nil?
+        }
+      end
 
-    def self.jars_not_on_classpath?
-      begin
-        Java::net.sf.saxon.s9api.Processor
-        false
-      rescue
-        true
+      def extra_jars(path)
+        optional = ['saxon9-unpack.jar', 'saxon9-sql.jar'].map { |jar| path.join(jar) }.select { |jar| jar.file? }
+        icu = path.children.find { |jar| jar.extname == '.jar' && !jar.basename.to_s.match(/^saxon-icu|^icu4j/).nil? }
+        ([icu] + optional).compact
       end
-    end
 
-    def self.add_jars_to_classpath!(saxon_home, jars)
-      jars.each do |jar|
-        $CLASSPATH << jar.to_s
+      def add_jars_to_classpath!(saxon_home, jars)
+        jars.each do |jar|
+          $CLASSPATH << jar.to_s
+        end
       end
     end
   end

data/lib/saxon/s9api.rb

@@ -11,28 +11,28 @@ module Saxon
       # alternate location for them, if they don't want to use the bundled Saxon
       # HE
       def const_missing(name)
-        Saxon::Loader.load!
-        begin
-          const_set(name, imported_classes.const_get(name))
-        rescue NameError
-          msg = "uninitialized constant Saxon::S9API::#{name}"
-          e = NameError.new(msg, name)
-          raise e
-        end
+        CLASS_IMPORT_SEMAPHORE.synchronize {
+          return const_get(name) if const_defined?(name)
+          Saxon::Loader.load!
+          begin
+            const_set(name, imported_classes.const_get(name))
+          rescue NameError
+            msg = "uninitialized constant Saxon::S9API::#{name}"
+            e = NameError.new(msg, name)
+            raise e
+          end
+        }
       end
 
       private
 
       def imported_classes
-        return @imported_classes if instance_variable_defined?(:@imported_classes)
-        CLASS_IMPORT_SEMAPHORE.synchronize do
-          @imported_classes = Module.new {
-            include_package 'net.sf.saxon.s9api'
-            java_import Java::net.sf.saxon.Configuration
-            java_import Java::net.sf.saxon.lib.FeatureKeys
-            java_import Java::net.sf.saxon.lib.ParseOptions
-          }
-        end
+        @imported_classes ||= Module.new {
+          include_package 'net.sf.saxon.s9api'
+          java_import Java::net.sf.saxon.Configuration
+          java_import Java::net.sf.saxon.lib.FeatureKeys
+          java_import Java::net.sf.saxon.lib.ParseOptions
+        }
       end
     end
   end

data/lib/saxon/version.rb

@@ -1,9 +1,9 @@
-require 'saxon/s9api'
+require 'saxon/version/library'
 
 module Saxon
   # Provides the saxon-rb and underlying Saxon library versions
   module Version
     # The version of the saxon-rb gem (not of Saxon itself)
-    WRAPPER = "0.7.2"
+    WRAPPER = "0.8.3"
   end
 end

data/lib/saxon/version/library.rb

@@ -12,7 +12,7 @@ module Saxon
         Saxon::Loader.load!
 
         sv = Java::net.sf.saxon.Version
-        new(sv.getProductVersion, sv.getStructuredVersionNumber, sv.softwareEdition)
+        new(sv.getProductVersion, sv.softwareEdition)
       end
 
       include Comparable
@@ -27,9 +27,9 @@ module Saxon
       # @param version [String] the version string
       # @param components [Array<Integer>] the version components separated
       # @param edition [String, Symbol] the name of the Saxon edition (e.g. +:he+, +'HE'+)
-      def initialize(version, components, edition)
+      def initialize(version, edition)
         @version = version.dup.freeze
-        @components = components.dup.freeze
+        @components = version.split('.').map { |n| Integer(n, 10) }
         @edition = edition.downcase.to_sym
       end
 

data/lib/saxon/xdm/atomic_value.rb

@@ -36,12 +36,17 @@ module Saxon
         end
       end
 
-      # ItemType representing QNames
-      XS_QNAME = ItemType.get_type('xs:QName')
-      # ItemType representing NOTATION
-      XS_NOTATION = ItemType.get_type('xs:NOTATION')
-
       class << self
+        # ItemType representing QNames
+        def xs_qname
+          @xs_qname ||= ItemType.get_type('xs:QName')
+        end
+
+        # ItemType representing NOTATION
+        def xs_notation
+          @xs_notation ||= ItemType.get_type('xs:NOTATION')
+        end
+
         # Convert a single Ruby value into an XDM::AtomicValue
         #
         # If no explicit {ItemType} is passed, the correct type is guessed based
@@ -71,8 +76,8 @@ module Saxon
 
             item_type = ItemType.get_type(item_type)
 
-            return new(Saxon::S9API::XdmAtomicValue.new(value.to_java)) if item_type == XS_QNAME && value_is_qname?(value)
-            raise NotationCannotBeDirectlyCreated if item_type == XS_NOTATION
+            return new(Saxon::S9API::XdmAtomicValue.new(value.to_java)) if item_type == xs_qname && value_is_qname?(value)
+            raise NotationCannotBeDirectlyCreated if item_type == xs_notation
 
             value_lexical_string = item_type.lexical_string(value)
             new(new_s9_xdm_atomic_value(value_lexical_string, item_type))
@@ -91,7 +96,7 @@ module Saxon
         # @return [Saxon::XDM::AtomicValue]
         def from_lexical_string(value, item_type)
           item_type = ItemType.get_type(item_type)
-          raise CannotCreateQNameFromString if item_type == XS_QNAME
+          raise CannotCreateQNameFromString if item_type == xs_qname
           new(new_s9_xdm_atomic_value(value.to_s, item_type))
         end
 

data/saxon-rb.gemspec

@@ -24,7 +24,7 @@ It aims to provide an idiomatic Ruby wrapper around all of Saxon's features.}
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.requirements << 'jar net.sf.saxon, Saxon-HE, 9.9.1-6'
+  spec.requirements << 'jar net.sf.saxon, Saxon-HE, 9.9.1-7'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'jar-dependencies'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saxon-rb
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.3
 platform: java
 authors:
 - Matt Patterson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -17,8 +17,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
   name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -31,8 +31,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: jar-dependencies
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -45,8 +45,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '12.0'
   name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -59,8 +59,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
   name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -73,8 +73,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
   name: vcr
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -87,8 +87,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.4.0
   name: addressable
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -101,8 +101,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.3.2
   name: webmock
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -115,8 +115,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.12
   name: yard
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -129,8 +129,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.17.1
   name: simplecov
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -143,8 +143,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: rspec_junit_formatter
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -163,6 +163,7 @@ files:
 - ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
+- ".rspec-jar-loading"
 - ".ruby-version"
 - ".yardopts"
 - CODE_OF_CONDUCT.md
@@ -173,7 +174,7 @@ files:
 - bin/console
 - bin/setup
 - docs/templates/plugin.rb
-- lib/net/sf/saxon/Saxon-HE/9.9.1-6/Saxon-HE-9.9.1-6.jar
+- lib/net/sf/saxon/Saxon-HE/9.9.1-7/Saxon-HE-9.9.1-7.jar
 - lib/saxon-rb.rb
 - lib/saxon-rb_jars.rb
 - lib/saxon.rb
@@ -188,6 +189,7 @@ files:
 - lib/saxon/item_type/lexical_string_conversion.rb
 - lib/saxon/item_type/value_to_ruby.rb
 - lib/saxon/jaxp.rb
+- lib/saxon/jruby_bug_6197_workaround.rb
 - lib/saxon/loader.rb
 - lib/saxon/nokogiri.rb
 - lib/saxon/occurrence_indicator.rb
@@ -244,8 +246,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- jar net.sf.saxon, Saxon-HE, 9.9.1-6
-rubygems_version: 3.1.3
+- jar net.sf.saxon, Saxon-HE, 9.9.1-7
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: Saxon 9.9 for JRuby, with an idiomatic Ruby API