clearance 2.9.3 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63e1102563fe30d25f825d35b7b9cfb97e9c7a63966350d249550786301aef68
-  data.tar.gz: 0445a9f0883f00671b612e6bddb07adcba4f5d1ba0b42946ecd5aee9eac3cb1f
+  metadata.gz: ba8d0e578c8ea2e05b8371d4f7c454a471b3d4453c966c78c6f5c86a456578b1
+  data.tar.gz: 547e6a373627223859c02542ae64436d6153253917c8c06fd959dbc322b556f4
 SHA512:
-  metadata.gz: 90f4330cc836c066594314824eb212bdf463ce7187803bc99123d30bf59b5223298d390af5bea1891199d126692c679682382b59e320ea7e1ad27d979e03a90f
-  data.tar.gz: 23f8e1faebcadf721cfd2434b4ef61f05fc3d17b4374ea6830ae612905c730d6939bb87a495ff9fd191a9a5d84143d0a74f42b23bf064b7fc5d954a58cbfc0f1
+  metadata.gz: 1531128089a20a6519a78dd10dd9143d511a35d1d8acdb6abe610767aec6f373e98314b8f0f2e57640a97f528601ff0861e1345ed63cdaf32d927a4562bd817e
+  data.tar.gz: abacb24d88a4a88915a502a85570f15ab32e7a2e60f7f4a6bcafd7c4cceef52122067bebafa656bec13370046a984b3756930a6ff7c86eb94f8fe8780ec6389d

data/.github/workflows/codeql.yml

@@ -0,0 +1,39 @@
+name: "CodeQL Advanced"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: '21 23 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    runs-on: 'ubuntu-latest'
+    permissions:
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - language: actions
+          build-mode: none
+        - language: ruby
+          build-mode: none
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v5
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"

data/.github/workflows/standardrb.yml

@@ -0,0 +1,19 @@
+name: Run Linter
+
+on:
+  push:
+    branches: "main"
+  pull_request:
+    branches: "*"
+
+jobs:
+  standardrb:
+    name: StandardRB
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: 3.2.9
+      - run: bundle exec standardrb --format github --parallel

data/.github/workflows/tests.yml

@@ -16,24 +16,20 @@ jobs:
       fail-fast: false
       matrix:
         gemfile:
-          - "7.0"
           - "7.1"
           - "7.2"
           - "8.0"
         ruby:
-          - "3.1.6"
-          - "3.2.5"
-          - "3.3.5"
-        exclude:
-          - ruby: "3.1.6"
-            gemfile: "8.0"
+          - "3.2.9"
+          - "3.3.9"
+          - "3.4.5"
 
     env:
       BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.gemfile }}.gemfile
       RAILS_ENV: test
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: "Install Ruby ${{ matrix.ruby  }}"
         uses: ruby/setup-ruby@v1

data/Appraisals

@@ -1,12 +1,3 @@
-appraise "rails_7.0" do
-  gem "railties", "~> 7.0.0"
-  # The following gems will not be bundled with Ruby 3.4
-  gem "base64", require: false
-  gem "bigdecimal", require: false
-  gem "drb", require: false
-  gem "mutex_m", require: false
-end
-
 appraise "rails_7.1" do
   gem "railties", "~> 7.1.0"
 end
@@ -17,5 +8,5 @@ end
 
 appraise "rails_8.0" do
   gem "railties", "~> 8.0.0"
-  gem 'sqlite3', '>= 2.1'
+  gem "sqlite3", ">= 2.1"
 end

data/CHANGELOG.md

@@ -5,7 +5,32 @@ complete changelog, see the git history for each version via the version links.
 
 ## [Unreleased]
 
-[Unreleased]: https://github.com/thoughtbot/clearance/compare/v2.9.3...main
+[Unreleased]: https://github.com/thoughtbot/clearance/compare/v2.11.0...main
+
+## [2.11.0] - September 26, 2025
+- Bump actions/checkout from 4 to 5 for tests workflow (#1051)
+- Bump nokogiri from 1.18.6 to 1.18.9 (#1052)
+- Bump Ruby 3.2.8 to 3.2.9 (#1053)
+- Bump Ruby 3.3.7 to 3.3.9 (#1053)
+- Add support for Ruby 3.4.5 (#1053)
+- Add Standardrb (#1021) Mina Slater, Sara Jackson, and Fernando Perales
+- Add code quality workflow (#1033) Sara Jackson and Fernando Perales
+- Use latest version of code scanning (#1054)
+- Update CodeQL settings: (#1055)
+- Bump actions/checkout from 4 to 5 for standardrb workflow (#1056)
+- Bump rspec-rails from 5.1.2 to 8.0.2 (#1057)
+- Bump sqlite3 from 1.7.3 to 2.7.4 (#1062)
+- Bump pry from 0.14.1 to 0.15.2 (#1059)
+- Bump ammeter from 1.1.5 to 1.1.7 (#1060)
+- Bump ffi from 1.16.3 to 1.17.2
+- Bump net-imap from 0.4.14 to 0.4.20 (#1063)
+
+[2.11.0]: https://github.com/thoughtbot/clearance/compare/v2.10.0...v2.11.0
+
+## [2.10.0] - March 28, 2025
+- Drop support for Rails 7.0 and Ruby 3.1 (#1045)
+
+[2.10.0]: https://github.com/thoughtbot/clearance/compare/v2.9.3...v2.10.0
 
 ## [2.9.3] - November 26, 2024
 - Add Rails 8 to testing matrix (#1038) Hamed Asghari

data/CODEOWNERS

@@ -1 +1,3 @@
 *       @sej3506
+*       @rdnewmanbot
+*       @ferperales

data/Gemfile

@@ -1,17 +1,20 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
-gem 'addressable'
-gem 'ammeter'
-gem 'appraisal'
-gem 'capybara'
-gem 'database_cleaner'
-gem 'erb_lint', require: false
-gem 'factory_bot_rails'
-gem 'nokogiri'
-gem 'pry', require: false
-gem 'rails-controller-testing'
-gem 'rspec-rails'
-gem 'shoulda-matchers'
-gem 'sqlite3', '~> 1.7'
+gem "addressable"
+gem "ammeter"
+gem "appraisal"
+gem "capybara"
+gem "database_cleaner"
+gem "erb_lint", require: false
+gem "factory_bot_rails"
+gem "ffi", "< 1.18.0"
+gem "nokogiri"
+gem "pry", require: false
+gem "rails-controller-testing"
+gem "rspec-rails"
+gem "shoulda-matchers"
+gem "sqlite3", "~> 2.7"
+gem "standard", ">= 1.35.1", require: false
+gem "timecop"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clearance (2.9.3)
+    clearance (2.11.0)
       actionmailer (>= 5.0)
       activemodel (>= 5.0)
       activerecord (>= 5.0)
@@ -13,16 +13,16 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (7.2.0)
-      actionpack (= 7.2.0)
-      actionview (= 7.2.0)
-      activejob (= 7.2.0)
-      activesupport (= 7.2.0)
+    actionmailer (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      actionview (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.0)
-      actionview (= 7.2.0)
-      activesupport (= 7.2.0)
+    actionpack (7.2.2.2)
+      actionview (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4, < 3.2)
@@ -31,23 +31,24 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actionview (7.2.0)
-      activesupport (= 7.2.0)
+    actionview (7.2.2.2)
+      activesupport (= 7.2.2.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.2.0)
-      activesupport (= 7.2.0)
+    activejob (7.2.2.2)
+      activesupport (= 7.2.2.2)
       globalid (>= 0.3.6)
-    activemodel (7.2.0)
-      activesupport (= 7.2.0)
-    activerecord (7.2.0)
-      activemodel (= 7.2.0)
-      activesupport (= 7.2.0)
+    activemodel (7.2.2.2)
+      activesupport (= 7.2.2.2)
+    activerecord (7.2.2.2)
+      activemodel (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       timeout (>= 0.4.0)
-    activesupport (7.2.0)
+    activesupport (7.2.2.2)
       base64
+      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
@@ -67,12 +68,13 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
-    argon2 (2.3.0)
+    argon2 (2.3.2)
       ffi (~> 1.15)
       ffi-compiler (~> 1.0)
     ast (2.4.2)
-    base64 (0.2.0)
+    base64 (0.3.0)
     bcrypt (3.1.20)
+    benchmark (0.4.1)
     better_html (2.1.1)
       actionview (>= 6.0)
       activesupport (>= 6.0)
@@ -80,7 +82,7 @@ GEM
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
-    bigdecimal (3.1.8)
+    bigdecimal (3.2.3)
     builder (3.3.0)
     capybara (3.40.0)
       addressable
@@ -91,50 +93,56 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
+    cgi (0.5.0)
     coderay (1.1.3)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.4)
     crass (1.0.6)
-    database_cleaner (2.0.2)
-      database_cleaner-active_record (>= 2, < 3)
-    database_cleaner-active_record (2.2.0)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    date (3.4.0)
-    diff-lcs (1.5.1)
-    drb (2.2.1)
+    date (3.4.1)
+    diff-lcs (1.6.2)
+    drb (2.2.3)
     email_validator (2.2.4)
       activemodel
-    erb_lint (0.6.0)
+    erb (4.0.4)
+      cgi (>= 0.3.3)
+    erb_lint (0.9.0)
       activesupport
       better_html (>= 2.0.1)
       parser (>= 2.7.1.4)
       rainbow
       rubocop (>= 1)
       smart_properties
-    erubi (1.13.0)
-    factory_bot (6.4.6)
-      activesupport (>= 5.0.0)
-    factory_bot_rails (6.4.3)
-      factory_bot (~> 6.4)
-      railties (>= 5.0.0)
-    ffi (1.17.0)
+    erubi (1.13.1)
+    factory_bot (6.5.5)
+      activesupport (>= 6.1.0)
+    factory_bot_rails (6.5.1)
+      factory_bot (~> 6.5)
+      railties (>= 6.1.0)
+    ffi (1.17.2-arm64-darwin)
+    ffi (1.17.2-x86_64-linux-gnu)
     ffi-compiler (1.3.2)
       ffi (>= 1.15.5)
       rake
     globalid (1.2.1)
       activesupport (>= 6.1)
-    i18n (1.14.5)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    io-console (0.7.2)
-    irb (1.14.0)
+    io-console (0.8.1)
+    irb (1.15.2)
+      pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.7.2)
-    language_server-protocol (3.17.0.3)
-    logger (1.6.0)
-    loofah (2.22.0)
+    json (2.13.2)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -142,122 +150,145 @@ GEM
       net-imap
       net-pop
       net-smtp
-    matrix (0.4.2)
+    matrix (0.4.3)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.7)
-    minitest (5.25.1)
-    net-imap (0.5.1)
+    minitest (5.25.5)
+    net-imap (0.4.20)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
-    nokogiri (1.16.7)
-      mini_portile2 (~> 2.8.2)
+    nokogiri (1.18.9-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.9-x86_64-linux-gnu)
       racc (~> 1.4)
-    parallel (1.26.3)
-    parser (3.3.4.2)
+    parallel (1.27.0)
+    parser (3.3.7.3)
       ast (~> 2.4.1)
       racc
-    pry (0.14.2)
+    pp (0.6.2)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.4.0)
+    pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    psych (5.1.2)
+    psych (5.2.6)
+      date
       stringio
-    public_suffix (6.0.1)
+    public_suffix (6.0.2)
     racc (1.8.1)
-    rack (3.1.7)
-    rack-session (2.0.0)
+    rack (3.1.16)
+    rack-session (2.1.1)
+      base64 (>= 0.1.0)
       rack (>= 3.0.0)
-    rack-test (2.1.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
-    rackup (2.1.0)
+    rackup (2.2.1)
       rack (>= 3)
-      webrick (~> 1.8)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.2.0)
+    rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    railties (7.2.0)
-      actionpack (= 7.2.0)
-      activesupport (= 7.2.0)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    railties (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.2.1)
-    rdoc (6.7.0)
+    rake (13.3.0)
+    rdoc (6.14.2)
+      erb
       psych (>= 4.0.0)
-    regexp_parser (2.9.2)
-    reline (0.5.9)
+    regexp_parser (2.11.2)
+    reline (0.6.2)
       io-console (~> 0.5)
-    rexml (3.3.5)
-      strscan
-    rspec-core (3.13.0)
+    rspec-core (3.13.5)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.4)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      railties (>= 6.1)
+    rspec-rails (8.0.2)
+      actionpack (>= 7.2)
+      activesupport (>= 7.2)
+      railties (>= 7.2)
       rspec-core (~> 3.13)
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-support (3.13.1)
-    rubocop (1.65.1)
+    rspec-support (3.13.6)
+    rubocop (1.75.8)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.1)
-      parser (>= 3.3.1.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.46.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-performance (1.25.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
     ruby-progressbar (1.13.0)
-    securerandom (0.3.1)
-    shoulda-matchers (6.4.0)
+    securerandom (0.4.1)
+    shoulda-matchers (5.1.0)
       activesupport (>= 5.2.0)
     smart_properties (1.17.0)
-    sqlite3 (1.7.3)
-      mini_portile2 (~> 2.8.0)
-    stringio (3.1.1)
-    strscan (3.1.0)
-    thor (1.3.1)
-    timeout (0.4.1)
+    sqlite3 (2.7.4-arm64-darwin)
+    sqlite3 (2.7.4-x86_64-linux-gnu)
+    standard (1.50.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.75.5)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.8)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.8.0)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.25.0)
+    stringio (3.1.7)
+    thor (1.4.0)
+    timecop (0.9.5)
+    timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
-    useragent (0.16.10)
-    webrick (1.8.1)
+    unicode-display_width (3.1.5)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    useragent (0.16.11)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.17)
+    zeitwerk (2.6.18)
 
 PLATFORMS
-  ruby
+  arm64-darwin-24
+  x86_64-linux
 
 DEPENDENCIES
   addressable
@@ -268,12 +299,15 @@ DEPENDENCIES
   database_cleaner
   erb_lint
   factory_bot_rails
+  ffi (< 1.18.0)
   nokogiri
   pry
   rails-controller-testing
   rspec-rails
   shoulda-matchers
-  sqlite3 (~> 1.7)
+  sqlite3 (~> 2.7)
+  standard (>= 1.35.1)
+  timecop
 
 BUNDLED WITH
-   2.3.15
+   2.5.6

data/README.md

@@ -18,7 +18,7 @@ monitored by contributors.
 
 ## Getting Started
 
-Clearance is a Rails engine tested against Rails `>= 7.0` and Ruby `>= 3.1.6`.
+Clearance is a Rails engine tested against Rails `>= 7.1` and Ruby `>= 3.2.9`.
 
 You can add it to your Gemfile with:
 
@@ -511,5 +511,4 @@ We are [available for hire][hire].
 [community]: https://thoughtbot.com/community?utm_source=github
 [hire]: https://thoughtbot.com/hire-us?utm_source=github
 
-
 <!-- END /templates/footer.md -->

data/Rakefile

@@ -25,4 +25,4 @@ task :erb_lint do
 end
 
 desc "Run the specs and acceptance tests"
-task default: %w(spec spec:acceptance erb_lint)
+task default: %w[spec spec:acceptance erb_lint]

data/app/controllers/clearance/passwords_controller.rb

@@ -1,4 +1,4 @@
-require 'active_support/deprecation'
+require "active_support/deprecation"
 
 class Clearance::PasswordsController < Clearance::BaseController
   before_action :ensure_existing_user, only: [:edit, :update]
@@ -10,7 +10,7 @@ class Clearance::PasswordsController < Clearance::BaseController
   end
 
   def create
-    if user = find_user_for_create
+    if (user = find_user_for_create)
       user.forgot_password!
       deliver_email(user)
     end
@@ -56,8 +56,8 @@ class Clearance::PasswordsController < Clearance::BaseController
     user_param = Clearance.configuration.user_id_parameter
     token = params[:token] || session[:password_reset_token]
 
-    Clearance.configuration.user_model.
-      find_by(id: params[user_param], confirmation_token: token.to_s)
+    Clearance.configuration.user_model
+      .find_by(id: params[user_param], confirmation_token: token.to_s)
   end
 
   def email_from_password_params
@@ -65,8 +65,8 @@ class Clearance::PasswordsController < Clearance::BaseController
   end
 
   def find_user_for_create
-    Clearance.configuration.user_model.
-      find_by_normalized_email(email_from_password_params)
+    Clearance.configuration.user_model
+      .find_by_normalized_email(email_from_password_params)
   end
 
   def find_user_for_edit

data/app/mailers/clearance_mailer.rb

@@ -7,7 +7,7 @@ class ClearanceMailer < ActionMailer::Base
       subject: I18n.t(
         :change_password,
         scope: [:clearance, :models, :clearance_mailer]
-      ),
+      )
     )
   end
 end