From 5a42fd3ac789350cb7f78ac7ef0d5a9e29579da3 Mon Sep 17 00:00:00 2001
From: Gonzalo Rodriguez <grzuy0@gmail.com>
Date: Fri, 1 Mar 2019 21:51:15 -0300
Subject: [PATCH] style: enable Style/OptionalArguments rubocop

---
 .rubocop.yml                 |  3 +++
 lib/rack/attack.rb           | 10 +++++-----
 lib/rack/attack/blocklist.rb |  2 +-
 lib/rack/attack/check.rb     |  2 +-
 lib/rack/attack/safelist.rb  |  2 +-
 lib/rack/attack/track.rb     |  4 ++--
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 0d4f3c6..8e210a5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -53,6 +53,9 @@ Style/FrozenStringLiteralComment:
 Style/HashSyntax:
   Enabled: true
 
+Style/OptionalArguments:
+  Enabled: true
+
 Style/RaiseArgs:
   Enabled: true
 
diff --git a/lib/rack/attack.rb b/lib/rack/attack.rb
index 4ac4c44..1c5c2ab 100644
--- a/lib/rack/attack.rb
+++ b/lib/rack/attack.rb
@@ -30,7 +30,7 @@ class Rack::Attack
     attr_accessor :notifier, :blocklisted_response, :throttled_response, :anonymous_blocklists, :anonymous_safelists
 
     def safelist(name = nil, &block)
-      safelist = Safelist.new(name, block)
+      safelist = Safelist.new(name, &block)
 
       if name
         safelists[name] = safelist
@@ -40,7 +40,7 @@ class Rack::Attack
     end
 
     def blocklist(name = nil, &block)
-      blocklist = Blocklist.new(name, block)
+      blocklist = Blocklist.new(name, &block)
 
       if name
         blocklists[name] = blocklist
@@ -51,12 +51,12 @@ class Rack::Attack
 
     def blocklist_ip(ip_address)
       ip_blocklist_proc = lambda { |request| IPAddr.new(ip_address).include?(IPAddr.new(request.ip)) }
-      anonymous_blocklists << Blocklist.new(nil, ip_blocklist_proc)
+      anonymous_blocklists << Blocklist.new(nil, &ip_blocklist_proc)
     end
 
     def safelist_ip(ip_address)
       ip_safelist_proc = lambda { |request| IPAddr.new(ip_address).include?(IPAddr.new(request.ip)) }
-      anonymous_safelists << Safelist.new(nil, ip_safelist_proc)
+      anonymous_safelists << Safelist.new(nil, &ip_safelist_proc)
     end
 
     def throttle(name, options, &block)
@@ -64,7 +64,7 @@ class Rack::Attack
     end
 
     def track(name, options = {}, &block)
-      tracks[name] = Track.new(name, options, block)
+      tracks[name] = Track.new(name, options, &block)
     end
 
     def safelists;
diff --git a/lib/rack/attack/blocklist.rb b/lib/rack/attack/blocklist.rb
index ee57656..bd7fa11 100644
--- a/lib/rack/attack/blocklist.rb
+++ b/lib/rack/attack/blocklist.rb
@@ -3,7 +3,7 @@
 module Rack
   class Attack
     class Blocklist < Check
-      def initialize(name, block)
+      def initialize(name, &block)
         super
         @type = :blocklist
       end
diff --git a/lib/rack/attack/check.rb b/lib/rack/attack/check.rb
index 2e5c64d..ef4ad78 100644
--- a/lib/rack/attack/check.rb
+++ b/lib/rack/attack/check.rb
@@ -4,7 +4,7 @@ module Rack
   class Attack
     class Check
       attr_reader :name, :block, :type
-      def initialize(name, options = {}, block)
+      def initialize(name, options = {}, &block)
         @name, @block = name, block
         @type = options.fetch(:type, nil)
       end
diff --git a/lib/rack/attack/safelist.rb b/lib/rack/attack/safelist.rb
index d335be2..0bd1453 100644
--- a/lib/rack/attack/safelist.rb
+++ b/lib/rack/attack/safelist.rb
@@ -3,7 +3,7 @@
 module Rack
   class Attack
     class Safelist < Check
-      def initialize(name, block)
+      def initialize(name, &block)
         super
         @type = :safelist
       end
diff --git a/lib/rack/attack/track.rb b/lib/rack/attack/track.rb
index dba16ca..9e7ff2e 100644
--- a/lib/rack/attack/track.rb
+++ b/lib/rack/attack/track.rb
@@ -5,13 +5,13 @@ module Rack
     class Track
       attr_reader :filter
 
-      def initialize(name, options = {}, block)
+      def initialize(name, options = {}, &block)
         options[:type] = :track
 
         if options[:limit] && options[:period]
           @filter = Throttle.new(name, options, block)
         else
-          @filter = Check.new(name, options, block)
+          @filter = Check.new(name, options, &block)
         end
       end