Update license year

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: Test
 on:
   push:
     branches:
-      - master
+      - main
     paths-ignore:
       - '**.md'
   pull_request:
@@ -27,18 +27,24 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - 3.0.2
-          - 2.7.4
-          - 2.6.8
+          - 3.1.2
+          - 3.0.4
+          - 2.7.6
+          - 2.6.10
         appraisal:
+          - rails_7_0
           - rails_6_1
           - rails_6_0
           - rails_5_2
         adapter:
           - sqlite3
           - postgresql
         exclude:
-          - { ruby: 3.0.2, appraisal: rails_5_2 }
+          - { ruby: 3.1.2, appraisal: rails_5_2 }
+          - { ruby: 3.0.4, appraisal: rails_5_2 }
+          - { ruby: 3.0.4, appraisal: rails_7_0 }
+          - { ruby: 2.7.6, appraisal: rails_7_0 }
+          - { ruby: 2.6.10, appraisal: rails_7_0 }
     env:
       DATABASE_ADAPTER: ${{ matrix.adapter }}
       BUNDLE_GEMFILE: gemfiles/${{ matrix.appraisal }}.gemfile

.rubocop.yml

@@ -30,7 +30,7 @@ Layout/LineLength:
     - '^[ ]*#.+$'
     - '^[ ]*''.+?'' => ''.+?'',?$'
     - '^[ ]*".+?" => ".+?",?$'
-  Max: 80
+  Max: 100
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 Layout/ParameterAlignment:
@@ -104,6 +104,8 @@ Naming/MemoizedInstanceVariableName:
   EnforcedStyleForLeadingUnderscores: required
 Naming/PredicateName:
   Enabled: false
+Naming/VariableNumber:
+  Enabled: false
 Naming/RescuedExceptionsVariableName:
   Enabled: false
 Rails/Date:

.ruby-version

@@ -1 +1 @@
-3.0.2
+3.1.2

.tool-versions

@@ -1 +1 @@
-ruby 3.0.2
+ruby 3.1.2

Appraisals

@@ -27,7 +27,7 @@ appraise 'rails_5_2' do
   instance_eval(&shared_dependencies)
   instance_eval(&controller_test_dependency)
 
-  gem 'rails', '5.2.6'
+  gem 'rails', '5.2.8.1'
   gem 'puma', '~> 3.11'
   gem 'bootsnap', '>= 1.1.0', require: false
   gem 'sass-rails', '~> 5.0'
@@ -42,14 +42,14 @@ appraise 'rails_5_2' do
 
   # Database adapters
   gem 'pg', '~> 0.18'
-  gem 'sqlite3', '~> 1.3.6'
+  gem 'sqlite3', '~> 1.4'
 end
 
 appraise 'rails_6_0' do
   instance_eval(&shared_dependencies)
   instance_eval(&controller_test_dependency)
 
-  gem 'rails', '6.0.4'
+  gem 'rails', '6.0.6'
   gem 'puma', '~> 4.1'
   gem 'bootsnap', '>= 1.4.2', require: false
   gem 'sass-rails', '>= 6'
@@ -58,12 +58,11 @@ appraise 'rails_6_0' do
   gem 'bcrypt', '~> 3.1.7'
   gem 'capybara', '>= 2.15'
   gem 'listen', '~> 3.3.0'
+  gem 'psych', '~> 3.0'
   gem 'spring-watcher-listen', '~> 2.0.0'
   gem 'selenium-webdriver'
   gem 'webdrivers'
-
-  # Other dependencies
-  gem 'actiontext', '~> 6.0.4'
+  gem 'net-smtp', require: false
 
   # Database adapters
   gem 'pg', '>= 0.18', '< 2.0'
@@ -74,7 +73,7 @@ appraise 'rails_6_1' do
   instance_eval(&shared_dependencies)
   instance_eval(&controller_test_dependency)
 
-  gem 'rails', '6.1.4'
+  gem 'rails', '6.1.7'
   gem 'puma', '~> 5.0'
   gem 'bootsnap', '>= 1.4.2', require: false
   gem 'sass-rails', '>= 6'
@@ -83,15 +82,41 @@ appraise 'rails_6_1' do
   gem 'bcrypt', '~> 3.1.7'
   gem 'capybara', '>= 2.15'
   gem 'listen', '>= 3.0.5', '< 3.6'
+  gem 'net-smtp', require: false
+  gem 'psych', '~> 3.0'
   gem 'rack-mini-profiler', '~> 2.0.0'
   gem 'spring-watcher-listen', '~> 2.0.0'
   gem 'selenium-webdriver'
   gem 'webdrivers'
 
-  # Other dependencies
-  gem 'actiontext', '~> 6.1.4'
-
   # Database adapters
   gem 'pg', '>= 0.18', '< 2.0'
   gem 'sqlite3', '~> 1.4'
 end
+
+appraise 'rails_7_0' do
+  instance_eval(&shared_spring_dependencies)
+  instance_eval(&shared_test_dependencies)
+
+  gem 'rails', '~> 7.0.1'
+  gem 'sprockets-rails'
+  gem 'puma', '~> 5.0'
+  gem 'importmap-rails'
+  gem 'turbo-rails'
+  gem 'stimulus-rails'
+  gem 'jbuilder'
+  gem 'redis', '~> 4.0'
+  gem 'bootsnap', require: false
+  gem 'capybara'
+  gem 'selenium-webdriver'
+  gem 'webdrivers'
+
+  # other dependencies
+  gem 'bcrypt', '~> 3.1.7'
+  gem 'rails-controller-testing'
+  gem 'debug', platforms: %i[mri mingw x64_mingw]
+
+  # Database adapters
+  gem 'sqlite3', '~> 1.4'
+  gem 'pg', '~> 1.1'
+end

CHANGELOG.md

@@ -1,5 +1,57 @@
 # Changelog
 
+## 5.3.0 - 2022-12-16
+
+### Features
+
+* Add `in: range` matcher to validate_numericality_of. ([#1512])
+
+* Support :uuid column type for validate_absence_of matcher. ([#1518])
+
+[#1512]: https://github.com/thoughtbot/shoulda-matchers/pull/1512
+[#1518]: https://github.com/thoughtbot/shoulda-matchers/pull/1518
+
+### Bug fixes
+
+* Fix confusing error message from validate_inclusion_of matcher when used against a polymorphic association. ([#1523])
+
+[#1523]: https://github.com/thoughtbot/shoulda-matchers/pull/1523
+
+## 5.2.0 - 2022-09-15
+
+### Features
+
+* Add without_scopes method to enum matcher. ([#1453])
+
+* Add support for Ruby 3.1. ([#1474])
+
+* Add allow_blank method to validate_presence_of matcher. ([#1499])
+
+* Add support for Rails 7.0. No new Rails 7.0 features are supported, but only
+  existing features that broke with the upgrade. ([#1506])
+
+[#1453]: https://github.com/thoughtbot/shoulda-matchers/pull/1453
+[#1474]: https://github.com/thoughtbot/shoulda-matchers/pull/1474
+[#1499]: https://github.com/thoughtbot/shoulda-matchers/pull/1499
+[#1506]: https://github.com/thoughtbot/shoulda-matchers/pull/1506
+
+## 5.1.0 - 2021-12-22
+
+### Bug fixes
+
+* Fix the undefined method error for non rails project due to use of many? - method from ActiveSupport. ([#1459])
+
+[#1459]: https://github.com/thoughtbot/shoulda-matchers/pull/1459
+
+### Features
+
+* Add array option support for have db column matcher. ([#1465])
+
+* Add enum attributes support for validate_absence_of matcher. ([#1464])
+
+[#1464]: https://github.com/thoughtbot/shoulda-matchers/pull/1464
+[#1465]: https://github.com/thoughtbot/shoulda-matchers/pull/1465
+
 ## 5.0.0 - 2021-07-09
 
 ### Bug fixes

CONTRIBUTING.md

@@ -20,15 +20,15 @@ you think would be useful? Here's what you need to do:
    API](#documentation).
 1. [Refrain from updating the changelog.](#a-word-on-the-changelog)
 1. Push to your fork and submit a pull request.
-1. [Ensure that the test suite passes on Travis and make any necessary changes
-   to your branch to bring it to green.](#continuous-integration)
+1. [Ensure that the test suite passes on GitHub Actions and make any necessary
+   changes to your branch to bring it to green.](#continuous-integration)
 
 Although we maintain Shoulda Matchers in our free time, we try to respond to
 contributions in a timely manner. Once we look at your pull request, we may give
 you feedback. For instance, we may suggest some changes to make to your code to
 fit within the project style or discuss alternate ways of addressing the issue
 in question. Assuming we're happy with everything, we'll then bring your changes
-into master. Now you're a contributor!
+into main. Now you're a contributor!
 
 ---
 
@@ -171,7 +171,7 @@ bundle exec rake
   guide] was a wonderful piece on this topic when it came out and we still find
   it to be helpful even today.
 * Squash "WIP" commits and remove merge commits by rebasing your branch against
-  `master`. We try to keep our commit history as clean as possible.
+  `main`. We try to keep our commit history as clean as possible.
 
 [Tim Pope's guide]: https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
 
@@ -199,16 +199,17 @@ your branch, but don't worry about this — we'll take care of it!
 While running `bundle exec rake` is a great way to check your work, this command
 will only run your tests against the latest supported Ruby and Rails version.
 Ultimately, though, you'll want to ensure that your changes work in all possible
-environments. We make use of [Travis][travis] to do this work for us. Travis
-will kick in after you push up a branch or open a PR. It takes 20-30 minutes to
-run a complete build, which you are free to
-[monitor as it progresses][shoulda-matchers-on-travis].
+environments. We make use of [GitHub Actions][gh-actions] to do this work for
+us. GitHub Actions will kick in after you push up a branch or open a PR.
+It takes 20-30 minutes to run a complete build, which you are free to
+[monitor as it progresses][shoulda-matchers-on-gh-actions]. First-time
+contributors may need to wait until a maintainer approves the build.
 
-[shoulda-matchers-on-travis]: https://travis-ci.org/thoughtbot/shoulda-matchers
+[shoulda-matchers-on-gh-actions]: https://github.com/thoughtbot/shoulda-matchers/actions
 
 What happens if the build fails in some way? Don't fear! Click on a failed job
 and scroll through its output to determine the cause of the failure. You'll want
 to make changes to your branch and push them up until the entire build is green.
 It may take a bit of time, but overall it is worth it and it helps us immensely!
 
-[travis]: https://travis-ci.org/
+[gh-actions]: https://github.com/features/actions

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'appraisal', '2.2.0'
-gem 'bundler', '~> 1.1'
+gem 'bundler', '~> 2.0'
 gem 'pry'
 gem 'pry-byebug'
 gem 'rake', '13.0.1'

Gemfile.lock

@@ -1,41 +1,41 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.4)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
-    ast (2.4.1)
+    ast (2.4.2)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.3)
     fssm (0.2.10)
-    i18n (1.8.5)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
+    json (2.6.2)
     method_source (1.0.0)
-    minitest (5.14.2)
-    parallel (1.19.2)
-    parser (2.7.2.0)
+    minitest (5.16.3)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
-    rack (2.2.3)
-    rainbow (3.0.0)
+    rack (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.1)
     redcarpet (3.5.0)
-    regexp_parser (1.8.2)
-    rexml (3.2.4)
+    regexp_parser (2.5.0)
+    rexml (3.2.5)
     rouge (3.22.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -50,32 +50,31 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.0)
-    rubocop (1.0.0)
+    rubocop (1.36.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
-      rexml
-      rubocop-ast (>= 0.6.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.1.0)
-      parser (>= 2.7.1.5)
-    rubocop-packaging (0.5.1)
-      rubocop (>= 0.89, < 2.0)
-    rubocop-rails (2.8.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
+    rubocop-packaging (0.5.2)
+      rubocop (>= 1.33, < 2.0)
+    rubocop-rails (2.16.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.87.0)
-    ruby-progressbar (1.10.1)
+      rubocop (>= 1.33.0, < 2.0)
+    ruby-progressbar (1.11.0)
     thor (0.20.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.3.0)
     warnings_logger (0.1.1)
     yard (0.9.25)
-    zeitwerk (2.4.0)
     zeus (0.15.14)
       method_source (>= 0.6.7)
 
@@ -84,7 +83,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (= 2.2.0)
-  bundler (~> 1.1)
+  bundler (~> 2.0)
   fssm
   pry
   pry-byebug
@@ -100,4 +99,4 @@ DEPENDENCIES
   zeus
 
 BUNDLED WITH
-   1.17.3
+   2.2.32