redis_mutex 0.0.1 → 0.0.2.alpha.12

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: ed7285292327df555cdb24c880c95488bd49ef48
-  data.tar.gz: f664b54f0fcc52e1e1d90e771c52666f18174063
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MmNmNTU4ZmRlOWM4MDBiYTIyNDdlYjUzYTBmZjA1OTE4N2E1MjQ2ZQ==
+  data.tar.gz: !binary |-
+    ZTYzZDg3NjdmNzc2ZDEyZDNmYjU4MWJiMzM1MzBmZTQwYTVhM2M5Yg==
 SHA512:
-  metadata.gz: 4a0177cb03328bcca09855fbc2abeab8eeb9ef26785eee204bd7ce2cc2325a90c878015efabcd17709c4644dbb8582b12873289ae069da9d48a421da0f350fbb
-  data.tar.gz: 4c3eaff96de53af183942973176a2055b2efbae2aeda1393120ea6d4d97787d20b70ba87988bc562ee50ca0c4d2c515b8a834a2e419dccf8229f2434ed31d13c
+  metadata.gz: !binary |-
+    ZGRkMTZjZjYzMThmYTQxMTJiMjExNjc0MjcxYzQzYWYwNDRmZmQwY2JmNTA4
+    NjBmMGMzNzY4MjlmNmFhZGFlZjhhZDY4YjhkMjBjMjlmZGNjZDE1YmMxYWZm
+    ODFkODk3ZDBlM2ZiOWUxMWE1MDFlMDQyOGI1NjIwODJkYTYyY2Q=
+  data.tar.gz: !binary |-
+    NzhjNDY1YTZmYTFiMzkzNzYzMGU5YjMwYWRkZTM3NmRlNmU2OTI4MDMwMTg4
+    NjVlMGYwOWYzYzMxNjNkMmY3ZmMwMjQxYTNhNjllNjAyYjgzODUxOTdkZTM1
+    N2RjMGE5MWM1NzRjNmM4YTNkMWI0OTExZjMxODI2ODZhNTAwNjQ=

data/lib/redis_mutex/version.rb

@@ -1,3 +1,3 @@
 class RedisMutex
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

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/redis_mutex.gemspec

@@ -6,7 +6,7 @@ require 'redis_mutex/version'
 Gem::Specification.new do |spec|
   spec.name          = "redis_mutex"
   if ENV['TRAVIS']
-    spec.version       = "#{RedisMutex::VERSION}-alpha-#{ENV['TRAVIS_BUILD_NUMBER']}"
+    spec.version       = "#{RedisMutex::VERSION}.alpha.#{ENV['TRAVIS_BUILD_NUMBER']}"
   else
     spec.version       = RedisMutex::VERSION
   end
@@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{}
   spec.homepage      = "https://github.com/GoodGuide/redis_mutex"
   spec.license       = "MIT"
+  spec.required_ruby_version = '>= 1.9.3'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/test/test_redis_mutex.rb

@@ -43,11 +43,11 @@ class TestRedisMutex < Minitest::Test
     assert redis.get(key) == original_token
   end
 
-  def test_locked_when_unlocked
+  def test_locked_is_false_when_unlocked
     assert !mutex_a.locked?
   end
 
-  def test_locked_when_locked
+  def test_locked_is_true_when_locked
     mutex_a.acquire_lock(DEFAULT_TIMEOUT)
     assert mutex_a.locked?
   end
@@ -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
+  version: 0.0.2.alpha.12
 platform: ruby
 authors:
 - Ryan Taylor Long
@@ -14,56 +14,56 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 5.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 5.5.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
 description: ''
@@ -73,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -94,17 +94,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simple distributed mutex using Redis.