gcra 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0398e02c46f08f3f248e36db5d87bc49c2185531
-  data.tar.gz: 47aee2e95b7267165702aa9350c6b71225b7e8f4
+  metadata.gz: a4022887c88859ed2259a2e49450a62b1215b73b
+  data.tar.gz: 8e5fe0ed06ca9012b455fb91571fa45d4c0f75ed
 SHA512:
-  metadata.gz: 2755f80c4957e77ba5073df77c658263682dbbc92730bb7d4231010cdd379550167cad27a83bf321545c9879a45d7ee992219581e7885eabf1c403774bdbc316
-  data.tar.gz: eb8b0e85d5141fcdf949b428ff930902286c7267d12dd3ae66a3297b58a211d86db03bb8c73cf104ae39cca9e194af1ba093c82c0e2a7a4a65e12ec37153d908
+  metadata.gz: e175732bc7e3d2f3e2fd0e9c4d75fbcaa80c8ad3786229ffdc22aff210f96d9a66ceacab0788a55eba4abcb0ac876c34d3654d25b8481ee1c28bfa643e62b2b9
+  data.tar.gz: 4407751fe08bb38ad05c0af7fbaba7b9657d55cddd696a90a62a4b7550f1c57c8ddc5f8c94bd63ed78c6cfb405e51ea96a33dd9b8dba63b42383f77a8032bd51

data/lib/gcra/redis_store.rb

@@ -12,7 +12,11 @@ module GCRA
   redis.call('psetex', KEYS[1], ARGV[3], ARGV[2])
   return 1
   EOF
+
+    # 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.'
 
     def initialize(redis, key_prefix)
       @redis = redis
@@ -22,10 +26,12 @@ 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 = @redis.time # returns tuple (seconds since epoch, microseconds)
+      time_response, value = @redis.pipelined do
+        @redis.time # returns tuple (seconds since epoch, microseconds)
+        @redis.get(@key_prefix + key)
+      end
       # Convert tuple to nanoseconds
       time = (time_response[0] * 1_000_000 + time_response[1]) * 1_000
-      value = @redis.get(@key_prefix + key)
       if value != nil
         value = value.to_i
       end
@@ -34,17 +40,11 @@ module GCRA
     end
 
     # Set the value of key only if it is not already set. Return whether the value was set.
-    # Also set the key's expiration (ttl, in seconds). The operations are not performed atomically.
+    # Also set the key's expiration (ttl, in seconds).
     def set_if_not_exists_with_ttl(key, value, ttl_nano)
       full_key = @key_prefix + key
-      did_set = @redis.setnx(full_key, value)
-
-      if did_set
-        ttl_milli = calculate_ttl_milli(ttl_nano)
-        @redis.pexpire(full_key, ttl_milli)
-      end
-
-      return did_set
+      ttl_milli = calculate_ttl_milli(ttl_nano)
+      @redis.set(full_key, value, nx: true, px: ttl_milli)
     end
 
     # Atomically compare the value at key to the old value. If it matches, set it to the new value
@@ -52,12 +52,17 @@ module GCRA
     # return false with no error. If the swap succeeds, update the ttl for the key atomically.
     def compare_and_set_with_ttl(key, old_value, new_value, ttl_nano)
       full_key = @key_prefix + key
+      retried = false
       begin
         ttl_milli = calculate_ttl_milli(ttl_nano)
-        swapped = @redis.eval(CAS_SCRIPT, keys: [full_key], argv: [old_value, new_value, ttl_milli])
+        swapped = @redis.evalsha(CAS_SHA, keys: [full_key], argv: [old_value, new_value, ttl_milli])
       rescue Redis::CommandError => e
         if e.message == CAS_SCRIPT_MISSING_KEY_RESPONSE
           return false
+        elsif e.message == SCRIPT_NOT_IN_CACHE_RESPONSE && !retried
+          @redis.script('load', CAS_SCRIPT)
+          retried = true
+          retry
         end
         raise
       end

data/lib/gcra/version.rb

@@ -1,3 +1,3 @@
 module GCRA
-  VERSION = '1.0.3'.freeze
+  VERSION = '1.0.4'.freeze
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: gcra
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Michael Frister
+- Tobias Schoknecht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-16 00:00:00.000000000 Z
+date: 2019-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -40,7 +41,7 @@ dependencies:
         version: '3.3'
 description: GCRA implementation for rate limiting
 email:
-- michael.frister@barzahlen.de
+- tobias.schoknecht@barzahlen.de
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -48,7 +49,7 @@ files:
 - lib/gcra/rate_limiter.rb
 - lib/gcra/redis_store.rb
 - lib/gcra/version.rb
-homepage: https://github.com/Barzahlen/gcra
+homepage: https://github.com/Barzahlen/gcra-ruby
 licenses:
 - MIT
 metadata: {}