diff --git a/CHANGELOG.md b/CHANGELOG.md index ff1b520..74c55a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +## [1.2.0] + +- Update to [rubocop-rails@2.26.0](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md#2260-2024-08-24) +- Enable new [Rails/EnumSyntax](https://github.com/rubocop/rubocop-rails/blob/master/docs/modules/ROOT/pages/cops_rails.adoc#railsenumsyntax) +- Exclude [Rails/ApplicationModel](/commit/94029ecc04635bdcda9c54bfcca27f6f9656205d) from migrations +- Disable [Rails/HelperInstanceVariable](https://github.com/rubocop/rubocop-rails/blob/master/docs/modules/ROOT/pages/cops_rails.adoc#railshelperinstancevariable) +- Disable [Rails/WhereRange](https://github.com/standardrb/standard-rails/pull/57) +- Disable [Rails/BulkChangeTable](https://github.com/standardrb/standard-rails/pull/55) +- Disable [Rails/InverseOf](https://github.com/standardrb/standard-rails/pull/54) +- Disable [Rails/HasManyOrHasOneDependent](https://github.com/standardrb/standard-rails/pull/53) +- Disable [Rails/EnvironmentVariableAccess](https://github.com/standardrb/standard-rails/pull/47) + ## [1.1.0] - Minimum Ruby version increased to 3.0 diff --git a/Gemfile.lock b/Gemfile.lock index ad1c93a..2bf1f1e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ PATH remote: . specs: - standard-rails (1.1.0) + standard-rails (1.2.0) lint_roller (~> 1.0) - rubocop-rails (~> 2.25.0) + rubocop-rails (~> 2.26.0) GEM remote: https://rubygems.org/ @@ -63,10 +63,10 @@ GEM rubocop-performance (1.21.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.25.1) + rubocop-rails (2.26.0) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.33.0, < 2.0) + rubocop (>= 1.52.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (1.13.0) securerandom (0.3.1) diff --git a/config/base.yml b/config/base.yml index 83130b0..ac4bf60 100644 --- a/config/base.yml +++ b/config/base.yml @@ -77,7 +77,6 @@ Rails/ApplicationRecord: Exclude: - 'db/migrate/**/*' - Rails/ArelStar: Enabled: true diff --git a/lib/standard/rails/load_rubocop_rails_without_the_monkey_patch.rb b/lib/standard/rails/load_rubocop_rails_without_the_monkey_patch.rb index 6416d45..e137a1a 100644 --- a/lib/standard/rails/load_rubocop_rails_without_the_monkey_patch.rb +++ b/lib/standard/rails/load_rubocop_rails_without_the_monkey_patch.rb @@ -7,7 +7,7 @@ # of RuboCop built-in cops in this file, we need to monitor it for changes # in rubocop-rails and keep it up to date. # -# Last updated from rubocop-rails v2.25.1 +# Last updated from rubocop-rails v2.26.0 # frozen_string_literal: true diff --git a/lib/standard/rails/version.rb b/lib/standard/rails/version.rb index 7847576..fc18e46 100644 --- a/lib/standard/rails/version.rb +++ b/lib/standard/rails/version.rb @@ -1,5 +1,5 @@ module Standard module Rails - VERSION = "1.1.0" + VERSION = "1.2.0" end end diff --git a/standard-rails.gemspec b/standard-rails.gemspec index ab38ec8..171ce07 100644 --- a/standard-rails.gemspec +++ b/standard-rails.gemspec @@ -30,5 +30,5 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.add_dependency "lint_roller", "~> 1.0" - spec.add_dependency "rubocop-rails", "~> 2.25.0" + spec.add_dependency "rubocop-rails", "~> 2.26.0" end diff --git a/test/standard/rails_test.rb b/test/standard/rails_test.rb index 3ac6c59..cb4125c 100644 --- a/test/standard/rails_test.rb +++ b/test/standard/rails_test.rb @@ -18,7 +18,7 @@ def test_that_it_has_a_version_number ].freeze def test_configures_all_rails_cops expected = YAML.load_file(Pathname.new(Gem.loaded_specs["rubocop-rails"].full_gem_path).join("config/default.yml")).reject { |name, cop| - ["Lint/NumberConversion", "Style/AndOr", "Style/FormatStringToken", "Style/SymbolProc", "Lint/RedundantSafeNavigation", "Style/InvertibleUnlessCondition"].include?(name) + ["Lint/NumberConversion", "Style/AndOr", "Style/FormatStringToken", "Style/SymbolProc", "Lint/RedundantSafeNavigation", "Style/InvertibleUnlessCondition", "Style/CollectionCompact"].include?(name) }.to_h actual = YAML.load_file(BASE_CONFIG) missing = (expected.keys - actual.keys).grep(/\//) # ignore groups like "Layout"