diff -Nru ruby-redis-activesupport-5.2.1/debian/changelog ruby-redis-activesupport-5.3.0/debian/changelog --- ruby-redis-activesupport-5.2.1/debian/changelog 2021-11-24 19:06:35.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/debian/changelog 2022-01-21 21:30:37.000000000 +0000 @@ -1,3 +1,15 @@ +ruby-redis-activesupport (5.3.0-1) unstable; urgency=medium + + * Team upload. + * New upstream version 5.3.0 + * Fix build with Ruby3.0. + - d/p/Fix-Ruby-3.0-keyword-argument-issue.patch: Remove patch. + This has been incorporated by upstream. + - d/p/Use-redis.exists-method-instead-of-exists.patch: Fix testcase + failure when building with Ruby3.0. + + -- Sergio Durigan Junior Fri, 21 Jan 2022 16:30:37 -0500 + ruby-redis-activesupport (5.2.1-1) unstable; urgency=medium * Team upload. diff -Nru ruby-redis-activesupport-5.2.1/debian/patches/Fix-Ruby-3.0-keyword-argument-issue.patch ruby-redis-activesupport-5.3.0/debian/patches/Fix-Ruby-3.0-keyword-argument-issue.patch --- ruby-redis-activesupport-5.2.1/debian/patches/Fix-Ruby-3.0-keyword-argument-issue.patch 2021-11-24 19:06:35.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/debian/patches/Fix-Ruby-3.0-keyword-argument-issue.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -From: Daniel Leidert -Date: Wed, 24 Nov 2021 19:10:33 +0100 -Subject: Fix Ruby 3.0 keyword argument issue - -Forwarded: https://github.com/redis-store/redis-activesupport/pull/129 ---- - lib/active_support/cache/redis_store.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/active_support/cache/redis_store.rb b/lib/active_support/cache/redis_store.rb -index 5d9493b..7147e9f 100644 ---- a/lib/active_support/cache/redis_store.rb -+++ b/lib/active_support/cache/redis_store.rb -@@ -302,7 +302,7 @@ module ActiveSupport - # - # It's really needed and use - # -- def delete_entry(key, options) -+ def delete_entry(key, **options) - failsafe(:delete_entry, returning: false) do - with { |c| c.del key } - end diff -Nru ruby-redis-activesupport-5.2.1/debian/patches/series ruby-redis-activesupport-5.3.0/debian/patches/series --- ruby-redis-activesupport-5.2.1/debian/patches/series 2021-11-24 19:06:35.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/debian/patches/series 2022-01-21 21:29:37.000000000 +0000 @@ -1,3 +1,3 @@ Bundler-Requirement -Fix-Ruby-3.0-keyword-argument-issue.patch Disable-tests-which-will-fail-with-Rails-6.patch +Use-redis.exists-method-instead-of-exists.patch diff -Nru ruby-redis-activesupport-5.2.1/debian/patches/Use-redis.exists-method-instead-of-exists.patch ruby-redis-activesupport-5.3.0/debian/patches/Use-redis.exists-method-instead-of-exists.patch --- ruby-redis-activesupport-5.2.1/debian/patches/Use-redis.exists-method-instead-of-exists.patch 1970-01-01 00:00:00.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/debian/patches/Use-redis.exists-method-instead-of-exists.patch 2022-01-21 21:29:37.000000000 +0000 @@ -0,0 +1,66 @@ +From: Sergio Durigan Junior +Date: Fri, 21 Jan 2022 15:52:33 -0500 +Subject: Use redis.exists? method instead of exists + +According to +https://github.com/redis/redis-rb/blob/e3cf29dfb1d933bcd6670eb87a6246d54546cd80/lib/redis.rb#L17, +it is recommended to use the "exists?" method instead of the +"exists". + +On Debian, we're seeing 4 related failures when using "exists". +Here's one: + + 1) Failure: +ActiveSupport::Cache::RedisStore#test_0006_namespaces all operations [/<>/test/active_support/cache/redis_store_test.rb:93]: +Expected: true + Actual: 1 + +These failures are solved by using "exists?". + +Signed-off-by: Sergio Durigan Junior + +Forwarded: yes, https://github.com/redis-store/redis-activesupport/pull/131 +--- + test/active_support/cache/redis_store_test.rb | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/test/active_support/cache/redis_store_test.rb b/test/active_support/cache/redis_store_test.rb +index 39c9c0d..0efd4ed 100644 +--- a/test/active_support/cache/redis_store_test.rb ++++ b/test/active_support/cache/redis_store_test.rb +@@ -45,7 +45,7 @@ describe ActiveSupport::Cache::RedisStore do + + store.write("rabbit", 0) + +- redis.exists("rabbit").must_equal(true) ++ redis.exists?("rabbit").must_equal(true) + end + + it "connects using an string of options" do +@@ -60,7 +60,7 @@ describe ActiveSupport::Cache::RedisStore do + + store.write("rabbit", 0) + +- redis.exists("rabbit").must_equal(true) ++ redis.exists?("rabbit").must_equal(true) + end + + it "connects using the passed hash of options" do +@@ -74,7 +74,7 @@ describe ActiveSupport::Cache::RedisStore do + + store.write("rabbit", 0) + +- redis.exists("rabbit").must_equal(true) ++ redis.exists?("rabbit").must_equal(true) + end + + it "raises an error if :pool isn't a pool" do +@@ -90,7 +90,7 @@ describe ActiveSupport::Cache::RedisStore do + + store.write("white-rabbit", 0) + +- redis.exists('cache-namespace:white-rabbit').must_equal(true) ++ redis.exists?('cache-namespace:white-rabbit').must_equal(true) + end + + it "creates a normal store when given no addresses" do diff -Nru ruby-redis-activesupport-5.2.1/lib/active_support/cache/redis_store.rb ruby-redis-activesupport-5.3.0/lib/active_support/cache/redis_store.rb --- ruby-redis-activesupport-5.2.1/lib/active_support/cache/redis_store.rb 2021-06-28 01:58:28.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/lib/active_support/cache/redis_store.rb 2022-01-21 19:29:04.000000000 +0000 @@ -302,7 +302,7 @@ # # It's really needed and use # - def delete_entry(key, options) + def delete_entry(key, **options) failsafe(:delete_entry, returning: false) do with { |c| c.del key } end diff -Nru ruby-redis-activesupport-5.2.1/lib/redis/active_support/version.rb ruby-redis-activesupport-5.3.0/lib/redis/active_support/version.rb --- ruby-redis-activesupport-5.2.1/lib/redis/active_support/version.rb 2021-06-28 01:58:28.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/lib/redis/active_support/version.rb 2022-01-21 19:29:04.000000000 +0000 @@ -1,5 +1,5 @@ class Redis module ActiveSupport - VERSION = '5.2.1' + VERSION = '5.3.0' end end diff -Nru ruby-redis-activesupport-5.2.1/README.md ruby-redis-activesupport-5.3.0/README.md --- ruby-redis-activesupport-5.2.1/README.md 2021-06-28 01:58:28.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/README.md 2022-01-21 19:29:04.000000000 +0000 @@ -1,3 +1,11 @@ +# This gem is in LTS mode. + +Rails 5.2.0 [includes a Redis cache store out of the +box](https://github.com/rails/rails/pull/31134), so you don't really +need this anymore if you're generating a new Rails application. We +are no longer accepting new features for this gem, only security +updates will be considered for new pull requests. + # Redis stores for ActiveSupport __`redis-activesupport`__ provides a cache for __ActiveSupport__. @@ -9,14 +17,6 @@ If, for some reason, you're using `ActiveSupport::Cache` and not in a Rails app, read on to learn how to install/use this gem by itself! -## A quick note about Rails 5.2 - -Rails 5.2.0 [includes a Redis cache store out of the -box](https://github.com/rails/rails/pull/31134), so you don't really -need this anymore if you're generating a new Rails application. We -are no longer accepting new features for this gem, only pull requests -for security and compatibility fixes will be accepted. - ## Installation ```ruby diff -Nru ruby-redis-activesupport-5.2.1/redis-activesupport.gemspec ruby-redis-activesupport-5.3.0/redis-activesupport.gemspec --- ruby-redis-activesupport-5.2.1/redis-activesupport.gemspec 2021-06-28 01:58:28.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/redis-activesupport.gemspec 2022-01-21 19:29:04.000000000 +0000 @@ -19,7 +19,7 @@ s.require_paths = ['lib'] s.add_runtime_dependency "redis-store", '>= 1.3', '< 2' - s.add_runtime_dependency 'activesupport', '>= 3', '< 7' + s.add_runtime_dependency 'activesupport', '>= 3', '< 8' s.add_development_dependency 'rake', '>= 12.3.3' s.add_development_dependency 'bundler'