inferno_core 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d68733c094e3253b759c9ed8ff9e4aab60441bc1745bee4274fa849728125fb
-  data.tar.gz: 8c8fc1c1e4a8a654748cc5e46538140e38c68c545eb0f000dd9c1d994da8b45e
+  metadata.gz: 48f096486362742aa31ed9f7edec9df07786be3ac7e4f5dfdf121c65b61da1e5
+  data.tar.gz: d6edfd6063f0ba5b83708b86ee5ccc9e0302a32e9a1f96473bbabeabc2d18184
 SHA512:
-  metadata.gz: 53f0f4d62d278aa23be7b4986766db4e68b14859a8c11186506954ea4deeb49e25e2bdd03aabaf7d1baca471f8ad910c970bd907690f5bdcf9c794ede9d60ad8
-  data.tar.gz: bc367a1e28d573097ffaa347ab0e232f794cd9ffb3069479f70d0a31e4f44280fc44111244e615aab50b747d59e68155149140cc00eac8a79cb144d04c3c5207
+  metadata.gz: e065c783d7def8ca873e964f61b9ab4cfcf01a352c99e63157d11eb5ca909f617ee031d5421e26b244caa4f36831ae6574160ac59e2d99647aa2d6d99a152fa0
+  data.tar.gz: 68c8b17c1c635fc4e2986d1e56b06225aa858cf0c049447957c33982f16d0587a0f0407f24c4164ca8b9c08fdbbe6adae693f7a6b1abf0fd9ca258efc50c7db1

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

@@ -1,6 +1,7 @@
-require_relative '../../../inferno/dsl/fhir_evaluation/evaluator'
-require_relative '../../../inferno/dsl/fhir_evaluation/config'
-require_relative '../../../inferno/entities'
+require_relative '../../dsl/fhir_evaluation/evaluator'
+require_relative '../../dsl/fhir_evaluation/config'
+require_relative '../../entities'
+require_relative '../../repositories'
 require_relative '../../utils/ig_downloader'
 
 require 'tempfile'
@@ -21,7 +22,9 @@ module Inferno
             ig.examples
           end
 
-        evaluator = Inferno::DSL::FHIREvaluation::Evaluator.new(ig)
+        validator = setup_validator(ig_path)
+
+        evaluator = Inferno::DSL::FHIREvaluation::Evaluator.new(ig, validator)
 
         config = Inferno::DSL::FHIREvaluation::Config.new
         results = evaluator.evaluate(data, config)
@@ -44,6 +47,24 @@ module Inferno
         puts '**WARNING** The selected IG targets a FHIR version higher than 4.0.1, which is not supported by Inferno.'
       end
 
+      def setup_validator(ig_path)
+        igs_directory = File.join(Dir.pwd, 'data', 'igs')
+        if File.exist?(ig_path) && !File.realpath(ig_path).start_with?(igs_directory)
+          puts "Copying #{File.basename(ig_path)} to data/igs so it is accessible to validator"
+          destination_file_path = File.join(igs_directory, File.basename(ig_path))
+          FileUtils.copy_file(ig_path, destination_file_path, true)
+          ig_path = "igs/#{File.basename(ig_path)}"
+        end
+        Inferno::DSL::FHIRResourceValidation::Validator.new(:default, 'evaluator_cli') do
+          igs(ig_path)
+
+          cli_context do
+            # For our purposes, code display mismatches should be warnings and not affect profile conformance
+            displayWarnings(true)
+          end
+        end
+      end
+
       def output_results(results, output)
         if output&.end_with?('json')
           oo = FhirEvaluator::EvaluationResult.to_operation_outcome(results)

data/lib/inferno/dsl/auth_info.rb

@@ -132,7 +132,7 @@ module Inferno
       # @!attribute [rw] name
 
       # @private
-      def initialize(raw_attributes_hash)
+      def initialize(raw_attributes_hash) # rubocop:disable Metrics/CyclomaticComplexity
         attributes_hash = raw_attributes_hash.symbolize_keys
 
         invalid_keys = attributes_hash.keys - ATTRIBUTES
@@ -143,6 +143,8 @@ module Inferno
           value = DateTime.parse(value) if name == :issue_time && value.is_a?(String)
 
           instance_variable_set(:"@#{name}", value)
+        rescue Date::Error
+          Inferno::Application['logger'].error("Received invalid date: #{value.inspect}")
         end
 
         self.issue_time = DateTime.now if access_token.present? && issue_time.blank?

data/lib/inferno/dsl/fhir_evaluation/profile_conformance_helper.rb

@@ -55,10 +55,16 @@ module Inferno
           declared_profiles.include?(profile_url) || declared_profiles.include?(versioned_url)
         end
 
-        # @private until implemented
-        def validates_profile?(_resource, _profile, _validator)
-          raise 'Profile validation is not yet implemented. ' \
-                'Set considerValidationResults=false.'
+        # Check if the given resource validates against the given profile.
+        # "Validates" means the provided Validator instance returns no fatal or error messages.
+        # @param resource [FHIR::Resource]
+        # @param profile [FHIR::StructureDefinition]
+        # @param validator [Inferno::DSL::FHIRResourceValidation::Validator]
+        def validates_profile?(resource, profile, validator)
+          return false if validator.nil?
+
+          runnable = Inferno::Entities::Test.new
+          validator.resource_is_valid?(resource, profile.url, runnable, add_messages_to_runnable: false)
         end
       end
     end