inferno_core 0.3.12 → 0.4.0

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

@@ -1,3 +1,7 @@
+require_relative 'preset'
+require_relative 'suite_option'
+require_relative 'test_group'
+
 module Inferno
   module Web
     module Serializers
@@ -25,7 +29,7 @@ module Inferno
           include_view :summary
           field :test_groups do |suite, options|
             suite_options = options[:suite_options]
-            TestGroup.render_as_hash(suite.groups(suite_options), suite_options: suite_options)
+            TestGroup.render_as_hash(suite.groups(suite_options), suite_options:)
           end
           field :configuration_messages
           field :inputs do |suite, options|

data/lib/inferno/config/application.rb

@@ -25,13 +25,8 @@ module Inferno
 
     configure do |config|
       config.root = File.expand_path('../../..', __dir__)
-      config.default_namespace = 'inferno'
-      config.system_dir = File.join('lib', 'inferno', 'config')
       config.bootable_dirs = [File.join('lib', 'inferno', 'config', 'boot')]
-
-      config.auto_register = 'lib'
+      config.component_dirs.add 'lib'
     end
-
-    load_paths!('lib')
   end
 end

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

@@ -1,15 +1,10 @@
 Inferno::Application.boot(:web) do |_app|
   init do
     require 'blueprinter'
-    require 'hanami-router'
-    require 'hanami-controller'
+    require 'hanami/router'
+    require 'hanami/controller'
     require 'oj'
 
-    Hanami::Controller.configure do
-      default_request_format :json
-      default_response_format :json
-    end
-
     Blueprinter.configure do |config|
       config.generator = Oj
     end

data/lib/inferno/dsl/assertions.rb

@@ -58,7 +58,7 @@ module Inferno
       # @param profile_url [String] url of the profile to validate against,
       #   defaults to validating against the base FHIR resource
       def assert_valid_resource(resource: self.resource, profile_url: nil)
-        assert resource_is_valid?(resource: resource, profile_url: profile_url),
+        assert resource_is_valid?(resource:, profile_url:),
                invalid_resource_message(profile_url)
       end
 
@@ -100,7 +100,7 @@ module Inferno
             .map(&:resource)
             .select { |resource| types_to_check.empty? || types_to_check.include?(resource.resourceType) }
             .reject do |resource|
-              validation_params = { resource: resource }
+              validation_params = { resource: }
               profile = types_to_check[resource.resourceType]
               validation_params[:profile_url] = profile if profile
 

data/lib/inferno/dsl/configurable.rb

@@ -37,7 +37,7 @@ module Inferno
               new_configuration
             end
 
-          self.configuration = configuration.deep_merge(config_to_apply.reject { |key, _| key == :inputs })
+          self.configuration = configuration.deep_merge(config_to_apply.except(:inputs))
 
           config_to_apply[:inputs]&.each do |identifier, new_input|
             add_input(identifier, new_input.to_hash)
@@ -58,13 +58,13 @@ module Inferno
           existing_config = input(identifier)
 
           if existing_config.nil?
-            return inputs[identifier] = Entities::Input.new(default_input_params(identifier).merge(new_config))
+            return inputs[identifier] = Entities::Input.new(**default_input_params(identifier).merge(new_config))
           end
 
           inputs[identifier] =
             Entities::Input
-              .new(existing_config.to_hash)
-              .merge(Entities::Input.new(new_config))
+              .new(**existing_config.to_hash)
+              .merge(Entities::Input.new(**new_config))
         end
 
         def default_input_params(identifier)

data/lib/inferno/dsl/fhir_client.rb

@@ -1,3 +1,4 @@
+require_relative 'fhir_client_builder'
 require_relative 'request_storage'
 require_relative 'tcp_exception_handler'
 
@@ -136,7 +137,7 @@ module Inferno
         store_request_and_refresh_token(fhir_client(client), name) do
           tcp_exception_handler do
             fhir_client(client)
-              .search(fhir_class_from_resource_type(resource_type), { search: search })
+              .search(fhir_class_from_resource_type(resource_type), { search: })
           end
         end
       end
@@ -194,7 +195,7 @@ module Inferno
             name: credentials.name,
             value: credentials,
             type: 'oauth_credentials',
-            test_session_id: test_session_id
+            test_session_id:
           )
         end
       rescue StandardError => e

data/lib/inferno/dsl/fhir_client_builder.rb

@@ -73,8 +73,8 @@ module Inferno
       end
 
       # @private
