diff --git a/.circleci/config.yml b/.circleci/config.yml index 172b0f210..a8964450b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,13 +4,13 @@ orbs: jobs: build: docker: - - image: cimg/ruby:4.0.3-node + - image: cimg/ruby:4.0.5-node environment: RAILS_ENV: test RACK_ENV: test PGHOST: localhost PGUSER: osuny - - image: cimg/postgres:16.9 + - image: cimg/postgres:17.9 environment: POSTGRES_PASSWORD: "" POSTGRES_USER: osuny diff --git a/.ruby-version b/.ruby-version index c4e41f945..7636e7565 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -4.0.3 +4.0.5 diff --git a/Gemfile b/Gemfile index 3b2084c46..9eef37828 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby "4.0.3" +ruby "4.0.5" gem "activestorage-scaleway-service"#, path: "../activestorage-scaleway-service" gem "active_hashcash" @@ -19,7 +19,7 @@ gem "bugsnag" gem "cancancan", "~> 3.3.0" gem "caxlsx_rails", "~> 0" gem "cgi", "~> 0.5.1" # To handle CGI::parse -gem "chartkick", "~> 5.0" +gem "chartkick", "~> 5.2" gem "citeproc", "~> 1" gem "citeproc-ruby", "~> 2" gem "cocoon", "~> 1" @@ -59,6 +59,7 @@ gem "metainspector", git: "https://github.com/jaimeiniesta/metainspector.git" gem "octokit" gem "omniauth-saml", "~> 2" gem "orthotypo" +gem "ostruct" # Needed for rswag(-ui) gem "paranoia" gem "pexels", "~> 0" gem "pg", "~> 1" @@ -66,11 +67,11 @@ gem "pghero" gem "pg_query" gem "puma" gem "rack-timeout" -gem "rails", "~> 8.1.2" +gem "rails", "~> 8.1.3" gem "rails-autocomplete", "~> 2" gem "rails-i18n" gem "rbnacl", "~> 7.1" -gem "redis", "~> 5.1" +gem "redis", "~> 5.4" gem "roo", "~> 2" gem "rorvswild" gem "rswag", "~> 2" @@ -103,18 +104,17 @@ group :development do gem "annotaterb" gem "better_errors" gem "binding_of_caller" - gem "listen", "~> 3.3" - gem "rack-mini-profiler", "~> 3.0" + gem "listen", "~> 3.10" + gem "rack-mini-profiler", "~> 4.0" gem "spring" gem "web-console", ">= 4.1.0" end group :test do - gem "capybara", ">= 3.26" + gem "capybara", ">= 3.40" gem "selenium-webdriver" gem "webdrivers" gem "simplecov", require: false end gem "tzinfo-data", platforms: [:windows, :jruby] - diff --git a/Gemfile.lock b/Gemfile.lock index 9f1ebb468..62e4c21ca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -134,19 +134,21 @@ GEM securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) uri (>= 0.13.1) - add_to_calendar (0.5.1) + add_to_calendar (0.5.2) tzinfo (>= 1.1, < 3) tzinfo-data (~> 1.2020) addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) - annotaterb (4.22.0) + annotaterb (4.23.0) activerecord (>= 6.0.0) activesupport (>= 6.0.0) - auth-sanitizer (0.1.4) - version_gem (~> 1.1, >= 1.1.9) + anonymous_loader (0.1.2) + version_gem (~> 1.1, >= 1.1.13) + auth-sanitizer (0.2.2) + version_gem (~> 1.1, >= 1.1.10) aws-eventstream (1.4.0) - aws-partitions (1.1253.0) - aws-sdk-core (3.249.0) + aws-partitions (1.1262.0) + aws-sdk-core (3.252.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) @@ -154,10 +156,10 @@ GEM bigdecimal jmespath (~> 1, >= 1.6.1) logger - aws-sdk-kms (1.128.0) + aws-sdk-kms (1.129.0) aws-sdk-core (~> 3, >= 3.248.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.224.0) + aws-sdk-s3 (1.226.0) aws-sdk-core (~> 3, >= 3.248.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) @@ -173,7 +175,7 @@ GEM bindex (0.8.1) binding_of_caller (2.0.0) debug_inspector (>= 1.2.0) - bootsnap (1.24.5) + bootsnap (1.24.6) msgpack (~> 1.2) bootstrap (5.3.8) popper_js (>= 2.11.8, < 3) @@ -201,15 +203,15 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - caxlsx (4.4.2) + caxlsx (4.5.0) htmlentities (~> 4.3, >= 4.3.4) marcel (~> 1.0) nokogiri (~> 1.10, >= 1.10.4) rubyzip (>= 2.4, < 4) - caxlsx_rails (0.7.1) + caxlsx_rails (0.7.2) actionpack (>= 6.1) caxlsx (>= 4.0) - cgi (0.5.1) + cgi (0.5.2) chartkick (5.2.1) citeproc (1.1.0) date @@ -223,7 +225,7 @@ GEM csl (~> 2.0) observer (< 1.0) cocoon (1.2.15) - concurrent-ruby (1.3.6) + concurrent-ruby (1.3.7) connection_pool (3.0.2) countries (8.1.0) unaccent (~> 0.3) @@ -232,7 +234,7 @@ GEM crack (1.0.1) bigdecimal rexml - crass (1.0.6) + crass (1.0.7) csl (2.2.1) forwardable (~> 1.3) namae (~> 1.2) @@ -278,7 +280,7 @@ GEM faceted_search (3.6.4) font-awesome-sass rails (>= 5.2.0) - faraday (2.14.2) + faraday (2.14.3) faraday-net_http (>= 2.0, < 3.5) json logger @@ -296,7 +298,7 @@ GEM faraday (>= 0.8) faraday-multipart (1.2.0) multipart-post (~> 2.0) - faraday-net_http (3.4.3) + faraday-net_http (3.4.4) net-http (~> 0.5) faraday-retry (2.4.0) faraday (~> 2.0) @@ -333,22 +335,22 @@ GEM base64 httparty (~> 0.20) terminal-table (>= 1.5.1) - globalid (1.3.0) + globalid (1.4.0) activesupport (>= 6.1) - good_job (4.19.0) + good_job (4.19.1) activejob (>= 6.1.0) activerecord (>= 6.1.0) concurrent-ruby (>= 1.3.1) fugit (>= 1.11.0) railties (>= 6.1.0) thor (>= 1.0.0) - google-protobuf (4.35.0-arm64-darwin) + google-protobuf (4.35.1-arm64-darwin) bigdecimal rake (~> 13.3) - google-protobuf (4.35.0-x86_64-darwin) + google-protobuf (4.35.1-x86_64-darwin) bigdecimal rake (~> 13.3) - google-protobuf (4.35.0-x86_64-linux-gnu) + google-protobuf (4.35.1-x86_64-linux-gnu) bigdecimal rake (~> 13.3) hal_openscience (1.0.0) @@ -367,14 +369,14 @@ GEM multi_xml (>= 0.5.2) httpclient (2.9.0) mutex_m - i18n (1.14.8) + i18n (1.15.2) concurrent-ruby (~> 1.0) i18n_data (0.17.1) simple_po_parser (~> 1.1) i18n_date_range (2.1.2) rails rails-i18n - image_processing (2.0.1) + image_processing (2.0.2) invisible_captcha (2.3.0) rails (>= 5.2) io-console (0.8.2) @@ -395,7 +397,7 @@ GEM railties (>= 3.2.16) jsbundling-rails (1.3.1) railties (>= 6.0.0) - json (2.19.6) + json (2.20.0) json-schema (6.2.0) addressable (~> 2.8) bigdecimal (>= 3.1, < 5) @@ -447,7 +449,7 @@ GEM minitest (6.0.6) drb (~> 2.0) prism (~> 1.5) - msgpack (1.8.1) + msgpack (1.8.3) multi_xml (0.9.1) bigdecimal (>= 3.1, < 5) multipart-post (2.4.1) @@ -457,7 +459,7 @@ GEM nesty (1.0.2) net-http (0.9.1) uri (>= 0.11.1) - net-imap (0.6.4) + net-imap (0.6.4.1) date net-protocol net-pop (0.1.2) @@ -467,32 +469,32 @@ GEM net-smtp (0.5.1) net-protocol nio4r (2.7.5) - nokogiri (1.19.3-arm64-darwin) + nokogiri (1.19.4-arm64-darwin) racc (~> 1.4) - nokogiri (1.19.3-x86_64-darwin) + nokogiri (1.19.4-x86_64-darwin) racc (~> 1.4) - nokogiri (1.19.3-x86_64-linux-gnu) + nokogiri (1.19.4-x86_64-linux-gnu) racc (~> 1.4) - oauth (1.1.5) - auth-sanitizer (~> 0.1, >= 0.1.3) + oauth (1.1.7) + auth-sanitizer (~> 0.2, >= 0.2.1) base64 (~> 0.1) - cgi - oauth-tty (~> 1.0, >= 1.0.8) - snaky_hash (~> 2.0, >= 2.0.4) - version_gem (~> 1.1, >= 1.1.9) - oauth-tty (1.0.8) - auth-sanitizer (~> 0.1, >= 0.1.3) - cgi - version_gem (~> 1.1, >= 1.1.9) - oauth2 (2.0.20) - auth-sanitizer (~> 0.1, >= 0.1.3) + oauth-tty (~> 1.0, >= 1.0.10) + snaky_hash (~> 2.0, >= 2.0.5) + version_gem (~> 1.1, >= 1.1.12) + oauth-tty (1.0.12) + anonymous_loader (~> 0.1, >= 0.1.1) + auth-sanitizer (~> 0.2, >= 0.2.2) + version_gem (~> 1.1, >= 1.1.12) + oauth2 (2.0.24) + anonymous_loader (~> 0.1, >= 0.1.1) + auth-sanitizer (~> 0.2, >= 0.2.2) faraday (>= 0.17.3, < 4.0) jwt (>= 1.0, < 4.0) logger (~> 1.2) multi_xml (~> 0.5) rack (>= 1.2, < 4) - snaky_hash (~> 2.0, >= 2.0.4) - version_gem (~> 1.1, >= 1.1.9) + snaky_hash (~> 2.0, >= 2.0.6) + version_gem (~> 1.1, >= 1.1.12) observer (0.1.2) octokit (10.0.0) faraday (>= 1, < 3) @@ -524,20 +526,17 @@ GEM pghero (3.8.0) activerecord (>= 7.2) popper_js (2.11.8) - pp (0.6.3) + pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - psych (5.3.1) - date - stringio public_suffix (7.0.5) puma (8.0.2) nio4r (~> 2.0) raabro (1.4.0) racc (1.8.1) rack (3.2.6) - rack-mini-profiler (3.3.1) + rack-mini-profiler (4.0.1) rack (>= 1.2.0) rack-protection (4.2.1) base64 (>= 0.1.0) @@ -593,13 +592,18 @@ GEM ffi (~> 1.0) rbnacl (7.1.2) ffi (~> 1) - rdoc (7.2.0) + rbs (4.0.3) + logger + prism (>= 1.6.0) + tsort + rdoc (8.0.0) erb - psych (>= 4.0.0) + prism (>= 1.6.0) + rbs (>= 4.0.0) tsort redis (5.4.1) redis-client (>= 0.22.0) - redis-client (0.29.0) + redis-client (0.30.0) connection_pool regexp_parser (2.12.0) reline (0.6.3) @@ -676,9 +680,10 @@ GEM rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) set (1.1.3) - simple-navigation (4.4.1) - activesupport (>= 2.3.2) - ostruct + simple-navigation (4.5.0) + activesupport (>= 6.1.0) + json + zeitwerk simple_form (5.4.1) actionpack (>= 7.0) activemodel (>= 7.0) @@ -696,10 +701,10 @@ GEM simplecov-html (0.13.2) simplecov_json_formatter (0.1.4) singleton (0.3.0) - snaky_hash (2.0.4) + snaky_hash (2.0.6) hashie (>= 0.1.0, < 6) version_gem (>= 1.1.8, < 3) - spring (4.6.0) + spring (4.7.0) sprockets (4.2.2) concurrent-ruby (~> 1.0) logger @@ -735,7 +740,7 @@ GEM uri (1.1.1) useragent (0.16.11) vcr (6.4.0) - version_gem (1.1.9) + version_gem (1.1.13) vimeo (1.5.4) httparty (>= 0.4.5) httpclient (>= 2.1.5.2) @@ -757,7 +762,7 @@ GEM crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) websocket (1.2.11) - websocket-driver (0.8.0) + websocket-driver (0.8.2) base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -792,10 +797,10 @@ DEPENDENCIES bugsnag byebug cancancan (~> 3.3.0) - capybara (>= 3.26) + capybara (>= 3.40) caxlsx_rails (~> 0) cgi (~> 0.5.1) - chartkick (~> 5.0) + chartkick (~> 5.2) citeproc (~> 1) citeproc-ruby (~> 2) cocoon (~> 1) @@ -827,26 +832,27 @@ DEPENDENCIES languagetool-widget leaflet-rails libretranslate - listen (~> 3.3) + listen (~> 3.10) lucide-rails metainspector! mutex_m (~> 0.3.0) octokit omniauth-saml (~> 2) orthotypo + ostruct paranoia pexels (~> 0) pg (~> 1) pg_query pghero puma - rack-mini-profiler (~> 3.0) + rack-mini-profiler (~> 4.0) rack-timeout - rails (~> 8.1.2) + rails (~> 8.1.3) rails-autocomplete (~> 2) rails-i18n rbnacl (~> 7.1) - redis (~> 5.1) + redis (~> 5.4) roo (~> 2) rorvswild rspec-rails @@ -873,7 +879,7 @@ DEPENDENCIES webmock RUBY VERSION - ruby 4.0.3 + ruby 4.0.5 BUNDLED WITH - 4.0.11 + 4.0.15