au_core_test_kit 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c32e06a580aec281c4cd8b9a3c81876c100aec48c3339da38039738c95076c33
-  data.tar.gz: 9974c68cbd0a99509beec400b1f7c7fddb26df6d149cb718980b477780ff81d2
+  metadata.gz: 5f15fd88cfb916854facac06878f74b895ce349054166335ce53ad549e83957c
+  data.tar.gz: 7d3443b5ed200b329adfca57ea6b450041abe86617d71dbe48858624d2f9eff8
 SHA512:
-  metadata.gz: ea07dad9fb4e636d9523fc880e2605595705abbab51314bc794b41f3e8242e68b76c86abfdf42d8677cd533967e37cfb92c9932811c05366efcbe84af11367f9
-  data.tar.gz: 306aa54265e5a7f53cac8dd4e43d6d5f5a4878e299bd5a30bdb701533663713fd28ce2e7dc2d7edd61d73008f5b2811cb062a734749871a189144a907f51df8e
+  metadata.gz: 4a3f62dba98f75f60ffdf00b2301d803abf236a9e479857b7167fcb5152839c26661328f16c8e3a5d4d0b7dbb6dbec605177c73ddbf3a06ef0a452100c96cbe2
+  data.tar.gz: 7af925d33efc5a94d19afe5619216b54953646730ba6dccd187ea40b9948300ecd88f84bf342884153407dc17cce1a0a3d3856158d33c2e669db8cb9a2331321

data/lib/au_core_test_kit/validation_test.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
 require_relative 'assert_helpers'
+require_relative 'validator_helpers'
 
 module AUCoreTestKit
   module ValidationTest
     include AssertHelpers
+    include ValidatorHelpers
 
     DAR_CODE_SYSTEM_URL = 'http://terminology.hl7.org/CodeSystem/data-absent-reason'
     DAR_EXTENSION_URL = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason'
@@ -19,6 +21,8 @@ module AUCoreTestKit
       omit_if resources.blank?,
               "No #{resource_type} resources provided so the #{profile_url} profile does not apply"
 
+      show_validator_version
+
       profile_with_version = "#{profile_url}|#{profile_version}"
       resources.each do |resource|
         resource_is_valid?(resource:, profile_url: profile_with_version)

data/lib/au_core_test_kit/validator_helpers.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+# Helpers for validating FHIR resources
+module ValidatorHelpers
+  VALIDATOR_KEY = 'validator_version'
+  WRAPPER_KEY = 'validator_wrapper_version'
+  RESPONSE_VALIDATOR_KEY = 'validatorVersion'
+  RESPONSE_WRAPPER_KEY = 'validatorWrapperVersion'
+  RESPONSE_KEYS = [RESPONSE_VALIDATOR_KEY, RESPONSE_WRAPPER_KEY].freeze
+  DEFAULT_VALUE = 'Unknown'
+
+  def show_validator_version
+    versions = read_or_create_validator_version
+    if versions.nil?
+      info 'Unable to fetch validator version'
+      return
+    end
+
+    validator_version = versions[VALIDATOR_KEY] || DEFAULT_VALUE
+    wrapper_version = versions[WRAPPER_KEY] || DEFAULT_VALUE
+
+    info "Using validator version #{validator_version} and validator wrapper version #{wrapper_version}"
+  end
+
+  private
+
+  def read_or_create_validator_version
+    return cached_versions if version_cached?
+
+    fetch_and_cache_versions
+  end
+
+  def validator_url
+    ENV['FHIR_RESOURCE_VALIDATOR_URL']
+  end
+
+  def response_valid?(version_data)
+    RESPONSE_KEYS.all? { |key| version_data.keys.include?(key) }
+  end
+
+  def fetch_and_cache_versions
+    response_body = fetch_validator_version(validator_url)
+    return warning("Unable to fetch validator version from #{validator_url}") if response_body.nil?
+
+    version_data = parse_response(response_body)
+
+    return warning "Invalid response from validator at #{validator_url}: #{version_data}" unless response_valid?(version_data)
+
+    cache_versions(version_data[RESPONSE_VALIDATOR_KEY], version_data[RESPONSE_WRAPPER_KEY])
+    build_version_hash(version_data[RESPONSE_VALIDATOR_KEY], version_data[RESPONSE_WRAPPER_KEY])
+  end
+
+  def cache_versions(validator_version, validator_wrapper_version)
+    scratch[VALIDATOR_KEY.to_sym] = validator_version
+    scratch[WRAPPER_KEY.to_sym] = validator_wrapper_version
+  end
+
+  def version_cached?
+    scratch[VALIDATOR_KEY.to_sym] && scratch[WRAPPER_KEY.to_sym]
+  end
+
+  def cached_versions
+    build_version_hash(scratch[VALIDATOR_KEY.to_sym], scratch[WRAPPER_KEY.to_sym])
+  end
+
+  def fetch_validator_version(url)
+    version_url = "#{url}/validator/version"
+    begin
+      response = Faraday.get(version_url)
+      response.body
+    rescue Faraday::Error => e
+      warning "Error connecting to validator at #{url}: #{e.message}"
+      nil
+    end
+  end
+
+  def parse_response(response_body)
+    JSON.parse(response_body)
+  rescue JSON::ParserError => e
+    warning "Error parsing response from validator: #{e.message}"
+    nil
+  end
+
+  def build_version_hash(validator_version, validator_wrapper_version)
+    {
+      'validator_version' => validator_version,
+      'validator_wrapper_version' => validator_wrapper_version
+    }
+  end
+end

data/lib/au_core_test_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AUCoreTestKit
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: au_core_test_kit
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Ilya Beda
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-01 00:00:00.000000000 Z
+date: 2025-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core
@@ -2482,6 +2482,7 @@ files:
 - lib/au_core_test_kit/search_test_properties.rb
 - lib/au_core_test_kit/special_identifier_search_test.rb
 - lib/au_core_test_kit/validation_test.rb
+- lib/au_core_test_kit/validator_helpers.rb
 - lib/au_core_test_kit/version.rb
 homepage: https://github.com/hl7au/au-fhir-core-inferno
 licenses: