Update rubocop (#629)

* Upgrade rubocop gem

* Fix obsolete parameter

* Fix Lint/MissingSuper

* Fix Lint/ConstantDefinitionInBlock

* Fix Layout/EmptyLineBetweenDefs

* Add rubocop-minitest

* Add rubocop-rake

* Upgrade rubocop-performance

.rubocop.yml

@@ -1,5 +1,7 @@
 require:
+  - rubocop-minitest
   - rubocop-performance
+  - rubocop-rake
 
 inherit_mode:
   merge:
@@ -56,7 +58,6 @@ Security:
 
 Style/BlockDelimiters:
   Enabled: true
-  IgnoredMethods: [] # Workaround rubocop bug: https://github.com/rubocop-hq/rubocop/issues/6179
 
 Style/ClassAndModuleChildren:
   Enabled: true

lib/rack/attack.rb

@@ -17,8 +17,11 @@ require 'rack/attack/railtie' if defined?(::Rails)
 module Rack
   class Attack
     class Error < StandardError; end
+
     class MisconfiguredStoreError < Error; end
+
     class MissingStoreError < Error; end
+
     class IncompatibleStoreError < Error; end
 
     autoload :Check,                'rack/attack/check'

lib/rack/attack/base_proxy.rb

@@ -11,6 +11,7 @@ module Rack
         end
 
         def inherited(klass)
+          super
           proxies << klass
         end
 

rack-attack.gemspec

@@ -34,8 +34,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency "minitest-stub-const", "~> 0.6"
   s.add_development_dependency 'rack-test', "~> 2.0"
   s.add_development_dependency 'rake', "~> 13.0"
-  s.add_development_dependency "rubocop", "0.89.1"
+  s.add_development_dependency "rubocop", "1.12.1"
-  s.add_development_dependency "rubocop-performance", "~> 1.5.0"
+  s.add_development_dependency "rubocop-minitest", "~> 0.11.1"
+  s.add_development_dependency "rubocop-performance", "~> 1.10.2"
+  s.add_development_dependency "rubocop-rake", "~> 0.5.1"
   s.add_development_dependency "timecop", "~> 0.9.1"
 
   # byebug only works with MRI

spec/acceptance/cache_store_config_for_fail2ban_spec.rb

@@ -79,7 +79,7 @@ describe "Cache store config when using fail2ban" do
   end
 
   it "works with any object that responds to #read, #write and #increment" do
-    FakeStore = Class.new do
+    fake_store_class = Class.new do
       attr_accessor :backend
 
       def initialize
@@ -100,7 +100,7 @@ describe "Cache store config when using fail2ban" do
       end
     end
 
-    Rack::Attack.cache.store = FakeStore.new
+    Rack::Attack.cache.store = fake_store_class.new
 
     get "/"
     assert_equal 200, last_response.status

spec/acceptance/extending_request_object_spec.rb

@@ -4,10 +4,8 @@ require_relative "../spec_helper"
 
 describe "Extending the request object" do
   before do
-    class Rack::Attack::Request
+    Rack::Attack::Request.define_method :authorized? do
-      def authorized?
+      env["APIKey"] == "private-secret"
-        env["APIKey"] == "private-secret"
-      end
     end
 
     Rack::Attack.blocklist("unauthorized requests") do |request|
@@ -17,9 +15,7 @@ describe "Extending the request object" do
 
   # We don't want the extension to leak to other test cases
   after do
-    class Rack::Attack::Request
+    Rack::Attack::Request.undef_method :authorized?
-      remove_method :authorized?
-    end
   end
 
   it "forbids request if blocklist condition is true" do

spec/rack_attack_request_spec.rb

@@ -5,10 +5,8 @@ require_relative 'spec_helper'
 describe 'Rack::Attack' do
   describe 'helpers' do
     before do
-      class Rack::Attack::Request
+      Rack::Attack::Request.define_method :remote_ip do
-        def remote_ip
+        ip
-          ip
-        end
       end
 
       Rack::Attack.safelist('valid IP') do |req|

spec/rack_attack_track_spec.rb

@@ -3,17 +3,19 @@
 require_relative 'spec_helper'
 
 describe 'Rack::Attack.track' do
-  class Counter
+  let(:counter_class) do
-    def self.incr
+    Class.new do
-      @counter += 1
+      def self.incr
-    end
+        @counter += 1
+      end
 
-    def self.reset
+      def self.reset
-      @counter = 0
+        @counter = 0
-    end
+      end
 
-    def self.check
+      def self.check
-      @counter
+        @counter
+      end
     end
   end
 
@@ -32,19 +34,19 @@ describe 'Rack::Attack.track' do
 
   describe "with a notification subscriber and two tracks" do
     before do
-      Counter.reset
+      counter_class.reset
       # A second track
       Rack::Attack.track("homepage") { |req| req.path == "/" }
 
       ActiveSupport::Notifications.subscribe("track.rack_attack") do |*_args|
-        Counter.incr
+        counter_class.incr
       end
 
       get "/"
     end
 
     it "should notify twice" do
-      _(Counter.check).must_equal 2
+      _(counter_class.check).must_equal 2
     end
   end