saxon-rb 0.7.1-java → 0.7.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d368b655e7f8915a8adc9981dd8f2c3490be76f82307bd0e9620af0c864a244
-  data.tar.gz: f95484360c8d7e364de5b72b0c5e1a3cd66f1e9a187c59bc1c7f30ce179724e5
+  metadata.gz: b28465f21f4fe169b356cbd1bce2d66ae1ae2a083d2ebe022963e1c3d229ef12
+  data.tar.gz: 82da6fa6d8570e791d17b3e46ec644200c7518019c9cec3c7804ad106ef2306e
 SHA512:
-  metadata.gz: b37d08c73e14a7abd3efc3a7a5dbc1c1f18e2eda0ffb00d5e602d3331a7789c56a330e468d682e74ee9186a871eb9151d33c850fdfaa9322b60b45793217e135
-  data.tar.gz: 32e296fa39be9f5ba45cf630bd88969bcca0ed8c1f244b81bfb48d22e8133e4dccfb2b1f2c85beed5e3af8a7d52512492859f9ad17b2ddced988680a085c2b7c
+  metadata.gz: 83cc23c8755cb8843cb8f44afd948582339e26b492ff7eb505badbb9f727f8a98d622b1adf501f06f77ab4554ba40b5e40ead8554a7bd06caf20ab570a7765fb
+  data.tar.gz: '09db9b468b5ce5d21bc48c6602ec6a93e1a0ad61b55a550556cff4804912848a0947904d6fa0ff19e9a8cb92cb847e61615dc435c15147e43b197a8fa5d3d6e0'

data/lib/saxon/item_type.rb

@@ -6,8 +6,49 @@ require_relative 'item_type/value_to_ruby'
 module Saxon
   # Represent XDM types abstractly
   class ItemType
-    # Error raised when a Ruby class has no equivalent XDM type to be converted
-    # into
+    # lazy-loading Hash so we can avoid eager-loading saxon Jars, which prevents
+    # using external Saxon Jars unless the user is more careful than they should
+    # have to be.
+    class LazyReadOnlyHash
+      include Enumerable
+
+      attr_reader :loaded_hash, :load_mutex, :init_block
+      private :loaded_hash, :load_mutex, :init_block
+
+      def initialize(&init_block)
+        @init_block = init_block
+        @load_mutex = Mutex.new
+        @loaded_hash = nil
+      end
+
+      def [](key)
+        ensure_loaded!
+        loaded_hash[key]
+      end
+
+      def fetch(*args, &block)
+        ensure_loaded!
+        loaded_hash.fetch(*args, &block)
+      end
+
+      def each(&block)
+        ensure_loaded!
+        loaded_hash.each(&block)
+      end
+
+      private
+
+      def ensure_loaded!
+        return true unless loaded_hash.nil?
+        load_mutex.synchronize do
+          return true unless loaded_hash.nil?
+          @loaded_hash = init_block.call
+        end
+      end
+    end
+
+    # Error raised when a Ruby class has no equivalent XDM type to
+    # be converted into
     class UnmappedRubyTypeError < StandardError
       def initialize(class_name)
         @class_name = class_name
@@ -54,85 +95,89 @@ module Saxon
     }.freeze
 
     # A mapping of QNames to XDM type constants
-    QNAME_MAPPING = Hash[{
-      'anyAtomicType' => :ANY_ATOMIC_VALUE,
-      'anyURI' => :ANY_URI,
-      'base64Binary' => :BASE64_BINARY,
-      'boolean' => :BOOLEAN,
-      'byte' => :BYTE,
-      'date' => :DATE,
-      'dateTime' => :DATE_TIME,
-      'dateTimeStamp' => :DATE_TIME_STAMP,
-      'dayTimeDuration' => :DAY_TIME_DURATION,
-      'decimal' => :DECIMAL,
-      'double' => :DOUBLE,
-      'duration' => :DURATION,
-      'ENTITY' => :ENTITY,
-      'float' => :FLOAT,
-      'gDay' => :G_DAY,
-      'gMonth' => :G_MONTH,
-      'gMonthDay' => :G_MONTH_DAY,
-      'gYear' => :G_YEAR,
-      'gYearMonth' => :G_YEAR_MONTH,
-      'hexBinary' => :HEX_BINARY,
-      'ID' => :ID,
-      'IDREF' => :IDREF,
-      'int' => :INT,
-      'integer' => :INTEGER,
-      'language' => :LANGUAGE,
-      'long' => :LONG,
-      'Name' => :NAME,
-      'NCName' => :NCNAME,
-      'negativeInteger' => :NEGATIVE_INTEGER,
-      'NMTOKEN' => :NMTOKEN,
-      'nonNegativeInteger' => :NON_NEGATIVE_INTEGER,
-      'nonPositiveInteger' => :NON_POSITIVE_INTEGER,
-      'normalizedString' => :NORMALIZED_STRING,
-      'NOTATION' => :NOTATION,
-      'numeric' => :NUMERIC,
-      'positiveInteger' => :POSITIVE_INTEGER,
-      'QName' => :QNAME,
-      'short' => :SHORT,
-      'string' => :STRING,
-      'time' => :TIME,
-      'token' => :TOKEN,
-      'unsignedByte' => :UNSIGNED_BYTE,
-      'unsignedInt' => :UNSIGNED_INT,
-      'unsignedLong' => :UNSIGNED_LONG,
-      'unsignedShort' => :UNSIGNED_SHORT,
-      'untypedAtomic' => :UNTYPED_ATOMIC,
-      'yearMonthDuration' => :YEAR_MONTH_DURATION
-    }.map { |local_name, constant|
-      qname = Saxon::QName.create({
-        prefix: 'xs', uri: 'http://www.w3.org/2001/XMLSchema',
-        local_name: local_name
-      })
-      [qname, constant]
-    }].freeze
+    QNAME_MAPPING = LazyReadOnlyHash.new do
+      {
+        'anyAtomicType' => :ANY_ATOMIC_VALUE,
+        'anyURI' => :ANY_URI,
+        'base64Binary' => :BASE64_BINARY,
+        'boolean' => :BOOLEAN,
+        'byte' => :BYTE,
+        'date' => :DATE,
+        'dateTime' => :DATE_TIME,
+        'dateTimeStamp' => :DATE_TIME_STAMP,
+        'dayTimeDuration' => :DAY_TIME_DURATION,
+        'decimal' => :DECIMAL,
+        'double' => :DOUBLE,
+        'duration' => :DURATION,
+        'ENTITY' => :ENTITY,
+        'float' => :FLOAT,
+        'gDay' => :G_DAY,
+        'gMonth' => :G_MONTH,
+        'gMonthDay' => :G_MONTH_DAY,
+        'gYear' => :G_YEAR,
+        'gYearMonth' => :G_YEAR_MONTH,
+        'hexBinary' => :HEX_BINARY,
+        'ID' => :ID,
+        'IDREF' => :IDREF,
+        'int' => :INT,
+        'integer' => :INTEGER,
+        'language' => :LANGUAGE,
+        'long' => :LONG,
+        'Name' => :NAME,
+        'NCName' => :NCNAME,
+        'negativeInteger' => :NEGATIVE_INTEGER,
+        'NMTOKEN' => :NMTOKEN,
+        'nonNegativeInteger' => :NON_NEGATIVE_INTEGER,
+        'nonPositiveInteger' => :NON_POSITIVE_INTEGER,
+        'normalizedString' => :NORMALIZED_STRING,
+        'NOTATION' => :NOTATION,
+        'numeric' => :NUMERIC,
+        'positiveInteger' => :POSITIVE_INTEGER,
+        'QName' => :QNAME,
+        'short' => :SHORT,
+        'string' => :STRING,
+        'time' => :TIME,
+        'token' => :TOKEN,
+        'unsignedByte' => :UNSIGNED_BYTE,
+        'unsignedInt' => :UNSIGNED_INT,
+        'unsignedLong' => :UNSIGNED_LONG,
+        'unsignedShort' => :UNSIGNED_SHORT,
+        'untypedAtomic' => :UNTYPED_ATOMIC,
+        'yearMonthDuration' => :YEAR_MONTH_DURATION
+      }.map { |local_name, constant|
+        qname = Saxon::QName.create({
+          prefix: 'xs', uri: 'http://www.w3.org/2001/XMLSchema',
+          local_name: local_name
+        })
+        [qname, constant]
+      }.to_h.freeze
+    end
 
     # A mapping of type names/QNames to XDM type constants
-    STR_MAPPING = {
-      'array(*)' => :ANY_ARRAY,
-      'item()' => :ANY_ITEM,
-      'map(*)' => :ANY_MAP,
-      'node()' => :ANY_NODE
-    }.merge(
-      Hash[QNAME_MAPPING.map { |qname, v| [qname.to_s, v] }]
-    ).freeze
+    STR_MAPPING = LazyReadOnlyHash.new do
+      {
+        'array(*)' => :ANY_ARRAY,
+        'item()' => :ANY_ITEM,
+        'map(*)' => :ANY_MAP,
+        'node()' => :ANY_NODE
+      }.merge(
+        Hash[QNAME_MAPPING.map { |qname, v| [qname.to_s, v] }]
+      ).freeze
+    end
 
     # convertors to generate lexical strings for a given {ItemType}, as a hash keyed on the ItemType
-    ATOMIC_VALUE_LEXICAL_STRING_CONVERTORS = Hash[
+    ATOMIC_VALUE_LEXICAL_STRING_CONVERTORS = LazyReadOnlyHash.new do
       LexicalStringConversion::Convertors.constants.map { |const|
         [S9API::ItemType.const_get(const), LexicalStringConversion::Convertors.const_get(const)]
-      }
-    ].freeze
+      }.to_h.freeze
+    end
 
     # convertors from {XDM::AtomicValue} to a ruby primitve value, as a hash keyed on the ItemType
-    ATOMIC_VALUE_TO_RUBY_CONVERTORS = Hash[
+    ATOMIC_VALUE_TO_RUBY_CONVERTORS = LazyReadOnlyHash.new do
       ValueToRuby::Convertors.constants.map { |const|
         [S9API::ItemType.const_get(const), ValueToRuby::Convertors.const_get(const)]
-      }
-    ].freeze
+      }.to_h.freeze
+    end
 
     class << self
       # Get an appropriate {ItemType} for a Ruby type or given a type name as a

data/lib/saxon/version.rb

@@ -4,6 +4,6 @@ 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.7.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saxon-rb
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: java
 authors:
 - Matt Patterson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-24 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement