Remove support for unmaintained ActiveSupport::Cache::RedisStore (#625)

* remove support for unmaintained ActiveSupport::Cache::RedisStore * ci: removes active_support_redis_store matrix job * test: removes unecessary redis-activesupport require * test: removes dead code * fix typo --------- Co-authored-by: Gonzalo <[email protected]>
rack · Oct 14, 2023 · 9a7815c · 9a7815c
1 parent c9bd363
commit 9a7815c
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 88 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -40,7 +40,6 @@ jobs:
           - active_support_redis_cache_store
           - active_support_redis_cache_store_pooled
           - redis_store
-          - active_support_redis_store
         exclude:
           - gemfile: rack_1
             ruby: 3.2.2

diff --git a/Appraisals b/Appraisals
@@ -80,8 +80,3 @@ end
 appraise "redis_store" do
   gem "redis-store", "~> 1.5"
 end
-
-appraise "active_support_redis_store" do
-  gem "redis-activesupport", "~> 5.0"
-  gem 'redis-store', '1.9.1' # remove after https://github.com/redis-store/redis-store/issues/358 is resolved
-end
diff --git a/gemfiles/active_support_redis_store.gemfile b/gemfiles/active_support_redis_store.gemfile
diff --git a/lib/rack/attack.rb b/lib/rack/attack.rb
@@ -11,7 +11,6 @@
 require 'rack/attack/store_proxy/redis_proxy'
 require 'rack/attack/store_proxy/redis_store_proxy'
 require 'rack/attack/store_proxy/redis_cache_store_proxy'
-require 'rack/attack/store_proxy/active_support_redis_store_proxy'
 
 require 'rack/attack/railtie' if defined?(::Rails)
 

diff --git a/lib/rack/attack/store_proxy/active_support_redis_store_proxy.rb b/lib/rack/attack/store_proxy/active_support_redis_store_proxy.rb
diff --git a/spec/acceptance/stores/active_support_redis_store_spec.rb b/spec/acceptance/stores/active_support_redis_store_spec.rb
diff --git a/spec/acceptance/stores/redis_store_spec.rb b/spec/acceptance/stores/redis_store_spec.rb
@@ -6,7 +6,7 @@
 if defined?(::Redis::Store)
   require "timecop"
 
-  describe "ActiveSupport::Cache::RedisStore as a cache backend" do
+  describe "Redis::Store as a cache backend" do
     before do
       Rack::Attack.cache.store = ::Redis::Store.new
     end

diff --git a/spec/integration/offline_spec.rb b/spec/integration/offline_spec.rb
@@ -21,18 +21,6 @@
   end
 end
 
-if defined?(::ActiveSupport::Cache::RedisStore)
-  describe 'when Redis is offline' do
-    include OfflineExamples
-
-    before do
-      @cache = Rack::Attack::Cache.new
-      # Use presumably unused port for Redis client
-      @cache.store = ActiveSupport::Cache::RedisStore.new(host: '127.0.0.1', port: 3333)
-    end
-  end
-end
-
 if defined?(Redis) && defined?(ActiveSupport::Cache::RedisCacheStore) && Redis::VERSION >= '4'
   describe 'when Redis is offline' do
     include OfflineExamples

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -21,7 +21,6 @@ def safe_require(name)
 safe_require "connection_pool"
 safe_require "dalli"
 safe_require "redis"
-safe_require "redis-activesupport"
 safe_require "redis-store"
 
 class Minitest::Spec