saxon-rb 0.7.2-java → 0.7.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b28465f21f4fe169b356cbd1bce2d66ae1ae2a083d2ebe022963e1c3d229ef12
-  data.tar.gz: 82da6fa6d8570e791d17b3e46ec644200c7518019c9cec3c7804ad106ef2306e
+  metadata.gz: c17f2a7367744b11c9ffdcf65e191dee9859cc3887902ce98291e52cea245080
+  data.tar.gz: 919c7e5a00c629ecc5d6193ce9f4836b0fb55ae1a4e80673347856d8ad4c5ce1
 SHA512:
-  metadata.gz: 83cc23c8755cb8843cb8f44afd948582339e26b492ff7eb505badbb9f727f8a98d622b1adf501f06f77ab4554ba40b5e40ead8554a7bd06caf20ab570a7765fb
-  data.tar.gz: '09db9b468b5ce5d21bc48c6602ec6a93e1a0ad61b55a550556cff4804912848a0947904d6fa0ff19e9a8cb92cb847e61615dc435c15147e43b197a8fa5d3d6e0'
+  metadata.gz: 5781e2bd70022ed23b2b649de4dcffef94abf400f9d0ab71ee28a8b711f74c7fd4efec02d5a88221ffcd14a99663f9be27413c12de312aa419c217ac26eaf250
+  data.tar.gz: 6d13e4918a6140693ec1e3dbcbb07bcefbcac9afa49cfd76edec287254b795bdf49ee91cdee2b08def37258c7e466675dbca6f56c04628c9b4bb1cd77b9e91da

data/.circleci/config.yml

@@ -33,8 +33,11 @@ jobs:
         command: |-
           ./cc-test-reporter before-build
           mkdir -p /tmp/test-results
+          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
+          if [ $? -eq 0 ]; then ./cc-test-reporter format-coverage -t simplecov -o "cc-coverage-jar-loading-alt-saxon.json"; fi
+          rm -rf coverage
           bundle exec rspec spec --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
-          if [ $? -eq 0 ]; then ./cc-test-reporter format-coverage -t simplecov -o "cc-coverage-alt-saxon.json"; fi
+          if [ $? -eq 0 ]; then ./cc-test-reporter format-coverage -t simplecov -o "cc-coverage-main-alt-saxon.json"; fi
     - persist_to_workspace:
         root: "~/project"
         paths:
@@ -67,8 +70,11 @@ jobs:
         command: |-
           ./cc-test-reporter before-build
           mkdir -p /tmp/test-results
+          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
+          if [ $? -eq 0 ]; then ./cc-test-reporter format-coverage -t simplecov -o "cc-coverage-jar-loading.json"; fi
+          rm -rf coverage
           bundle exec rspec spec --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
-          if [ $? -eq 0 ]; then ./cc-test-reporter format-coverage -t simplecov -o "cc-coverage.json"; fi
+          if [ $? -eq 0 ]; then ./cc-test-reporter format-coverage -t simplecov -o "cc-coverage-main.json"; fi
     - persist_to_workspace:
         root: "~/project"
         paths:
@@ -104,6 +110,8 @@ jobs:
         name: Run the tests
         command: |-
           mkdir -p /tmp/test-results
+          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
+          rm -rf coverage
           bundle exec rspec spec --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
     - store_test_results:
         path: "/tmp/test-results"
@@ -127,6 +135,8 @@ jobs:
         name: Run the tests
         command: |-
           mkdir -p /tmp/test-results
+          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
+          rm -rf coverage
           bundle exec rspec spec --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
     - store_test_results:
         path: "/tmp/test-results"
@@ -159,6 +169,8 @@ jobs:
         name: Run the tests
         command: |-
           mkdir -p /tmp/test-results
+          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
+          rm -rf coverage
           bundle exec rspec spec --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
     - store_test_results:
         path: "/tmp/test-results"
@@ -182,6 +194,8 @@ jobs:
         name: Run the tests
         command: |-
           mkdir -p /tmp/test-results
+          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
+          rm -rf coverage
           bundle exec rspec spec --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
     - store_test_results:
         path: "/tmp/test-results"
@@ -214,6 +228,8 @@ jobs:
         name: Run the tests
         command: |-
           mkdir -p /tmp/test-results
+          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
+          rm -rf coverage
           bundle exec rspec spec --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
     - store_test_results:
         path: "/tmp/test-results"
@@ -237,6 +253,8 @@ jobs:
         name: Run the tests
         command: |-
           mkdir -p /tmp/test-results
+          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
+          rm -rf coverage
           bundle exec rspec spec --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
     - store_test_results:
         path: "/tmp/test-results"
@@ -269,6 +287,8 @@ jobs:
         name: Run the tests
         command: |-
           mkdir -p /tmp/test-results
+          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
+          rm -rf coverage
           bundle exec rspec spec --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
     - store_test_results:
         path: "/tmp/test-results"
@@ -292,6 +312,8 @@ jobs:
         name: Run the tests
         command: |-
           mkdir -p /tmp/test-results
+          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
+          rm -rf coverage
           bundle exec rspec spec --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
     - store_test_results:
         path: "/tmp/test-results"
@@ -324,6 +346,8 @@ jobs:
         name: Run the tests
         command: |-
           mkdir -p /tmp/test-results
+          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
+          rm -rf coverage
           bundle exec rspec spec --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
     - store_test_results:
         path: "/tmp/test-results"
@@ -347,6 +371,8 @@ jobs:
         name: Run the tests
         command: |-
           mkdir -p /tmp/test-results
+          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
+          rm -rf coverage
           bundle exec rspec spec --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
     - store_test_results:
         path: "/tmp/test-results"
@@ -379,6 +405,8 @@ jobs:
         name: Run the tests
         command: |-
           mkdir -p /tmp/test-results
+          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
+          rm -rf coverage
           bundle exec rspec spec --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
     - store_test_results:
         path: "/tmp/test-results"
@@ -402,6 +430,8 @@ jobs:
         name: Run the tests
         command: |-
           mkdir -p /tmp/test-results
+          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
+          rm -rf coverage
           bundle exec rspec spec --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
     - store_test_results:
         path: "/tmp/test-results"

data/.rspec-jar-loading

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

data/Rakefile

@@ -190,12 +190,18 @@ 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"
       ]
       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#{"-alt-saxon" if opts.fetch(:alt_saxon_url)}.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#{"-alt-saxon" if opts.fetch(:alt_saxon_url)}.json\"; fi")
+      end
+
       {
         "run" => {
           "name" => "Run the tests" + (opts.fetch(:run_codeclimate) ? ", and upload coverage data to Code Climate" : ""),

data/lib/saxon/loader.rb

@@ -38,60 +38,70 @@ 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
+            @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)
+        ['saxon9he.jar', 'saxon9pe.jar', 'saxon9ee.jar'].map { |jar| path.join(jar) }.find { |jar| jar.file? }
+      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/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.2"
+    WRAPPER = "0.7.3"
   end
 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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saxon-rb
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: java
 authors:
 - Matt Patterson
@@ -163,6 +163,7 @@ files:
 - ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
+- ".rspec-jar-loading"
 - ".ruby-version"
 - ".yardopts"
 - CODE_OF_CONDUCT.md