39 legacy connection handler

.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- ruby-version: ["2.7", "3.0", "3.1", "3.2"]
+ ruby-version: ["3.0", "3.1", "3.2", "3.3"]
  gemfiles: ["Gemfile", "Gemfile.rails6"]
  env:
  BUNDLE_GEMFILE: ${{ matrix.gemfile }}

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
  remote: .
  specs:
- grape-app (0.11.1)
+ grape-app (0.11.2)
  activesupport
  grape (>= 1.7)
  grape-entity
@@ -14,68 +14,80 @@ PATH
 GEM
  remote: https://rubygems.org/
  specs:
- activejob (7.0.7.2)
- activesupport (= 7.0.7.2)
+ activejob (7.1.3)
+ activesupport (= 7.1.3)
  globalid (>= 0.3.6)
- activemodel (7.0.7.2)
- activesupport (= 7.0.7.2)
- activerecord (7.0.7.2)
- activemodel (= 7.0.7.2)
- activesupport (= 7.0.7.2)
- activesupport (7.0.7.2)
+ activemodel (7.1.3)
+ activesupport (= 7.1.3)
+ activerecord (7.1.3)
+ activemodel (= 7.1.3)
+ activesupport (= 7.1.3)
+ timeout (>= 0.4.0)
+ activesupport (7.1.3)
+ base64
+ bigdecimal
  concurrent-ruby (~> 1.0, >= 1.0.2)
+ connection_pool (>= 2.2.5)
+ drb
  i18n (>= 1.6, < 2)
  minitest (>= 5.1)
+ mutex_m
  tzinfo (~> 2.0)
  ast (2.4.2)
- base64 (0.1.1)
+ base64 (0.2.0)
+ bigdecimal (3.1.6)
  builder (3.2.4)
- concurrent-ruby (1.2.2)
+ concurrent-ruby (1.2.3)
+ connection_pool (2.4.1)
  diff-lcs (1.5.0)
- dry-core (1.0.0)
+ drb (2.2.0)
+ ruby2_keywords
+ dry-core (1.0.1)
  concurrent-ruby (~> 1.0)
  zeitwerk (~> 2.6)
  dry-inflector (1.0.0)
  dry-logic (1.5.0)
  concurrent-ruby (~> 1.0)
  dry-core (~> 1.0, < 2)
  zeitwerk (~> 2.6)
- dry-types (1.7.1)
+ dry-types (1.7.2)
+ bigdecimal (~> 3.0)
  concurrent-ruby (~> 1.0)
  dry-core (~> 1.0)
  dry-inflector (~> 1.0)
  dry-logic (~> 1.4)
  zeitwerk (~> 2.6)
- globalid (1.1.0)
- activesupport (>= 5.0)
- grape (1.7.1)
- activesupport
+ globalid (1.2.1)
+ activesupport (>= 6.1)
+ grape (2.0.0)
+ activesupport (>= 5)
  builder
  dry-types (>= 1.1)
  mustermann-grape (~> 1.0.0)
- rack (>= 1.3.0, < 3)
+ rack (>= 1.3.0)
  rack-accept
  grape-entity (1.0.0)
  activesupport (>= 3.0.0)
  multi_json (>= 1.3.2)
  i18n (1.14.1)
  concurrent-ruby (~> 1.0)
- json (2.6.3)
+ json (2.7.1)
  language_server-protocol (3.17.0.3)
- mini_portile2 (2.8.4)
- minitest (5.19.0)
+ mini_portile2 (2.8.5)
+ minitest (5.21.2)
  multi_json (1.15.0)
  mustermann (3.0.0)
  ruby2_keywords (~> 0.0.1)
  mustermann-grape (1.0.2)
  mustermann (>= 1.0.0)
- openssl (3.1.0)
- parallel (1.23.0)
- parser (3.2.2.3)
+ mutex_m (0.2.0)
+ openssl (3.2.0)
+ parallel (1.24.0)
+ parser (3.3.0.4)
  ast (~> 2.4.1)
  racc
- racc (1.7.1)
- rack (2.2.8)
+ racc (1.7.3)
+ rack (3.0.8)
  rack-accept (0.4.5)
  rack (>= 0.4)
  rack-cors (2.0.1)
@@ -84,8 +96,8 @@ GEM
  rack-test (2.1.0)
  rack (>= 1.3)
  rainbow (3.1.1)
- rake (13.0.6)
- regexp_parser (2.8.1)
+ rake (13.1.0)
+ regexp_parser (2.9.0)
  rexml (3.2.6)
  rspec (3.12.0)
  rspec-core (~> 3.12.0)
@@ -100,47 +112,47 @@ GEM
  diff-lcs (>= 1.2.0, < 2.0)
  rspec-support (~> 3.12.0)
  rspec-support (3.12.1)
- rubocop (1.56.2)
- base64 (~> 0.1.1)
+ rubocop (1.60.1)
  json (~> 2.3)
  language_server-protocol (>= 3.17.0)
  parallel (~> 1.10)
- parser (>= 3.2.2.3)
+ parser (>= 3.3.0.2)
  rainbow (>= 2.2.2, < 4.0)
  regexp_parser (>= 1.8, < 3.0)
  rexml (>= 3.2.5, < 4.0)
- rubocop-ast (>= 1.28.1, < 2.0)
+ rubocop-ast (>= 1.30.0, < 2.0)
  ruby-progressbar (~> 1.7)
  unicode-display_width (>= 2.4.0, < 3.0)
