Only require connection_pool running connection_pool appraisal

This commit is contained in:
Gonzalo Rodriguez 2018-06-22 17:45:58 -03:00
parent 79de0d53e1
commit bd2ade8977
No known key found for this signature in database
GPG key ID: 5DB8B81B049B8AB1
6 changed files with 49 additions and 30 deletions

View file

@ -32,3 +32,8 @@ end
appraise 'dalli2' do
gem 'dalli', '~> 2.0'
end
appraise "connection_pool_dalli" do
gem "connection_pool", "~> 2.2"
gem "dalli", "~> 2.7"
end

View file

@ -0,0 +1,8 @@
# This file was generated by Appraisal
source "https://rubygems.org"
gem "connection_pool", "~> 2.2"
gem "dalli", "~> 2.7"
gemspec path: "../"

View file

@ -48,6 +48,5 @@ Gem::Specification.new do |s|
# which rack-attack uses only for testing compatibility in test suite.
s.add_development_dependency 'actionpack', '>= 3.0.0'
s.add_development_dependency 'activesupport', '>= 3.0.0'
s.add_development_dependency 'connection_pool'
s.add_development_dependency 'redis-activesupport'
end

View file

@ -1,40 +1,42 @@
require_relative "../../spec_helper"
require_relative "../../support/cache_store_helper"
require "timecop"
if defined?(::ConnectionPool)
require_relative "../../support/cache_store_helper"
require "timecop"
if ActiveSupport.version >= Gem::Version.new("5.2.0")
describe "ActiveSupport::Cache::RedisCacheStore (pooled) as a cache backend" do
before do
Rack::Attack.cache.store = ActiveSupport::Cache::RedisCacheStore.new(pool_size: 2)
end
after do
Rack::Attack.cache.store.clear
end
it_works_for_cache_backed_features
it "doesn't leak keys" do
Rack::Attack.throttle("by ip", limit: 1, period: 1) do |request|
request.ip
if ActiveSupport.version >= Gem::Version.new("5.2.0")
describe "ActiveSupport::Cache::RedisCacheStore (pooled) as a cache backend" do
before do
Rack::Attack.cache.store = ActiveSupport::Cache::RedisCacheStore.new(pool_size: 2)
end
key = nil
# Freeze time during these statement to be sure that the key used by rack attack is the same
# we pre-calculate in local variable `key`
Timecop.freeze do
key = "rack::attack:#{Time.now.to_i}:by ip:1.2.3.4"
get "/", {}, "REMOTE_ADDR" => "1.2.3.4"
after do
Rack::Attack.cache.store.clear
end
assert Rack::Attack.cache.store.fetch(key)
it_works_for_cache_backed_features
sleep 2.1
it "doesn't leak keys" do
Rack::Attack.throttle("by ip", limit: 1, period: 1) do |request|
request.ip
end
assert_nil Rack::Attack.cache.store.fetch(key)
key = nil
# Freeze time during these statement to be sure that the key used by rack attack is the same
# we pre-calculate in local variable `key`
Timecop.freeze do
key = "rack::attack:#{Time.now.to_i}:by ip:1.2.3.4"
get "/", {}, "REMOTE_ADDR" => "1.2.3.4"
end
assert Rack::Attack.cache.store.fetch(key)
sleep 2.1
assert_nil Rack::Attack.cache.store.fetch(key)
end
end
end
end

View file

@ -1,6 +1,6 @@
require_relative "../../spec_helper"
if defined?(::Dalli)
if defined?(::Dalli) && defined?(::ConnectionPool)
require_relative "../../support/cache_store_helper"
require "connection_pool"
require "dalli"

View file

@ -18,6 +18,11 @@ begin
rescue LoadError
end
begin
require "connection_pool"
rescue LoadError
end
class MiniTest::Spec
include Rack::Test::Methods