From b7eb7851cf3359f2754993645f72e72d070d4fba Mon Sep 17 00:00:00 2001 From: Gonzalo Rodriguez Date: Thu, 25 Jan 2018 15:52:20 -0300 Subject: [PATCH] Cleanup unnecessary self references --- lib/rack/attack.rb | 2 +- lib/rack/attack/store_proxy/redis_store_proxy.rb | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/rack/attack.rb b/lib/rack/attack.rb index 941cf4a..5619c20 100644 --- a/lib/rack/attack.rb +++ b/lib/rack/attack.rb @@ -115,7 +115,7 @@ class Rack::Attack def blacklisted_response warn "[DEPRECATION] 'Rack::Attack.blacklisted_response' is deprecated. Please use 'blocklisted_response' instead." - self.blocklisted_response + blocklisted_response end end diff --git a/lib/rack/attack/store_proxy/redis_store_proxy.rb b/lib/rack/attack/store_proxy/redis_store_proxy.rb index be3c412..c980369 100644 --- a/lib/rack/attack/store_proxy/redis_store_proxy.rb +++ b/lib/rack/attack/store_proxy/redis_store_proxy.rb @@ -13,31 +13,33 @@ module Rack end def read(key) - self.get(key, raw: true) + get(key, raw: true) rescue Redis::BaseError end def write(key, value, options={}) if (expires_in = options[:expires_in]) - self.setex(key, expires_in, value, raw: true) + setex(key, expires_in, value, raw: true) else - self.set(key, value, raw: true) + set(key, value, raw: true) end rescue Redis::BaseError end def increment(key, amount, options={}) count = nil - self.pipelined do - count = self.incrby(key, amount) - self.expire(key, options[:expires_in]) if options[:expires_in] + + pipelined do + count = incrby(key, amount) + expire(key, options[:expires_in]) if options[:expires_in] end + count.value if count rescue Redis::BaseError end def delete(key, options={}) - self.del(key) + del(key) rescue Redis::BaseError end end