Merge branch 'patch-2' into patch-3

Conflicts:
	lib/rack/attack/store_proxy.rb

lib/rack/attack/store_proxy.rb

@@ -66,6 +66,7 @@ module Rack
       class DalliProxy < SimpleDelegator
         def initialize(client)
           super(client)
+          stub_with_method_on_older_clients
         end
 
         def read(key)
@@ -95,6 +96,16 @@ module Rack
           end
         rescue Dalli::DalliError
         end
+
+        private
+
+        # So we support Dalli < 2.7.0
+        def stub_with_method_on_older_clients
+          unless __getobj__.respond_to?(:with)
+            def __getobj__.with; yield self; end
+          end
+        end
+
       end
     end
   end

spec/integration/rack_attack_cache_spec.rb

@@ -143,4 +143,11 @@ describe Rack::Attack::Cache do
     end
   end
 
+  describe "given an older Dalli::Client" do
+    it "should stub #with" do
+      proxy = Rack::Attack::StoreProxy::DalliProxy.new(Class.new)
+      proxy.must_respond_to :with
+    end
+  end
+
 end