inferno_core 0.6.11 → 0.6.13

data/lib/inferno/repositories/repository.rb

@@ -64,6 +64,22 @@ module Inferno
         end
       end
 
+      def update_non_db_entities_ids(hash, use_database_id: false)
+        key_map = {
+          test_id: Tests.new,
+          test_group_id: TestGroups.new,
+          test_suite_id: TestSuites.new
+        }
+
+        key_map.each do |key, repo|
+          next unless hash.key?(key)
+
+          entity = repo.find(hash[key])
+          hash[key] = use_database_id ? (entity&.database_id || hash[key]) : (entity&.id || hash[key])
+          break
+        end
+      end
+
       # Create a new record in the database.
       #
       # @param params [Hash]
@@ -76,7 +92,9 @@ module Inferno
       #     # handle error
       #   end
       def create(params)
+        update_non_db_entities_ids(params, use_database_id: true)
         result = self.class::Model.create(db_params(params))
+
         build_entity(result.to_hash.merge(handle_non_db_params(params)))
       end
 
@@ -100,6 +118,7 @@ module Inferno
       # @return [Object] an instance of `#entity_class`
       def build_entity(params)
         add_non_db_entities(params)
+        update_non_db_entities_ids(params)
         entity_class.new(params)
       end
 

data/lib/inferno/repositories/requirements.rb

@@ -10,6 +10,8 @@ module Inferno
         result = []
 
         CSV.foreach(path, headers: true, header_converters: :symbol) do |row|
+          next if row[:conformance].casecmp? 'deprecated'
+
           req_set = row[:req_set]
           id = row[:id]
           sub_requirements_field = row[:subrequirements]
@@ -25,12 +27,14 @@ module Inferno
             url: row[:url],
             requirement: row[:requirement],
             conformance: row[:conformance],
-            actor: row[:actor],
+            actors: row[:actors].split(',').map(&:strip),
             sub_requirements: sub_requirements,
             conditionality: row[:conditionality]&.downcase,
             not_tested_reason: row[:not_tested_reason],
             not_tested_details: row[:not_tested_details]
           }
+        rescue StandardError => e
+          Application[:logger].error("Unable to load requirement: #{combined_id}:\n#{e.full_message.lines.first}")
         end
 
         result.each do |raw_req|
@@ -40,6 +44,10 @@ module Inferno
         end
       end
 
+      def requirements_for_actor(requirement_set, actor)
+        all.select { |requirement| requirement.requirement_set == requirement_set && requirement.actor?(actor) }
+      end
+
       def filter_requirements_by_ids(ids)
         all.select { |requirement| ids.include?(requirement.id) }
       end
@@ -57,7 +65,9 @@ module Inferno
           test_suite
             .requirement_sets
             .select do |set|
-              set.suite_options.all? { |set_option| selected_suite_options.include? set_option }
+              set.suite_options.all? do |set_option|
+                selected_suite_options.blank? || selected_suite_options.include?(set_option)
+              end
             end
 
         requirements =
@@ -72,8 +82,7 @@ module Inferno
           .flat_map do |requirement_set|
             all.select do |requirement|
               requirement.requirement_set == requirement_set.identifier &&
-                requirement.actor == requirement_set.actor &&
-                requirement.tested?
+                requirement.actor?(requirement_set.actor)
             end
           end
       end
@@ -84,7 +93,7 @@ module Inferno
             requirement_set
               .expand_requirement_ids
               .map { |requirement_id| find(requirement_id) }
-              .select { |requirement| requirement.actor == requirement_set.actor }
+              .select { |requirement| requirement.actor?(requirement_set.actor) }
           end
       end
 
@@ -102,7 +111,7 @@ module Inferno
             .flat_map(&:sub_requirements)
             .select do |requirement_id|
               referenced_requirement_sets.any? do |set|
-                requirement_id.start_with?("#{set.identifier}@") && (find(requirement_id).actor == set.actor)
+                requirement_id.start_with?("#{set.identifier}@") && find(requirement_id)&.actor?(set.actor)
               end
             end
 

data/lib/inferno/repositories/results.rb

@@ -38,6 +38,7 @@ module Inferno
       #     test_id: 'test_id'
       #   )
       def current_result_for_test_session(test_session_id, params)
+        update_non_db_entities_ids(params, use_database_id: true)
         self.class::Model
           .where({ test_session_id: }.merge(params))
           .order(Sequel.desc(:updated_at))
@@ -63,10 +64,12 @@ module Inferno
           else
             {}
           end
+        update_non_db_entities_ids(params)
         entity_class.new(params.merge(runnable))
       end
 
       def result_for_test_run(params)
+        update_non_db_entities_ids(params, use_database_id: true)
         result_hash =
           self.class::Model
             .find(params)
@@ -202,9 +205,9 @@ module Inferno
         end
 
         def self.current_results_for_test_session_and_runnables(test_session_id, runnables)
-          test_ids = runnables.select { |runnable| runnable < Entities::Test }.map!(&:id)
-          test_group_ids = runnables.select { |runnable| runnable < Entities::TestGroup }.map!(&:id)
-          test_suite_ids = runnables.select { |runnable| runnable < Entities::TestSuite }.map!(&:id)
+          test_ids = runnables.select { |runnable| runnable < Entities::Test }.map!(&:database_id)
+          test_group_ids = runnables.select { |runnable| runnable < Entities::TestGroup }.map!(&:database_id)
+          test_suite_ids = runnables.select { |runnable| runnable < Entities::TestSuite }.map!(&:database_id)
 
           fetch(
             current_results_sql(with_runnables_filter: true),

data/lib/inferno/repositories/runnable_repository.rb

@@ -0,0 +1,29 @@
+require_relative 'in_memory_repository'
+
+module Inferno
+  module Repositories
+    class RunnableRepository < InMemoryRepository
+      def insert(entity)
+        raise Exceptions::DuplicateEntityIdException, entity.id if exists?(entity.id)
+
+        # Safety check to prevent rare database_id collisions from overwriting entries
+        if exists?(entity.database_id) && entity.database_id.to_s != entity.id.to_s
+          raise Exceptions::DuplicateEntityIdException,
+                "database_id: `#{entity.database_id}` generated from original id: `#{entity.id}`"
+        end
+
+        all << entity
+        all_by_id[entity.id.to_s] = entity
+        all_by_id[entity.database_id.to_s] = entity unless entity.database_id.to_s == entity.id.to_s
+
+        entity
+      end
+
+      def remove(entity)
+        super
+
+        all_by_id.delete(entity.database_id.to_s) unless entity.database_id.to_s == entity.id.to_s
+      end
+    end
+  end
+end

data/lib/inferno/repositories/test_groups.rb

@@ -1,9 +1,9 @@
-require_relative 'in_memory_repository'
+require_relative 'runnable_repository'
 
 module Inferno
   module Repositories
     # Repository that deals with persistence for the `TestGroup` entity.
-    class TestGroups < InMemoryRepository
+    class TestGroups < RunnableRepository
     end
   end
 end

data/lib/inferno/repositories/test_sessions.rb

@@ -60,6 +60,7 @@ module Inferno
 
         final_params = params.merge(suite_options:)
         add_non_db_entities(final_params)
+        update_non_db_entities_ids(final_params)
         entity_class.new(final_params)
       end
 

data/lib/inferno/repositories/test_suites.rb

@@ -1,9 +1,9 @@
-require_relative 'in_memory_repository'
+require_relative 'runnable_repository'
 
 module Inferno
   module Repositories
     # Repository that deals with persistence for the `TestSuite` entity.
-    class TestSuites < InMemoryRepository
+    class TestSuites < RunnableRepository
     end
   end
 end

data/lib/inferno/repositories/tests.rb

@@ -1,9 +1,9 @@
-require_relative 'in_memory_repository'
+require_relative 'runnable_repository'
 
 module Inferno
   module Repositories
     # Repository that deals with persistence for the `Test` entity.
-    class Tests < InMemoryRepository
+    class Tests < RunnableRepository
     end
   end
 end

data/lib/inferno/repositories.rb

@@ -4,6 +4,7 @@ require_relative 'repositories/test_groups'
 require_relative 'repositories/test_suites'
 require_relative 'repositories/tests'
 require_relative 'repositories/test_kits'
+require_relative 'repositories/requirements'
 
 # Skip loading things which require the db when not necessary, such as CLI
 # commands which don't need the db

data/lib/inferno/version.rb

@@ -1,4 +1,4 @@
 module Inferno
   # Standard patterns for gem versions: https://guides.rubygems.org/patterns/
-  VERSION = '0.6.11'.freeze
+  VERSION = '0.6.13'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inferno_core
 version: !ruby/object:Gem::Version
-  version: 0.6.11
+  version: 0.6.13
 platform: ruby
 authors:
 - Stephen MacVicar
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-30 00:00:00.000000000 Z
+date: 2025-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -431,6 +431,7 @@ files:
 - lib/inferno/apps/cli/migration.rb
 - lib/inferno/apps/cli/new.rb
 - lib/inferno/apps/cli/requirements.rb
+- lib/inferno/apps/cli/requirements_coverage_checker.rb
 - lib/inferno/apps/cli/requirements_exporter.rb
 - lib/inferno/apps/cli/services.rb
 - lib/inferno/apps/cli/suite.rb
@@ -494,6 +495,7 @@ files:
 - lib/inferno/apps/web/controllers/test_sessions/create.rb
 - lib/inferno/apps/web/controllers/test_sessions/last_test_run.rb
 - lib/inferno/apps/web/controllers/test_sessions/results/index.rb
+- lib/inferno/apps/web/controllers/test_sessions/results/io_value.rb
 - lib/inferno/apps/web/controllers/test_sessions/session_data/apply_preset.rb
 - lib/inferno/apps/web/controllers/test_sessions/session_data/index.rb
 - lib/inferno/apps/web/controllers/test_sessions/show.rb
@@ -642,6 +644,7 @@ files:
 - lib/inferno/repositories/requests.rb
 - lib/inferno/repositories/requirements.rb
 - lib/inferno/repositories/results.rb
+- lib/inferno/repositories/runnable_repository.rb
 - lib/inferno/repositories/session_data.rb
 - lib/inferno/repositories/tags.rb
 - lib/inferno/repositories/test_groups.rb