inferno_core 0.3.11 → 0.4.0

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

@@ -1,62 +1,76 @@
 require 'erb'
 
+Dir.glob(File.join(__dir__, 'controllers', '**', '*.rb')).each { |path| require_relative path }
+
 module Inferno
   module Web
     client_page = ERB.new(File.read(File.join(Inferno::Application.root, 'lib', 'inferno', 'apps', 'web',
                                               'index.html.erb'))).result
 
-    Router = Hanami::Router.new(namespace: Inferno::Web::Controllers) do
-      namespace Application['base_path'] do
-        namespace 'api' do
-          resources 'test_runs', only: [:create, :show, :destroy] do
-            resources 'results', only: [:index]
-          end
-
-          resources 'test_sessions', only: [:create, :show] do
-            resources 'results', only: [:index]
-            resources 'session_data', only: [:index] do
-              collection do
-                put '/apply_preset',
-                    to: Inferno::Web::Controllers::TestSessions::SessionData::ApplyPreset,
-                    as: :apply_preset
-              end
-            end
-          end
-          get 'test_sessions/:test_session_id/last_test_run',
+    base_path = Application['base_path']
+    base_path = "/#{base_path.delete_prefix('/')}" if base_path.present?
+
+    Router = Hanami::Router.new(prefix: base_path) do
+      scope 'api' do
+        scope 'test_runs' do
+          post '/', to: Inferno::Web::Controllers::TestRuns::Create, as: :create
+          get '/:id', to: Inferno::Web::Controllers::TestRuns::Show, as: :show
+          delete '/:id', to: Inferno::Web::Controllers::TestRuns::Destroy, as: :destroy
+
+          get '/results', to: Inferno::Web::Controllers::TestRuns::Results::Index, as: :results
+        end
+
+        scope 'test_sessions' do
+          post '/', to: Inferno::Web::Controllers::TestSessions::Create, as: :create
+          get '/:id', to: Inferno::Web::Controllers::TestSessions::Show, as: :show
+
+          get '/:id/last_test_run',
               to: Inferno::Web::Controllers::TestSessions::LastTestRun,
               as: :last_test_run
+          get '/:id/results',
+              to: Inferno::Web::Controllers::TestSessions::Results::Index,
+              as: :results
+          get '/:id/session_data',
+              to: Inferno::Web::Controllers::TestSessions::SessionData::Index
+          put '/:id/session_data/apply_preset',
+              to: Inferno::Web::Controllers::TestSessions::SessionData::ApplyPreset,
+              as: :session_data_apply_preset
+        end
 
-          resources 'test_suites', only: [:index, :show]
-          put 'test_suites/:id/check_configuration',
+        scope 'test_suites' do
+          get '/', to: Inferno::Web::Controllers::TestSuites::Index, as: :index
+          get '/:id', to: Inferno::Web::Controllers::TestSuites::Show, as: :show
+
+          put '/:id/check_configuration',
               to: Inferno::Web::Controllers::TestSuites::CheckConfiguration,
               as: :check_configuration
+        end
 
-          resources 'requests', only: [:show]
+        get '/requests/:id', to: Inferno::Web::Controllers::Requests::Show, as: :requests_show
 
-          get '/version', to: ->(_env) { [200, {}, [{ 'version' => Inferno::VERSION.to_s }.to_json]] }, as: :api_version
-        end
+        get '/version', to: ->(_env) { [200, {}, [{ 'version' => Inferno::VERSION.to_s }.to_json]] }, as: :version
+      end
 
-        # Should not need Content-Type header but GitHub Codespaces will not work without them.
-        # This could be investigated and likely removed if addressed properly elsewhere.
-        get '/', to: ->(_env) { [200, { 'Content-Type' => 'text/html' }, [client_page]] }
-        get '/test_sessions/:id', to: ->(_env) { [200, { 'Content-Type' => 'text/html' }, [client_page]] }
-
-        Inferno.routes.each do |route|
-          cleaned_id = route[:suite].id.gsub(/[^a-zA-Z\d\-._~]/, '_')
-          path = "/custom/#{cleaned_id}#{route[:path]}"
-          Application['logger'].info("Registering custom route: #{path}")
-          if route[:method] == :all
-            mount route[:handler], at: path
-          else
-            send(route[:method], path, to: route[:handler])
-          end
-        end
+      # Should not need Content-Type header but GitHub Codespaces will not work without them.
+      # This could be investigated and likely removed if addressed properly elsewhere.
+      get '/', to: ->(_env) { [200, { 'Content-Type' => 'text/html' }, [client_page]] }
+      get '/test_sessions/:id', to: ->(_env) { [200, { 'Content-Type' => 'text/html' }, [client_page]] }
 
-        Inferno::Repositories::TestSuites.all.map { |suite| "/#{suite.id}" }.each do |suite_path|
-          Application['logger'].info("Registering suite route: #{suite_path}")
-          get suite_path, to: ->(_env) { [200, {}, [client_page]] }
+      Inferno.routes.each do |route|
+        cleaned_id = route[:suite].id.gsub(/[^a-zA-Z\d\-._~]/, '_')
+        path = "/custom/#{cleaned_id}#{route[:path]}"
+        Application['logger'].info("Registering custom route: #{path}")
+        if route[:method] == :all
+          mount route[:handler], at: path
+        else
+          send(route[:method], path, to: route[:handler])
         end
       end
+
+      Inferno::Repositories::TestSuites.all.map { |suite| "/#{suite.id}" }.each do |suite_path|
+        Application['logger'].info("Registering suite route: #{suite_path}")
+        get suite_path, to: ->(_env) { [200, {}, [client_page]] }
+      end
     end
   end
 end

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

@@ -1,3 +1,5 @@
+require_relative 'serializer'
+
 module Inferno
   module Web
     module Serializers

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

@@ -1,3 +1,5 @@
+require_relative 'serializer'
+
 module Inferno
   module Web
     module Serializers
@@ -6,11 +8,6 @@ module Inferno
           identifier :id
           field :title
         end
-
-        # view :full do
-        #   include_view :summary
-        #   field :inputs, blueprint: Input
-        # end
       end
     end
   end

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

@@ -1,9 +1,12 @@
+require_relative 'header'
+
 module Inferno
   module Web
     module Serializers
       class Request < Serializer
         view :summary do
-          field :id
+          identifier :id
+          field :index
           field :created_at, name: :timestamp
           field :verb
           field :url

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

@@ -1,4 +1,6 @@
 require 'json'
+require_relative 'message'
+require_relative 'request'
 
 module Inferno
   module Web
@@ -27,7 +29,9 @@ module Inferno
         end
 
         association :messages, blueprint: Message, if: :field_present?
-        association :requests, blueprint: Request, view: :summary, if: :field_present?
+        field :requests do |result, _options|
+          Request.render_as_hash(result.requests.sort_by(&:index), view: :summary)
+        end
       end
     end
   end

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

@@ -1,3 +1,5 @@
+require_relative 'serializer'
+
 module Inferno
   module Web
     module Serializers

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

@@ -1,3 +1,5 @@
+require_relative 'serializer'
+
 module Inferno
   module Web
     module Serializers

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

@@ -1,3 +1,6 @@
+require_relative 'hash_value_extractor'
+require_relative 'input'
+
 module Inferno
   module Web
     module Serializers

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

@@ -1,3 +1,5 @@
+require_relative 'test'
+
 module Inferno
   module Web
     module Serializers
@@ -19,11 +21,11 @@ module Inferno
         end
         field :test_groups do |group, options|
           suite_options = options[:suite_options]
-          TestGroup.render_as_hash(group.groups(suite_options), suite_options: suite_options)
+          TestGroup.render_as_hash(group.groups(suite_options), suite_options:)
         end
         field :tests do |group, options|
           suite_options = options[:suite_options]
-          Test.render_as_hash(group.tests(suite_options), suite_options: suite_options)
+          Test.render_as_hash(group.tests(suite_options), suite_options:)
         end
         field :inputs do |group, options|
           suite_options = options[:suite_options]

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

@@ -1,3 +1,6 @@
+require_relative 'input'
+require_relative 'result'
+
 module Inferno
   module Web
     module Serializers

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/config/boot.rb

@@ -4,4 +4,9 @@ ENV['APP_ENV'] ||= 'development'
 
 root_path = Dir.pwd
 
-Dotenv.load(File.join(root_path, '.env'), File.join(root_path, ".env.#{ENV.fetch('APP_ENV', nil)}"))
+Dotenv.load(
+  File.join(root_path, ".env.#{ENV.fetch('APP_ENV', nil)}.local"),
+  File.join(root_path, '.env.local'),
+  File.join(root_path, ".env.#{ENV.fetch('APP_ENV', nil)}"),
+  File.join(root_path, '.env')
+)

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