diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 6ebc4fd..dccbbba 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -13,9 +13,6 @@ jobs: ruby: ['3.0', '3.1', '3.2', '3.3'] rails: ['6.0', '6.1', '7.0', '7.1'] include: - - {ruby: '2.7', rails: '5.0'} - - {ruby: '2.7', rails: '5.1'} - - {ruby: '2.7', rails: '5.2'} - {ruby: '3.3', rails: '_main'} name: ruby${{ matrix.ruby }} rails${{ matrix.rails }} rake test env: diff --git a/.rubocop.yml b/.rubocop.yml index 516e21c..2324c03 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -6,6 +6,6 @@ inherit_gem: AllCops: SuggestExtensions: false - TargetRubyVersion: "2.7" + TargetRubyVersion: "3.0" Exclude: - vendor/**/* diff --git a/Changelog.md b/Changelog.md index f26e93a..a7f085a 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,4 +1,6 @@ # NEXT +- Drop Ruby 2.7 support. +- Drop Rails 5 support. # v2.23.1 - Fix an incompatibility with the Rails main branch. diff --git a/Gemfile.lock b/Gemfile.lock index 41de5a5..ae961b1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: . specs: stronger_parameters (2.23.1) - actionpack (>= 5.0) + actionpack (>= 6.0) GEM remote: https://rubygems.org/ @@ -51,7 +51,7 @@ GEM irb (1.14.0) rdoc (>= 4.0.0) reline (>= 0.4.2) - json (2.7.2) + json (2.8.2) language_server-protocol (3.17.0.3) lint_roller (1.1.0) loofah (2.22.0) @@ -72,7 +72,7 @@ GEM parallel (1.26.3) parallel_tests (4.7.2) parallel - parser (3.3.5.0) + parser (3.3.6.0) ast (~> 2.4.1) racc psych (5.1.2) @@ -108,37 +108,35 @@ GEM regexp_parser (2.9.2) reline (0.5.10) io-console (~> 0.5) - rexml (3.3.7) - rubocop (1.59.0) + rubocop (1.68.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.4) + 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.30.0, < 2.0) + regexp_parser (>= 2.4, < 3.0) + rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.32.3) + rubocop-ast (1.36.1) parser (>= 3.3.1.0) - rubocop-performance (1.21.1) + rubocop-performance (1.22.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (1.13.0) single_cov (1.11.0) - standard (1.33.0) + standard (1.42.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.59.0) + rubocop (~> 1.68.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.3) + standard-performance (~> 1.5) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.4.0) + standard-performance (1.5.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.21.0) + rubocop-performance (~> 1.22.0) stringio (3.1.1) thor (1.3.2) tzinfo (2.0.6) @@ -154,7 +152,6 @@ PLATFORMS DEPENDENCIES bump - bundler forking_test_runner maxitest railties (~> 7.1.0) @@ -164,4 +161,4 @@ DEPENDENCIES stronger_parameters! BUNDLED WITH - 2.5.11 + 2.5.23 diff --git a/gemfiles/common.rb b/gemfiles/common.rb index b82e83e..48fdd2d 100644 --- a/gemfiles/common.rb +++ b/gemfiles/common.rb @@ -3,3 +3,10 @@ source "https://rubygems.org" gemspec path: ".." + +gem "rake" +gem "maxitest" +gem "bump" +gem "single_cov" +gem "standard" +gem "forking_test_runner" diff --git a/gemfiles/rails5.0.gemfile b/gemfiles/rails5.0.gemfile deleted file mode 100644 index 67b78e7..0000000 --- a/gemfiles/rails5.0.gemfile +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true - -gem "railties", "~> 5.0.0" - -eval_gemfile "common.rb" diff --git a/gemfiles/rails5.0.gemfile.lock b/gemfiles/rails5.0.gemfile.lock deleted file mode 100644 index c9394c6..0000000 --- a/gemfiles/rails5.0.gemfile.lock +++ /dev/null @@ -1,136 +0,0 @@ -PATH - remote: .. - specs: - stronger_parameters (2.23.1) - actionpack (>= 5.0) - -GEM - remote: https://rubygems.org/ - specs: - actionpack (5.0.7.2) - actionview (= 5.0.7.2) - activesupport (= 5.0.7.2) - rack (~> 2.0) - rack-test (~> 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.7.2) - activesupport (= 5.0.7.2) - builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activesupport (5.0.7.2) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - ast (2.4.2) - builder (3.2.4) - bump (0.10.0) - concurrent-ruby (1.2.3) - crass (1.0.6) - erubis (2.7.0) - forking_test_runner (1.13.0) - parallel_tests (>= 1.3.7) - i18n (1.14.1) - concurrent-ruby (~> 1.0) - json (2.7.1) - language_server-protocol (3.17.0.3) - lint_roller (1.1.0) - loofah (2.22.0) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) - maxitest (4.5.0) - minitest (>= 5.0.0, < 5.19.0) - method_source (1.0.0) - mini_portile2 (2.8.5) - minitest (5.18.1) - nokogiri (1.15.5) - mini_portile2 (~> 2.8.2) - racc (~> 1.4) - nokogiri (1.15.5-arm64-darwin) - racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) - racc (~> 1.4) - parallel (1.24.0) - parallel_tests (4.4.0) - parallel - parser (3.3.0.5) - ast (~> 2.4.1) - racc - racc (1.7.3) - rack (2.2.8) - rack-test (0.6.3) - rack (>= 1.0) - rails-dom-testing (2.2.0) - activesupport (>= 5.0.0) - minitest - nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) - loofah (~> 2.21) - nokogiri (~> 1.14) - railties (5.0.7.2) - actionpack (= 5.0.7.2) - activesupport (= 5.0.7.2) - method_source - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rainbow (3.1.1) - rake (13.1.0) - regexp_parser (2.9.0) - rexml (3.2.6) - rubocop (1.59.0) - json (~> 2.3) - language_server-protocol (>= 3.17.0) - parallel (~> 1.10) - parser (>= 3.2.2.4) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.30.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) - rubocop-performance (1.20.2) - rubocop (>= 1.48.1, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) - ruby-progressbar (1.13.0) - single_cov (1.11.0) - standard (1.33.0) - language_server-protocol (~> 3.17.0.2) - lint_roller (~> 1.0) - rubocop (~> 1.59.0) - standard-custom (~> 1.0.0) - standard-performance (~> 1.3) - standard-custom (1.0.2) - lint_roller (~> 1.0) - rubocop (~> 1.50) - standard-performance (1.3.1) - lint_roller (~> 1.1) - rubocop-performance (~> 1.20.2) - thor (1.3.0) - thread_safe (0.3.6) - tzinfo (1.2.11) - thread_safe (~> 0.1) - unicode-display_width (2.5.0) - -PLATFORMS - arm64-darwin - ruby - x86_64-linux - -DEPENDENCIES - bump - bundler - forking_test_runner - maxitest - railties (~> 5.0.0) - rake - single_cov - standard - stronger_parameters! - -BUNDLED WITH - 2.4.22 diff --git a/gemfiles/rails5.1.gemfile b/gemfiles/rails5.1.gemfile deleted file mode 100644 index e98e41c..0000000 --- a/gemfiles/rails5.1.gemfile +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true - -gem "railties", "~> 5.1.0" - -eval_gemfile "common.rb" diff --git a/gemfiles/rails5.1.gemfile.lock b/gemfiles/rails5.1.gemfile.lock deleted file mode 100644 index 863bf9b..0000000 --- a/gemfiles/rails5.1.gemfile.lock +++ /dev/null @@ -1,136 +0,0 @@ -PATH - remote: .. - specs: - stronger_parameters (2.23.1) - actionpack (>= 5.0) - -GEM - remote: https://rubygems.org/ - specs: - actionpack (5.1.7) - actionview (= 5.1.7) - activesupport (= 5.1.7) - rack (~> 2.0) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.7) - activesupport (= 5.1.7) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activesupport (5.1.7) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - ast (2.4.2) - builder (3.2.4) - bump (0.10.0) - concurrent-ruby (1.2.3) - crass (1.0.6) - erubi (1.12.0) - forking_test_runner (1.13.0) - parallel_tests (>= 1.3.7) - i18n (1.14.1) - concurrent-ruby (~> 1.0) - json (2.7.1) - language_server-protocol (3.17.0.3) - lint_roller (1.1.0) - loofah (2.22.0) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) - maxitest (4.5.0) - minitest (>= 5.0.0, < 5.19.0) - method_source (1.0.0) - mini_portile2 (2.8.5) - minitest (5.18.1) - nokogiri (1.15.5) - mini_portile2 (~> 2.8.2) - racc (~> 1.4) - nokogiri (1.15.5-arm64-darwin) - racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) - racc (~> 1.4) - parallel (1.24.0) - parallel_tests (4.4.0) - parallel - parser (3.3.0.5) - ast (~> 2.4.1) - racc - racc (1.7.3) - rack (2.2.8) - rack-test (2.1.0) - rack (>= 1.3) - rails-dom-testing (2.2.0) - activesupport (>= 5.0.0) - minitest - nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) - loofah (~> 2.21) - nokogiri (~> 1.14) - railties (5.1.7) - actionpack (= 5.1.7) - activesupport (= 5.1.7) - method_source - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rainbow (3.1.1) - rake (13.1.0) - regexp_parser (2.9.0) - rexml (3.2.6) - rubocop (1.59.0) - json (~> 2.3) - language_server-protocol (>= 3.17.0) - parallel (~> 1.10) - parser (>= 3.2.2.4) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.30.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) - rubocop-performance (1.20.2) - rubocop (>= 1.48.1, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) - ruby-progressbar (1.13.0) - single_cov (1.11.0) - standard (1.33.0) - language_server-protocol (~> 3.17.0.2) - lint_roller (~> 1.0) - rubocop (~> 1.59.0) - standard-custom (~> 1.0.0) - standard-performance (~> 1.3) - standard-custom (1.0.2) - lint_roller (~> 1.0) - rubocop (~> 1.50) - standard-performance (1.3.1) - lint_roller (~> 1.1) - rubocop-performance (~> 1.20.2) - thor (1.3.0) - thread_safe (0.3.6) - tzinfo (1.2.11) - thread_safe (~> 0.1) - unicode-display_width (2.5.0) - -PLATFORMS - arm64-darwin - ruby - x86_64-linux - -DEPENDENCIES - bump - bundler - forking_test_runner - maxitest - railties (~> 5.1.0) - rake - single_cov - standard - stronger_parameters! - -BUNDLED WITH - 2.4.22 diff --git a/gemfiles/rails5.2.gemfile b/gemfiles/rails5.2.gemfile deleted file mode 100644 index 141f839..0000000 --- a/gemfiles/rails5.2.gemfile +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true - -gem "railties", "~> 5.2.0" - -eval_gemfile "common.rb" diff --git a/gemfiles/rails5.2.gemfile.lock b/gemfiles/rails5.2.gemfile.lock deleted file mode 100644 index 0149229..0000000 --- a/gemfiles/rails5.2.gemfile.lock +++ /dev/null @@ -1,136 +0,0 @@ -PATH - remote: .. - specs: - stronger_parameters (2.23.1) - actionpack (>= 5.0) - -GEM - remote: https://rubygems.org/ - specs: - actionpack (5.2.8.1) - actionview (= 5.2.8.1) - activesupport (= 5.2.8.1) - rack (~> 2.0, >= 2.0.8) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.8.1) - activesupport (= 5.2.8.1) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activesupport (5.2.8.1) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - ast (2.4.2) - builder (3.2.4) - bump (0.10.0) - concurrent-ruby (1.2.3) - crass (1.0.6) - erubi (1.12.0) - forking_test_runner (1.13.0) - parallel_tests (>= 1.3.7) - i18n (1.14.1) - concurrent-ruby (~> 1.0) - json (2.7.1) - language_server-protocol (3.17.0.3) - lint_roller (1.1.0) - loofah (2.22.0) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) - maxitest (4.5.0) - minitest (>= 5.0.0, < 5.19.0) - method_source (1.0.0) - mini_portile2 (2.8.5) - minitest (5.18.1) - nokogiri (1.15.5) - mini_portile2 (~> 2.8.2) - racc (~> 1.4) - nokogiri (1.15.5-arm64-darwin) - racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) - racc (~> 1.4) - parallel (1.24.0) - parallel_tests (4.4.0) - parallel - parser (3.3.0.5) - ast (~> 2.4.1) - racc - racc (1.7.3) - rack (2.2.8) - rack-test (2.1.0) - rack (>= 1.3) - rails-dom-testing (2.2.0) - activesupport (>= 5.0.0) - minitest - nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) - loofah (~> 2.21) - nokogiri (~> 1.14) - railties (5.2.8.1) - actionpack (= 5.2.8.1) - activesupport (= 5.2.8.1) - method_source - rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) - rainbow (3.1.1) - rake (13.1.0) - regexp_parser (2.9.0) - rexml (3.2.6) - rubocop (1.59.0) - json (~> 2.3) - language_server-protocol (>= 3.17.0) - parallel (~> 1.10) - parser (>= 3.2.2.4) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.30.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) - rubocop-performance (1.20.2) - rubocop (>= 1.48.1, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) - ruby-progressbar (1.13.0) - single_cov (1.11.0) - standard (1.33.0) - language_server-protocol (~> 3.17.0.2) - lint_roller (~> 1.0) - rubocop (~> 1.59.0) - standard-custom (~> 1.0.0) - standard-performance (~> 1.3) - standard-custom (1.0.2) - lint_roller (~> 1.0) - rubocop (~> 1.50) - standard-performance (1.3.1) - lint_roller (~> 1.1) - rubocop-performance (~> 1.20.2) - thor (1.3.0) - thread_safe (0.3.6) - tzinfo (1.2.11) - thread_safe (~> 0.1) - unicode-display_width (2.5.0) - -PLATFORMS - arm64-darwin - ruby - x86_64-linux - -DEPENDENCIES - bump - bundler - forking_test_runner - maxitest - railties (~> 5.2.0) - rake - single_cov - standard - stronger_parameters! - -BUNDLED WITH - 2.4.22 diff --git a/gemfiles/rails6.0.gemfile.lock b/gemfiles/rails6.0.gemfile.lock index d4a4af9..ff0e140 100644 --- a/gemfiles/rails6.0.gemfile.lock +++ b/gemfiles/rails6.0.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: stronger_parameters (2.23.1) - actionpack (>= 5.0) + actionpack (>= 6.0) GEM remote: https://rubygems.org/ @@ -32,11 +32,11 @@ GEM concurrent-ruby (1.2.3) crass (1.0.6) erubi (1.12.0) - forking_test_runner (1.13.0) + forking_test_runner (1.14.0) parallel_tests (>= 1.3.7) i18n (1.14.1) concurrent-ruby (~> 1.0) - json (2.7.1) + json (2.8.2) language_server-protocol (3.17.0.3) lint_roller (1.1.0) loofah (2.22.0) @@ -54,13 +54,13 @@ GEM racc (~> 1.4) nokogiri (1.16.2-x86_64-linux) racc (~> 1.4) - parallel (1.24.0) - parallel_tests (4.4.0) + parallel (1.26.3) + parallel_tests (4.7.2) parallel - parser (3.3.0.5) + parser (3.3.6.0) ast (~> 2.4.1) racc - racc (1.7.3) + racc (1.8.1) rack (2.2.8) rack-test (2.1.0) rack (>= 1.3) @@ -79,43 +79,41 @@ GEM thor (>= 0.20.3, < 2.0) rainbow (3.1.1) rake (13.1.0) - regexp_parser (2.9.0) - rexml (3.2.6) - rubocop (1.59.0) + regexp_parser (2.9.2) + rubocop (1.68.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.4) + 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.30.0, < 2.0) + regexp_parser (>= 2.4, < 3.0) + rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) - rubocop-performance (1.20.2) + rubocop-ast (1.36.1) + parser (>= 3.3.1.0) + rubocop-performance (1.22.1) rubocop (>= 1.48.1, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (1.13.0) single_cov (1.11.0) - standard (1.33.0) + standard (1.42.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.59.0) + rubocop (~> 1.68.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.3) + standard-performance (~> 1.5) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.3.1) + standard-performance (1.5.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.20.2) + rubocop-performance (~> 1.22.0) thor (1.3.0) thread_safe (0.3.6) tzinfo (1.2.11) thread_safe (~> 0.1) - unicode-display_width (2.5.0) + unicode-display_width (2.6.0) zeitwerk (2.6.13) PLATFORMS @@ -125,7 +123,6 @@ PLATFORMS DEPENDENCIES bump - bundler forking_test_runner maxitest railties (~> 6.0.0) @@ -135,4 +132,4 @@ DEPENDENCIES stronger_parameters! BUNDLED WITH - 2.4.22 + 2.5.23 diff --git a/gemfiles/rails6.1.gemfile.lock b/gemfiles/rails6.1.gemfile.lock index d96d9d5..2979462 100644 --- a/gemfiles/rails6.1.gemfile.lock +++ b/gemfiles/rails6.1.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: stronger_parameters (2.23.1) - actionpack (>= 5.0) + actionpack (>= 6.0) GEM remote: https://rubygems.org/ @@ -32,11 +32,11 @@ GEM concurrent-ruby (1.2.3) crass (1.0.6) erubi (1.12.0) - forking_test_runner (1.13.0) + forking_test_runner (1.14.0) parallel_tests (>= 1.3.7) i18n (1.14.1) concurrent-ruby (~> 1.0) - json (2.7.1) + json (2.8.2) language_server-protocol (3.17.0.3) lint_roller (1.1.0) loofah (2.22.0) @@ -54,13 +54,13 @@ GEM racc (~> 1.4) nokogiri (1.16.2-x86_64-linux) racc (~> 1.4) - parallel (1.24.0) - parallel_tests (4.4.0) + parallel (1.26.3) + parallel_tests (4.7.2) parallel - parser (3.3.0.5) + parser (3.3.6.0) ast (~> 2.4.1) racc - racc (1.7.3) + racc (1.8.1) rack (2.2.8) rack-test (2.1.0) rack (>= 1.3) @@ -79,42 +79,40 @@ GEM thor (~> 1.0) rainbow (3.1.1) rake (13.1.0) - regexp_parser (2.9.0) - rexml (3.2.6) - rubocop (1.59.0) + regexp_parser (2.9.2) + rubocop (1.68.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.4) + 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.30.0, < 2.0) + regexp_parser (>= 2.4, < 3.0) + rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) - rubocop-performance (1.20.2) + rubocop-ast (1.36.1) + parser (>= 3.3.1.0) + rubocop-performance (1.22.1) rubocop (>= 1.48.1, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (1.13.0) single_cov (1.11.0) - standard (1.33.0) + standard (1.42.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.59.0) + rubocop (~> 1.68.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.3) + standard-performance (~> 1.5) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.3.1) + standard-performance (1.5.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.20.2) + rubocop-performance (~> 1.22.0) thor (1.3.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) + unicode-display_width (2.6.0) zeitwerk (2.6.13) PLATFORMS @@ -124,7 +122,6 @@ PLATFORMS DEPENDENCIES bump - bundler forking_test_runner maxitest railties (~> 6.1.0) @@ -134,4 +131,4 @@ DEPENDENCIES stronger_parameters! BUNDLED WITH - 2.4.22 + 2.5.23 diff --git a/gemfiles/rails7.0.gemfile.lock b/gemfiles/rails7.0.gemfile.lock index 3480795..40abcea 100644 --- a/gemfiles/rails7.0.gemfile.lock +++ b/gemfiles/rails7.0.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: stronger_parameters (2.23.1) - actionpack (>= 5.0) + actionpack (>= 6.0) GEM remote: https://rubygems.org/ @@ -31,11 +31,11 @@ GEM concurrent-ruby (1.2.3) crass (1.0.6) erubi (1.12.0) - forking_test_runner (1.13.0) + forking_test_runner (1.14.0) parallel_tests (>= 1.3.7) i18n (1.14.1) concurrent-ruby (~> 1.0) - json (2.7.1) + json (2.8.2) language_server-protocol (3.17.0.3) lint_roller (1.1.0) loofah (2.22.0) @@ -53,13 +53,13 @@ GEM racc (~> 1.4) nokogiri (1.16.2-x86_64-linux) racc (~> 1.4) - parallel (1.24.0) - parallel_tests (4.4.0) + parallel (1.26.3) + parallel_tests (4.7.2) parallel - parser (3.3.0.5) + parser (3.3.6.0) ast (~> 2.4.1) racc - racc (1.7.3) + racc (1.8.1) rack (2.2.8) rack-test (2.1.0) rack (>= 1.3) @@ -79,42 +79,40 @@ GEM zeitwerk (~> 2.5) rainbow (3.1.1) rake (13.1.0) - regexp_parser (2.9.0) - rexml (3.2.6) - rubocop (1.59.0) + regexp_parser (2.9.2) + rubocop (1.68.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.4) + 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.30.0, < 2.0) + regexp_parser (>= 2.4, < 3.0) + rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) - rubocop-performance (1.20.2) + rubocop-ast (1.36.1) + parser (>= 3.3.1.0) + rubocop-performance (1.22.1) rubocop (>= 1.48.1, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (1.13.0) single_cov (1.11.0) - standard (1.33.0) + standard (1.42.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.59.0) + rubocop (~> 1.68.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.3) + standard-performance (~> 1.5) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.3.1) + standard-performance (1.5.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.20.2) + rubocop-performance (~> 1.22.0) thor (1.3.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) + unicode-display_width (2.6.0) zeitwerk (2.6.13) PLATFORMS @@ -124,7 +122,6 @@ PLATFORMS DEPENDENCIES bump - bundler forking_test_runner maxitest railties (~> 7.0.0) @@ -134,4 +131,4 @@ DEPENDENCIES stronger_parameters! BUNDLED WITH - 2.4.22 + 2.5.23 diff --git a/gemfiles/rails7.1.gemfile.lock b/gemfiles/rails7.1.gemfile.lock index aaece9d..fb56449 100644 --- a/gemfiles/rails7.1.gemfile.lock +++ b/gemfiles/rails7.1.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: stronger_parameters (2.23.1) - actionpack (>= 5.0) + actionpack (>= 6.0) GEM remote: https://rubygems.org/ @@ -44,7 +44,7 @@ GEM drb (2.2.0) ruby2_keywords erubi (1.12.0) - forking_test_runner (1.13.0) + forking_test_runner (1.14.0) parallel_tests (>= 1.3.7) i18n (1.14.1) concurrent-ruby (~> 1.0) @@ -52,7 +52,7 @@ GEM irb (1.11.1) rdoc reline (>= 0.4.2) - json (2.7.1) + json (2.8.2) language_server-protocol (3.17.0.3) lint_roller (1.1.0) loofah (2.22.0) @@ -70,15 +70,15 @@ GEM racc (~> 1.4) nokogiri (1.16.2-x86_64-linux) racc (~> 1.4) - parallel (1.24.0) - parallel_tests (4.4.0) + parallel (1.26.3) + parallel_tests (4.7.2) parallel - parser (3.3.0.5) + parser (3.3.6.0) ast (~> 2.4.1) racc psych (5.1.2) stringio - racc (1.7.3) + racc (1.8.1) rack (3.0.9) rack-session (2.0.0) rack (>= 3.0.0) @@ -106,46 +106,44 @@ GEM rake (13.1.0) rdoc (6.6.2) psych (>= 4.0.0) - regexp_parser (2.9.0) + regexp_parser (2.9.2) reline (0.4.2) io-console (~> 0.5) - rexml (3.2.6) - rubocop (1.59.0) + rubocop (1.68.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.4) + 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.30.0, < 2.0) + regexp_parser (>= 2.4, < 3.0) + rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) - rubocop-performance (1.20.2) + rubocop-ast (1.36.1) + parser (>= 3.3.1.0) + rubocop-performance (1.22.1) rubocop (>= 1.48.1, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) single_cov (1.11.0) - standard (1.33.0) + standard (1.42.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.59.0) + rubocop (~> 1.68.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.3) + standard-performance (~> 1.5) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.3.1) + standard-performance (1.5.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.20.2) + rubocop-performance (~> 1.22.0) stringio (3.1.0) thor (1.3.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) + unicode-display_width (2.6.0) webrick (1.8.1) zeitwerk (2.6.13) @@ -156,7 +154,6 @@ PLATFORMS DEPENDENCIES bump - bundler forking_test_runner maxitest railties (~> 7.1.0) @@ -166,4 +163,4 @@ DEPENDENCIES stronger_parameters! BUNDLED WITH - 2.4.22 + 2.5.23 diff --git a/stronger_parameters.gemspec b/stronger_parameters.gemspec index f0d860e..e1ffc43 100644 --- a/stronger_parameters.gemspec +++ b/stronger_parameters.gemspec @@ -13,15 +13,8 @@ Gem::Specification.new do |spec| spec.files = Dir.glob("lib/**/*") + %w[README.md] - spec.add_development_dependency "bundler" - spec.add_development_dependency "rake" - spec.add_development_dependency "maxitest" - spec.add_development_dependency "bump" - spec.add_development_dependency "single_cov" - spec.add_development_dependency "standard" - spec.add_development_dependency "forking_test_runner" - spec.add_runtime_dependency "actionpack", ">= 5.0" + spec.add_runtime_dependency "actionpack", ">= 6.0" - spec.required_ruby_version = ">= 2.7.0" + spec.required_ruby_version = ">= 3.0" spec.metadata["rubygems_mfa_required"] = "true" end diff --git a/test/stronger_parameters/constraints/date_time_iso8601_constraint_test.rb b/test/stronger_parameters/constraints/date_time_iso8601_constraint_test.rb index ba2fa41..a031fd2 100644 --- a/test/stronger_parameters/constraints/date_time_iso8601_constraint_test.rb +++ b/test/stronger_parameters/constraints/date_time_iso8601_constraint_test.rb @@ -19,5 +19,5 @@ rejects nil rejects "2015-03-32" # Invalid day rejects "2015-00-15" # Invalid month - rejects "2015-03-31T14:34:56Zxxx" # + rejects "2015-03-31T14:34:56Zxxx" end diff --git a/test/stronger_parameters/constraints/hash_constraint_test.rb b/test/stronger_parameters/constraints/hash_constraint_test.rb index 9ad570e..5efe5f3 100644 --- a/test/stronger_parameters/constraints/hash_constraint_test.rb +++ b/test/stronger_parameters/constraints/hash_constraint_test.rb @@ -9,7 +9,7 @@ def self.permits(value, options = {}) options[:as] ||= value options[:as] = options[:as].with_indifferent_access - super(value, options) + super end subject do