inferno_core 0.3.11 → 0.4.0

data/lib/inferno/repositories/messages.rb

@@ -4,7 +4,7 @@ module Inferno
       def messages_for_result(result_id)
         self.class::Model
           .order(:index)
-          .where(result_id: result_id)
+          .where(result_id:)
           .to_a
           .map!(&:to_json_data)
           .each(&:deep_symbolize_keys!)

data/lib/inferno/repositories/repository.rb

@@ -48,7 +48,7 @@ module Inferno
       # @return [Inferno::Entities] an instance of the class returned by
       #   `#entity_class`
       def find(id)
-        result = self.class::Model.find(id: id)
+        result = self.class::Model.find(id:)
         return result if result.nil?
 
         build_entity(result.to_hash)

data/lib/inferno/repositories/requests.rb

@@ -1,7 +1,7 @@
 module Inferno
   module Repositories
     class Requests < Repository
-      include Import[headers_repo: 'repositories.headers']
+      include Import[headers_repo: 'inferno.repositories.headers']
 
       def create(params)
         request = self.class::Model.create(db_params(params))
@@ -17,7 +17,7 @@ module Inferno
 
         build_entity(
           request.to_hash
-            .merge(headers: headers)
+            .merge(headers:)
             .merge(non_db_params(params))
         )
       end
@@ -25,7 +25,7 @@ module Inferno
       def find(id)
         result =
           self.class::Model
-            .where(id: id)
+            .where(id:)
             .select(*entity_class::SUMMARY_FIELDS)
             .to_a
         return nil if result.blank?
@@ -36,7 +36,7 @@ module Inferno
       def find_full_request(id)
         result =
           self.class::Model
-            .find(id: id)
+            .find(id:)
             .to_json_data(json_serializer_options)
             .deep_symbolize_keys!
 
@@ -46,7 +46,7 @@ module Inferno
       def find_named_request(test_session_id, name)
         results =
           self.class::Model
-            .where(test_session_id: test_session_id, name: name.to_s)
+            .where(test_session_id:, name: name.to_s)
             .map { |model| model.to_json_data(json_serializer_options) }
         return nil if results.blank?
 
@@ -59,7 +59,7 @@ module Inferno
       def requests_for_result(result_id)
         self.class::Model
           .order(:index)
-          .where(result_id: result_id)
+          .where(result_id:)
           .select(*entity_class::SUMMARY_FIELDS)
           .to_a
           .map(&:to_hash)

data/lib/inferno/repositories/results.rb

@@ -4,11 +4,11 @@ module Inferno
   module Repositories
     class Results < Repository
       include Import[
-                messages_repo: 'repositories.messages',
-                requests_repo: 'repositories.requests',
-                tests_repo: 'repositories.tests',
-                groups_repo: 'repositories.test_groups',
-                suites_repo: 'repositories.test_suites'
+                messages_repo: 'inferno.repositories.messages',
+                requests_repo: 'inferno.repositories.requests',
+                tests_repo: 'inferno.repositories.tests',
+                groups_repo: 'inferno.repositories.test_groups',
+                suites_repo: 'inferno.repositories.test_suites'
               ]
 
       def create(params)
@@ -37,9 +37,9 @@ module Inferno
       #     test_session_id,
       #     test_id: 'test_id'
       #   )
-      def current_result_for_test_session(test_session_id, **params)
+      def current_result_for_test_session(test_session_id, params)
         self.class::Model
-          .where({ test_session_id: test_session_id }.merge(params))
+          .where({ test_session_id: }.merge(params))
           .order(Sequel.desc(:updated_at))
           .limit(1)
           .all
@@ -66,10 +66,10 @@ module Inferno
         entity_class.new(params.merge(runnable))
       end
 
-      def result_for_test_run(test_run_id:, **params)
+      def result_for_test_run(params)
         result_hash =
           self.class::Model
-            .find({ test_run_id: test_run_id }.merge(params))
+            .find(params)
             &.to_hash
 
         return nil if result_hash.nil?
@@ -79,7 +79,7 @@ module Inferno
 
       def test_run_results_after(test_run_id:, after:)
         Model
