gcra 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b02bda1b59d67535c5f7e098f0553e7d79dab0baed8266668e4533eaf083fdd8
-  data.tar.gz: 12f92e851d067cc367180e9c4528f7564ffc487ddd62273fecd6450fbb8de894
+  metadata.gz: d08cd7202437ad330ea13e7e5566e4d8625a951da36b5c096c53b0502f3d5d70
+  data.tar.gz: 9a7f6298e891d16172b6f08fce6adbf2e7f114a1309ab993e949ca485333bb38
 SHA512:
-  metadata.gz: 993dfc9876b0b5f92e7456a20f1e9da2875505f41457540d7e8a41ea59f2e0080880ad96bc6e7b1751dbea67c60b4b416a88099350a5435c60b467f90f42e1fa
-  data.tar.gz: cdc1e40167c88d8a3749a8176c2683520973e844063ed3035e4b9be8533c1c07af7d8119ed8eec6a24e3c918850f914a55394784e3db06d8d9c0e91e5bb3eed0
+  metadata.gz: cceec9abdfcc126ed38eec59778cf0ee4f1992d1414c61f545baee34cf9c590860ad6cfc3e6120a51369b1546f64c2dd30d47a43b95f40f66b0999ac150a3d27
+  data.tar.gz: e288210de6c6ac86d431468c881b438533490353b10040babd850da091e8aedb6788258adb7105a7b94240da93dfc4704cdb29dbb6ff3d3a253e2eba5e87921e

data/lib/gcra/redis_store.rb

@@ -15,10 +15,10 @@ module GCRA
 
     # 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
@@ -30,9 +30,9 @@ module GCRA
     # Returns the value of the key or nil, if it isn't in the store.
     # Also returns the time from the Redis server, with microsecond precision.
     def get_with_time(key)
-      time_response, value = @redis.pipelined do
-        @redis.time # returns tuple (seconds since epoch, microseconds)
-        @redis.get(@key_prefix + key)
+      time_response, value = @redis.pipelined do |pipeline|
+        pipeline.time # returns tuple (seconds since epoch, microseconds)
+        pipeline.get(@key_prefix + key)
       end
       # Convert tuple to nanoseconds
       time = (time_response[0] * 1_000_000 + time_response[1]) * 1_000
@@ -51,9 +51,9 @@ module GCRA
       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 @@ module GCRA
       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

data/lib/gcra/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gcra
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Michael Frister
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-18 00:00:00.000000000 Z
+date: 2024-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -17,31 +17,31 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '5.1'
 description: GCRA implementation for rate limiting
 email:
-- tobias.schoknecht@barzahlen.de
+- tobias.schoknecht@viafintech.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -49,7 +49,7 @@ files:
 - lib/gcra/rate_limiter.rb
 - lib/gcra/redis_store.rb
 - lib/gcra/version.rb
-homepage: https://github.com/Barzahlen/gcra-ruby
+homepage: https://github.com/viafintech/gcra-ruby
 licenses:
 - MIT
 metadata: {}
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.4.14
 signing_key:
 specification_version: 4
 summary: Ruby implementation of a generic cell rate algorithm (GCRA), ported from