-      def method_missing(name, *args, &block)
-        return runnable.call(name, *args, &block) if runnable.respond_to? name
+      def method_missing(name, *args, &)
+        return runnable.call(name, *args, &) if runnable.respond_to? name
 
         super
       end

data/lib/inferno/dsl/fhir_validation.rb

@@ -45,8 +45,8 @@ module Inferno
         attr_reader :requirements
 
         # @private
-        def initialize(requirements = nil, &block)
-          instance_eval(&block)
+        def initialize(requirements = nil, &)
+          instance_eval(&)
           @requirements = requirements
         end
 
@@ -172,11 +172,10 @@ module Inferno
         # @param profile_url [String]
         # @return [String] the body of the validation response
         def validate(resource, profile_url)
-          RestClient.post(
-            "#{url}/validate",
-            resource.source_contents,
+          Faraday.new(
+            url,
             params: { profile: profile_url }
-          ).body
+          ).post('validate', resource.source_contents).body
         end
       end
 

data/lib/inferno/dsl/http_client.rb

@@ -1,5 +1,6 @@
 require 'faraday_middleware'
 
+require_relative 'http_client_builder'
 require_relative 'request_storage'
 require_relative 'tcp_exception_handler'
 
@@ -66,18 +67,17 @@ module Inferno
       # @param client [Symbol]
       # @param name [Symbol] Name for this request to allow it to be used by
       #   other tests
-      # @option options [Hash] Input headers here - headers are optional and
-      #   must be entered as the last piece of input to this method
+      # @param headers [Hash] Input headers here
       # @return [Inferno::Entities::Request]
-      def get(url = '', client: :default, name: nil, **options)
+      def get(url = '', client: :default, name: nil, headers: nil)
         store_request('outgoing', name) do
           tcp_exception_handler do
             client = http_client(client)
 
             if client
