From 02a011ae2b740656a2c7bf467418894363e3f93e Mon Sep 17 00:00:00 2001 From: Jason Gessner Date: Sun, 23 Mar 2025 18:54:35 +0000 Subject: [PATCH] Update rack to 3.1. Update rspec_api_documentation to compatible fork. --- Gemfile | 7 ++++--- Gemfile.lock | 35 ++++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/Gemfile b/Gemfile index 81e8a15..035ec25 100644 --- a/Gemfile +++ b/Gemfile @@ -22,9 +22,9 @@ gem 'parslet' # Reduces boot times through caching; required in config/boot.rb gem 'bootsnap', require: false -gem 'rack', '~> 2.2' +gem 'rack', '~> 3.1' # Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible -gem 'rack-cors', '2.0.0' +gem 'rack-cors' # Used for our import of the card data. gem 'activerecord-import' @@ -41,7 +41,8 @@ gem 'scenic' gem 'apitome' gem 'jwt' -gem 'rspec_api_documentation' +# Specific fork to deal with rack 3.1 compatibility issue. +gem 'rspec_api_documentation', github: 'SchoolKeep/rspec_api_documentation', ref: '13df1ac' gem 'sprockets-rails' # Observability and monitoring via OpenTelemetry. diff --git a/Gemfile.lock b/Gemfile.lock index 87ed40e..3b0080d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,13 @@ +GIT + remote: https://github.com/SchoolKeep/rspec_api_documentation.git + revision: 13df1acbcacf730468b6cfd2bae56e3c0d1a5b3a + ref: 13df1ac + specs: + rspec_api_documentation (6.1.0) + activesupport (>= 3.0.0) + mustache (~> 1.0, >= 0.99.4) + rspec (~> 3.0) + GEM remote: https://rubygems.org/ specs: @@ -430,16 +440,16 @@ GEM puma (6.6.0) nio4r (~> 2.0) racc (1.8.1) - rack (2.2.13) - rack-cors (2.0.0) + rack (3.1.12) + rack-cors (2.0.2) rack (>= 2.0.0) - rack-session (1.0.2) - rack (< 3) + rack-session (2.1.0) + base64 (>= 0.1.0) + rack (>= 3.0.0) rack-test (2.2.0) rack (>= 1.3) - rackup (1.0.1) - rack (< 3) - webrick + rackup (2.2.1) + rack (>= 3) rails (7.2.2.1) actioncable (= 7.2.2.1) actionmailbox (= 7.2.2.1) @@ -505,10 +515,6 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.2) - rspec_api_documentation (6.1.0) - activesupport (>= 3.0.0) - mustache (~> 1.0, >= 0.99.4) - rspec (~> 3.0) rubocop (1.74.0) json (~> 2.3) language_server-protocol (~> 3.17.0.2) @@ -569,7 +575,6 @@ GEM unicode-emoji (4.0.4) uniform_notifier (1.16.0) useragent (0.16.11) - webrick (1.9.1) websocket-driver (0.7.7) base64 websocket-extensions (>= 0.1.0) @@ -606,13 +611,13 @@ DEPENDENCIES parslet pg (~> 1.1) puma (~> 6.4) - rack (~> 2.2) - rack-cors (= 2.0.0) + rack (~> 3.1) + rack-cors rails (~> 7) responders reverse_markdown rspec-rails - rspec_api_documentation + rspec_api_documentation! rubocop rubocop-factory_bot rubocop-rails