Update rubocop config

Author: rafaelfranca

.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.4
   # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
   # to ignore them, so only the ones explicitly set in this file are enabled.
   DisabledByDefault: true
@@ -8,80 +8,117 @@ AllCops:
 Style/AndOr:
   Enabled: true
 
-# Do not use braces for hash literals when they are the last argument of a
-# method call.
-Style/BracesAroundHashParameters:
+# Align `when` with `case`.
+Layout/CaseIndentation:
   Enabled: true
 
-# Align `when` with `case`.
-Style/CaseIndentation:
+Layout/ClosingHeredocIndentation:
   Enabled: true
 
 # Align comments with method definitions.
-Style/CommentIndentation:
+Layout/CommentIndentation:
+  Enabled: true
+
+Layout/ElseAlignment:
+  Enabled: true
+
+# Align `end` with the matching keyword or starting expression except for
+# assignments, where it should be aligned with the LHS.
+Layout/EndAlignment:
+  Enabled: true
+  EnforcedStyleAlignWith: variable
+  AutoCorrect: true
+
+Layout/EmptyLineAfterMagicComment:
   Enabled: true
 
-# No extra empty lines.
-Style/EmptyLines:
+Layout/EmptyLinesAroundAccessModifier:
+  Enabled: true
+  EnforcedStyle: only_before
+
+Layout/EmptyLinesAroundBlockBody:
   Enabled: true
 
 # In a regular class definition, no empty lines around the body.
-Style/EmptyLinesAroundClassBody:
+Layout/EmptyLinesAroundClassBody:
+  Enabled: true
+
+# In a regular method definition, no empty lines around the body.
+Layout/EmptyLinesAroundMethodBody:
   Enabled: true
 
 # In a regular module definition, no empty lines around the body.
-Style/EmptyLinesAroundModuleBody:
+Layout/EmptyLinesAroundModuleBody:
   Enabled: true
 
 # Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
 Style/HashSyntax:
   Enabled: true
 
+Layout/FirstArgumentIndentation:
+  Enabled: true
+
 # Method definitions after `private` or `protected` isolated calls need one
 # extra level of indentation.
-Style/IndentationConsistency:
+Layout/IndentationConsistency:
   Enabled: true
-  EnforcedStyle: rails
+  EnforcedStyle: indented_internal_methods
 
 # Two spaces, no tabs (for indentation).
-Style/IndentationWidth:
+Layout/IndentationWidth:
+  Enabled: true
+
+Layout/LeadingCommentSpace:
+  Enabled: true
+
+Layout/SpaceAfterColon:
+  Enabled: true
+
+Layout/SpaceAfterComma:
+  Enabled: true
+
+Layout/SpaceAfterSemicolon:
   Enabled: true
 
-Style/SpaceAfterColon:
+Layout/SpaceAroundEqualsInParameterDefault:
   Enabled: true
 
-Style/SpaceAfterComma:
+Layout/SpaceAroundKeyword:
   Enabled: true
 
-Style/SpaceAroundEqualsInParameterDefault:
+Layout/SpaceBeforeComma:
   Enabled: true
 
-Style/SpaceAroundKeyword:
+Layout/SpaceBeforeComment:
   Enabled: true
 
-Style/SpaceAroundOperators:
+Layout/SpaceBeforeFirstArg:
   Enabled: true
 
-Style/SpaceBeforeFirstArg:
-    Enabled: true
+Style/DefWithParentheses:
+  Enabled: true
 
 # Defining a method with parameters needs parentheses.
 Style/MethodDefParentheses:
   Enabled: true
 
+Style/RedundantFreeze:
+  Enabled: true
+
 # Use `foo {}` not `foo{}`.
-Style/SpaceBeforeBlockBraces:
+Layout/SpaceBeforeBlockBraces:
   Enabled: true
 
 # Use `foo { bar }` not `foo {bar}`.
-Style/SpaceInsideBlockBraces:
+Layout/SpaceInsideBlockBraces:
   Enabled: true
+  EnforcedStyleForEmptyBraces: space
 
 # Use `{ a: 1 }` not `{a:1}`.
-Style/SpaceInsideHashLiteralBraces:
+Layout/SpaceInsideHashLiteralBraces:
   Enabled: true
 
-Style/SpaceInsideParens:
+Layout/SpaceInsideParens:
   Enabled: true
 
 # Check quotes usage according to lint rule below.
@@ -90,27 +127,66 @@ Style/StringLiterals:
   EnforcedStyle: double_quotes
 
 # Detect hard tabs, no hard tabs.
-Style/Tab:
+Layout/Tab:
   Enabled: true
 
-# Blank lines should not have any spaces.
-Style/TrailingBlankLines:
+# Empty lines should not have any spaces.
+Layout/TrailingEmptyLines:
   Enabled: true
 
 # No trailing whitespace.
-Style/TrailingWhitespace:
+Layout/TrailingWhitespace:
   Enabled: true
 
 # Use quotes for string literals when they are enough.
-Style/UnneededPercentQ:
+Style/RedundantPercentQ:
   Enabled: true
 
-# Align `end` with the matching keyword or starting expression except for
-# assignments, where it should be aligned with the LHS.
-Lint/EndAlignment:
+Lint/AmbiguousOperator:
+  Enabled: true
+
+Lint/AmbiguousRegexpLiteral:
+  Enabled: true
+
+Lint/ErbNewArguments:
   Enabled: true
-  AlignWith: variable
 
 # Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
 Lint/RequireParentheses:
   Enabled: true
+
+Lint/ShadowingOuterLocalVariable:
+  Enabled: true
+
+Lint/RedundantStringCoercion:
+  Enabled: true
+
+Lint/UriEscapeUnescape:
+  Enabled: true
+
+Lint/UselessAssignment:
+  Enabled: true
+
+Lint/DeprecatedClassMethods:
+  Enabled: true
+
+Style/ParenthesesAroundCondition:
+  Enabled: true
+
+Style/RedundantBegin:
+  Enabled: true
+
+Style/RedundantReturn:
+  Enabled: true
+  AllowMultipleReturnValues: true
+
+Style/Semicolon:
+  Enabled: true
+  AllowAsExpressionSeparator: true
+
+# Prefer Foo.method over Foo::method
+Style/ColonMethodCall:
+  Enabled: true
+
+Style/TrivialAccessors:
+  Enabled: true

Gemfile

@@ -3,3 +3,4 @@ source "https://rubygems.org"
 gemspec
 
 gem "rails"
+gem "rubocop", ">= 0.77.0", require: false

actionpack-page_caching.gemspec

@@ -8,12 +8,12 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/rails/actionpack-page_caching"
   gem.license       = "MIT"
 
-  gem.required_ruby_version = '>= 2.4.6'
+  gem.required_ruby_version = ">= 2.4.6"
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.license       = 'MIT'
+  gem.license       = "MIT"
 
   gem.add_dependency "actionpack", ">= 5.0.0"
 

lib/action_controller/caching/pages.rb

@@ -136,9 +136,7 @@ def raise_runtime_error
             MSG
           end
 
-          def default_extension
-            @default_extension
-          end
+          attr_reader :default_extension
 
           def cache_file(path, extension)
             if path.empty? || path =~ %r{\A/+\z}
@@ -276,10 +274,10 @@ def cache_page(content = nil, options = nil, gzip = Zlib::BEST_COMPRESSION)
             end
 
           type = if self.respond_to?(:media_type)
-                   Mime::LOOKUP[self.media_type]
-                 else
-                   Mime::LOOKUP[self.content_type]
-                 end
+            Mime::LOOKUP[self.media_type]
+          else
+            Mime::LOOKUP[self.content_type]
+          end
 
           if type && (type_symbol = type.symbol).present?
             extension = ".#{type_symbol}"

test/caching_test.rb

@@ -24,7 +24,6 @@ def teardown
   end
 
   private
-
     def assert_page_cached(action, options = {})
       expected = options[:content] || action.to_s
       path = cache_file(action, options)
@@ -330,19 +329,17 @@ def test_page_caching_conditional_options
   end
 
   def test_page_caching_directory_set_as_pathname
-    begin
-      ActionController::Base.page_cache_directory = Pathname.new(FILE_STORE_PATH)
-
-      draw do
-        get "/page_caching_test/ok", to: "page_caching_test#ok"
-      end
+    ActionController::Base.page_cache_directory = Pathname.new(FILE_STORE_PATH)
 
-      get :ok
-      assert_response :ok
-      assert_page_cached :ok
-    ensure
-      ActionController::Base.page_cache_directory = FILE_STORE_PATH
+    draw do
+      get "/page_caching_test/ok", to: "page_caching_test#ok"
     end
+
+    get :ok
+    assert_response :ok
+    assert_page_cached :ok
+  ensure
+    ActionController::Base.page_cache_directory = FILE_STORE_PATH
   end
 
   def test_page_caching_directory_set_on_controller_instance