-          .where(test_run_id: test_run_id)
+          .where(test_run_id:)
           .where { updated_at >= after }
           .to_a
           .map! do |result_hash|
@@ -94,7 +94,7 @@ module Inferno
       def find_waiting_result(test_run_id:)
         result_hash =
           Model
-            .where(test_run_id: test_run_id, result: 'wait')
+            .where(test_run_id:, result: 'wait')
             .where { test_id !~ nil }
             .limit(1)
             .to_a
@@ -202,7 +202,7 @@ module Inferno
         end
 
         def self.current_results_for_test_session(test_session_id)
-          fetch(current_results_sql, test_session_id: test_session_id)
+          fetch(current_results_sql, test_session_id:)
         end
 
         def self.current_results_for_test_session_and_runnables(test_session_id, runnables)
@@ -212,10 +212,10 @@ module Inferno
 
           fetch(
             current_results_sql(with_runnables_filter: true),
-            test_session_id: test_session_id,
-            test_ids: test_ids,
-            test_group_ids: test_group_ids,
-            test_suite_ids: test_suite_ids
+            test_session_id:,
+            test_ids:,
+            test_group_ids:,
+            test_suite_ids:
           )
         end
       end

data/lib/inferno/repositories/session_data.rb

@@ -10,19 +10,19 @@ module Inferno
         db
           .insert_conflict(
             target: :id,
-            update: { value: value }
+            update: { value: }
           ).insert(
             id: "#{test_session_id}_#{name}",
-            name: name,
-            value: value,
-            test_session_id: test_session_id
+            name:,
+            value:,
+            test_session_id:
           )
       end
 
       def load(test_session_id:, name:, type: 'text')
         raw_value =
           self.class::Model
-            .find(test_session_id: test_session_id, name: name.to_s.downcase)
+            .find(test_session_id:, name: name.to_s.downcase)
             &.value
 
         case type.to_s
@@ -35,7 +35,7 @@ module Inferno
 
       def get_all_from_session(test_session_id)
         self.class::Model
-          .where(test_session_id: test_session_id)
+          .where(test_session_id:)
           .all
           .map! do |session_data_hash|
             build_entity(

data/lib/inferno/repositories/test_runs.rb

@@ -3,7 +3,7 @@ require_relative 'validate_runnable_reference'
 module Inferno
   module Repositories
     class TestRuns < Repository
-      include Import[results_repo: 'repositories.results']
+      include Import[results_repo: 'inferno.repositories.results']
 
       def json_serializer_options
         {
@@ -36,7 +36,7 @@ module Inferno
         test_run_hash =
           self.class::Model
             .where(status: 'waiting')
-            .where(identifier: identifier)
+            .where(identifier:)
             .where { wait_timeout >= Time.now }
             .order(Sequel.desc(:updated_at))
             .limit(1)
@@ -52,7 +52,7 @@ module Inferno
       def last_test_run(test_session_id)
         test_run_hash =
           self.class::Model
-            .where(test_session_id: test_session_id)
+            .where(test_session_id:)
             .order(Sequel.desc(:updated_at))
             .limit(1)
             .to_a
@@ -66,7 +66,7 @@ module Inferno
       end
 
       def status_for_test_run(id)
-        self.class::Model.where(id: id).get(:status)
+        self.class::Model.where(id:).get(:status)
       end
 
       def mark_as_running(test_run_id)
@@ -81,7 +81,7 @@ module Inferno
         update(
           test_run_id,
           status: 'waiting',
-          identifier: identifier,
+          identifier:,
           wait_timeout: Time.now + timeout.seconds
         )
       end
@@ -126,7 +126,7 @@ module Inferno
 
       def active_test_run_for_session?(test_session_id)
         self.class::Model
-          .where(test_session_id: test_session_id)
+          .where(test_session_id:)
           .exclude(status: 'done')
           .count.positive?
       end

data/lib/inferno/repositories/test_sessions.rb

@@ -5,9 +5,9 @@ module Inferno
     # Repository that deals with persistence for the `TestSession` entity.
     class TestSessions < Repository
       include Import[
-                results_repo: 'repositories.results',
-                session_data_repo: 'repositories.session_data',
-                presets_repo: 'repositories.presets'
+                results_repo: 'inferno.repositories.results',
+                session_data_repo: 'inferno.repositories.session_data',
+                presets_repo: 'inferno.repositories.presets'
               ]
 
       def json_serializer_options
@@ -28,7 +28,7 @@ module Inferno
             JSON.generate(raw_suite_options.map(&:to_hash))
           end
 
-        super(params.merge(suite_options: suite_options))
+        super(params.merge(suite_options:))
       end
 
       def results_for_test_session(test_session_id)
@@ -45,7 +45,7 @@ module Inferno
       def apply_preset(test_session_id, preset_id)
         preset = presets_repo.find(preset_id)
         preset.inputs.each do |input|
-          session_data_repo.save(input.merge(test_session_id: test_session_id))
+          session_data_repo.save(input.merge(test_session_id:))
         end
       end
 
@@ -56,13 +56,13 @@ module Inferno
           DSL::SuiteOption.new(suite_option_hash)
         end
 
-        final_params = params.merge(suite_options: suite_options)
+        final_params = params.merge(suite_options:)
         add_non_db_entities(final_params)
         entity_class.new(final_params)
       end
 
       class Model < Sequel::Model(db)
-        include Import[test_suites_repo: 'repositories.test_suites']
+        include Import[test_suites_repo: 'inferno.repositories.test_suites']
 
         one_to_many :results,
                     eager: [:messages, :requests],

data/lib/inferno/test_runner.rb

@@ -64,9 +64,9 @@ module Inferno
 
       test_instance =
         test.new(
-          inputs: inputs,
+          inputs:,
           test_session_id: test_session.id,
-          scratch: scratch,
+          scratch:,
           suite_options: test_session.suite_options_hash
         )
 
@@ -96,7 +96,7 @@ module Inferno
         {
           messages: test_instance.messages,
           requests: test_instance.requests,
-          result: result,
+          result:,
           result_message: test_instance.result_message,
           input_json: input_json_string,
           output_json: output_json_string

data/lib/inferno/utils/preset_template_generator.rb

@@ -29,7 +29,7 @@ module Inferno
 
       def generate
         metadata.merge(
-          inputs: inputs
+          inputs:
         )
       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.3.11'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/spec/factories/test_run.rb

@@ -4,7 +4,7 @@ FactoryBot.define do
     test_session_id { test_session.id }
 
     transient do
-      runnable { { test_suite_id: 'BasicTestSuite::Suite' } }
+      runnable { { test_suite_id: 'basic' } }
     end
 
     test_suite_id { runnable[:test_suite_id] }

data/spec/factories/test_session.rb

@@ -2,7 +2,7 @@ require_relative '../../lib/inferno/repositories'
 
 FactoryBot.define do
   factory :test_session, class: 'Inferno::Entities::TestSession' do
-    test_suite_id { 'BasicTestSuite::Suite' }
+    test_suite_id { 'basic' }
 
     initialize_with { new(**attributes) }
 

data/spec/fixtures/basic_test_suite.rb

@@ -4,5 +4,6 @@ module BasicTestSuite
   class Suite < Inferno::Entities::TestSuite
     title 'Basic Test Suite'
     group from: 'BasicTestSuite::AbcGroup'
+    id :basic
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: inferno_core
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.4.0
 platform: ruby
 authors:
 - Stephen MacVicar
 - Robert Scanlon
 - Chase Zhou
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-13 00:00:00.000000000 Z
+date: 2022-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -60,42 +60,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: dry-container
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: dry-system
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -156,30 +156,30 @@ dependencies:
   name: hanami-controller
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: hanami-router
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.0.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -298,14 +298,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -490,6 +490,7 @@ files:
 - lib/inferno/apps/cli/console.rb
 - lib/inferno/apps/cli/main.rb
 - lib/inferno/apps/cli/migration.rb
+- lib/inferno/apps/cli/services.rb
 - lib/inferno/apps/cli/suite.rb
 - lib/inferno/apps/cli/suite_input_template.rb
 - lib/inferno/apps/cli/suites.rb
@@ -628,24 +629,24 @@ metadata:
   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: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 - spec
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Inferno Core is an open source tool for testing data exchanges enabled by
   the FHIR standand