gcra 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9436b4bda7bf469a2a3cf08df00716039ba14ef
-  data.tar.gz: d3b31ffe07a84f62310acb0724ee7401be104ab1
+  metadata.gz: e37214a0a8181beff8863287ffdabee12b6cd6a4
+  data.tar.gz: d23082af239177bafeda35a8f4db1d0223d0d09a
 SHA512:
-  metadata.gz: f50866ecc292bb86a613e421b4c095a8e1a7afe452c292c63242e3e912b99744266e2f8621ca087cdb85619d6fc20772a66fbf3065082e440c4dd452540c210e
-  data.tar.gz: d820ff9d540b75d471392e3a56dcab43b700c21a05ca60ec317926b945a67ce45fa905159385431432d153692127063393169aed5d693f32fef4e9c3ef630d58
+  metadata.gz: 75d41403c38028215e7afd7962ade25cb24c751e99ae349ee02c4a17d2f8ad26fb5510d81d108a70b32900aafec0161c588cf6b492c00a0995c099b34bc85c08
+  data.tar.gz: 945835400bcf67bbaa8e153c12fb612a08a626e59cd9cbc6b5d33045dfe43a627d80106113db847bc2855f00ab5de2ee2932421a48d489aef90d26c014bab53e

data/lib/gcra/redis_store.rb

@@ -9,11 +9,7 @@ module GCRA
   if v ~= ARGV[1] then
     return 0
   end
-  if ARGV[3] ~= "0" then
-    redis.call('psetex', KEYS[1], ARGV[3], ARGV[2])
-  else
-    redis.call('set', KEYS[1], ARGV[2])
-  end
+  redis.call('psetex', KEYS[1], ARGV[3], ARGV[2])
   return 1
   EOF
     CAS_SCRIPT_MISSING_KEY_RESPONSE = 'key does not exist'.freeze
@@ -43,8 +39,8 @@ module GCRA
       full_key = @key_prefix + key
       did_set = @redis.setnx(full_key, value)
 
-      if did_set && ttl_nano > 0
-        ttl_milli = ttl_nano / 1_000_000
+      if did_set
+        ttl_milli = calculate_ttl_milli(ttl_nano)
         @redis.pexpire(full_key, ttl_milli)
       end
 
@@ -57,7 +53,7 @@ module GCRA
     def compare_and_set_with_ttl(key, old_value, new_value, ttl_nano)
       full_key = @key_prefix + key
       begin
-        ttl_milli = ttl_nano / 1_000_000
+        ttl_milli = calculate_ttl_milli(ttl_nano)
         swapped = @redis.eval(CAS_SCRIPT, keys: [full_key], argv: [old_value, new_value, ttl_milli])
       rescue Redis::CommandError => e
         if e.message == CAS_SCRIPT_MISSING_KEY_RESPONSE
@@ -68,5 +64,17 @@ module GCRA
 
       return swapped == 1
     end
+
+    private
+
+    def calculate_ttl_milli(ttl_nano)
+      ttl_milli = ttl_nano / 1_000_000
+      # Setting 0 as expiration/ttl would result in an error.
+      # Therefore overwrite it and use 1
+      if ttl_milli == 0
+        return 1
+      end
+      return ttl_milli
+    end
   end
 end

data/lib/gcra/version.rb

@@ -1,3 +1,3 @@
 module GCRA
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gcra
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Michael Frister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec