saxon-rb 0.7.1-java → 0.8.2-java

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.1"
+    WRAPPER = "0.8.2"
   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.1
+  version: 0.8.2
 platform: java
 authors:
 - Matt Patterson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-24 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