-              client.get(url, nil, options[:headers])
+              client.get(url, nil, headers)
             elsif url.match?(%r{\Ahttps?://})
-              connection.get(url, nil, options[:headers])
+              connection.get(url, nil, headers)
             else
               raise StandardError, 'Must use an absolute url or define an HTTP client with a base url'
             end
@@ -102,18 +102,17 @@ module Inferno
       # @param client [Symbol]
       # @param name [Symbol] Name for this request to allow it to be used by
       #   other tests
-      # @option options [Hash] Input headers here - headers are optional and
-      #   must be entered as the last piece of input to this method
+      # @param headers [Hash] Input headers here
       # @return [Inferno::Entities::Request]
-      def post(url = '', body: nil, client: :default, name: nil, **options)
+      def post(url = '', body: nil, client: :default, name: nil, headers: nil)
         store_request('outgoing', name) do
           tcp_exception_handler do
             client = http_client(client)
 
             if client
-              client.post(url, body, options[:headers])
+              client.post(url, body, headers)
             elsif url.match?(%r{\Ahttps?://})
-              connection.post(url, body, options[:headers])
+              connection.post(url, body, headers)
             else
               raise StandardError, 'Must use an absolute url or define an HTTP client with a base url'
             end
@@ -129,16 +128,17 @@ module Inferno
       # @param client [Symbol]
       # @param name [Symbol] Name for this request to allow it to be used by
       #   other tests
+      # @param headers [Hash] Input headers here
       # @return [Inferno::Entities::Request]
-      def delete(url = '', client: :default, name: :nil, **options)
+      def delete(url = '', client: :default, name: :nil, headers: nil)
         store_request('outgoing', name) do
           tcp_exception_handler do
             client = http_client(client)
 
             if client
-              client.delete(url, nil, options[:headers])
+              client.delete(url, nil, headers)
             elsif url.match?(%r{\Ahttps?://})
-              connection.delete(url, nil, options[:headers])
+              connection.delete(url, nil, headers)
             else
               raise StandardError, 'Must use an absolute url or define an HTTP client with a base url'
             end
@@ -158,10 +158,9 @@ module Inferno
       # @param client [Symbol]
       # @param name [Symbol] Name for this request to allow it to be used by
       #   other tests
-      # @option options [Hash] Input headers here - headers are optional and
-      #   must be entered as the last piece of input to this method
+      # @param headers [Hash] Input headers here
       # @return [Inferno::Entities::Request]
-      def stream(block, url = '', limit = 100, client: :default, name: nil, **options)
+      def stream(block, url = '', limit = 100, client: :default, name: nil, headers: nil)
         streamed = []
 
         collector = proc do |chunk, bytes|
@@ -175,9 +174,9 @@ module Inferno
             client = http_client(client)
 
             if client
-              response = client.get(url, nil, options[:headers]) { |req| req.options.on_data = collector }
+              response = client.get(url, nil, headers) { |req| req.options.on_data = collector }
             elsif url.match?(%r{\Ahttps?://})
-              response = connection.get(url, nil, options[:headers]) { |req| req.options.on_data = collector }
+              response = connection.get(url, nil, 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

@@ -11,8 +11,8 @@ module Inferno
         self.runnable = runnable
         instance_exec(self, &block)
 
-        params = { url: url }
-        params.merge!(headers: headers) if headers
+        params = { url: }
+        params.merge!(headers:) if headers
 
         Faraday.new(params) do |f|
           f.request :url_encoded
@@ -44,8 +44,8 @@ module Inferno
       end
 
       # @private
-      def method_missing(name, *args, &block)
-        return runnable.call(name, *args, &block) if runnable.respond_to? name
+      def method_missing(name, *args, &)
+        return runnable.call(name, *args, &) if runnable.respond_to? name
 
         super
       end

data/lib/inferno/dsl/input_output_handling.rb

@@ -183,7 +183,7 @@ module Inferno
           config.inputs
             .slice(*inputs)
             .each_with_object({}) do |(_, input), inputs|
-              inputs[input.name.to_sym] = Entities::Input.new(input.to_hash)
+              inputs[input.name.to_sym] = Entities::Input.new(**input.to_hash)
             end
 
         available_inputs.each do |input, current_definition|

data/lib/inferno/dsl/request_storage.rb

@@ -49,11 +49,11 @@ module Inferno
         request =
           if response.is_a? FHIR::ClientReply
             Entities::Request.from_fhir_client_reply(
-              response, direction: direction, name: name, test_session_id: test_session_id
+              response, direction:, name:, test_session_id:
             )
           else
             Entities::Request.from_http_response(
-              response, direction: direction, name: name, test_session_id: test_session_id
+              response, direction:, name:, test_session_id:
             )
           end
 

data/lib/inferno/dsl/resume_test_route.rb

@@ -1,4 +1,4 @@
-require 'hanami-controller'
+require 'hanami/controller'
 
 module Inferno
   module DSL
@@ -6,44 +6,40 @@ module Inferno
     # an incoming request.
     # @private
     # @see Inferno::DSL::Runnable#resume_test_route
-    class ResumeTestRoute
-      include Hanami::Action
+    class ResumeTestRoute < Hanami::Action
       include Import[
-                requests_repo: 'repositories.requests',
-                results_repo: 'repositories.results',
-                test_runs_repo: 'repositories.test_runs',
-                tests_repo: 'repositories.tests'
+                requests_repo: 'inferno.repositories.requests',
+                results_repo: 'inferno.repositories.results',
+                test_runs_repo: 'inferno.repositories.test_runs',
+                tests_repo: 'inferno.repositories.tests'
               ]
 
-      def self.call(params)
-        new.call(params)
+      def self.call(...)
+        new.call(...)
       end
 
-      # The incoming request
-      #
-      # @return [Inferno::Entities::Request]
-      def request
-        @request ||= Inferno::Entities::Request.from_rack_env(@params.env)
+      # @private
+      def test_run_identifier_block
+        self.class.singleton_class.instance_variable_get(:@test_run_identifier_block)
       end
 
       # @private
-      def test_run
-        @test_run ||=
-          test_runs_repo.find_latest_waiting_by_identifier(test_run_identifier)
+      def find_test_run(test_run_identifier)
+        test_runs_repo.find_latest_waiting_by_identifier(test_run_identifier)
       end
 
       # @private
-      def waiting_result
-        @waiting_result ||= results_repo.find_waiting_result(test_run_id: test_run.id)
+      def find_waiting_result(test_run)
+        results_repo.find_waiting_result(test_run_id: test_run.id)
       end
 
       # @private
-      def update_result
+      def update_result(waiting_result)
         results_repo.pass_waiting_result(waiting_result.id)
       end
 
       # @private
-      def persist_request
+      def persist_request(request, test_run, waiting_result, test)
         requests_repo.create(
           request.to_hash.merge(
             test_session_id: test_run.test_session_id,
@@ -54,35 +50,41 @@ module Inferno
       end
 
       # @private
-      def redirect_route
-        "#{Application['base_url']}/test_sessions/#{test_run.test_session_id}##{resume_ui_at_id}"
+      def redirect_route(test_run, test)
+        "#{Application['base_url']}/test_sessions/#{test_run.test_session_id}##{resume_ui_at_id(test_run, test)}"
       end
 
       # @private
-      def test
-        @test ||= tests_repo.find(waiting_result.test_id)
+      def find_test(waiting_result)
+        tests_repo.find(waiting_result.test_id)
       end
 
       # @private
-      def resume_ui_at_id
+      def resume_ui_at_id(test_run, test)
         test_run.test_suite_id || test_run.test_group_id || test.parent.id
       end
 
       # @private
-      def call(_params)
-        if test_run.nil?
-          status(500, "Unable to find test run with identifier '#{test_run_identifier}'.")
-          return
-        end
+      def handle(req, res)
+        request = Inferno::Entities::Request.from_hanami_request(req)
+
+        test_run_identifier = instance_exec(request, &test_run_identifier_block)
+
+        test_run = find_test_run(test_run_identifier)
+
+        halt 500, "Unable to find test run with identifier '#{test_run_identifier}'." if test_run.nil?
 
         test_runs_repo.mark_as_no_longer_waiting(test_run.id)
 
-        update_result
-        persist_request
+        waiting_result = find_waiting_result(test_run)
+        test = find_test(waiting_result)
+
+        update_result(waiting_result)
+        persist_request(request, test_run, waiting_result, test)
 
         Jobs.perform(Jobs::ResumeTestRun, test_run.id)
 
-        redirect_to redirect_route
+        res.redirect_to redirect_route(test_run, test)
       end
     end
   end

data/lib/inferno/dsl/runnable.rb

@@ -88,7 +88,7 @@ module Inferno
       # alias the method name they wish to use to define child entities to this
       # method.
       # @private
-      def define_child(*args, &block)
+      def define_child(*args, &)
         hash_args = process_args(args)
 
         klass = create_child_class(hash_args)
@@ -99,7 +99,7 @@ module Inferno
 
         configure_child_class(klass, hash_args)
 
-        handle_child_definition_block(klass, &block)
+        handle_child_definition_block(klass, &)
 
         klass.add_self_to_repository
 
@@ -190,8 +190,8 @@ module Inferno
       end
 
       # @private
-      def handle_child_definition_block(klass, &block)
-        klass.class_eval(&block) if block_given?
+      def handle_child_definition_block(klass, &)
+        klass.class_eval(&) if block_given?
       end
 
       # Set/Get a runnable's id
@@ -353,9 +353,8 @@ module Inferno
       #   {Inferno::Entities::Request} object with the information for the
       #   incoming request.
       def resume_test_route(method, path, &block)
-        route_class = Class.new(ResumeTestRoute) do
-          define_method(:test_run_identifier, &block)
-          define_method(:request_name, -> { options[:name] })
+        route_class = Class.new(ResumeTestRoute) do |klass|
+          klass.singleton_class.instance_variable_set(:@test_run_identifier_block, block)
         end
 
         route(method, path, route_class)
@@ -375,7 +374,7 @@ module Inferno
       #   app](http://sinatrarb.com/)) as described in the [Hanami Router
       #   documentation.](https://github.com/hanami/router/tree/f41001d4c3ee9e2d2c7bb142f74b43f8e1d3a265#mount-rack-applications)
       def route(method, path, handler)
-        Inferno.routes << { method: method, path: path, handler: handler, suite: suite }
+        Inferno.routes << { method:, path:, handler:, suite: }
       end
 
       # @private
@@ -401,7 +400,7 @@ module Inferno
       def required_suite_options(suite_option_requirements)
         @suite_option_requirements =
           suite_option_requirements.map do |key, value|
-            DSL::SuiteOption.new(id: key, value: value)
+            DSL::SuiteOption.new(id: key, value:)
           end
       end
 

data/lib/inferno/entities/header.rb

@@ -35,13 +35,13 @@ module Inferno
 
       def to_hash
         {
-          id: id,
-          request_id: request_id,
-          type: type,
-          name: name,
-          value: value,
-          created_at: created_at,
-          updated_at: updated_at
+          id:,
+          request_id:,
+          type:,
+          name:,
+          value:,
+          created_at:,
+          updated_at:
         }.compact
       end
     end

data/lib/inferno/entities/request.rb

@@ -89,8 +89,8 @@ module Inferno
       # @return [Hash]
       def request
         {
-          verb: verb,
-          url: url,
+          verb:,
+          url:,
           headers: request_headers,
           body: request_body
         }
@@ -101,7 +101,7 @@ module Inferno
       # @return [Hash]
       def response
         {
-          status: status,
+          status:,
           headers: response_headers,
           body: response_body
         }
@@ -110,20 +110,20 @@ module Inferno
       # @private
       def to_hash
         {
-          id: id,
-          verb: verb,
-          url: url,
-          direction: direction,
-          status: status,
-          name: name,
-          request_body: request_body,
-          response_body: response_body,
-          result_id: result_id,
-          test_session_id: test_session_id,
+          id:,
+          verb:,
+          url:,
+          direction:,
+          status:,
+          name:,
+          request_body:,
+          response_body:,
+          result_id:,
+          test_session_id:,
           request_headers: request_headers.map(&:to_hash),
           response_headers: response_headers.map(&:to_hash),
-          created_at: created_at,
-          updated_at: updated_at
+          created_at:,
+          updated_at:
         }.compact
       end
 
@@ -136,22 +136,21 @@ module Inferno
 
       class << self
         # @private
-        def from_rack_env(env, name: nil)
-          rack_request = env['router.request'].rack_request
-          url = "#{rack_request.base_url}#{rack_request.path}"
-          url += "?#{rack_request.query_string}" if rack_request.query_string.present?
+        def from_hanami_request(request, name: nil)
+          url = "#{request.base_url}#{request.path}"
+          url += "?#{request.query_string}" if request.query_string.present?
           request_headers =
-            env
+            request.params.env
               .select { |key, _| key.start_with? 'HTTP_' }
               .transform_keys { |key| key.delete_prefix('HTTP_').tr('_', '-').downcase }
-              .map { |header_name, value| Header.new(name: header_name, value: value, type: 'request') }
+              .map { |header_name, value| Header.new(name: header_name, value:, type: 'request') }
 
           new(
-            verb: rack_request.request_method.downcase,
-            url: url,
+            verb: request.request_method.downcase,
+            url:,
             direction: 'incoming',
-            name: name,
-            request_body: rack_request.body.string,
+            name:,
+            request_body: request.body.string,
             headers: request_headers
           )
         end
@@ -160,20 +159,20 @@ module Inferno
         def from_http_response(response, test_session_id:, direction: 'outgoing', name: nil)
           request_headers =
             response.env.request_headers
-              .map { |header_name, value| Header.new(name: header_name.downcase, value: value, type: 'request') }
+              .map { |header_name, value| Header.new(name: header_name.downcase, value:, type: 'request') }
           response_headers =
             response.headers
-              .map { |header_name, value| Header.new(name: header_name.downcase, value: value, type: 'response') }
+              .map { |header_name, value| Header.new(name: header_name.downcase, value:, type: 'response') }
 
           new(
             verb: response.env.method,
             url: response.env.url.to_s,
-            direction: direction,
-            name: name,
+            direction:,
+            name:,
             status: response.status,
             request_body: response.env.request_body,
             response_body: response.body,
-            test_session_id: test_session_id,
+            test_session_id:,
             headers: request_headers + response_headers
           )
         end
@@ -183,9 +182,9 @@ module Inferno
           request = reply.request
           response = reply.response
           request_headers = request[:headers]
-            .map { |header_name, value| Header.new(name: header_name.downcase, value: value, type: 'request') }
+            .map { |header_name, value| Header.new(name: header_name.downcase, value:, type: 'request') }
           response_headers = response[:headers]
-            .map { |header_name, value| Header.new(name: header_name.downcase, value: value, type: 'response') }
+            .map { |header_name, value| Header.new(name: header_name.downcase, value:, type: 'response') }
           request_body =
             if request.dig(:headers, 'Content-Type')&.include?('application/x-www-form-urlencoded')
               URI.encode_www_form(request[:payload])
@@ -196,12 +195,12 @@ module Inferno
           new(
             verb: request[:method],
             url: request[:url],
-            direction: direction,
-            name: name,
+            direction:,
+            name:,
             status: response[:code].to_i,
-            request_body: request_body,
+            request_body:,
             response_body: response[:body],
-            test_session_id: test_session_id,
+            test_session_id:,
             headers: request_headers + response_headers
           )
         end

data/lib/inferno/entities/session_data.rb

@@ -26,12 +26,12 @@ module Inferno
 
       def to_hash
         {
-          id: id,
-          name: name,
-          value: value,
-          test_session_id: test_session_id,
-          created_at: created_at,
-          updated_at: updated_at
+          id:,
+          name:,
+          value:,
+          test_session_id:,
+          created_at:,
+          updated_at:
         }
       end
     end