ftr_ruby 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e667a36034df0b5e34edc576681737cb36d010ad54ae6f71a9254823438ddf0e
-  data.tar.gz: 48b56876e75bc26dd80c430f9a0e242538895aa239e5290ebbdd77253010bb64
+  metadata.gz: 59f547350dda6c8637f28caa54f6c2bfd2efac24a0392dae1f03da050d1e594c
+  data.tar.gz: 8c54b00e3f70e04a566508acbb5fed6bfa31271d34b87ddc7c058ada716016ca
 SHA512:
-  metadata.gz: c26ebde15b974102fbf169f7d4a60118cdde56ceaa041306f5edf8c81f8c260b0deb389b1e36d9e7a5fbd4c11ca7e2f729dfdbd24bf59560a82f8c62d5f8de1a
-  data.tar.gz: 6c5746418ab0aba173c1cd8f975ecaf71b4df961cc365570873d795b75d6ee414080ab2c78a253f3c4c58e07a713bc2800b4d0ce806659628749b2c7ef124568
+  metadata.gz: dd93ae6f08eff36fdfb17cdc07443338b5bf626bff5c70365c3c8469db49c14d94c1b8521a5d711d80989f70f4e6562d172d4b63c5dfd3ea4a0fa8a2d0da20d5
+  data.tar.gz: 7a48cd2953db78715f20133a2a88305529aecb83b343995af3989eee6a82059bb3065e487b33ef6db6f29e9114c8b7630a86406bbdebd4f1b55a5b9005953edf

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 ## [Unreleased]
 
+## [0.1.12] - 2026-05-27
+
+### Fixed
+- `Output#createEvaluationResponse`: `score = "fail"` inside the `rescue` block and `summary = ...` inside the `if` block both introduced local variables that shadowed the `attr_accessor` methods for the entire method scope; replaced all references with `@score` and `@summary` to read and write the instance variables directly — this was causing `prov:value` to always be serialized as `nil` regardless of what callers set on `output.score`
+
+## [0.1.11] - 2026-05-26
+
+### Changed
+- `TestInfra#get_tests_metrics` now fetches all test metrics in parallel using Ruby threads, significantly reducing latency when querying 40+ tests
+- Refactored `TestInfra` internals into focused private helpers (`fetch_metric`, `fetch_metric_url`, `load_metric_graph`, `query_metric_graph`)
+- `test_infrastructure.rb` now explicitly requires `jsonpath` rather than relying on transitive loading
+
+### Added
+- RSpec tests for `TestInfra#get_tests_metrics` and `#fetch_metric_url` covering happy path, missing metadata, RDF load failures, and empty input
+
 ## [0.1.0] - 2026-03-28
 
 - Initial release

data/lib/ftr_ruby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FtrRuby
-  VERSION = "0.1.10"
+  VERSION = "0.1.12"
 end

data/lib/output.rb

@@ -80,9 +80,9 @@ module FtrRuby
 
       add_newline_to_comments
 
-      if summary =~ /^Summary$/
-        summary = "Summary of test results: #{comments[-1]}"
-        summary ||= "Summary of test results: #{comments[-2]}"
+      if @summary =~ /^Summary$/
+        @summary = "Summary of test results: #{comments[-1]}"
+        @summary ||= "Summary of test results: #{comments[-2]}"
       end
 
       executionid = "urn:ostrails:testexecutionactivity:" + SecureRandom.uuid
@@ -99,7 +99,7 @@ module FtrRuby
       triplify(uniqueid, dct.title, "#{name} OUTPUT", g)
       triplify(uniqueid, dct.description, "OUTPUT OF #{description}", g)
       triplify(uniqueid, dct.license, license, g)
-      triplify(uniqueid, prov.value, score, g)
+      triplify(uniqueid, prov.value, @score, g)
       triplify(uniqueid, ftr.summary, summary, g)
       triplify(uniqueid, RDF::Vocab::PROV.generatedAtTime, dt, g)
       triplify(uniqueid, ftr.log, comments.join, g)
@@ -134,10 +134,10 @@ module FtrRuby
       rescue StandardError
         triplify(uniqueid, ftr.assessmentTarget, "not a URI", g)
         triplify(executionid, prov.used, "not a URI", g)
-        score = "fail"
+        @score = "fail"
       end
 
-      unless score == "pass"
+      unless @score == "pass"
         guidance.each do |advice, label|
           adviceid = "urn:ostrails:testexecutionactivity:advice:" + SecureRandom.uuid
           triplify(uniqueid, ftr.suggestion, adviceid, g)

data/lib/test_infrastructure.rb

@@ -1,3 +1,5 @@
+require "jsonpath"
+
 module FtrRuby
   class TestInfra
     attr_accessor :test_protocol, :test_host, :basepath
@@ -8,46 +10,57 @@ module FtrRuby
       @basepath = basepath
     end
 
-    # there is a need to map between a test and its registered Metric in FS.  This will return the label for the test
-    # in principle, we cojuld return a more complex object, but all I need now is the label
+    # there is a need to map between a test and its registered Metric in FS.
+    # This will return the label for the test
+    # in principle, we cojuld return a more complex object,
+    # but all I need now is the label
     def get_tests_metrics(tests:)
+      threads = tests.map { |testid| Thread.new(testid) { |tid| fetch_metric(tid) } }
+
       labels = {}
       landingpages = {}
-      tests.each do |testid|
-        warn "getting dcat for #{testid}    #{test_protocol}://#{test_host}/#{basepath}/#{testid}"
-        dcat = RestClient::Request.execute({
-                                             method: :get,
-                                             url: "#{test_protocol}://#{test_host}/#{basepath}/#{testid}",
-                                             headers: { "Accept" => "application/json" }
-                                           }).body
-        parseddcat = JSON.parse(dcat)
-        # this next line should probably be done with SPARQL
-        # # TODO TODO TODO
-        jpath = JsonPath.new('[0]["http://semanticscience.org/resource/SIO_000233"][0]["@id"]') # is implementation of
-        metricurl = jpath.on(parseddcat).first
-
-        begin
-          g = RDF::Graph.load(metricurl, format: :turtle)
-        rescue StandardError => e
-          warn "DCAT Metric loading failed #{e.inspect}"
-          g = RDF::Graph.new
-        end
-
-        title = g.query([nil, RDF::Vocab::DC.title, nil])&.first&.object&.to_s
-        lp = g.query([nil, RDF::Vocab::DCAT.landingPage, nil])&.first&.object&.to_s
-
-        labels[testid] = if title != ""
-                           title
-                         else
-                           "Metric label not available"
-                         end
-        landingpages[testid] = if lp != ""
-                                 lp
-                               else
-                                 ""
-                               end
+      threads.each do |t|
+        tid, label, lpage = t.value
+        labels[tid] = label
+        landingpages[tid] = lpage
       end
       [labels, landingpages]
     end
+
+    private
+
+    def fetch_metric(testid)
+      metricurl = fetch_metric_url(testid)
+      g = load_metric_graph(metricurl)
+      title, lp = query_metric_graph(g)
+      label = title.to_s != "" ? title : "Metric label not available"
+      [testid, label, lp.to_s]
+    end
+
+    def fetch_metric_url(testid)
+      warn "getting dcat for #{testid}    #{test_protocol}://#{test_host}/#{basepath}/#{testid}"
+      dcat = RestClient::Request.execute({
+                                           method: :get,
+                                           url: "#{test_protocol}://#{test_host}/#{basepath}/#{testid}",
+                                           headers: { "Accept" => "application/json" }
+                                         }).body
+      parseddcat = JSON.parse(dcat)
+      # TODO: this should probably be done with SPARQL
+      jpath = JsonPath.new('[0]["http://semanticscience.org/resource/SIO_000233"][0]["@id"]') # is implementation of
+      jpath.on(parseddcat).first
+    end
+
+    def load_metric_graph(metricurl)
+      RDF::Graph.load(metricurl, format: :turtle)
+    rescue StandardError => e
+      warn "DCAT Metric loading failed #{e.inspect}"
+      RDF::Graph.new
+    end
+
+    def query_metric_graph(graph)
+      title = graph.query([nil, RDF::Vocab::DC.title, nil])&.first&.object&.to_s
+      lp = graph.query([nil, RDF::Vocab::DCAT.landingPage, nil])&.first&.object&.to_s
+      [title, lp]
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ftr_ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.12
 platform: ruby
 authors:
 - markwilkinson