inferno_core 0.4.24 → 0.4.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab9c01a985f9ceb43cc9ad79ddb604cc246b19dfa39f09b323c7677ed347aa88
-  data.tar.gz: 05aa6e68ea46177b1fab155052e1c84fe7c09368eca5ada5f9a5d933ff270a07
+  metadata.gz: 57454d0d82af134cbd8442876476ccb93ae8dd381a5a57e306b6a6f633a58b63
+  data.tar.gz: 3af45799f0be1f94f8f10242bfdb88e93cd87889fbaae7e3f2f212410d7d6b8c
 SHA512:
-  metadata.gz: f2879c429dea880db81928b84a0b17afbc06dab2dc2dae2bd088918ac0e25e594b13b12b1bd4f01943c698c382acd1f85ae07a2b14b0b8eea07484e23cc0eb8e
-  data.tar.gz: 5bc9bcf0b1006acf2fd46962d0e69609f343b480c88b832f1465382001029dc5b97353fb80ae3dd22c9c32e375012a290b585f9064eabb2e22816855b9d51612
+  metadata.gz: 185562b9ff9f39805ac4a6eb5a4215a583ea997cff81421d9f6445b2011a5244d8702128b60bd2a4b79dd1af4eff3df71ddae87145fd03b121b96f9c3d7fca50
+  data.tar.gz: a5024572e4f88e0a68df5e328dfc8d63e48ad4062c8aa38af62ab562ae21e9f853f380721596a5443148ca921ed33387dbf306fd9ef22eabb6ae36132bfb34e1

data/lib/inferno/apps/web/index.html.erb

@@ -34,6 +34,9 @@
           display: none;
         }
       }
+      body {
+        margin: 0;
+      }
       .wrapper {
         height: 100%;
         display: flex;

data/lib/inferno/dsl/fhir_resource_validation.rb

@@ -50,12 +50,52 @@ module Inferno
         end
 
         # Set the IGs that the validator will need to load
-        # Example: ["hl7.fhir.us.core#4.0.0"]
-        # @param igs [Array<String>]
-        def igs(validator_igs = nil)
-          @igs = validator_igs if validator_igs
+        # @example
+        #   igs "hl7.fhir.us.core#4.0.0"
+        # @example
+        #   igs("hl7.fhir.us.core#3.1.1", "hl7.fhir.us.core#6.0.0")
+        # @param validator_igs [Array<String>]
+        def igs(*validator_igs)
+          cli_context(igs: validator_igs) if validator_igs
 
-          @igs
+          cli_context.igs
+        end
+
+        # Set the cliContext used as part of each validation request.
+        # Fields may be passed as either a Hash or block.
+        # Note that all fields included here will be sent directly in requests,
+        # there is no check that the fields are correct.
+        #
+        # @example
+        #   fhir_resource_validator do
+        #     url 'http://example.com/validator'
+        #     cli_context do
+        #       noExtensibleBindingMessages true
+        #       txServer nil
+        #     end
+        #   end
+        #
+        # @example
+        #   fhir_resource_validator do
+        #     url 'http://example.org/validator'
+        #     cli_context({
+        #       noExtensibleBindingMessages: true,
+        #       txServer: nil
+        #     })
+        #   end
+        #
+        # @param definition [Hash] raw fields to set, optional
+        def cli_context(definition = nil, &)
+          if @cli_context
+            if definition
+              @cli_context.definition.merge!(definition.deep_symbolize_keys)
+            elsif block_given?
+              @cli_context.instance_eval(&)
+            end
+          else
+            @cli_context = CliContext.new(definition || {}, &)
+          end
+          @cli_context
         end
 
         # @private
@@ -193,19 +233,13 @@ module Inferno
         def wrap_resource_for_hl7_wrapper(resource, profile_url)
           wrapped_resource = {
             cliContext: {
-              # TODO: these should be configurable as well
-              sv: '4.0.1',
-              # displayWarnings: true,  # -display-issues-are-warnings
-              # txServer: nil,          # -tx n/a
-              igs: @igs || [],
-              # NOTE: this profile must be part of a loaded IG,
-              # otherwise the response is an HTTP 500 with no content
+              **cli_context.definition,
               profiles: [profile_url]
             },
             filesToValidate: [
               {
                 fileName: "#{resource.resourceType}/#{resource.id}.json",
-                fileContent: resource.to_json,
+                fileContent: resource.source_contents,
                 fileType: 'json'
               }
             ],
@@ -259,6 +293,39 @@ module Inferno
         end
       end
 
+      # @private
+      class CliContext
+        attr_reader :definition
+
+        CLICONTEXT_DEFAULTS = {
+          sv: '4.0.1',
+          doNative: false,
+          extensions: ['any']
+        }.freeze
+
+        # @private
+        def initialize(definition, &)
+          @definition = CLICONTEXT_DEFAULTS.merge(definition.deep_symbolize_keys)
+          instance_eval(&) if block_given?
+        end
+
+        # @private
+        def method_missing(method_name, *args)
+          # Interpret any other method as setting a field on cliContext.
+          # Follow the same format as `Validator.url` here:
+          # only set the value if one is provided.
+          # args will be an empty array if no value is provided.
+          definition[method_name] = args[0] unless args.empty?
+
+          definition[method_name]
+        end
+
+        # @private
+        def respond_to_missing?(_method_name, _include_private = false)
+          true
+        end
+      end
+
       module ClassMethods
         # @private
         def fhir_validators

data/lib/inferno/dsl/oauth_credentials.rb

@@ -80,7 +80,7 @@ module Inferno
 
         return true if expires_in.blank?
 
-        token_retrieval_time.to_i + expires_in - DateTime.now.to_i < 60
+        token_retrieval_time.to_i + expires_in.to_i - DateTime.now.to_i < 60
       end
 
       # @private