inferno_core 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2266ffdfdf00fea5f565f6b1d5f927ba0c6c64b4d5b5725b737bdb822fe231cd
-  data.tar.gz: bfb17c44e6dabfb9ba46b153e25c1c62aaae6179eaf202505213ab920e4cbcca
+  metadata.gz: 41fdda8d351bb039a654949835c70ed19999cbce0ccba735b4154774cdc61225
+  data.tar.gz: 1c0a86692b2a231af565fd6695fcc229d0ea51c2acf55e4236a5ff551e0a83a9
 SHA512:
-  metadata.gz: a12e012b24105c8f7e3feb22bd12612ccd4c0f4b345b3289d8fc0c946f1229581f476d1a984418e768b6c0baa65145fcd07f2dd27728ca76508328577de4812b
-  data.tar.gz: f0aabd22881fddc9ad3292e15daf717dd5009fc63d46a947a2696c6d684b11ea239cd669d9e89a0efe0b0eb6233a04fe7e3ae4b8839fb024153a555d7b976fe7
+  metadata.gz: 5612c208f1aa22d56bdb168754e50c7dfb67d2b71a5b1699d42382f56994c782771d76865feb533cc1e87052d47540fd7d2fca5c708f5c2d02718c55b033c498
+  data.tar.gz: 6dd48102d0ba87b339f5534312a949f390b69ad26741e2be73db1ec287b281efa9842c814ca6e8a4250745597909111b10759b2d171711686025c060194dad61

data/lib/inferno/apps/cli/execute.rb

@@ -44,10 +44,12 @@ module Inferno
 
         self.options = options
 
-        outputter.print_start_message(options)
+        outputter.print_start_message(self.options)
+
+        load_preset_file_and_set_preset_id
 
         results = []
-        outputter.print_around_run(options) do
+        outputter.print_around_run(self.options) do
           if all_selected_groups_and_tests.empty?
             test_run = create_test_run(suite)
             run_one(suite, test_run)
@@ -102,6 +104,18 @@ module Inferno
         @outputter ||= OUTPUTTERS[options[:outputter]].new
       end
 
+      def load_preset_file_and_set_preset_id
+        return unless options[:preset_file]
+        raise StandardError, 'Cannot use `--preset-id` and `--preset-file` options together' if options[:preset_id]
+
+        raise StandardError, "File #{options[:preset_file]} not found" unless File.exist? options[:preset_file]
+
+        options[:preset_id] = JSON.parse(File.read(options[:preset_file]))['id']
+        raise StandardError, "Preset #{options[:preset_file]} is missing id" if options[:preset_id].nil?
+
+        presets_repo.insert_from_file(options[:preset_file])
+      end
+
       def all_selected_groups_and_tests
         @all_selected_groups_and_tests ||= runnables_by_short_id + groups + tests
       end
@@ -109,7 +123,7 @@ module Inferno
       def run_one(runnable, test_run)
         verify_runnable(
           runnable,
-          thor_hash_to_inputs_array(options[:inputs]),
+          thor_hash_to_inputs_array(inputs_and_preset),
           test_session.suite_options
         )
 
@@ -118,6 +132,33 @@ module Inferno
         dispatch_job(test_run)
       end
 
+      def inputs_and_preset
+        if preset
+          preset_inputs = preset.inputs.to_h do |preset_input|
+            [preset_input[:name], preset_input[:value]]
+          end
+
+          options.fetch(:inputs, {}).reverse_merge(preset_inputs)
+        else
+          options.fetch(:inputs, {})
+        end
+      end
+
+      def preset
+        return unless options[:preset_id]
+
+        @preset ||= presets_repo.find(options[:preset_id])
+
+        raise StandardError, "Preset #{options[:preset_id]} not found" if @preset.nil?
+
+        unless presets_repo.presets_for_suite(suite.id).include?(@preset)
+          raise StandardError,
+                "Preset #{options[:preset_id]} is incompatible with suite #{suite.id}"
+        end
+
+        @preset
+      end
+
       def suite
         @suite ||= Inferno::Repositories::TestSuites.new.find(options[:suite])
 
@@ -156,6 +197,10 @@ module Inferno
         @session_data_repo ||= Inferno::Repositories::SessionData.new
       end
 
+      def presets_repo
+        @presets_repo ||= Inferno::Repositories::Presets.new
+      end
+
       def test_session
         @test_session ||= test_sessions_repo.create({
                                                       test_suite_id: suite.id,
@@ -169,7 +214,7 @@ module Inferno
         {
           test_session_id: test_session.id,
           runnable_id_key(runnable) => runnable.id,
-          inputs: thor_hash_to_inputs_array(options[:inputs])
+          inputs: thor_hash_to_inputs_array(inputs_and_preset)
         }
       end
 

data/lib/inferno/apps/cli/main.rb

@@ -125,7 +125,15 @@ module Inferno
       option :inputs,
              aliases: ['-i'],
              type: :hash,
-             desc: 'Inputs (i.e: --inputs=foo:bar goo:baz)'
+             desc: 'Inputs (i.e: --inputs=foo:bar goo:baz); will merge and override preset inputs'
+      option :preset_id,
+             aliases: ['-P'],
+             type: :string,
+             desc: 'Inferno preset id; cannot be used with `--preset-file`'
+      option :preset_file,
+             aliases: ['-p'],
+             type: :string,
+             desc: 'Path to an Inferno preset file for inputs; cannot be used with `--preset-id`'
       option :outputter,
              aliases: ['-o'],
              default: 'console',
@@ -142,7 +150,7 @@ module Inferno
              desc: 'Display this message'
       def execute
         Execute.boot_full_inferno
-        Execute.new.run(options)
+        Execute.new.run(options.dup) # dup to unfreeze Thor options
       end
 
       # https://github.com/rails/thor/issues/244 - Make Thor exit(1) on Errors/Exceptions

data/lib/inferno/apps/web/application.rb

@@ -1,6 +1,10 @@
 require 'hanami/middleware/body_parser'
 require_relative 'router'
 
+# Only required to monkey patch the JSON parser to support application/fhir+json
+require 'hanami/middleware/body_parser/json_parser'
+require_relative '../../ext/json_parser'
+
 module Inferno
   module Web
     def self.app

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

@@ -9,10 +9,18 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta id="base-path" name="base-path" content="<%= Inferno::Application['base_path'] %>">
-    <meta
-      name="description"
-      content="FHIR Testing"
-    />
+    
+    <!-- Social media link unfurling meta tags -->
+    <title>Inferno Test Session</title>
+    <link rel="canonical" href="<%= Inferno::Application['base_url'] %>" />
+    <meta name="application-name" content="Inferno" />
+    <meta name="og:image" content="<%= Inferno::Application['inferno_host'] %><%= Inferno::Application['public_path'] %>/logo192.png" />
+    <meta name="og:type" content="website" />
+    <meta name="og:url" content="<%= Inferno::Application['base_url'] %>" />
+    <meta name="og:site_name" content="Inferno" />
+    <meta name="twitter:card" content="summary" />
+    <meta name="twitter:image" content="<%= Inferno::Application['inferno_host'] %><%= Inferno::Application['public_path'] %>/logo192.png" />
+    
     <link rel="apple-touch-icon" href="<%= Inferno::Application['public_path'] %>/logo192.png" />
     <!--
       manifest.json provides metadata used when your web app is installed on a

data/lib/inferno/config/boot/executor.rb

@@ -10,5 +10,6 @@ Inferno::Application.register_provider(:executor) do
     end
 
     target_container.start :suites
+    target_container.start :presets
   end
 end

data/lib/inferno/ext/json_parser.rb

@@ -0,0 +1,11 @@
+module Hanami
+  module Middleware
+    class BodyParser
+      class JsonParser
+        def self.mime_types
+          ['application/json', 'application/vnd.api+json', 'application/fhir+json']
+        end
+      end
+    end
+  end
+end