rack-attack 4.4.0 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d06cf65c8cfce9d8611003c5da19f1384273d6d
-  data.tar.gz: 4e8e0064ab9087fc7503e9e1cb850f6dd10c8838
+  metadata.gz: b35131dd58c3ab63a32c6ebeba00cd203c207973
+  data.tar.gz: 86113382083a32cec8f0c3a5ed67d45b8a797bba
 SHA512:
-  metadata.gz: d66f18bf9e4f6058c2f40339392e38a62f71afd6852eb0f3f30075fe1eb233b5a355b61bcac39dcf109644987c1ae41fb4831d6c0ed206827258f59a06c4883e
-  data.tar.gz: b5f72dc5abf4c6b27d89b38dfea3ba85cdbed807bf9aced9388c69707f5e8115aa06a32204bd6fc7c49263ea73dff8fbf2914fcb3868b8965b36e0b63729d10c
+  metadata.gz: f9b12687222d55512bc1958b56e50b04f2bd87099a3806539df170d321db1e32b992bcff13f18b95875259448a0193f6caf5f5ba63caca0a6a018847a43dfbd3
+  data.tar.gz: 227b3c795cf86843e607ec36cb0c5a5ef3bdfe31ffdc7f30788bf935f716129d51574c326f2b29a542955e028b45a28ff282b13d4277e2233cb93842c1cb2d63

data/lib/rack/attack/store_proxy.rb

@@ -3,26 +3,30 @@ module Rack
     module StoreProxy
       PROXIES = [DalliProxy, MemCacheProxy, RedisStoreProxy]
 
+      ACTIVE_SUPPORT_WRAPPER_CLASSES = Set.new(['ActiveSupport::Cache::MemCacheStore', 'ActiveSupport::Cache::RedisStore']).freeze
+      ACTIVE_SUPPORT_CLIENTS = Set.new(['Redis::Store', 'Dalli::Client', 'MemCache']).freeze
+
       def self.build(store)
-        # RedisStore#increment needs different behavior, so detect that
-        # (method has an arity of 2; must call #expire separately
-        if (defined?(::ActiveSupport::Cache::RedisStore) && store.is_a?(::ActiveSupport::Cache::RedisStore)) ||
-          (defined?(::ActiveSupport::Cache::MemCacheStore) && store.is_a?(::ActiveSupport::Cache::MemCacheStore))
+        client = unwrap_active_support_stores(store)
+        klass = PROXIES.find { |proxy| proxy.handle?(client) }
+        klass ? klass.new(client) : client
+      end
+
 
-          # ActiveSupport::Cache::RedisStore doesn't expose any way to set an expiry,
-          # so use the raw Redis::Store instead.
-          # We also want to use the underlying Dalli client instead of ::ActiveSupport::Cache::MemCacheStore,
-          # and the MemCache client if using Rails 3.x
-          client = store.instance_variable_get(:@data)
-          if (defined?(::Redis::Store) && client.is_a?(Redis::Store)) ||
-            (defined?(Dalli::Client) && client.is_a?(Dalli::Client)) || (defined?(MemCache) && client.is_a?(MemCache))
-            store = store.instance_variable_get(:@data)
-          end
+      private
+      def self.unwrap_active_support_stores(store)
+        # ActiveSupport::Cache::RedisStore doesn't expose any way to set an expiry,
+        # so use the raw Redis::Store instead.
+        # We also want to use the underlying Dalli client instead of ::ActiveSupport::Cache::MemCacheStore,
+        # and the MemCache client if using Rails 3.x
+
+        client = store.instance_variable_get(:@data)
+        if ACTIVE_SUPPORT_WRAPPER_CLASSES.include?(store.class.to_s) && ACTIVE_SUPPORT_CLIENTS.include?(client.class.to_s)
+          client
+        else
+          store
         end
-        klass = PROXIES.find { |proxy| proxy.handle?(store) }
-        klass ? klass.new(store) : store
       end
-
     end
   end
 end

data/lib/rack/attack/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Attack
-    VERSION = '4.4.0'
+    VERSION = '4.4.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-attack
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.4.1
 platform: ruby
 authors:
 - Aaron Suggs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack