davinci_us_drug_formulary_test_kit 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d6b4a9ccf4297a309b64e061a13c0328bf7ff0a0050b54885dbc76b06070036
-  data.tar.gz: 743ff9f19270b523a56bb6911830fa1339e573cc6b2f4b040738aeac96d864b2
+  metadata.gz: e65817122b43903b0e36cf5321d955c85c84e242c62d551f2788c4e39a6d15f3
+  data.tar.gz: 65a4dd64907aeb998e66f6aa082c4360e3bc73c820ae45f12f30d470582bfd2a
 SHA512:
-  metadata.gz: a9114b502c22d5ba3bb6db78dcef5aca546b4fc621591683ef8c684b485ae6d2632235af4501be68ef54e0aabe319e3057e41790722508a51af273282ecbe12d
-  data.tar.gz: afab6c4c7c64a3920aa4044119d625f4c0b3a5518e4338592dabb718715cd1b52a50aeb8a9de6b1f64c1c50a89725501437ac02d65872693ed3d51818176f21e
+  metadata.gz: 651f8926d9e60874efa3b8879fb89fa2814a20287569ede857422ebf7a254bcda0ca31480161d5af07993441d2804fc141ae9ef33b4f8baf121421e043604ba7
+  data.tar.gz: 7d1cab5b5d87618aa7667a46db081bba38cd108dfc07b1f9210c049f01e0cc46201291d7fc26fe4584584dd450300eee51318f39fa613615baa02e2996794bd2

data/lib/davinci_us_drug_formulary_test_kit/custom_groups/v2.0.1/capability_statement_group.rb

@@ -17,15 +17,17 @@ module DaVinciUSDrugFormularyTestKit
         The #{title} Sequence tests a FHIR server's ability to formally describe
         features supported by the API by using the [Capability
         Statement](https://www.hl7.org/fhir/capabilitystatement.html) resource.
-        The features described in the Capability Statement must be consistent with
-        the required [capabilities of a US Drug Formulary](http://hl7.org/fhir/us/davinci-drug-formulary/STU2.0.1/CapabilityStatement-usdf-server.html). The Capability Statement
-        must also advertise the location of the required SMART on FHIR endpoints
-        that enable authenticated access to the FHIR server resources.
+        The features described in the Capability Statement must be consistent
+        with the required [capabilities of a US Drug
+        Formulary](http://hl7.org/fhir/us/davinci-drug-formulary/STU2.0.1/CapabilityStatement-usdf-server.html).
+        The Capability Statement must also advertise the location of the
+        required SMART on FHIR endpoints that enable authenticated access to the
+        FHIR server resources.
 
         The Capability Statement resource allows clients to determine which
-        resources are supported by a FHIR Server. Not all servers are expected to
-        implement all possible queries and data elements described in the US Drug Formulary
-        API.
+        resources are supported by a FHIR Server. Not all servers are expected
+        to implement all possible queries and data elements described in the US
+        Drug Formulary API.
 
         # Test Methodology
 

data/lib/davinci_us_drug_formulary_test_kit/fhir_resource_navigation.rb

@@ -102,13 +102,13 @@ module DaVinciUSDrugFormularyTestKit
             when 'Date'
               begin
                 Date.parse(slice)
-              rescue ArgumentError
+              rescue ArgumentError # rubocop:disable Metrics/BlockNesting
                 false
               end
             when 'DateTime'
               begin
                 DateTime.parse(slice)
-              rescue ArgumentError
+              rescue ArgumentError # rubocop:disable Metrics/BlockNesting
                 false
               end
             when 'String'
@@ -121,8 +121,9 @@ module DaVinciUSDrugFormularyTestKit
             slice_value { |coding| discriminator[:values].include?(coding.code) }
           end
         end
-      else
-        # TODO: Error handling for if this file doesn't have access to metadata for some reason (begin/rescue with StandardError?)
+      else # rubocop:disable Style/EmptyElse
+        # TODO: Error handling for if this file doesn't have access to metadata
+        # for some reason (begin/rescue with StandardError?)
       end
     end
 

data/lib/davinci_us_drug_formulary_test_kit/generated/v2.0.1/usdf_test_suite.rb

@@ -47,10 +47,13 @@ module DaVinciUSDrugFormularyTestKit
       )
       version VERSION
 
+      id :davinci_us_drug_formulary_v201
+
       VALIDATION_MESSAGE_FILTERS = [
         %r{Sub-extension url 'introspect' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris},
         %r{Sub-extension url 'revoke' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris},
-        /Observation\.effective\.ofType\(Period\): .*vs-1:/ # Invalid invariant in FHIR v4.0.1
+        /Observation\.effective\.ofType\(Period\): .*vs-1:/, # Invalid invariant in FHIR v4.0.1
+        /\A\S+: \S+: URL value '.*' does not resolve/,
       ].freeze
 
       VERSION_SPECIFIC_MESSAGE_FILTERS = [].freeze
@@ -61,8 +64,9 @@ module DaVinciUSDrugFormularyTestKit
           end
       end
 
-      validator do
-        url ENV.fetch('V201_VALIDATOR_URL', 'http://validator_service:4567')
+      fhir_resource_validator do
+        igs 'hl7.fhir.us.davinci-drug-formulary#2.0.1'
+
         message_filters = VALIDATION_MESSAGE_FILTERS + VERSION_SPECIFIC_MESSAGE_FILTERS
 
         exclude_message do |message|
@@ -90,9 +94,6 @@ module DaVinciUSDrugFormularyTestKit
         }
       ]
 
-
-      id :davinci_us_drug_formulary_v201
-
       input :url,
         title: 'FHIR Endpoint',
         description: 'URL of the FHIR endpoint'

data/lib/davinci_us_drug_formulary_test_kit/generator/suite_generator.rb

@@ -56,8 +56,9 @@ module DaVinciUSDrugFormularyTestKit
         "US Drug Formulary #{ig_metadata.ig_version}"
       end
 
-      def validator_env_name
-        "#{ig_metadata.reformatted_version.upcase}_VALIDATOR_URL"
+      def ig_identifier
+        version = ig_metadata.ig_version[1..] # Remove leading 'v'
+        "hl7.fhir.us.davinci-drug-formulary##{version}"
       end
 
       def ig_link

data/lib/davinci_us_drug_formulary_test_kit/must_support_test.rb

@@ -94,11 +94,11 @@ module DaVinciUSDrugFormularyTestKit
         must_support_extensions.select do |extension_definition|
           resources.none? do |resource|
             path = extension_definition[:path]
-            if extension_definition[:path] != "extension" 
+            if extension_definition[:path] == 'extension'
+              resource.extension.any? { |extension| extension.url == extension_definition[:url] }
+            else
               extension = find_a_value_at(resource, path)
               extension&.url == extension_definition[:url]
-            else
-              resource.extension.any? { |extension| extension.url == extension_definition[:url] }
             end
           end
         end

data/lib/davinci_us_drug_formulary_test_kit/reference_resolution_test.rb

@@ -160,7 +160,8 @@ module DaVinciUSDrugFormularyTestKit
       target_profile_with_version =
         target_profile.include?('|') ? target_profile : "#{target_profile}|#{metadata.profile_version}"
 
-      outcome = FHIR::OperationOutcome.new(JSON.parse(validator.validate(resource, target_profile_with_version)))
+      validator_response = validator.validate(resource, target_profile_with_version)
+      outcome = validator.operation_outcome_from_hl7_wrapped_response(validator_response)
 
       message_hashes = outcome.issue&.map { |issue| validator.message_hash_from_issue(issue, resource) } || []
 

data/lib/davinci_us_drug_formulary_test_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DaVinciUSDrugFormularyTestKit
-  VERSION = '0.9.1'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: davinci_us_drug_formulary_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Stephen MacVicar
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-07 00:00:00.000000000 Z
+date: 2024-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.37
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.37
 - !ruby/object:Gem::Dependency
   name: tls_test_kit
   requirement: !ruby/object:Gem::Requirement