inferno_core 0.6.12 → 0.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7e5f22313a778dd7b70ba70eae9513bda158a7c0cd6beba9a2d195b3a37f077
-  data.tar.gz: 8e7d6155fad17e00ccc48257853f4df2cc816d0965cc0b18a50515bbd26d343f
+  metadata.gz: 3b6ca0be7f115ec7578f07efdb81f51301ffc58011257839439325a0f232f3dd
+  data.tar.gz: 79c99071c6d89aafea8234c9fea372efbbaf4835f39da46bad226a8b12a317b3
 SHA512:
-  metadata.gz: 56b26537ac370a6b475ab33895ad91e3d5cf5ff588cd3fa5be979c6e250e5aa703a76c093ea46c787ecd2c4f061f1f55e39c43ba245219618c18b9a44e522f3e
-  data.tar.gz: a1549f23c6e8c501286bc490c6821be19da1a730b950a497bdd7a2c7d61c392090e0ac1603f251e4d033abedbc4457e1dfcbf7ecac5bcfcd875392e7125ca4ef
+  metadata.gz: bb251b81e0232761cdddd83603a00d7d16844c61a8c80315b4a239a2f3ff1a6305700bd9c7f352d8c179773ecc45e5d5f824d08f3c00438f4cf460069cb0ae16
+  data.tar.gz: f01952a5cd0cd31c5e6f35901409581cd047d7b6bd099865efa9bebfe40450d115c299266b1c700a7fd7cceb7b20b15a0e8635e6ff482e27193af81030d7b400

data/lib/inferno/apps/cli/requirements.rb

@@ -43,7 +43,7 @@ module Inferno
           RequirementsCoverageChecker.new(test_suite_id).run
         else
           Inferno::Repositories::TestSuites.all.each do |test_suite|
-            if Object.const_source_location(test_suite.to_s).first.start_with? Dir.pwd
+            if Object.const_source_location(test_suite.to_s).first.start_with? File.join(Dir.pwd, 'lib')
               RequirementsCoverageChecker.new(test_suite.id).run
             end
           end
@@ -66,7 +66,7 @@ module Inferno
           RequirementsCoverageChecker.new(test_suite_id).run_check
         else
           Inferno::Repositories::TestSuites.all.each do |test_suite|
-            if Object.const_source_location(test_suite.to_s).first.start_with? Dir.pwd
+            if Object.const_source_location(test_suite.to_s).first.start_with?(Dir.pwd, 'lib')
               RequirementsCoverageChecker.new(test_suite.id).run_check
             end
           end

data/lib/inferno/apps/cli/requirements_coverage_checker.rb

@@ -90,7 +90,7 @@ module Inferno
                 requirement.url,
                 requirement.requirement,
                 requirement.conformance,
-                requirement.actor,
+                requirement.actors.join(','),
                 requirement.conditionality,
                 requirement.not_tested_reason,
                 requirement.not_tested_details,

data/lib/inferno/apps/cli/requirements_exporter.rb

@@ -10,7 +10,7 @@ module Inferno
           'URL*',
           'Requirement*',
           'Conformance*',
-          'Actor*',
+          'Actors*',
           'Sub-Requirement(s)',
           'Conditionality',
           'Verifiable?',
@@ -25,7 +25,7 @@ module Inferno
           'URL',
           'Requirement',
           'Conformance',
-          'Actor',
+          'Actors',
           'Sub-Requirement(s)',
           'Conditionality',
           'Not Tested Reason',

data/lib/inferno/apps/web/serializers/requirement.rb

@@ -8,10 +8,12 @@ module Inferno
 
         field :requirement
         field :conformance
-        field :actor
+        field :actors
         field :sub_requirements
         field :conditionality
         field :url, if: :field_present?
+        field :not_tested_reason, if: :field_present?
+        field :not_tested_details, if: :field_present?
       end
     end
   end

data/lib/inferno/config/boot/requirements.rb

@@ -12,19 +12,24 @@ Inferno::Application.register_provider(:requirements) do
         .specs
         .select { |spec| spec.metadata.fetch('inferno_test_kit', 'false').casecmp? 'true' }
 
-    files_to_load = Dir.glob(['lib/*test_kit/requirements/*.csv'])
+    files_to_load = Dir.glob(['lib/*/requirements/*.csv'])
 
     if ENV['LOAD_DEV_SUITES'].present?
       ENV['LOAD_DEV_SUITES'].split(',').map(&:strip).reject(&:empty?).each do |suite|
-        files_to_load.concat Dir.glob(File.join(Inferno::Application.root, 'dev_suites', suite, 'requirements',
-                                                '*.csv'))
+        files_to_load.concat(
+          Dir.glob(
+            File.join(
+              Inferno::Application.root, 'dev_suites', suite, 'requirements', '*.csv'
+            )
+          )
+        )
       end
     end
 
     files_to_load +=
       test_kit_gems.flat_map do |gem|
         [
-          Dir.glob([File.join(gem.full_gem_path, 'lib', '*test_kit', 'requirements', '*.csv')])
+          Dir.glob([File.join(gem.full_gem_path, 'lib', '*', 'requirements', '*.csv')])
         ].flatten
       end
 

data/lib/inferno/dsl/must_support_assessment.rb

@@ -234,6 +234,10 @@ module Inferno
 
         def resource_populates_element?(resource, element_definition)
           path = element_definition[:path]
+
+          # handle MustSupport element under extension: Ex: extension:supporting-info.value[x]
+          resource, path = process_must_support_element_in_extension(resource, path) if path.start_with?('extension:')
+
           ms_extension_urls = must_support_extensions.select { |ex| ex[:path] == "#{path}.extension" }
             .map { |ex| ex[:url] }
 
@@ -245,6 +249,25 @@ module Inferno
           value_found.present? || value_found == false
         end
 
+        def process_must_support_element_in_extension(resource, path)
+          return [resource, path] unless path.start_with?('extension:')
+
+          path_without_prefix = path.delete_prefix('extension:')
+          extension_split = path_without_prefix.split('.')
+          extension_name = extension_split.first
+          extension_path = extension_split.last
+
+          found_extension_url = must_support_extensions.find { |ex| ex[:id].include?(extension_name) }[:url]
+          ms_element_extension = resource.extension.find { |ex| ex.url == found_extension_url }
+
+          if ms_element_extension.present?
+            resource = ms_element_extension
+            path = extension_path
+          end
+
+          [resource, path]
+        end
+
         def matching_without_extensions?(value, ms_extension_urls, fixed_value)
           if value.instance_of?(Inferno::DSL::PrimitiveType)
             urls = value.extension&.map(&:url)

data/lib/inferno/entities/requirement.rb

@@ -11,7 +11,7 @@ module Inferno
         :url,
         :requirement,
         :conformance,
-        :actor,
+        :actors,
         :sub_requirements,
         :conditionality,
         :not_tested_reason,
@@ -23,7 +23,9 @@ module Inferno
       def initialize(params)
         super(params, ATTRIBUTES)
 
-        self.requirement_set = id.split('@').first if requirement_set.blank? && id&.include?('@')
+        return unless requirement_set.blank? && (id&.include?('@') || id&.include?('#'))
+
+        self.requirement_set = id.split(/[@#]/).first
       end
 
       # Expand a comma-delimited list of requirement id references into an Array
@@ -35,12 +37,14 @@ module Inferno
       #   used if none is included in the `requirement_id_string`
       #
       # @example
-      # expand_requirement_ids('example-ig@1,3,5-7')
-      # # => ['example-ig@1','example-ig@3','example-ig@5','example-ig@6','example-ig@7']
-      # expand_requirement_ids('example-ig')
-      # # => []
-      # expand_requirement_ids('1,3,5-7', 'example-ig')
-      # # => ['example-ig@1','example-ig@3','example-ig@5','example-ig@6','example-ig@7']
+      #   expand_requirement_ids('example-ig@1,3,5-7')
+      #   # => ['example-ig@1','example-ig@3','example-ig@5','example-ig@6','example-ig@7']
+      #   expand_requirement_ids('example-ig')
+      #   # => []
+      #   expand_requirement_ids('1,3,5-7', 'example-ig')
+      #   # => ['example-ig@1','example-ig@3','example-ig@5','example-ig@6','example-ig@7']
+      #   expand_requirement_ids('example-ig#actor1')
+      #   # => [all requirements for actor1 from example-ig]
       def self.expand_requirement_ids(requirement_id_string, default_set = nil) # rubocop:disable Metrics/CyclomaticComplexity
         return [] if requirement_id_string.blank?
 
@@ -49,10 +53,16 @@ module Inferno
           .split(',')
           .map(&:strip)
           .flat_map do |requirement_string|
-            current_set, requirement_string = requirement_string.split('@') if requirement_string.include?('@')
+            if requirement_string.include? '@'
+              current_set, requirement_string = requirement_string.split('@')
+            elsif requirement_string.include? '#'
+              current_set, actor = requirement_string.split('#')
+            end
 
             requirement_ids =
-              if requirement_string.include? '-'
+              if actor.present?
+                return Repositories::Requirements.new.requirements_for_actor(current_set, actor).map(&:id)
+              elsif requirement_string.include? '-'
                 start_id, end_id = requirement_string.split('-')
                 if start_id.match?(/^\d+$/) && end_id.match?(/^\d+$/)
                   (start_id..end_id).to_a
@@ -67,6 +77,10 @@ module Inferno
           end
       end
 
+      def actor?(actor_to_check)
+        actors.any? { |actor| actor.casecmp? actor_to_check }
+      end
+
       def tested?
         not_tested_reason.blank?
       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
@@ -74,7 +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.actor?(requirement_set.actor)
             end
           end
       end
@@ -85,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
 
@@ -103,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/version.rb

@@ -1,4 +1,4 @@
 module Inferno
   # Standard patterns for gem versions: https://guides.rubygems.org/patterns/
-  VERSION = '0.6.12'.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.12
+  version: 0.6.13
 platform: ruby
 authors:
 - Stephen MacVicar
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-17 00:00:00.000000000 Z
+date: 2025-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport