mirror of
https://github.com/samsonjs/rack-attack.git
synced 2026-04-27 15:07:41 +00:00
Only require dalli when running dalli appraisal
This commit is contained in:
parent
93fc1641ea
commit
79de0d53e1
7 changed files with 136 additions and 123 deletions
|
|
@ -49,6 +49,5 @@ Gem::Specification.new do |s|
|
||||||
s.add_development_dependency 'actionpack', '>= 3.0.0'
|
s.add_development_dependency 'actionpack', '>= 3.0.0'
|
||||||
s.add_development_dependency 'activesupport', '>= 3.0.0'
|
s.add_development_dependency 'activesupport', '>= 3.0.0'
|
||||||
s.add_development_dependency 'connection_pool'
|
s.add_development_dependency 'connection_pool'
|
||||||
s.add_development_dependency 'dalli'
|
|
||||||
s.add_development_dependency 'redis-activesupport'
|
s.add_development_dependency 'redis-activesupport'
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,11 @@
|
||||||
require_relative "../../spec_helper"
|
require_relative "../../spec_helper"
|
||||||
require_relative "../../support/cache_store_helper"
|
|
||||||
|
|
||||||
require "active_support/cache/dalli_store"
|
if defined?(::Dalli)
|
||||||
require "timecop"
|
require_relative "../../support/cache_store_helper"
|
||||||
|
require "active_support/cache/dalli_store"
|
||||||
|
require "timecop"
|
||||||
|
|
||||||
describe "ActiveSupport::Cache::DalliStore as a cache backend" do
|
describe "ActiveSupport::Cache::DalliStore as a cache backend" do
|
||||||
before do
|
before do
|
||||||
Rack::Attack.cache.store = ActiveSupport::Cache::DalliStore.new
|
Rack::Attack.cache.store = ActiveSupport::Cache::DalliStore.new
|
||||||
end
|
end
|
||||||
|
|
@ -36,4 +37,5 @@ describe "ActiveSupport::Cache::DalliStore as a cache backend" do
|
||||||
|
|
||||||
assert_nil Rack::Attack.cache.store.fetch(key)
|
assert_nil Rack::Attack.cache.store.fetch(key)
|
||||||
end
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,10 @@
|
||||||
require_relative "../../spec_helper"
|
require_relative "../../spec_helper"
|
||||||
require_relative "../../support/cache_store_helper"
|
|
||||||
|
|
||||||
require "timecop"
|
if defined?(::Dalli)
|
||||||
|
require_relative "../../support/cache_store_helper"
|
||||||
|
require "timecop"
|
||||||
|
|
||||||
describe "ActiveSupport::Cache::MemCacheStore as a cache backend" do
|
describe "ActiveSupport::Cache::MemCacheStore as a cache backend" do
|
||||||
before do
|
before do
|
||||||
Rack::Attack.cache.store = ActiveSupport::Cache::MemCacheStore.new
|
Rack::Attack.cache.store = ActiveSupport::Cache::MemCacheStore.new
|
||||||
end
|
end
|
||||||
|
|
@ -35,4 +36,5 @@ describe "ActiveSupport::Cache::MemCacheStore as a cache backend" do
|
||||||
|
|
||||||
assert_nil Rack::Attack.cache.store.get(key)
|
assert_nil Rack::Attack.cache.store.get(key)
|
||||||
end
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,12 @@
|
||||||
require_relative "../../spec_helper"
|
require_relative "../../spec_helper"
|
||||||
require_relative "../../support/cache_store_helper"
|
|
||||||
|
|
||||||
require "connection_pool"
|
if defined?(::Dalli)
|
||||||
require "dalli"
|
require_relative "../../support/cache_store_helper"
|
||||||
require "timecop"
|
require "connection_pool"
|
||||||
|
require "dalli"
|
||||||
|
require "timecop"
|
||||||
|
|
||||||
describe "ConnectionPool with Dalli::Client as a cache backend" do
|
describe "ConnectionPool with Dalli::Client as a cache backend" do
|
||||||
before do
|
before do
|
||||||
Rack::Attack.cache.store = ConnectionPool.new { Dalli::Client.new }
|
Rack::Attack.cache.store = ConnectionPool.new { Dalli::Client.new }
|
||||||
end
|
end
|
||||||
|
|
@ -37,4 +38,5 @@ describe "ConnectionPool with Dalli::Client as a cache backend" do
|
||||||
|
|
||||||
assert_nil(Rack::Attack.cache.store.with { |client| client.fetch(key) })
|
assert_nil(Rack::Attack.cache.store.with { |client| client.fetch(key) })
|
||||||
end
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,11 @@
|
||||||
require_relative "../../spec_helper"
|
require_relative "../../spec_helper"
|
||||||
require_relative "../../support/cache_store_helper"
|
|
||||||
|
|
||||||
require "dalli"
|
if defined?(::Dalli)
|
||||||
require "timecop"
|
require_relative "../../support/cache_store_helper"
|
||||||
|
require "dalli"
|
||||||
|
require "timecop"
|
||||||
|
|
||||||
describe "Dalli::Client as a cache backend" do
|
describe "Dalli::Client as a cache backend" do
|
||||||
before do
|
before do
|
||||||
Rack::Attack.cache.store = Dalli::Client.new
|
Rack::Attack.cache.store = Dalli::Client.new
|
||||||
end
|
end
|
||||||
|
|
@ -36,4 +37,5 @@ describe "Dalli::Client as a cache backend" do
|
||||||
|
|
||||||
assert_nil Rack::Attack.cache.store.fetch(key)
|
assert_nil Rack::Attack.cache.store.fetch(key)
|
||||||
end
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
require 'active_support/cache'
|
require 'active_support/cache'
|
||||||
require 'redis-activesupport'
|
require 'redis-activesupport'
|
||||||
require 'dalli'
|
|
||||||
require_relative '../spec_helper'
|
require_relative '../spec_helper'
|
||||||
|
|
||||||
OfflineExamples = Minitest::SharedExamples.new do
|
OfflineExamples = Minitest::SharedExamples.new do
|
||||||
|
|
@ -27,7 +26,8 @@ describe 'when Redis is offline' do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'when Memcached is offline' do
|
if defined?(::Dalli)
|
||||||
|
describe 'when Memcached is offline' do
|
||||||
include OfflineExamples
|
include OfflineExamples
|
||||||
|
|
||||||
before do
|
before do
|
||||||
|
|
@ -40,4 +40,5 @@ describe 'when Memcached is offline' do
|
||||||
after do
|
after do
|
||||||
Dalli.logger.level = Logger::INFO
|
Dalli.logger.level = Logger::INFO
|
||||||
end
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,11 @@ if RUBY_ENGINE == "ruby"
|
||||||
require "byebug"
|
require "byebug"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
begin
|
||||||
|
require "dalli"
|
||||||
|
rescue LoadError
|
||||||
|
end
|
||||||
|
|
||||||
class MiniTest::Spec
|
class MiniTest::Spec
|
||||||
include Rack::Test::Methods
|
include Rack::Test::Methods
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue