us_core_test_kit 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a121ebdf4c6d4f64205243404d6a60ffa914c360c82b12a5d87db7dfdc5cdcea
-  data.tar.gz: 653526a65dbbba58f5e2b2e1022c82f61e7df87dc988af09f9d7da0c041f9f9f
+  metadata.gz: 5dd7f080c0a7bcccec81de3a8b216983f000c5b872ac05f763a64793167a9f38
+  data.tar.gz: 26604b5c77f6d2ab3363962c6a0246e8b82693d629702c765dc18c7ed4649a82
 SHA512:
-  metadata.gz: deb705f62b68c74d8dbe4875bbb5eeeb03320d62b725229a797882558469d8cb8e09c75bd2ce71fa9c9426c2d2e8cab363ee77af621fc3ad83bb36b141f052f6
-  data.tar.gz: dac0ba9320a455434c6d976b926828ed16997d6f7434f121683a9d6ef8671315af861a6d6887cf2b4f240043718481a9d2a1c8e9bafac7ec4b62577e501f9da3
+  metadata.gz: c0fe916f13aaff72dfb8a5b114678e845037e6336bbcef867a5509e8e81685775c4533e993396a6961c5231b7ee397d452bdb20edb5683ce8d30a9d377fd1662
+  data.tar.gz: 9dc45374a94cbf2b9f23e594ba52bb6d2ce2ebad2e7eb995b29ef18d38553899d4569db9ac093fcd3dc9c0bd84aa2cb2456351fd06f213fb35dcab93b77f18cc

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/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/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module USCoreTestKit
-  VERSION = '1.1.0'
-  LAST_UPDATED = '2025-12-01'
+  VERSION = '1.1.1'
+  LAST_UPDATED = '2026-01-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.1
 platform: ruby
 authors:
 - Stephen MacVicar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-02 00:00:00.000000000 Z
+date: 2026-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core