inferno_core 0.6.15 → 0.6.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be97c34b62bf28dc41266ecc22d01ccb2b8548a75150507ea72fff5aa76f6b17
-  data.tar.gz: 2f4121330b353d2f425e1be20f3895a1f256b8f20a825cc5c26adc9aa85f0898
+  metadata.gz: bdded0041b27a81a8cedae003b073e738a719eda6671cb39b1556bd165a986c9
+  data.tar.gz: f9cb54ff76488ce34f8f9c9464bbc3588f67f3931d6eef284a78d1af32a0b78e
 SHA512:
-  metadata.gz: eded37149214782930c42e8e672e768eaf0e07411fba2ad9e8f96fad282ff0ff31aee18cab668592ea355a6ddafdfd1c4128d1c04de639e24aa3968a79026ac7
-  data.tar.gz: 4322a86fc7f289cfc3cc92e70d0926c7dd79a3ce6941f8479c6096ffdcd3718a7f59e17479031d50e2a0a24cbc0e6bd632e8c31ec9cf00fdad317351176524f4
+  metadata.gz: e53518c76be16a5cc631a503c84388b706d2030a30469048379f3b4d91d1525d5e1ee373cb454c191b97eb857c9682d821270c9c2a35cfe408b5fd7fa405a236
+  data.tar.gz: a078da89879d42f3cda28ebc8dca66feca2a85e9f735868bbcd4dbf70774ef268e613fd4aad4fe076002af1d3d7035bd02de8c2679d2ce17b8ee05a794f629ab

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

@@ -112,7 +112,7 @@ module Inferno
         Inferno::DSL::FHIRResourceValidation::Validator.new(:default, 'evaluator_cli') do
           igs(ig_path)
 
-          cli_context do
+          validation_context do
             # For our purposes, code display mismatches should be warnings and not affect profile conformance
             displayWarnings(true)
           end

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

@@ -15,8 +15,6 @@ module Inferno
 
         require_relative '../../../inferno'
 
-        Inferno::Application.start(:requirements)
-
         RequirementsExporter.new.run
       end
 

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

@@ -128,36 +128,36 @@ module Inferno
         @old_requirements_csv ||= File.read(requirements_output_file_path)
       end
 
-      def missing_sub_requirements
-        @missing_sub_requirements =
+      def missing_subrequirements
+        @missing_subrequirements =
           {}.tap do |missing_requirements|
             repo = Inferno::Repositories::Requirements.new
 
             input_requirement_sets
               .each do |requirement_set, requirements|
                 requirements.each do |requirement_hash|
-                  missing_sub_requirements =
+                  missing_subrequirements =
                     Inferno::Entities::Requirement.expand_requirement_ids(requirement_hash['Sub-Requirement(s)'])
                       .reject { |requirement_id| repo.exists? requirement_id }
 
-                  missing_sub_requirements += missing_actor_sub_requirements(requirement_hash['Sub-Requirement(s)'])
+                  missing_subrequirements += missing_actor_subrequirements(requirement_hash['Sub-Requirement(s)'])
 
-                  next if missing_sub_requirements.blank?
+                  next if missing_subrequirements.blank?
 
                   id = "#{requirement_set}@#{requirement_hash['ID*']}"
 
-                  missing_requirements[id] = missing_sub_requirements
+                  missing_requirements[id] = missing_subrequirements
                 end
               end
           end
       end
 
-      def missing_actor_sub_requirements(sub_requirement_string)
-        return [] if sub_requirement_string.blank?
+      def missing_actor_subrequirements(subrequirement_string)
+        return [] if subrequirement_string.blank?
 
-        return [] unless sub_requirement_string.include? '#'
+        return [] unless subrequirement_string.include? '#'
 
-        sub_requirement_string
+        subrequirement_string
           .split(',')
           .map(&:strip)
           .select { |requirement_string| requirement_string.include? '#' }
@@ -166,11 +166,11 @@ module Inferno
           end
       end
 
-      def check_sub_requirements
-        return if missing_sub_requirements.blank?
+      def check_subrequirements
+        return if missing_subrequirements.blank?
 
-        missing_sub_requirements.each do |id, sub_requirement_ids|
-          puts "#{id} is missing the following sub-requirements:\n  #{sub_requirement_ids.join(', ')}"
+        missing_subrequirements.each do |id, subrequirement_ids|
+          puts "#{id} is missing the following sub-requirements:\n  #{subrequirement_ids.join(', ')}"
         end
       end
 
@@ -196,7 +196,9 @@ module Inferno
           File.write(requirements_output_file_path, new_requirements_csv, encoding: Encoding::UTF_8)
         end
 
-        check_sub_requirements
+        Inferno::Application.start(:requirements)
+
+        check_subrequirements
 
         puts 'Done.'
       end
@@ -228,9 +230,9 @@ module Inferno
           exit(1)
         end
 
-        check_sub_requirements
+        check_subrequirements
 
-        return if missing_sub_requirements.blank?
+        return if missing_subrequirements.blank?
 
         exit(1)
       end

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

@@ -9,7 +9,7 @@ module Inferno
         field :requirement
         field :conformance
         field :actors
-        field :sub_requirements
+        field :subrequirements
         field :conditionality
         field :url, if: :field_present?
         field :not_tested_reason, if: :field_present?

data/lib/inferno/dsl/fhir_resource_navigation.rb

@@ -147,7 +147,7 @@ module Inferno
       end
 
       def matching_pattern_identifier_slice?(slice, discriminator)
-        slice.identifier.system == discriminator[:system]
+        slice.system == discriminator[:system]
       end
 
       def matching_value_slice?(slice, discriminator)

data/lib/inferno/dsl/fhir_resource_validation.rb

@@ -1,4 +1,5 @@
 require_relative '../ext/fhir_models'
+require_relative '../feature'
 module Inferno
   module DSL
     # This module contains the methods needed to configure a validator to
@@ -19,7 +20,7 @@ module Inferno
     #         { type: 'info', message: 'everything is ok' }
     #       end
     #     end
-    #     cli_context do
+    #     validation_context do
     #       noExtensibleBindingMessages true
     #       allowExampleUrls true
     #       txServer nil
@@ -74,12 +75,12 @@ module Inferno
         #   igs("hl7.fhir.us.core#3.1.1", "hl7.fhir.us.core#6.0.0")
         # @param validator_igs [Array<String>]
         def igs(*validator_igs)
-          cli_context(igs: validator_igs) if validator_igs.any?
+          validation_context(igs: validator_igs) if validator_igs.any?
 
-          cli_context.igs
+          validation_context.igs
         end
 
-        # Set the cliContext used as part of each validation request.
+        # Set the validationContext used as part of each validation request.
         # Fields may be passed as either a Hash or block.
         # Note that all fields included here will be sent directly in requests,
         # there is no check that the fields are correct.
@@ -88,7 +89,7 @@ module Inferno
         #   # Passing fields in a block
         #   fhir_resource_validator do
         #     url 'http://example.com/validator'
-        #     cli_context do
+        #     validation_context do
         #       noExtensibleBindingMessages true
         #       allowExampleUrls true
         #       txServer nil
@@ -99,7 +100,7 @@ module Inferno
         #   # Passing fields in a Hash
         #   fhir_resource_validator do
         #     url 'http://example.org/validator'
-        #     cli_context({
+        #     validation_context({
         #       noExtensibleBindingMessages: true,
         #       allowExampleUrls: true,
         #       txServer: nil
@@ -107,19 +108,21 @@ module Inferno
         #   end
         #
         # @param definition [Hash] raw fields to set, optional
-        def cli_context(definition = nil, &)
-          if @cli_context
+        def validation_context(definition = nil, &)
+          if @validation_context
             if definition
-              @cli_context.definition.merge!(definition.deep_symbolize_keys)
+              @validation_context.definition.merge!(definition.deep_symbolize_keys)
             elsif block_given?
-              @cli_context.instance_eval(&)
+              @validation_context.instance_eval(&)
             end
           else
-            @cli_context = CliContext.new(definition || {}, &)
+            @validation_context = ValidationContext.new(definition || {}, &)
           end
-          @cli_context
+          @validation_context
         end
 
+        alias cli_context validation_context
+
         # @private
         def additional_validations
           @additional_validations ||= []
@@ -268,9 +271,13 @@ module Inferno
 
           @session_id = validator_session_id if validator_session_id
 
+          # HL7 Validator Core 6.5.19+ renamed `cliContext` to `validationContext`.
+          # This allows backward compatibility until the validator-wrapper is updated.
+          context_key = Feature.use_validation_context_key? ? :validationContext : :cliContext
+
           wrapped_resource = {
-            cliContext: {
-              **cli_context.definition,
+            context_key => {
+              **validation_context.definition,
               profiles: [profile_url]
             },
             filesToValidate: [
@@ -365,10 +372,10 @@ module Inferno
       end
 
       # @private
-      class CliContext
+      class ValidationContext
         attr_reader :definition
 
-        CLICONTEXT_DEFAULTS = {
+        VALIDATIONCONTEXT_DEFAULTS = {
           sv: '4.0.1',
           doNative: false,
           extensions: ['any'],
@@ -377,13 +384,13 @@ module Inferno
 
         # @private
         def initialize(definition, &)
-          @definition = CLICONTEXT_DEFAULTS.merge(definition.deep_symbolize_keys)
+          @definition = VALIDATIONCONTEXT_DEFAULTS.merge(definition.deep_symbolize_keys)
           instance_eval(&) if block_given?
         end
 
         # @private
         def method_missing(method_name, *args)
-          # Interpret any other method as setting a field on cliContext.
+          # Interpret any other method as setting a field on validationContext.
           # Follow the same format as `Validator.url` here:
           # only set the value if one is provided.
           # args will be an empty array if no value is provided.

data/lib/inferno/entities/requirement.rb

@@ -12,7 +12,8 @@ module Inferno
         :requirement,
         :conformance,
         :actors,
-        :sub_requirements,
+        :subrequirements,
+        :subrequirements_string,
         :conditionality,
         :not_tested_reason,
         :not_tested_details
@@ -28,6 +29,10 @@ module Inferno
         self.requirement_set = id.split(/[@#]/).first
       end
 
+      def subrequirements
+        @subrequirements ||= self.class.expand_requirement_ids(subrequirements_string, requirement_set)
+      end
+
       # Expand a comma-delimited list of requirement id references into an Array
       # of full requirement ids
       #
@@ -62,7 +67,7 @@ module Inferno
             requirement_ids =
               if actor.present?
                 return Repositories::Requirements.new.requirements_for_actor(current_set, actor).map(&:id)
-              elsif requirement_string.include? '-'
+              elsif requirement_string.include?('-') && !requirement_string.match?(/[^\d\-]/)
                 start_id, end_id = requirement_string.split('-')
                 if start_id.match?(/^\d+$/) && end_id.match?(/^\d+$/)
                   (start_id..end_id).to_a

data/lib/inferno/feature.rb

@@ -4,6 +4,10 @@ module Inferno
       def requirements_enabled?
         ENV.fetch('ENABLE_REQUIREMENTS', 'false')&.casecmp?('true')
       end
+
+      def use_validation_context_key?
+        ENV.fetch('USE_VALIDATION_CONTEXT', 'false')&.casecmp?('true')
+      end
     end
   end
 end

data/lib/inferno/repositories/requirements.rb

@@ -14,13 +14,9 @@ module Inferno
 
           req_set = row[:req_set]
           id = row[:id]
-          sub_requirements_field = row[:subrequirements]
 
           combined_id = "#{req_set}@#{id}"
 
-          # Processing sub requirements: e.g. "170.315(g)(31)_hti-2-proposal@5,17,23,26,27,32,35,38-41"
-          sub_requirements = Inferno::Entities::Requirement.expand_requirement_ids(sub_requirements_field)
-
           result << {
             requirement_set: req_set,
             id: combined_id,
@@ -28,7 +24,7 @@ module Inferno
             requirement: row[:requirement],
             conformance: row[:conformance],
             actors: row[:actors]&.split(',')&.map(&:strip) || [],
-            sub_requirements: sub_requirements,
+            subrequirements_string: row[:subrequirements],
             conditionality: row[:conditionality]&.downcase,
             not_tested_reason: row[:not_tested_reason],
             not_tested_details: row[:not_tested_details]
@@ -108,7 +104,7 @@ module Inferno
 
         referenced_requirement_ids =
           requirements_to_process
-            .flat_map(&:sub_requirements)
+            .flat_map(&:subrequirements)
             .select do |requirement_id|
               referenced_requirement_sets.any? do |set|
                 requirement_id.start_with?("#{set.identifier}@") && find(requirement_id)&.actor?(set.actor)

data/lib/inferno/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inferno_core
 version: !ruby/object:Gem::Version
-  version: 0.6.15
+  version: 0.6.16
 platform: ruby
 authors:
 - Stephen MacVicar
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-25 00:00:00.000000000 Z
+date: 2025-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -68,6 +68,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.4
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.3.5
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -236,6 +250,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement