inferno_core 0.2.0 → 0.3.0.rc1

data/lib/inferno/public/bundle.js.LICENSE.txt

@@ -11,6 +11,8 @@ object-assign
  * @license  MIT
  */
 
+/*! js-yaml 4.1.0 https://github.com/nodeca/js-yaml @license MIT */
+
 /**
  * A better abstraction over CSS.
  *

data/lib/inferno/test_runner.rb

@@ -60,8 +60,8 @@ module Inferno
 
     def run_test(test, scratch)
       inputs = load_inputs(test)
+      input_json_string = inputs_as_json(test, inputs)
 
-      input_json_string = JSON.generate(inputs)
       test_instance = test.new(inputs: inputs, test_session_id: test_session.id, scratch: scratch)
 
       result = begin
@@ -107,6 +107,16 @@ module Inferno
     end
 
     def run_group(group, scratch)
+      group_inputs_with_values = group.available_inputs.map do |_input_identifier, input|
+        {
+          name: input.name,
+          label: input.title,
+          description: input.description,
+          value: session_data_repo.load(test_session_id: test_session.id, name: input.name, type: input.type),
+          type: input.type
+        }
+      end
+
       results = []
       group.children.each do |child|
         result = run(child, scratch)
@@ -116,7 +126,8 @@ module Inferno
 
       results.flatten!
 
-      group_result = persist_result(group.reference_hash.merge(result: roll_up_result(results)))
+      group_result = persist_result(group.reference_hash.merge(result: roll_up_result(results),
+                                                               input_json: JSON.generate(group_inputs_with_values)))
 
       update_parent_result(group.parent)
 
@@ -153,6 +164,17 @@ module Inferno
       end
     end
 
+    def inputs_as_json(runnable, input_values)
+      inputs_array = runnable.inputs.map do |input_identifier|
+        {
+          name: runnable.config.input_name(input_identifier),
+          value: input_values[input_identifier],
+          type: runnable.config.input_type(input_identifier)
+        }
+      end
+      JSON.generate(inputs_array)
+    end
+
     def save_outputs(runnable_instance)
       outputs =
         runnable_instance.outputs_to_persist.map do |output_identifier, value|

data/lib/inferno/utils/preset_template_generator.rb

@@ -7,17 +7,16 @@ module Inferno
         self.runnable = runnable
       end
 
-      def input_definitions
-        @input_definitions ||= runnable.available_input_definitions
+      def available_inputs
+        @available_inputs ||= runnable.available_inputs.transform_values(&:to_hash)
       end
 
       def inputs
         # The rubocop rule is disabled because `each_value` returns the hash,
         # while `values.each` will return the array of values. We want the array
         # of values here.
-        input_definitions.values.each do |input_definition| # rubocop:disable Style/HashEachMethods
-          input_definition[:value] =
-            (input_definition.delete(:default) if input_definition.key? :default)
+        available_inputs.values.each do |input| # rubocop:disable Style/HashEachMethods
+          input[:value] = (input.delete(:default) if input.key? :default)
         end
       end
 

data/lib/inferno/version.rb

@@ -1,3 +1,4 @@
 module Inferno
-  VERSION = '0.2.0'.freeze
+  # Standard patterns for gem versions: https://guides.rubygems.org/patterns/
+  VERSION = '0.3.0.rc1'.freeze
 end

data/spec/factories/result.rb

@@ -15,6 +15,7 @@ FactoryBot.define do
     test_group_id { runnable[:test_group_id] }
     test_id { runnable[:test_id] }
     output_json { '[]' }
+    input_json { '[]' }
 
     result { 'pass' }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inferno_core
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0.rc1
 platform: ruby
 authors:
 - Stephen MacVicar
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-06 00:00:00.000000000 Z
+date: 2022-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -520,6 +520,7 @@ files:
 - lib/inferno/dsl/fhir_validation.rb
 - lib/inferno/dsl/http_client.rb
 - lib/inferno/dsl/http_client_builder.rb
+- lib/inferno/dsl/input_output_handling.rb
 - lib/inferno/dsl/oauth_credentials.rb
 - lib/inferno/dsl/request_storage.rb
 - lib/inferno/dsl/results.rb
@@ -530,6 +531,7 @@ files:
 - lib/inferno/entities/entity.rb
 - lib/inferno/entities/has_runnable.rb
 - lib/inferno/entities/header.rb
+- lib/inferno/entities/input.rb
 - lib/inferno/entities/message.rb
 - lib/inferno/entities/preset.rb
 - lib/inferno/entities/request.rb
@@ -542,17 +544,16 @@ files:
 - lib/inferno/entities/test_suite.rb
 - lib/inferno/exceptions.rb
 - lib/inferno/ext/fhir_client.rb
+- lib/inferno/ext/fhir_models.rb
 - lib/inferno/jobs.rb
 - lib/inferno/jobs/execute_test_run.rb
 - lib/inferno/jobs/resume_test_run.rb
 - lib/inferno/public/0e0b993fd6ff351f435ff1c2938daf2d.png
 - lib/inferno/public/217.bundle.js
-- lib/inferno/public/72a5cd989e6aea904540824ec865a0f8.png
 - lib/inferno/public/a5cd39450ab0336db73c5e57228b649d.png
 - lib/inferno/public/assets.json
 - lib/inferno/public/bundle.js
 - lib/inferno/public/bundle.js.LICENSE.txt
-- lib/inferno/public/e09b16f5cb645eb05f90c8f38f3409fb.png
 - lib/inferno/public/favicon.ico
 - lib/inferno/public/logo192.png
 - lib/inferno/repositories.rb
@@ -588,13 +589,13 @@ files:
 - spec/fixtures/basic_test_group.rb
 - spec/fixtures/basic_test_suite.rb
 - spec/support/factory_bot.rb
-homepage: https://github.com/inferno_community/inferno-core
+homepage: https://github.com/inferno-framework/inferno-core
 licenses:
 - Apache-2.0
 metadata:
-  homepage_uri: https://github.com/inferno_community/inferno-core
-  source_code_uri: https://github.com/inferno_community/inferno-core
-  changelog_uri: https://github.com/inferno_community/inferno-core/CHANGELOG.md
+  homepage_uri: https://github.com/inferno-framework/inferno-core
+  source_code_uri: https://github.com/inferno-framework/inferno-core
+  changelog_uri: https://github.com/inferno-framework/inferno-core/blob/main/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -607,9 +608,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
 signing_key: