Drop support for EOL versions of Ruby and Rails

olivier-thatch · olivier-thatch · commit 53f08230745a · 2024-11-27T10:07:53.000-08:00
diff --git a/.github/workflows/test_suite.yml b/.github/workflows/test_suite.yml
@@ -1,52 +1,28 @@
 name: Test Suite
 
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-  schedule:
-    # 00:00 on the 1st of every month
-    - cron: '0 0 1 * *'
+on: [push]
+
 jobs:
   run-tests:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         orm: [active_record, mongoid]
-        rails: ["6.1", "7.0", "7.1"]
+        rails: ["7.0", "7.1"]
         ruby: ["3.1", "3.2", "3.3", head]
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - uses: actions/cache@v4
-        with:
-          path: |
-            **/bundle
-          key:
-            bundle-use-ruby-${{ matrix.ruby }}-rails-${{ matrix.rails }}-orm-${{
-            matrix.orm }}-gemfile-${{
-            hashFiles(format('**/gemfiles/rails_{0}.gemfile', matrix.rails))
-            }}-gemspec-${{ hashFiles('**/devise-security.gemspec') }}
-      - name: bundle install
-        env:
-          BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails }}.gemfile
-        run: |
-          bundle config path vendor/bundle
-          bundle install
+          bundler-cache: true
       - name: Start MongoDB
         uses: supercharge/mongodb-github-action@1.11.0
         if: ${{ matrix.orm == 'mongoid' }}
       - name:
           Tests for ORM ${{ matrix.orm }}, Rails ${{ matrix.rails }}, and Ruby
           ${{ matrix.ruby }}
-        env:
-          BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails }}.gemfile
-          CI: true
-          DEVISE_ORM: ${{ matrix.orm }}
         run: |
           bundle exec rake
       - name: Coveralls Parallel
diff --git a/Appraisals b/Appraisals
@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-appraise 'rails-6.1' do
-  gem 'railties', '~> 6.1.0'
-  gem 'minitest-rails', '~> 6.1.0'
-end
-
 appraise 'rails-7.0' do
   gem 'railties', '~> 7.0.1' # Rails 7.0.0 and Ruby 3.1 are incompatible. See https://github.com/rails/rails/issues/43998 and https://github.com/rails/rails/pull/43951
   gem 'minitest-rails', '~> 7.0.0'
diff --git a/Gemfile b/Gemfile
@@ -3,17 +3,17 @@
 source 'https://rubygems.org'
 gemspec
 
-# Oldest Rails version getting security patches is 6.0
-gem 'minitest-rails', '~> 6.1.0'
-gem 'railties', '~> 6.1.7.8'
+# Oldest Rails version getting security patches is 7.0
+gem 'minitest-rails', '~> 7.0.0'
+gem 'railties', '~> 7.0.0'
 
 group :active_record do
   gem 'pg'
   gem 'sqlite3', '~> 1.4'
 end
 
 group :mongoid do
-  gem 'mongoid', '~> 8.0'
+  gem 'mongoid', '~> 9.0'
 
   group :test do
     gem 'database_cleaner-mongoid', '~> 2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,70 +2,76 @@ PATH
   remote: .
   specs:
     devise-security (0.18.0)
