inferno_core 0.3.5 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40fa8983d93a7fc191a7d03bdb78c0bd80e138cfe5245d377c15f28360fb6b03
-  data.tar.gz: 4aa592411c216c13bc55ebcef30ce2019522cc3575edc184fcb10593eb28239a
+  metadata.gz: 669dde4b0ad34993f363e538ed2d7eae59d4211f0b988a7e6306231fd54d74c0
+  data.tar.gz: 5149b96b6931d27a41cd0c3b0a5665024b297c6d8e612e574582cb630ef29867
 SHA512:
-  metadata.gz: bb0f7e9aafced3a1181cd40d8638f4ac07fefc0239ab771b85ce22aaec3785b7328ca82969cd83b1617051201fa149272ba80a53a05789129e6ee35302cf3a1b
-  data.tar.gz: 5f14e0db2c0a2d3238198600a736790ea549ea11c91bb84578dda2e3de2270c31cb314b44972ec2fbc6635aa77b93f0ce4df2926d45c072745b19a1d6371b34f
+  metadata.gz: d5a839c224c59795ab5f79fdd18de124ba6eae8d2cdf60c1afeae4f7bf091ac1a0321ff97e7939753de1d05441df1152929e3d3ba2e743d9777ea39fc0603806
+  data.tar.gz: 602ac59a4417b6751d3e661d15ac55f4d7ac2f2ee171b9ac284637b3d4693f36ae85f09fbd63011fa570609dd1c8f54c7ee5c35fa28f1c909185bec2b28f0234

data/lib/inferno/apps/web/controllers/test_runs/create.rb

@@ -11,8 +11,8 @@ module Inferno
 
           PARAMS = [:test_session_id, :test_suite_id, :test_group_id, :test_id].freeze
 
-          def verify_runnable(runnable, inputs)
-            missing_inputs = runnable&.missing_inputs(inputs)
+          def verify_runnable(runnable, inputs, selected_suite_options)
+            missing_inputs = runnable&.missing_inputs(inputs, selected_suite_options)
             user_runnable = runnable&.user_runnable?
             raise Inferno::Exceptions::RequiredInputsNotFound, missing_inputs if missing_inputs&.any?
             raise Inferno::Exceptions::NotUserRunnableException unless user_runnable
@@ -26,7 +26,7 @@ module Inferno
                   &.last
 
               if input.nil?
-                Inferno::Application['logger'].warning(
+                Inferno::Application['logger'].warn(
                   "Unknown input `#{input_params[:name]}` for #{test_run.runnable.id}: #{test_run.runnable.title}"
                 )
                 next
@@ -51,11 +51,15 @@ module Inferno
               return
             end
 
-            verify_runnable(repo.build_entity(create_params(params)).runnable, params[:inputs])
+            verify_runnable(
+              repo.build_entity(create_params(params)).runnable,
+              params[:inputs],
+              test_session.suite_options
+            )
 
             test_run = repo.create(create_params(params).merge(status: 'queued'))
 
-            self.body = serialize(test_run)
+            self.body = serialize(test_run, suite_options: test_session.suite_options)
 
             persist_inputs(params, test_run)
 

data/lib/inferno/apps/web/controllers/test_runs/show.rb

@@ -3,6 +3,8 @@ module Inferno
     module Controllers
       module TestRuns
         class Show < Controller
+          include Import[test_sessions_repo: 'repositories.test_sessions']
+
           def call(params)
             test_run = repo.find(params[:id])
             halt 404 if test_run.nil?
@@ -17,7 +19,8 @@ module Inferno
                 end
             end
 
-            self.body = serialize(test_run)
+            test_session = test_sessions_repo.find(test_run.test_session_id)
+            self.body = serialize(test_run, suite_options: test_session.suite_options)
           end
         end
       end

data/lib/inferno/apps/web/controllers/test_sessions/create.rb

@@ -6,9 +6,8 @@ module Inferno
           PARAMS = [:test_suite_id, :suite_options].freeze
 
           def call(raw_params)
-            query_params = raw_params.to_h
-            body_params = JSON.parse(request.body.string).symbolize_keys
-            params = query_params.merge(body_params)
+            params = raw_params.to_h
+            params.merge!(JSON.parse(request.body.string).symbolize_keys) unless request.body.string.blank?
 
             session = repo.create(create_params(params))
 

data/lib/inferno/apps/web/serializers/input.rb

@@ -6,9 +6,13 @@ module Inferno
       class Input < Serializer
         identifier :name
 
-        field :label, if: :field_present?
+        field :title, if: :field_present?
         field :description, if: :field_present?
-        field :required, if: :field_present?
+        field :type, if: :field_present?
+        field :default, if: :field_present?
+        field :optional, if: :field_present?
+        field :options, if: :field_present?
+        field :locked, if: :field_present?
         field :value, if: :field_present?
       end
     end

data/lib/inferno/apps/web/serializers/test.rb

@@ -7,7 +7,10 @@ module Inferno
         field :short_id
         field :title
         field :short_title
-        field :available_inputs, name: :inputs, extractor: HashValueExtractor, blueprint: Input
+        field :inputs do |test, options|
+          suite_options = options[:suite_options]
+          Input.render_as_hash(test.available_inputs(suite_options).values)
+        end
         field :output_definitions, name: :outputs, extractor: HashValueExtractor
         field :description
         field :short_description

data/lib/inferno/apps/web/serializers/test_group.rb

@@ -10,18 +10,25 @@ module Inferno
         field :description
         field :short_description
         field :input_instructions
-        field :test_count
         field :run_as_group?, name: :run_as_group
         field :user_runnable?, name: :user_runnable
         field :optional?, name: :optional
 
+        field :test_count do |group, options|
+          group.test_count(options[:suite_options])
+        end
         field :test_groups do |group, options|
-          TestGroup.render_as_hash(group.groups(options[:suite_options]))
+          suite_options = options[:suite_options]
+          TestGroup.render_as_hash(group.groups(suite_options), suite_options: suite_options)
         end
         field :tests do |group, options|
-          Test.render_as_hash(group.tests(options[:suite_options]))
+          suite_options = options[:suite_options]
+          Test.render_as_hash(group.tests(suite_options), suite_options: suite_options)
+        end
+        field :inputs do |group, options|
+          suite_options = options[:suite_options]
+          Input.render_as_hash(group.available_inputs(suite_options).values)
         end
-        field :available_inputs, name: :inputs, extractor: HashValueExtractor, blueprint: Input
         field :output_definitions, name: :outputs, extractor: HashValueExtractor
       end
     end

data/lib/inferno/apps/web/serializers/test_run.rb

@@ -6,7 +6,9 @@ module Inferno
         field :test_session_id
 
         field :status
-        field :test_count
+        field :test_count do |test_run, options|
+          test_run.test_count(options[:suite_options])
+        end
 
         field :test_group_id, if: :field_present?
         field :test_suite_id, if: :field_present?

data/lib/inferno/apps/web/serializers/test_suite.rb

@@ -9,8 +9,13 @@ module Inferno
           field :description
           field :short_description
           field :input_instructions
-          field :test_count
           field :version
+          field :links
+
+          field :test_count do |suite, options|
+            suite.test_count(options[:suite_options])
+          end
+
           association :suite_options, blueprint: SuiteOption
           association :presets, view: :summary, blueprint: Preset
         end
@@ -18,10 +23,14 @@ module Inferno
         view :full do
           include_view :summary
           field :test_groups do |suite, options|
-            TestGroup.render_as_hash(suite.groups(options[:suite_options]))
+            suite_options = options[:suite_options]
+            TestGroup.render_as_hash(suite.groups(suite_options), suite_options: suite_options)
           end
           field :configuration_messages
-          field :available_inputs, name: :inputs, extractor: HashValueExtractor, blueprint: Input
+          field :inputs do |suite, options|
+            suite_options = options[:suite_options]
+            Input.render_as_hash(suite.available_inputs(suite_options).values)
+          end
         end
       end
     end

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

@@ -4,7 +4,7 @@ Inferno::Application.boot(:presets) do
   init do
     use :suites
 
-    files_to_load = Dir.glob(File.join(Dir.pwd, 'config', 'presets', '*.json'))
+    files_to_load = Dir.glob(['config/presets/*.json', 'config/presets/*.json.erb'])
     files_to_load.map! { |path| File.realpath(path) }
     presets_repo = Inferno::Repositories::Presets.new
 

data/lib/inferno/dsl/http_client.rb

@@ -1,3 +1,5 @@
+require 'faraday_middleware'
+
 require_relative 'request_storage'
 require_relative 'tcp_exception_handler'
 
@@ -75,7 +77,7 @@ module Inferno
             if client
               client.get(url, nil, options[:headers])
             elsif url.match?(%r{\Ahttps?://})
-              Faraday.get(url, nil, options[:headers])
+              connection.get(url, nil, options[:headers])
             else
               raise StandardError, 'Must use an absolute url or define an HTTP client with a base url'
             end
@@ -83,6 +85,14 @@ module Inferno
         end
       end
 
+      # @private
+      def connection
+        Faraday.new do |f|
+          f.request :url_encoded
+          f.use FaradayMiddleware::FollowRedirects
+        end
+      end
+
       # Perform an HTTP POST request
       #
       # @param url [String] if this request is using a defined client, this will
@@ -103,7 +113,7 @@ module Inferno
             if client
               client.post(url, body, options[:headers])
             elsif url.match?(%r{\Ahttps?://})
-              Faraday.post(url, body, options[:headers])
+              connection.post(url, body, options[:headers])
             else
               raise StandardError, 'Must use an absolute url or define an HTTP client with a base url'
             end
@@ -128,7 +138,7 @@ module Inferno
             if client
               client.delete(url, nil, options[:headers])
             elsif url.match?(%r{\Ahttps?://})
-              Faraday.delete(url, nil, options[:headers])
+              connection.delete(url, nil, options[:headers])
             else
               raise StandardError, 'Must use an absolute url or define an HTTP client with a base url'
             end
@@ -167,7 +177,7 @@ module Inferno
             if client
               response = client.get(url, nil, options[:headers]) { |req| req.options.on_data = collector }
             elsif url.match?(%r{\Ahttps?://})
-              response = Faraday.get(url, nil, options[:headers]) { |req| req.options.on_data = collector }
+              response = connection.get(url, nil, options[:headers]) { |req| req.options.on_data = collector }
             else
               raise StandardError, 'Must use an absolute url or define an HTTP client with a base url'
             end

data/lib/inferno/dsl/http_client_builder.rb

@@ -1,3 +1,5 @@
+require 'faraday_middleware'
+
 module Inferno
   module DSL
     # This module contains the HTTP DSL available to test writers.
@@ -12,7 +14,10 @@ module Inferno
         params = { url: url }
         params.merge!(headers: headers) if headers
 
-        Faraday.new(params)
+        Faraday.new(params) do |f|
+          f.request :url_encoded
+          f.use FaradayMiddleware::FollowRedirects
+        end
       end
 
       # Define the base url for an HTTP client. A string or symbol can be

data/lib/inferno/dsl/input_output_handling.rb

@@ -90,17 +90,17 @@ module Inferno
       end
 
       # @private
-      def required_inputs
-        available_inputs
+      def required_inputs(selected_suite_options)
+        available_inputs(selected_suite_options)
           .reject { |_, input| input.optional }
           .map { |_, input| input.name }
       end
 
       # @private
-      def missing_inputs(submitted_inputs)
+      def missing_inputs(submitted_inputs, selected_suite_options)
         submitted_inputs = [] if submitted_inputs.nil?
 
-        required_inputs.map(&:to_s) - submitted_inputs.map { |input| input[:name] }
+        required_inputs(selected_suite_options).map(&:to_s) - submitted_inputs.map { |input| input[:name] }
       end
 
       # Define a particular order for inputs to be presented in the API/UI
@@ -153,52 +153,46 @@ module Inferno
       # Inputs available for this runnable's children. A running list of outputs
       # created by the children is used to exclude any inputs which are provided
       # by an earlier child's output.
-      def children_available_inputs
-        @children_available_inputs ||=
-          begin
-            child_outputs = []
-            all_children.each_with_object({}) do |child, definitions|
-              new_definitions = child.available_inputs.map(&:dup)
-              new_definitions.each do |input, new_definition|
-                existing_definition = definitions[input]
-
-                updated_definition =
-                  if existing_definition.present?
-                    existing_definition.merge_with_child(new_definition)
-                  else
-                    new_definition
-                  end
-
-                next if child_outputs.include?(updated_definition.name.to_sym)
-
-                definitions[updated_definition.name.to_sym] = updated_definition
+      def children_available_inputs(selected_suite_options = nil)
+        child_outputs = []
+        children(selected_suite_options).each_with_object({}) do |child, definitions|
+          new_definitions = child.available_inputs(selected_suite_options).map(&:dup)
+          new_definitions.each do |input, new_definition|
+            existing_definition = definitions[input]
+
+            updated_definition =
+              if existing_definition.present?
+                existing_definition.merge_with_child(new_definition)
+              else
+                new_definition
               end
 
-              child_outputs.concat(child.all_outputs).uniq!
-            end
+            next if child_outputs.include?(updated_definition.name.to_sym)
+
+            definitions[updated_definition.name.to_sym] = updated_definition
           end
+
+          child_outputs.concat(child.all_outputs).uniq!
+        end
       end
 
       # @private
       # Inputs available for the user for this runnable and all its children.
-      def available_inputs
-        @available_inputs ||=
-          begin
-            available_inputs =
-              config.inputs
-                .slice(*inputs)
-                .each_with_object({}) do |(_, input), inputs|
-                  inputs[input.name.to_sym] = input
-                end
-
-            available_inputs.each do |input, current_definition|
-              child_definition = children_available_inputs[input]
-              current_definition.merge_with_child(child_definition)
+      def available_inputs(selected_suite_options = nil)
+        available_inputs =
+          config.inputs
+            .slice(*inputs)
+            .each_with_object({}) do |(_, input), inputs|
+              inputs[input.name.to_sym] = Entities::Input.new(input.to_hash)
             end
 
-            available_inputs = children_available_inputs.merge(available_inputs)
-            order_available_inputs(available_inputs)
-          end
+        available_inputs.each do |input, current_definition|
+          child_definition = children_available_inputs(selected_suite_options)[input]
+          current_definition.merge_with_child(child_definition)
+        end
+
+        available_inputs = children_available_inputs(selected_suite_options).merge(available_inputs)
+        order_available_inputs(available_inputs)
       end
     end
   end

data/lib/inferno/entities/input.rb

@@ -13,7 +13,8 @@ module Inferno
         :default,
         :optional,
         :options,
-        :locked
+        :locked,
+        :value
       ].freeze
       include Entities::Attributes
 

data/lib/inferno/entities/test_run.rb

@@ -68,8 +68,8 @@ module Inferno
         super.merge(test_session: test_session).compact
       end
 
-      def test_count
-        @test_count ||= runnable.test_count
+      def test_count(selected_suite_options = [])
+        @test_count ||= runnable.test_count(selected_suite_options)
       end
     end
   end

data/lib/inferno/entities/test_suite.rb

@@ -93,6 +93,12 @@ module Inferno
         def suite_options
           @suite_options ||= []
         end
+
+        def links(links = nil)
+          return @links if links.nil?
+
+          @links = links
+        end
       end
     end
   end