inferno_core 0.4.7.pre → 0.4.8

data/lib/inferno/repositories/test_sessions.rb

@@ -1,4 +1,5 @@
 require_relative 'repository'
+require_relative '../utils/preset_processor'
 
 module Inferno
   module Repositories
@@ -42,10 +43,10 @@ module Inferno
           .map! { |result| results_repo.build_entity(result) }
       end
 
-      def apply_preset(test_session_id, preset_id)
+      def apply_preset(test_session, preset_id)
         preset = presets_repo.find(preset_id)
-        preset.inputs.each do |input|
-          session_data_repo.save(input.merge(test_session_id:))
+        Utils::PresetProcessor.new(preset, test_session).processed_inputs.each do |input|
+          session_data_repo.save(input.merge(test_session_id: test_session.id))
         end
       end
 

data/lib/inferno/repositories.rb

@@ -1,16 +1,22 @@
 require_relative 'repositories/in_memory_repository'
-require_relative 'repositories/repository'
 require_relative 'repositories/validate_runnable_reference'
-require_relative 'repositories/headers'
-require_relative 'repositories/messages'
-require_relative 'repositories/requests'
-require_relative 'repositories/results'
 require_relative 'repositories/test_groups'
-require_relative 'repositories/test_runs'
-require_relative 'repositories/test_sessions'
 require_relative 'repositories/test_suites'
 require_relative 'repositories/tests'
 
+# Skip loading things which require the db when not necessary, such as CLI
+# commands which don't need the db
+unless ENV['NO_DB']&.casecmp? 'true'
+  require_relative 'repositories/repository'
+  require_relative 'repositories/headers'
+  require_relative 'repositories/messages'
+  require_relative 'repositories/requests'
+  require_relative 'repositories/results'
+  require_relative 'repositories/session_data'
+  require_relative 'repositories/test_runs'
+  require_relative 'repositories/test_sessions'
+end
+
 module Inferno
   # Repositories provide an abstraction layer for dealing with entity
   # persistence. All code for interacting with the database lives in

data/lib/inferno/utils/preset_processor.rb

@@ -0,0 +1,49 @@
+module Inferno
+  module Utils
+    # This class determines which values to use in a preset based on the suite
+    # options chosen in a session.
+    # @api private
+    class PresetProcessor
+      attr_accessor :preset, :session, :suite, :suite_inputs, :suite_options
+
+      def initialize(preset, session)
+        self.preset = preset
+        self.session = session
+        self.suite = session.test_suite
+        self.suite_inputs = suite.available_inputs.transform_values(&:to_hash)
+        self.suite_options = session.suite_options
+      end
+
+      # Returns the list of inputs which need to be persisted, with options
+      # applied.
+      def processed_inputs
+        preset.inputs
+          .map { |input| input_for_options(input) }
+      end
+
+      private
+
+      def input_for_options(input)
+        {
+          name: input[:name],
+          value: value(input),
+          type: suite_inputs[input[:name].to_sym][:type]
+        }
+      end
+
+      def value(input)
+        value_for_option(input).presence || input[:value]
+      end
+
+      def value_for_option(input)
+        input[:value_for_options]&.find do |option_value|
+          option_value[:options].all? do |option|
+            suite_options.any? do |suite_option|
+              suite_option.id.to_s == option[:name] && suite_option.value == option[:value]
+            end
+          end
+        end&.dig(:value)
+      end
+    end
+  end
+end

data/lib/inferno/utils/preset_template_generator.rb

@@ -15,8 +15,12 @@ module Inferno
         # 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.
-        available_inputs.values.each do |input| # rubocop:disable Style/HashEachMethods
-          input[:value] = (input.delete(:default) if input.key? :default)
+        available_inputs.values.map do |original_input|
+          {}.tap do |input|
+            input[:name] = original_input.delete(:name)
+            input[:value] = (original_input.delete(:default) if original_input.key? :default)
+            original_input.each { |key, value| input["_#{key}".to_sym] = value }
+          end
         end
       end
 

data/lib/inferno/version.rb

@@ -1,4 +1,4 @@
 module Inferno
   # Standard patterns for gem versions: https://guides.rubygems.org/patterns/
-  VERSION = '0.4.7.pre'.freeze
+  VERSION = '0.4.8'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inferno_core
 version: !ruby/object:Gem::Version
-  version: 0.4.7.pre
+  version: 0.4.8
 platform: ruby
 authors:
 - Stephen MacVicar
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-06 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -320,6 +320,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: tty-markdown
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -625,6 +639,7 @@ files:
 - lib/inferno/utils/markdown_formatter.rb
 - lib/inferno/utils/middleware/request_logger.rb
 - lib/inferno/utils/migration.rb
+- lib/inferno/utils/preset_processor.rb
 - lib/inferno/utils/preset_template_generator.rb
 - lib/inferno/utils/static_assets.rb
 - lib/inferno/version.rb
@@ -656,9 +671,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 3.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.7
 signing_key: