Update ruby base version and dependencies

.github/workflows/test.yml

@@ -14,8 +14,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.5', '2.6', '2.7', '3.0', '3.1']
-        redis-version: [5, 6]
+        ruby: ['3.0', '3.1', '3.2', '3.3']
+        redis-version: [4, 5, 6, 7]
 
     steps:
       - name: Checkout code
@@ -33,7 +33,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          gem install bundler -v '1.17.3' --no-document
+          gem install bundler -v '2.5.7' --no-document
           bundle install --jobs 4 --retry 3
 
       - name: Run Tests

Gemfile.lock

@@ -1,34 +1,38 @@
 PATH
   remote: .
   specs:
-    gcra (1.2.1)
+    gcra (1.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.2.5)
-    redis (3.3.3)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    connection_pool (2.4.1)
+    diff-lcs (1.5.0)
+    redis (5.1.0)
+      redis-client (>= 0.17.0)
+    redis-client (0.21.1)
+      connection_pool
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   gcra!
-  redis (~> 3.3)
-  rspec (~> 3.5)
+  redis (~> 5.1)
+  rspec (~> 3.12)
 
 BUNDLED WITH
-   1.17.3
+   2.5.7

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 viafintech GmbH
+Copyright (c) 2024 viafintech GmbH
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

gcra.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'rspec', '~> 3.5'
-  spec.add_development_dependency 'redis', '~> 3.3'
+  spec.add_development_dependency 'rspec', '~> 3.12'
+  spec.add_development_dependency 'redis', '~> 5.1'
 end

lib/gcra/redis_store.rb

@@ -15,10 +15,10 @@ class RedisStore
 
     # Digest::SHA1.hexdigest(CAS_SCRIPT)
     CAS_SHA = "89118e702230c0d65969c5fc557a6e942a2f4d31".freeze
-    CAS_SCRIPT_MISSING_KEY_RESPONSE = 'key does not exist'.freeze
-    SCRIPT_NOT_IN_CACHE_RESPONSE = 'NOSCRIPT No matching script. Please use EVAL.'.freeze
-
-    CONNECTED_TO_READONLY = "READONLY You can't write against a read only slave.".freeze
+    CAS_SCRIPT_MISSING_KEY_RESPONSE_PATTERN = Regexp.new('^key does not exist')
+    SCRIPT_NOT_IN_CACHE_RESPONSE_PATTERN = Regexp.new(
+      '^NOSCRIPT No matching script. Please use EVAL.',
+    )
 
     def initialize(redis, key_prefix, options = {})
       @redis = redis
@@ -51,9 +51,9 @@ def set_if_not_exists_with_ttl(key, value, ttl_nano)
       begin
         ttl_milli = calculate_ttl_milli(ttl_nano)
         @redis.set(full_key, value, nx: true, px: ttl_milli)
-      rescue Redis::CommandError => e
-        if e.message == CONNECTED_TO_READONLY && @reconnect_on_readonly && !retried
-          @redis.client.reconnect
+      rescue Redis::ReadOnlyError => e
+        if @reconnect_on_readonly && !retried
+          @redis.close
           retried = true
           retry
         end
@@ -70,17 +70,20 @@ def compare_and_set_with_ttl(key, old_value, new_value, ttl_nano)
       begin
         ttl_milli = calculate_ttl_milli(ttl_nano)
         swapped = @redis.evalsha(CAS_SHA, keys: [full_key], argv: [old_value, new_value, ttl_milli])
+      rescue Redis::ReadOnlyError => e
+        if @reconnect_on_readonly && !retried
+          @redis.close
+          retried = true
+          retry
+        end
+        raise
       rescue Redis::CommandError => e
-        if e.message == CAS_SCRIPT_MISSING_KEY_RESPONSE
+        if e.message =~ CAS_SCRIPT_MISSING_KEY_RESPONSE_PATTERN
           return false
-        elsif e.message == SCRIPT_NOT_IN_CACHE_RESPONSE && !retried
+        elsif e.message =~ SCRIPT_NOT_IN_CACHE_RESPONSE_PATTERN && !retried
           @redis.script('load', CAS_SCRIPT)
           retried = true
           retry
-        elsif e.message == CONNECTED_TO_READONLY && @reconnect_on_readonly && !retried
-          @redis.client.reconnect
-          retried = true
-          retry
         end
         raise
       end

lib/gcra/version.rb

@@ -1,3 +1,3 @@
 module GCRA
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.3.0'.freeze
 end

spec/lib/gcra/redis_store_spec.rb

@@ -69,7 +69,7 @@ def cleanup_redis
     end
 
     it 'with a readonly host and no readonly configured' do
-      exception = Redis::CommandError.new(GCRA::RedisStore::CONNECTED_TO_READONLY)
+      exception = Redis::ReadOnlyError.new
 
       expect(redis)
         .to receive(:set)
@@ -89,10 +89,10 @@ def cleanup_redis
       end
 
       it 'with a readonly host' do
-        exception = Redis::CommandError.new(GCRA::RedisStore::CONNECTED_TO_READONLY)
+        exception = Redis::ReadOnlyError.new
 
-        expect(redis.client)
-          .to receive(:reconnect)
+        expect(redis)
+          .to receive(:close)
                 .and_call_original
 
         expect(redis)
@@ -201,7 +201,7 @@ def cleanup_redis
 
     context 'with reconnect on readonly not configured' do
       it 'raises an error when the request is executed against a readonly host' do
-        exception = Redis::CommandError.new(GCRA::RedisStore::CONNECTED_TO_READONLY)
+        exception = Redis::ReadOnlyError.new
 
         expect(redis)
           .to receive(:evalsha)
@@ -231,10 +231,10 @@ def cleanup_redis
       end
 
       it 'attempts a reconnect once and then executes evalsha again' do
-        exception = Redis::CommandError.new(GCRA::RedisStore::CONNECTED_TO_READONLY)
+        exception = Redis::ReadOnlyError.new
 
-        expect(redis.client)
-          .to receive(:reconnect)
+        expect(redis)
+          .to receive(:close)
                 .and_call_original
 
         expect(redis)