Add Rails 7.1 support (#6)

This adds Rails 7.1 support and then some. I'll try to explain inline. Empty lines were added by running `rubocop` after adding the 7.1 gemfile.
Betterment · Mar 22, 2024 · aa1da89 · aa1da89
1 parent e7d84e9
commit aa1da89
Show file tree

Hide file tree

Showing 16 changed files with 328 additions and 101 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,12 +15,13 @@ jobs:
         ruby: ['3.2']
         gemfile:
           - gemfiles/rails_7_0.gemfile
+          - gemfiles/rails_7_1.gemfile
     services:
       postgres:
         image: postgres
         env:
           POSTGRES_USER: runner
-          POSTGRES_PASSWORD: postgres
+          POSTGRES_HOST_AUTH_METHOD: trust
           POSTGRES_DB: with_transactional_lock_test
           DB_ADAPTER: postgresql
         # Set health checks to wait until postgres has started
@@ -43,7 +44,7 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       env:
         BUNDLE_GEMFILE: ${{ matrix.gemfile }}

diff --git a/Appraisals b/Appraisals
@@ -3,3 +3,7 @@
 appraise 'rails-7-0' do
   gem 'rails', '~> 7.0.0'
 end
+
+appraise 'rails-7-1' do
+  gem 'rails', '~> 7.1.0'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    with_transactional_lock (2.1.0)
-      rails (>= 6.1, < 7.1)
+    with_transactional_lock (2.2.0)
+      rails (>= 7.0, < 7.2)
 
 GEM
   remote: https://rubygems.org/
@@ -72,14 +72,11 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
-    backports (3.24.1)
     betterlint (1.7.0)
       rubocop (> 1.0)
       rubocop-performance
@@ -88,7 +85,6 @@ GEM
       rubocop-rspec (>= 2.24)
     builder (3.2.4)
     concurrent-ruby (1.2.2)
-    connection_pool (2.4.1)
     crass (1.0.6)
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
@@ -99,29 +95,12 @@ GEM
     date (3.3.4)
     diff-lcs (1.5.0)
     erubi (1.12.0)
-    ethon (0.16.0)
-      ffi (>= 1.15.0)
-    faraday (0.17.6)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.14.0)
-      faraday (>= 0.7.4, < 1.0)
-    ffi (1.16.3)
-    gh (0.14.0)
-      addressable
-      backports
-      faraday (~> 0.8)
-      multi_json (~> 1.0)
-      net-http-persistent (>= 2.7)
-      net-http-pipeline
     globalid (1.2.1)
       activesupport (>= 6.1)
-    highline (1.7.10)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     json (2.7.1)
     language_server-protocol (3.17.0.3)
-    launchy (2.5.2)
-      addressable (~> 2.8)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -137,12 +116,7 @@ GEM
     mime-types-data (3.2023.1205)
     mini_mime (1.1.5)
     minitest (5.20.0)
-    multi_json (1.15.0)
-    multipart-post (2.3.0)
     mysql2 (0.5.5)
-    net-http-persistent (4.0.2)
-      connection_pool (~> 2.2)
-    net-http-pipeline (1.0.1)
     net-imap (0.4.9)
       date
       net-protocol
@@ -164,10 +138,6 @@ GEM
       ast (~> 2.4.1)
       racc
     pg (1.5.4)
-    public_suffix (5.0.4)
-    pusher-client (0.6.2)
-      json
-      websocket (~> 1.0)
     racc (1.7.3)
     rack (2.2.8.1)
     rack-test (2.1.0)
@@ -260,21 +230,9 @@ GEM
       rack (> 1, < 3)
     thor (1.3.0)
     timeout (0.4.1)
