redis_exp_lock 0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80f06ec8bcc081e69fac7bc26af297a9e62180af
-  data.tar.gz: 8875e101298264a8983a72d1b9d076e79c48b486
+  metadata.gz: 058391736f5480d69820f433bc306b6b358ac239
+  data.tar.gz: 94061a289cc41fff4f1c348df17c6b45529af01c
 SHA512:
-  metadata.gz: 514d2ef4aaa60255e3d3c664625c2ec06ecb669c160f7fcefefb84f6ef82443f1f60622a1fe98b7af5b509d4f54877c7337280e28242fd07b79cd193ca898531
-  data.tar.gz: eb34fbb2d1608563f2f9ad04983cff5c33cd7ada98f58ecd0a58e8af326b56a42a28481bb11f9c167ae35dac04741a1794e4b73a159a86504b82a615034e84f1
+  metadata.gz: a3868e179ca52f9ac3d9dee70d65beff38031aff0248948d2ac7bfe0803ee5ffb1dd3f28bc99aee863cd8bc280197c3429907963c0a585c863c1b933df33c98d
+  data.tar.gz: 60f13403deec8c2b47ebe77325d13935c491cb27ef3334099b8eb72c72dd961e45f2e66a908eaa3353b1b34af79b20cf44dc8be490d2a5fa5e7414e5968345c1

data/README.md

@@ -13,7 +13,7 @@ Redis 2.6.12 or higher, because:
 
 ```ruby
 require 'redis'
-requie 'redis_exp_lock'
+require 'redis_exp_lock'
 
 redis = Redis.new
 

data/lib/redis_exp_lock/version.rb

@@ -1,3 +1,3 @@
 class RedisExpLock
-	VERSION = '0.1'
-end
+  VERSION = '0.1.1'
+end

data/lib/redis_exp_lock.rb

@@ -2,96 +2,96 @@ require 'shavaluator'
 
 class RedisExpLock
 
-	# Errors
-	class TooManyLockAttemptsError < RuntimeError; end
-	class AlreadyAcquiredLockError < RuntimeError; end
-
-	LUA = {
-  	# Deletes keys if they equal the given values
-		:delequal => """
-	    local deleted = 0
-	    if redis.call('GET', KEYS[1]) == ARGV[1] then
-	      return redis.call('DEL', KEYS[1])
-	    end
-	    return 0
-		""",
-	}
-
-	attr_reader :redis, :lock_key, :lock_uuid, :expiry, :retries, :retry_interval
-
-	def initialize(lock_key, opts)
-		defaults = {
-			:expiry => nil, # in seconds
-			:retries => 0,
-			:retry_interval => 0.01, # in seconds
-		}
-		opts = {}.merge(defaults).merge(opts)
-
-		@lock_key = lock_key.to_s
-		raise ArgumentError.new('Invalid lock key') unless @lock_key.size > 0
-		@lock_uuid = nil
-
-		@redis = opts[:redis]
-		@shavaluator = Shavaluator.new(:redis => @redis)
-		@shavaluator.add(LUA)
-
-		@expiry = opts[:expiry]
-		@retries = opts[:retries]
-		@retry_interval = opts[:retry_interval]
-	end
-
-	def locked?
-		!@lock_uuid.nil?
-	end
-
-	def key_locked?
-		@redis.exists(@lock_key)
-	end
-
-	def key_owned?
-		!@lock_uuid.nil? && @lock_uuid == @redis.get(@lock_key)
-	end
-
-	# Attempt to acquire the lock, returning true if the lock was succesfully
-	# acquired, and false if not.
-	def try_lock
-		raise AlreadyAcquiredLockError if locked?
-
-		uuid = SecureRandom.uuid
-		set_opts = {
-			:nx => true
-		}
+  # Errors
+  class TooManyLockAttemptsError < RuntimeError; end
+  class AlreadyAcquiredLockError < RuntimeError; end
+
+  LUA = {
+    # Deletes keys if they equal the given values
+    :delequal => """
+      local deleted = 0
+      if redis.call('GET', KEYS[1]) == ARGV[1] then
+        return redis.call('DEL', KEYS[1])
+      end
+      return 0
+    """,
+  }
+
+  attr_reader :redis, :lock_key, :lock_uuid, :expiry, :retries, :retry_interval
+
+  def initialize(lock_key, opts)
+    defaults = {
+      :expiry => nil, # in seconds
+      :retries => 0,
+      :retry_interval => 0.01, # in seconds
+    }
+    opts = {}.merge(defaults).merge(opts)
+
+    @lock_key = lock_key.to_s
+    raise ArgumentError.new('Invalid lock key') unless @lock_key.size > 0
+    @lock_uuid = nil
+
+    @redis = opts[:redis]
+    @shavaluator = Shavaluator.new(:redis => @redis)
+    @shavaluator.add(LUA)
+
+    @expiry = opts[:expiry]
+    @retries = opts[:retries]
+    @retry_interval = opts[:retry_interval]
+  end
+
+  def locked?
+    !@lock_uuid.nil?
+  end
+
+  def key_locked?
+    @redis.exists(@lock_key)
+  end
+
+  def key_owned?
+    !@lock_uuid.nil? && @lock_uuid == @redis.get(@lock_key)
+  end
+
+  # Attempt to acquire the lock, returning true if the lock was succesfully
+  # acquired, and false if not.
+  def try_lock
+    raise AlreadyAcquiredLockError if locked?
+
+    uuid = SecureRandom.uuid
+    set_opts = {
+      :nx => true
+    }
     set_opts[:px] = Integer(@expiry * 1000) if @expiry
 
     if @redis.set(@lock_key, uuid, set_opts)
-    	@lock_uuid = uuid
-    	true
+      @lock_uuid = uuid
+      true
     else
-    	false
+      false
     end
-	end
-
-	def lock
-		attempts = 0
-		while attempts <= @retries
-			attempts += 1
-			return attempts if try_lock
-			sleep @retry_interval
-		end
-		raise TooManyLockAttemptsError
-	end
-
-	def unlock
-		return false unless locked?
-		was_locked = @shavaluator.exec(:delequal, :keys => [@lock_key], :argv => [@lock_uuid]) == 1
-		@lock_uuid = nil
-		was_locked
-	end
-
-	def synchronize(&crit_sec)
-		attempts = lock
-		crit_sec.call attempts
-		unlock
-	end
+  end
+
+  def lock
+    attempts = 0
+    while attempts <= @retries
+      attempts += 1
+      return attempts if try_lock
+      sleep @retry_interval
+    end
+    raise TooManyLockAttemptsError
+  end
+
+  def unlock
+    return false unless locked?
+    was_locked = @shavaluator.exec(:delequal, :keys => [@lock_key], :argv => [@lock_uuid]) == 1
+    @lock_uuid = nil
+    was_locked
+  end
+
+  def synchronize(&crit_sec)
+    attempts = lock
+    crit_sec.call attempts
+    unlock
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_exp_lock
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
 platform: ruby
 authors:
 - Jeff Lee