- rubocop-ast (1.29.0)
+ rubocop-ast (1.30.0)
  parser (>= 3.2.1.0)
  rubocop-bsm (0.6.1)
  rubocop (~> 1.0)
  rubocop-performance
  rubocop-rake
  rubocop-rspec
- rubocop-capybara (2.18.0)
+ rubocop-capybara (2.20.0)
+ rubocop (~> 1.41)
+ rubocop-factory_bot (2.25.1)
  rubocop (~> 1.41)
- rubocop-factory_bot (2.23.1)
- rubocop (~> 1.33)
- rubocop-performance (1.19.0)
- rubocop (>= 1.7.0, < 2.0)
- rubocop-ast (>= 0.4.0)
+ rubocop-performance (1.20.2)
+ rubocop (>= 1.48.1, < 2.0)
+ rubocop-ast (>= 1.30.0, < 2.0)
  rubocop-rake (0.6.0)
  rubocop (~> 1.0)
- rubocop-rspec (2.23.2)
- rubocop (~> 1.33)
+ rubocop-rspec (2.26.1)
+ rubocop (~> 1.40)
  rubocop-capybara (~> 2.17)
  rubocop-factory_bot (~> 2.22)
  ruby-progressbar (1.13.0)
  ruby2_keywords (0.0.5)
- sqlite3 (1.6.4)
+ sqlite3 (1.7.0)
  mini_portile2 (~> 2.8.0)
- thor (1.2.2)
+ thor (1.3.0)
+ timeout (0.4.1)
  tzinfo (2.0.6)
  concurrent-ruby (~> 1.0)
- unicode-display_width (2.4.2)
- zeitwerk (2.6.11)
+ unicode-display_width (2.5.0)
+ zeitwerk (2.6.12)
 
 PLATFORMS
  ruby

grape-app.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
  s.name = 'grape-app'
- s.version = '0.11.1'
+ s.version = '0.11.2'
  s.authors = ['Black Square Media Ltd']
  s.email = ['[email protected]']
  s.summary = %(Standalone Grape API apps)

lib/grape/app/helpers/caching.rb

@@ -25,9 +25,9 @@ def fresh_when(object = nil, etag: nil, last_modified: nil, last_modified_field:
  header 'Last-Modified', last_modified.httpdate if last_modified
  cache_control(**cache_control) unless cache_control.empty?
 
- if_modified_since = headers['If-Modified-Since']
+ if_modified_since = headers['if-modified-since']
  if_modified_since = Time.rfc2822(if_modified_since) rescue nil if if_modified_since # rubocop:disable Style/RescueModifier
- if_none_match = headers['If-None-Match']
+ if_none_match = headers['if-none-match']
  return unless if_modified_since || if_none_match
 
  fresh = true

lib/grape/app/initializers/pre.rb

@@ -8,6 +8,7 @@
 ActiveSupport::KeyGenerator.hash_digest_class = OpenSSL::Digest::SHA256 if ActiveSupport::KeyGenerator.respond_to?(:hash_digest_class=)
 ActiveSupport::MessageEncryptor.use_authenticated_message_encryption = true
 ActiveSupport::IsolatedExecutionState.isolation_level = :thread if defined?(ActiveSupport::IsolatedExecutionState)
+# This is legacy and removed in removed with Rails 7.1
 Digest::UUID.use_rfc4122_namespaced_uuids = true if Digest::UUID.respond_to?(:use_rfc4122_namespaced_uuids=)
 
 # Set default time-zone
@@ -43,10 +44,13 @@ def call(exception, *)
  ActiveRecord::Base.default_timezone = :utc
  end
 
- if ActiveRecord.respond_to?(:legacy_connection_handling=)
- ActiveRecord.legacy_connection_handling = false
- else
- ActiveRecord::Base.legacy_connection_handling = false
+ # legacy_connection_handling was deprecated in ActiveRecord 7
+ if ActiveRecord::VERSION::MAJOR < 7
+ if ActiveRecord.respond_to?(:legacy_connection_handling=)
+ ActiveRecord.legacy_connection_handling = false
+ else
+ ActiveRecord::Base.legacy_connection_handling = false
+ end
  end
 
  ActiveRecord.tap do |c|

spec/grape/app_spec.rb

@@ -43,17 +43,17 @@ def app
  if ActiveSupport::VERSION::MAJOR >= 7
  expect(ActiveSupport::KeyGenerator.hash_digest_class).to be(OpenSSL::Digest::SHA256)
  expect(ActiveSupport::IsolatedExecutionState.isolation_level).to be(:thread)
- expect(Digest::UUID.use_rfc4122_namespaced_uuids).to be(true)
  end
  end
 
  it 'configures ActiveRecord' do
  if ActiveRecord::VERSION::MAJOR >= 7
  expect(ActiveRecord.default_timezone).to be(:utc)
- expect(ActiveRecord.legacy_connection_handling).to be(false)
  expect(ActiveRecord.verify_foreign_keys_for_fixtures).to be(true)
  expect(ActiveRecord::Base.partial_inserts).to be(false)
  expect(ActiveRecord::Base.automatic_scope_inversing).to be(true)
+ else
+ expect(ActiveRecord.legacy_connection_handling).to be(false)
  end
  expect(ActiveRecord::Base.belongs_to_required_by_default).to be(true)
  expect(ActiveRecord::Base.cache_versioning).to be(true)