-      devise (>= 4.3.0)
+      devise (>= 4.8.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actioncable (7.0.8.6)
+      actionpack (= 7.0.8.6)
+      activesupport (= 7.0.8.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activestorage (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actionmailbox (7.0.8.6)
+      actionpack (= 7.0.8.6)
+      activejob (= 7.0.8.6)
+      activerecord (= 7.0.8.6)
+      activestorage (= 7.0.8.6)
+      activesupport (= 7.0.8.6)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      actionview (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.8.6)
+      actionpack (= 7.0.8.6)
+      actionview (= 7.0.8.6)
+      activejob (= 7.0.8.6)
+      activesupport (= 7.0.8.6)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.8)
-      actionview (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.8.6)
+      actionview (= 7.0.8.6)
+      activesupport (= 7.0.8.6)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activestorage (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actiontext (7.0.8.6)
+      actionpack (= 7.0.8.6)
+      activerecord (= 7.0.8.6)
+      activestorage (= 7.0.8.6)
+      activesupport (= 7.0.8.6)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actionview (7.0.8.6)
+      activesupport (= 7.0.8.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.7.8)
-      activesupport (= 6.1.7.8)
+    activejob (7.0.8.6)
+      activesupport (= 7.0.8.6)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.8)
-      activesupport (= 6.1.7.8)
-    activerecord (6.1.7.8)
-      activemodel (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
-    activestorage (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    activemodel (7.0.8.6)
+      activesupport (= 7.0.8.6)
+    activerecord (7.0.8.6)
+      activemodel (= 7.0.8.6)
+      activesupport (= 7.0.8.6)
+    activestorage (7.0.8.6)
+      actionpack (= 7.0.8.6)
+      activejob (= 7.0.8.6)
+      activerecord (= 7.0.8.6)
+      activesupport (= 7.0.8.6)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.8)
+    activesupport (7.0.8.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     appraisal (2.5.0)
       bundler
       rake
@@ -76,7 +82,7 @@ GEM
     bcrypt (3.1.20)
     benchmark (0.3.0)
     bigdecimal (3.1.8)
-    bson (5.0.1)
+    bson (5.0.2)
     builder (3.3.0)
     byebug (11.1.3)
     coderay (1.1.3)
@@ -152,16 +158,15 @@ GEM
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
     minitest (5.25.1)
-    minitest-rails (6.1.1)
+    minitest-rails (7.0.1)
       minitest (~> 5.10)
-      railties (~> 6.1.0)
-    mongo (2.20.1)
+      railties (~> 7.0.0)
+    mongo (2.21.0)
       bson (>= 4.14.1, < 6.0.0)
-    mongoid (8.1.5)
-      activemodel (>= 5.1, < 7.2, != 7.0.0)
+    mongoid (9.0.3)
+      activemodel (>= 5.1, < 8.1, != 7.0.0)
       concurrent-ruby (>= 1.0.5, < 2.0)
       mongo (>= 2.18.0, < 3.0.0)
-      ruby2_keywords (~> 0.0.5)
     mutex_m (0.2.0)
     net-imap (0.4.15)
       date
@@ -203,21 +208,20 @@ GEM
       rack (~> 2.2, >= 2.2.4)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.1.7.8)
-      actioncable (= 6.1.7.8)
-      actionmailbox (= 6.1.7.8)
-      actionmailer (= 6.1.7.8)
-      actionpack (= 6.1.7.8)
-      actiontext (= 6.1.7.8)
-      actionview (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activemodel (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activestorage (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    rails (7.0.8.6)
+      actioncable (= 7.0.8.6)
+      actionmailbox (= 7.0.8.6)
+      actionmailer (= 7.0.8.6)
+      actionpack (= 7.0.8.6)
+      actiontext (= 7.0.8.6)
+      actionview (= 7.0.8.6)
+      activejob (= 7.0.8.6)
+      activemodel (= 7.0.8.6)
+      activerecord (= 7.0.8.6)
+      activestorage (= 7.0.8.6)
+      activesupport (= 7.0.8.6)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.8)
-      sprockets-rails (>= 2.0.0)
+      railties (= 7.0.8.6)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -234,12 +238,13 @@ GEM
       railties (>= 6.0.0, < 8)
     rails_email_validator (0.1.4)
       activemodel (>= 3.0.0)
-    railties (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    railties (7.0.8.6)
+      actionpack (= 7.0.8.6)
+      activesupport (= 7.0.8.6)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.2.1)
     regexp_parser (2.9.2)
@@ -293,7 +298,6 @@ GEM
       rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -319,13 +323,6 @@ GEM
     solargraph-arc (0.3.0)
       activesupport (>= 5.0)
       solargraph (~> 0.44.2)
-    sprockets (4.2.1)
-      concurrent-ruby (~> 1.0)
-      rack (>= 2.2.4, < 4)
-    sprockets-rails (3.5.2)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      sprockets (>= 3.0.0)
     sqlite3 (1.7.3)
       mini_portile2 (~> 2.8.0)
     strscan (3.1.0)
@@ -362,15 +359,15 @@ DEPENDENCIES
   i18n-tasks
   m
   minitest
-  minitest-rails (~> 6.1.0)
-  mongoid (~> 8.0)
+  minitest-rails (~> 7.0.0)
+  mongoid (~> 9.0)
   mutex_m
   omniauth
   pg
   pry-rescue
   rails-controller-testing
   rails_email_validator
-  railties (~> 6.1.7.8)
+  railties (~> 7.0.0)
   rubocop
   rubocop-minitest
   rubocop-rails
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ automated mass creation and brute forcing of accounts harder)
 
 ## Getting started
 
-Devise Security works with Devise on Rails >= 5.2. You can add it to your
+Devise Security works with Devise on Rails >= 7.0. You can add it to your
 Gemfile after you successfully set up Devise (see
 [Devise documentation](https://github.com/heartcombo/devise)) with:
 
@@ -326,7 +326,7 @@ end
 ## Requirements
 
 - Devise (<https://github.com/heartcombo/devise>)
-- Rails 5.2 onwards (<http://github.com/rails/rails>)
+- Rails 7.0 onwards (<http://github.com/rails/rails>)
 - recommendations:
   - `autocomplete-off` (<http://github.com/phatworx/autocomplete-off>)
   - `easy_captcha` (<http://github.com/phatworx/easy_captcha>)
diff --git a/devise-security.gemspec b/devise-security.gemspec
@@ -27,9 +27,9 @@ Gem::Specification.new do |s|
   s.files         = Dir['README.md', 'LICENSE.txt', 'lib/**/*', 'app/**/*', 'config/**/*']
   s.test_files    = Dir['test/**/*']
   s.require_paths = ['lib']
-  s.required_ruby_version = '>= 2.3.0'
+  s.required_ruby_version = '>= 3.1.0'
 
-  s.add_runtime_dependency 'devise', '>= 4.3.0'
+  s.add_runtime_dependency 'devise', '>= 4.8.1'
 
   s.add_development_dependency 'appraisal'
   s.add_development_dependency 'bundler'
diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile
@@ -13,7 +13,7 @@ group :active_record do
 end
 
 group :mongoid do
-  gem "mongoid", "~> 8.0"
+  gem "mongoid", "~> 9.0"
 
   group :test do
     gem "database_cleaner-mongoid", "~> 2.0"
diff --git a/lib/generators/devise_security/migration_generator.rb b/lib/generators/devise_security/migration_generator.rb
diff --git a/test/generators/templates/create_some_table.rb.erb b/test/generators/templates/create_some_table.rb.erb
