redis_mutex 0.0.1.pre.alpha.pre.10 → 0.0.1.pre.alpha.pre.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmFiZTIwM2E3NTMwMWViY2Q1ZWE2ZGVlNGRhYTNiYjNjNzc4YzMwYQ==
+    ZWU4ZmJkOTliYzc4MzFlMDY3ZmE1ZTdjZThjNzM3OTEzNmQ1YTQ0OQ==
   data.tar.gz: !binary |-
-    MDc1M2VhZDZjNzkxNWQzNDVjYTAzNjhhMjU1NTAzZDMzNDAwY2I0ZA==
+    ZTBlYmMxZjA5YzcxMjQ0N2Q3NDBjYzUwMjRlOWZiMjM4OTVkOGEyNA==
 SHA512:
   metadata.gz: !binary |-
-    NzMyYTRmNDA3NzZhMDFhMmFhZjBhN2M1ZTg4M2RlZWNmYmRmNGU3ZDZhYTYy
-    MTBkNzYwOTlmNTgwMmZlZTZiZTY1OWVkZjg1NDg5MGEyYjlmMTY0ZTAzMDkz
-    NWYyNDYwOTBjM2U4ZWEwMDExNjViMDI2NzBlOWM4OGRiMGRlNjg=
+    OTRmYWNkY2M3Yjk1ZWRjZjFhMTIwNDA2ODdlODQ4YzQ4ODdiODAwZDcxNjlh
+    ZGU4OGNjYjc0MWU3YTIwYTRhMGQxMmQzOThmZWRjM2Y2MzFkYTI1ZmM5NDM4
+    NDUyODA3MmJjNTczNjZjOWNiZTA5M2Q3MTQ3NTc3ZDE5YmFkNTE=
   data.tar.gz: !binary |-
-    MGQ2OWJlMmQzNTBkMWFjZTU1ODA2ODQyMmVlMzNiNTBiMDhiNjE3MGExNzU2
-    NjhjYWRlN2EzMDFlMWExMTBjOTdmN2QxZjRmMGUwNTdmMzZmNmY0YmM0MTY5
-    NjRkYzYyYzUwZTU5MTIxNGY5YWE4YmVkMzJjNWY1YzM0Nzc3OTY=
+    MzcyZmQ0MTE0MzlmOWYxZTI3NjU1NzkxZjZjNjA4Zjk3NjgxNjQ2NzgyZThk
+    YzBlMWI4NDM1YWQ0MjMxZWQ1ODBiMTA4ZGVhOGFmODkwYmUxZWUyZjAxZmMz
+    ZGU3ZDAxZTJiNTNlYzUwZDM1OTc4OWVhZDYyY2NkY2M1OTk3NGY=

data/lib/redis_mutex.rb

@@ -2,9 +2,16 @@ require "redis_mutex/version"
 require 'securerandom'
 
 class RedisMutex
-  SHAs = {}
+  SCRIPTS = {}
   MutexNotLockedError = Class.new(StandardError)
 
+  def self.def_redis_script(name, source)
+    SCRIPTS[name] = {
+      source: source,
+      sha: Digest::SHA1.hexdigest(source),
+    }
+  end
+
   def initialize(redis, name, token=nil)
     @redis = redis
     @name = name
@@ -22,40 +29,37 @@ class RedisMutex
     @redis.set(key, token, nx: true, ex: expire)
   end
 
-  def release
-    sha = SHAs[:delete_if_locked] ||= @redis.script(:load, <<-LUA)
-      if ARGV[1] ~= redis.call('get', KEYS[1]) then
-        return false
-      end
-
-      return redis.call('del', KEYS[1])
-    LUA
+  def_redis_script :compare_and_delete, <<-LUA
+    if ARGV[1] ~= redis.call('get', KEYS[1]) then
+      return false
+    end
 
-    @redis.evalsha(sha, [key], [token]) or raise MutexNotLockedError
+    return redis.call('del', KEYS[1])
+  LUA
+  def release
+    run_script(:compare_and_delete, [key], [token]) or raise MutexNotLockedError
   end
 
-  def renew(expire)
-    sha = SHAs[:set_expiration_if_locked] ||= @redis.script(:load, <<-LUA)
-      if ARGV[1] ~= redis.call('get', KEYS[1]) then
-        return false
-      end
-
-      return redis.call('expire', KEYS[1], ARGV[2])
-    LUA
+  def_redis_script :compare_and_expire, <<-LUA
+    if ARGV[1] ~= redis.call('get', KEYS[1]) then
+      return false
+    end
 
-    @redis.evalsha(sha, [key], [token, expire]) or raise MutexNotLockedError
+    return redis.call('expire', KEYS[1], ARGV[2])
+  LUA
+  def renew(expire)
+    run_script(:compare_and_expire, [key], [token, expire]) or raise MutexNotLockedError
   end
 
-  def set_token(new_token)
-    sha = SHAs[:compare_and_swap] ||= @redis.script(:load, <<-LUA)
-      if ARGV[1] ~= redis.call('get', KEYS[1]) then
-        return false
-      end
-
-      return redis.call('set', KEYS[1], ARGV[2])
-    LUA
+  def_redis_script :compare_and_swap, <<-LUA
+    if ARGV[1] ~= redis.call('get', KEYS[1]) then
+      return false
+    end
 
-    @redis.evalsha(sha, [key], [token, new_token]) or raise MutexNotLockedError
+    return redis.call('set', KEYS[1], ARGV[2])
+  LUA
+  def set_token(new_token)
+    run_script(:compare_and_swap, [key], [token, new_token]) or raise MutexNotLockedError
     @token = new_token
   end
 
@@ -66,4 +70,13 @@ class RedisMutex
   def verify!
     locked? or raise MutexNotLockedError
   end
+
+  private
+
+  def run_script(name, keys, args)
+    script = SCRIPTS.fetch(name)
+    @redis.evalsha(script.fetch(:sha), keys, args)
+  rescue Redis::CommandError
+    @redis.eval(script.fetch(:source), keys, args)
+  end
 end

data/test/test_redis_mutex.rb

@@ -117,4 +117,13 @@ class TestRedisMutex < Minitest::Test
     assert RedisMutex.new(redis, mutex_name, mutex_a.token).release
   end
 
+  def test_automatic_script_loading
+    # lock to ensure a script is loaded and its SHA cached
+    mutex_a.acquire_lock(1)
+    mutex_a.release
+
+    redis.script(:flush)
+    assert mutex_a.acquire_lock(1)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_mutex
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.alpha.pre.10
+  version: 0.0.1.pre.alpha.pre.11
 platform: ruby
 authors:
 - Ryan Taylor Long