us_core_test_kit 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a121ebdf4c6d4f64205243404d6a60ffa914c360c82b12a5d87db7dfdc5cdcea
-  data.tar.gz: 653526a65dbbba58f5e2b2e1022c82f61e7df87dc988af09f9d7da0c041f9f9f
+  metadata.gz: 15c0bd80e82b8148c3d1e1aee402b51e8b6e8250e202f7c3e0e0918ad74b84f1
+  data.tar.gz: 5fd2682554e541fd6660be5fb820d14a5f412bab4bf0f13b07e36dcf46db67da
 SHA512:
-  metadata.gz: deb705f62b68c74d8dbe4875bbb5eeeb03320d62b725229a797882558469d8cb8e09c75bd2ce71fa9c9426c2d2e8cab363ee77af621fc3ad83bb36b141f052f6
-  data.tar.gz: dac0ba9320a455434c6d976b926828ed16997d6f7434f121683a9d6ef8671315af861a6d6887cf2b4f240043718481a9d2a1c8e9bafac7ec4b62577e501f9da3
+  metadata.gz: 2f4f271d76a5859d69ff4637ef27506a336cffc6a98a200b977daee40837a438684fa18088dff657f6139a01f006db12300ee126fa5c6575440ac30cd903127f
+  data.tar.gz: 2dcf5f55861560c01b29ac09fcfa525c69fda894785bb0f388a982a656fc9dac78795b7ffb100227c073c409a16964da462058caea4e4393484a52feda353ae7

data/lib/us_core_test_kit/custom_groups/v4.0.0/document_reference_custodian_test.rb

@@ -29,7 +29,7 @@ module USCoreTestKit
 
           if provenances.present?
             has_agent = provenances.any? do |provenance|
-              provenance.target.any? { |target| target.reference.end_with?("DocumentReference/#{docref.id}") } &&
+              provenance.target.any? { |target| target.reference.present? && target.reference.end_with?("DocumentReference/#{docref.id}") } &&
               provenance.agent.any? { |agent| agent.who.present? || agent.onBehalfOf.present? }
             end
           end

data/lib/us_core_test_kit/generator/must_support_metadata_extractor.rb

@@ -84,21 +84,25 @@ module USCoreTestKit
           type_path = '' if type_path == '$this'
           type_element =
             if type_path.present?
-              elements.find { |element| element.id == "#{current_element.id}.#{type_path}" }
+              profile_elements.find { |element| element.id == "#{current_element.id}.#{type_path}" }
             else
               current_element
             end
 
           type_code = type_element.type.first.code
 
+          discriminator = {
+            type: 'type',
+            code: type_code.upcase_first
+          }
+          
+          discriminator[:path] = type_path unless type_path.empty?
+
           {
             slice_id: current_element.id,
             slice_name: current_element.sliceName,
             path: current_element.path.gsub("#{resource}.", ''),
-            discriminator: {
-              type: 'type',
-              code: type_code.upcase_first
-            }
+            discriminator: discriminator
           }.tap do |metadata|
             if is_uscdi_requirement_element?(current_element)
               metadata[:uscdi_only] = true

data/lib/us_core_test_kit/generator/must_support_metadata_extractor_us_core_6.rb

@@ -107,7 +107,7 @@ module USCoreTestKit
         must_supports[:elements].delete_if { |element| element[:path].start_with?('media') }
       end
 
-      # genderIdentify is removed as directed by ASTP/ONC enforcement discretion issued on March 21, 2025:
+      # genderIdentify is removed as directed by ONC enforcement discretion issued on March 21, 2025:
       # https://www.healthit.gov/topic/certification-ehrs/enforcement-discretion
       def remove_patient_gender_identity
         return unless profile.type == 'Patient'

data/lib/us_core_test_kit/granular_scope.rb

@@ -1,5 +1,6 @@
 module USCoreTestKit
   module GranularScope
+    require 'uri'
 
     def granular_scopes
       @granular_scopes ||=
@@ -37,6 +38,25 @@ module USCoreTestKit
       end
     end
 
+    def resolve_url(url_string)
+      return nil if url_string.nil?
+      
+      uri = URI.parse(url_string)
+      # If already absolute, return as-is
+      return url_string if uri.absolute?
+      
+      # If relative, resolve against the configured FHIR base URL
+      # Per FHIR spec, relative URLs are interpreted relative to the FHIR base URL
+      # Strip leading slash from relative URL if present to prevent URI.join from
+      # treating it as absolute path from root, and ensure base has trailing slash
+      base_with_slash = url.end_with?('/') ? url : "#{url}/"
+      relative_without_leading_slash = url_string.start_with?('/') ? url_string[1..-1] : url_string
+      resolved = URI.join(base_with_slash, relative_without_leading_slash)
+      resolved.to_s
+    rescue URI::InvalidURIError
+      url_string
+    end
+
     def previous_request_resources
       first_request = previous_requests.first
       next_page_url = nil
@@ -49,10 +69,14 @@ module USCoreTestKit
             []
           end
 
-        first_request = request if request.url != next_page_url
+        # Check if current request URL matches the next page URL from the previous request
+        # If not, this is a new search, so update first_request
+        resolved_next_page_url = resolve_url(next_page_url)
+        first_request = request if request.url != resolved_next_page_url
 
         request_resource_hash[first_request].concat(request_resources)
 
+        # Extract the next page URL from the current request's bundle for the next iteration
         next if request.resource&.resourceType != 'Bundle'
 
         next_page_url = request.resource&.link&.find { |link| link.relation == 'next' }&.url

data/lib/us_core_test_kit/granular_scope_search_test.rb

@@ -66,26 +66,22 @@ module USCoreTestKit
     end
 
     def query_in_scope?(resource_type, params)
-      received_scopes.split(' ').each do |scope|
+      received_scopes.split(' ').any? do |scope|
         parsed_scope = URI.parse(scope)
         
         # check for resource type, search scope, and matched params
-        next unless parsed_scope.path =~ /\/#{resource_type}\./ &&
-                    parsed_scope.path.split('.')[1].include?('s') &&
-                    granular_params_present?(parsed_scope.query, params)
-      
-        return true
+        parsed_scope.path =~ /\/#{resource_type}\./ &&
+          parsed_scope.path.split('.')[1].include?('s') &&
+          search_is_for_the_granular_values?(parsed_scope.query, params)
       end
-
-      false
     end
 
-    def granular_params_present?(granular_params, search_params)
-      CGI.parse(granular_params).each do |param_name, value|
-        return false unless search_params.key?(param_name) && value.include?(search_params[param_name])
+    def search_is_for_the_granular_values?(granular_params, search_params)
+      return false if granular_params.blank? # ignore resource-level scopes
+      
+      CGI.parse(granular_params).all? do |param_name, value|
+        search_params.key?(param_name) && value.include?(search_params[param_name])
       end
-
-      true
     end
 
     def previous_resources(params)

data/lib/us_core_test_kit/reference_resolution_test.rb

@@ -84,7 +84,7 @@ module USCoreTestKit
           found_one_reference = false
 
           resolve_one_reference = resources.any? do |resource|
-            value_found = resolve_path(resource, path)
+            value_found = resolve_path(resource, path).select { |v| v.is_a?(FHIR::Reference) }
             next if value_found.empty?
 
             found_one_reference = true

data/lib/us_core_test_kit/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module USCoreTestKit
-  VERSION = '1.1.0'
-  LAST_UPDATED = '2025-12-01'
+  VERSION = '1.1.2'
+  LAST_UPDATED = '2026-05-13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: us_core_test_kit
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Stephen MacVicar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-02 00:00:00.000000000 Z
+date: 2026-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: smart_app_launch_test_kit
   requirement: !ruby/object:Gem::Requirement
@@ -37,6 +37,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,6 +47,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: tls_test_kit
   requirement: !ruby/object:Gem::Requirement
@@ -51,6 +57,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,6 +67,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: database_cleaner-sequel
   requirement: !ruby/object:Gem::Requirement