diff --git a/.gitignore b/.gitignore index ee52933..b10d100 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /data/*.db +/data/igs/*.tgz /data/redis/**/*.rdb /data/redis/**/*.aof /data/redis/**/*.manifest diff --git a/Gemfile.lock b/Gemfile.lock index 422239b..3e2ab9f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: . specs: eom_test_kit (0.1.0) - inferno_core (~> 0.6.4) + inferno_core (~> 1.0, >= 1.0.2) GEM remote: https://rubygems.org/ @@ -16,18 +16,19 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base62-rb (0.3.1) - base64 (0.2.0) + base64 (0.3.0) bcp47 (0.3.3) i18n - bigdecimal (3.1.9) + bigdecimal (3.2.2) blueprinter (0.25.2) - byebug (11.1.3) + byebug (12.0.0) coderay (1.1.3) concurrent-ruby (1.3.4) - connection_pool (2.5.0) + connection_pool (2.5.3) crack (1.0.0) bigdecimal rexml + csv (3.3.5) database_cleaner (1.99.0) database_cleaner-sequel (1.99.0) database_cleaner (~> 1.99.0) @@ -74,10 +75,10 @@ GEM faraday-retry (~> 1.0) ruby2_keywords (>= 0.0.4) faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) + faraday-em_synchrony (1.0.1) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.1.0) + faraday-multipart (1.1.1) multipart-post (~> 2.0) faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) @@ -140,11 +141,12 @@ GEM domain_name (~> 0.5) i18n (1.14.7) concurrent-ruby (~> 1.0) - inferno_core (0.6.4) + inferno_core (1.0.5) activesupport (~> 6.1.7.5) base62-rb (= 0.3.1) blueprinter (= 0.25.2) concurrent-ruby (= 1.3.4) + csv (~> 3.3.5) dotenv (~> 2.7) dry-configurable (= 1.0.0) dry-container (= 0.10.0) @@ -157,39 +159,45 @@ GEM fhir_models (>= 4.2.2) hanami-controller (= 2.0.0) hanami-router (= 2.0.0) + kramdown (~> 2.5.1) + kramdown-parser-gfm (~> 1.1.0) + mutex_m (~> 0.3.0) oj (= 3.11.0) pastel (~> 0.8.0) pry pry-byebug puma (~> 5.6.7) rake (~> 13.0) + roo (~> 2.10.1) sequel (~> 5.42.0) sidekiq (~> 7.2.4) sqlite3 (~> 1.4) - thor (~> 1.2.1) + thor (~> 1.4) tty-markdown (~> 0.7.1) io-console (0.8.0) irb (1.15.1) pp (>= 0.6.0) rdoc (>= 4.0.0) reline (>= 0.4.2) - jwt (2.10.1) + jwt (2.10.2) base64 kramdown (2.5.1) rexml (>= 3.3.9) + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - logger (1.6.6) + logger (1.7.0) method_source (1.1.0) - mime-types (3.6.0) + mime-types (3.7.0) logger - mime-types-data (~> 3.2015) - mime-types-data (3.2025.0220) - mini_portile2 (2.8.8) - minitest (5.25.4) - multi_json (1.15.0) - multi_xml (0.7.1) + mime-types-data (~> 3.2025, >= 3.2025.0507) + mime-types-data (3.2025.0722) + mini_portile2 (2.8.9) + minitest (5.25.5) + multi_json (1.17.0) + multi_xml (0.7.2) bigdecimal (~> 3.1) multipart-post (2.4.1) mustermann (1.1.2) @@ -197,20 +205,21 @@ GEM mustermann-contrib (1.1.2) hansi (~> 0.2.0) mustermann (= 1.1.2) + mutex_m (0.3.0) netrc (0.11.0) nio4r (2.7.4) - nokogiri (1.18.3) + nokogiri (1.18.9) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.18.3-aarch64-linux-gnu) + nokogiri (1.18.9-aarch64-linux-gnu) racc (~> 1.4) - nokogiri (1.18.3-arm-linux-gnu) + nokogiri (1.18.9-arm-linux-gnu) racc (~> 1.4) - nokogiri (1.18.3-arm64-darwin) + nokogiri (1.18.9-arm64-darwin) racc (~> 1.4) - nokogiri (1.18.3-x86_64-darwin) + nokogiri (1.18.9-x86_64-darwin) racc (~> 1.4) - nokogiri (1.18.3-x86_64-linux-gnu) + nokogiri (1.18.9-x86_64-linux-gnu) racc (~> 1.4) oauth2 (1.4.11) faraday (>= 0.17.3, < 3.0) @@ -224,29 +233,29 @@ GEM pp (0.6.2) prettyprint prettyprint (0.2.0) - pry (0.14.2) + pry (0.15.2) coderay (~> 1.1) method_source (~> 1.0) - pry-byebug (3.10.1) - byebug (~> 11.0) - pry (>= 0.13, < 0.15) + pry-byebug (3.11.0) + byebug (~> 12.0) + pry (>= 0.13, < 0.16) psych (5.2.3) date stringio - public_suffix (6.0.1) + public_suffix (6.0.2) puma (5.6.9) nio4r (~> 2.0) racc (1.8.1) - rack (2.2.11) + rack (2.2.17) rack-test (2.2.0) rack (>= 1.3) - rake (13.2.1) + rake (13.3.0) rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) rdoc (6.12.0) psych (>= 4.0.0) - redis-client (0.23.2) + redis-client (0.25.1) connection_pool reline (0.6.0) io-console (~> 0.5) @@ -258,7 +267,10 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) rexml (3.4.1) - rouge (4.5.1) + roo (2.10.1) + nokogiri (~> 1) + rubyzip (>= 1.3.0, < 3.0.0) + rouge (4.6.0) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) @@ -273,6 +285,7 @@ GEM rspec-support (~> 3.13.0) rspec-support (3.13.2) ruby2_keywords (0.0.5) + rubyzip (2.4.1) sequel (5.42.0) sidekiq (7.2.4) concurrent-ruby (< 2) @@ -291,8 +304,8 @@ GEM unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) - thor (1.2.2) - tilt (2.6.0) + thor (1.4.0) + tilt (2.6.1) tty-color (0.6.0) tty-markdown (0.7.2) kramdown (>= 1.16.2, < 3.0) @@ -310,7 +323,7 @@ GEM addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - zeitwerk (2.7.2) + zeitwerk (2.7.3) PLATFORMS aarch64-linux diff --git a/data/igs/.keep b/data/igs/.keep new file mode 100644 index 0000000..e69de29 diff --git a/docker-compose.background.yml b/docker-compose.background.yml index 4988a42..7466126 100644 --- a/docker-compose.background.yml +++ b/docker-compose.background.yml @@ -7,7 +7,7 @@ services: # Negative values mean sessions never expire, 0 means sessions immediately expire SESSION_CACHE_DURATION: -1 volumes: - - ./lib/eom_test_kit/igs:/app/igs + - ./data/igs:/app/igs # To let the service share your local FHIR package cache, # uncomment the below line # - ~/.fhir:/home/ktor/.fhir @@ -15,7 +15,7 @@ services: # image: infernocommunity/fhir-validator-service # # Update this path to match your directory structure # volumes: - # - ./lib/eom_test_kit/igs:/home/igs + # - ./data/igs:/home/igs # fhir_validator_app: # image: infernocommunity/fhir-validator-app # depends_on: diff --git a/eom_test_kit.gemspec b/eom_test_kit.gemspec index 77006bc..c68d965 100644 --- a/eom_test_kit.gemspec +++ b/eom_test_kit.gemspec @@ -8,7 +8,7 @@ Gem::Specification.new do |spec| spec.description = 'An Inferno Test Kit for the Enhancing Oncology Model IG' spec.homepage = 'https://github.com/inferno-framework/eom-test-kit' spec.license = 'Apache-2.0' - spec.add_runtime_dependency 'inferno_core', '~> 0.6.4' + spec.add_runtime_dependency 'inferno_core', '~> 1.0', '>= 1.0.2' spec.add_development_dependency 'database_cleaner-sequel', '~> 1.8' spec.add_development_dependency 'factory_bot', '~> 6.1' spec.add_development_dependency 'rspec', '~> 3.10'