-    travis (1.8.13)
-      backports
-      faraday (~> 0.9)
-      faraday_middleware (~> 0.9, >= 0.9.1)
-      gh (~> 0.13)
-      highline (~> 1.6)
-      launchy (~> 2.1)
-      pusher-client (~> 0.4)
-      typhoeus (~> 0.6, >= 0.6.8)
-    typhoeus (0.8.0)
-      ethon (>= 0.8.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
-    websocket (1.2.10)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -295,7 +253,6 @@ DEPENDENCIES
   rspec-rails (~> 3.1)
   rspec-retry
   sprockets (~> 3.0)
-  travis
   with_transactional_lock!
 
 BUNDLED WITH

diff --git a/Rakefile b/Rakefile
@@ -32,6 +32,7 @@ if (Rails.env.development? || Rails.env.test?) && defined? Dummy
 
   task(:default).clear
   if ENV['APPRAISAL_INITIALIZED'] || ENV['CI']
+    tasks = [:spec]
     tasks += [:rubocop] unless ENV['CI']
 
     task default: tasks # rubocop:disable Rake/DuplicateTask

diff --git a/gemfiles/rails_7_0.gemfile.lock b/gemfiles/rails_7_0.gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    with_transactional_lock (2.1.0)
-      rails (>= 6.1, < 7.1)
+    with_transactional_lock (2.2.0)
+      rails (>= 7.0, < 7.2)
 
 GEM
   remote: https://rubygems.org/
@@ -72,14 +72,11 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
-    backports (3.24.1)
     betterlint (1.7.0)
       rubocop (> 1.0)
       rubocop-performance
@@ -88,7 +85,6 @@ GEM
       rubocop-rspec (>= 2.24)
     builder (3.2.4)
     concurrent-ruby (1.2.2)
-    connection_pool (2.4.1)
     crass (1.0.6)
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
@@ -99,29 +95,12 @@ GEM
     date (3.3.4)
     diff-lcs (1.5.0)
     erubi (1.12.0)
-    ethon (0.16.0)
-      ffi (>= 1.15.0)
-    faraday (0.17.6)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.14.0)
-      faraday (>= 0.7.4, < 1.0)
-    ffi (1.16.3)
-    gh (0.14.0)
-      addressable
-      backports
-      faraday (~> 0.8)
-      multi_json (~> 1.0)
-      net-http-persistent (>= 2.7)
-      net-http-pipeline
     globalid (1.2.1)
       activesupport (>= 6.1)
-    highline (1.7.10)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     json (2.7.1)
     language_server-protocol (3.17.0.3)
-    launchy (2.5.2)
-      addressable (~> 2.8)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -137,12 +116,7 @@ GEM
     mime-types-data (3.2023.1205)
     mini_mime (1.1.5)
     minitest (5.20.0)
-    multi_json (1.15.0)
-    multipart-post (2.3.0)
     mysql2 (0.5.5)
-    net-http-persistent (4.0.2)
-      connection_pool (~> 2.2)
-    net-http-pipeline (1.0.1)
     net-imap (0.4.9)
       date
       net-protocol
@@ -153,17 +127,17 @@ GEM
     net-smtp (0.4.0)
       net-protocol
     nio4r (2.7.0)
+    nokogiri (1.16.0-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.16.0-x86_64-darwin)
       racc (~> 1.4)
+    nokogiri (1.16.0-x86_64-linux)
+      racc (~> 1.4)
     parallel (1.24.0)
     parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
     pg (1.5.4)
-    public_suffix (5.0.4)
-    pusher-client (0.6.2)
-      json
-      websocket (~> 1.0)
     racc (1.7.3)
     rack (2.2.8)
     rack-test (2.1.0)
@@ -256,27 +230,16 @@ GEM
       rack (> 1, < 3)
     thor (1.3.0)
     timeout (0.4.1)
-    travis (1.8.13)
-      backports
-      faraday (~> 0.9)
-      faraday_middleware (~> 0.9, >= 0.9.1)
-      gh (~> 0.13)
-      highline (~> 1.6)
-      launchy (~> 2.1)
-      pusher-client (~> 0.4)
-      typhoeus (~> 0.6, >= 0.6.8)
-    typhoeus (0.8.0)
-      ethon (>= 0.8.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
-    websocket (1.2.10)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     zeitwerk (2.6.12)
 
 PLATFORMS
+  arm64-darwin-22
   x86_64-darwin-22
   x86_64-linux
 
@@ -291,7 +254,6 @@ DEPENDENCIES
   rspec-rails (~> 3.1)
   rspec-retry
   sprockets (~> 3.0)
-  travis
   with_transactional_lock!
 
 BUNDLED WITH

diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 7.1.0"
+
+gemspec path: "../"