redis-read-write-locks 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '02872b14abf3f2ab995c0d0ccf405cbfbab1fe88c7ccb7c59453a11da4bb3e33'
-  data.tar.gz: 3f647988f91d9b003dcbd242920af95d6942b94be79b2845b54e2a0d4af893e2
+  metadata.gz: 9c9401651786ff69991b9b975ebbc62cf0442fd3f2639c79fad803fab00f335e
+  data.tar.gz: 724513d599b3a614e43a3be6b634ad52c1d64035c63ddfb1566e2c93d4a837a6
 SHA512:
-  metadata.gz: 771040f529b8d93a4acd3d1770c11413573fe37be918a1d91ea0e0dd0376ae1d184a4616fca159b914dec0a89da71c5d4657f7ced036b4be66634b996ad8a4a2
-  data.tar.gz: 4b15e4c18f97a0b76959df16bc821d1816efe437a82061c0dfd610806cd098e2de0b4253d00ca35215956bbd00ba428c0ff5a7a7d6d56621f4dcd47d9e39fd84
+  metadata.gz: be039491564babb54c6e1b5ce87e880bc643f4f761efa24faadbc9c2a890e019c48daac13ebbd83409b0db60885b21e23b53fa7fc2d83a879662690fafab2b2a
+  data.tar.gz: 765be840a9d1abba171df6cee27dc3c775eac4ad8edfdf38eebbc32c21a09e51912713ae7006d6863fc9ff8d6e6299dd1820be503231443169ebb36db62530b0

data/README.md

@@ -30,18 +30,18 @@ lock = client.read_lock("my_resource")
 lock.acquire          # => true / false (non-blocking)
 lock.release
 
-# Block on contention — retries for up to N seconds
-lock.acquire(timeout: 5)          # raises LockTimeoutError if timeout exceeded
-lock.synchronize(timeout: 5) { }  # acquire + yield + release
+# Block on contention — retries for up to N milliseconds
+lock.acquire(timeout: 5000)          # raises LockTimeoutError if timeout exceeded
+lock.synchronize(timeout: 5000) { }  # acquire + yield + release
 
 # Per-lock TTL override
-client.write_lock("my_resource", ttl: 60) { long_operation }
+client.write_lock("my_resource", ttl: 60_000) { long_operation }
 ```
 
 ### Client options
 
 ```ruby
-client = RedisReadWriteLocks::Client.new(redis, default_ttl: 60)
+client = RedisReadWriteLocks::Client.new(redis, default_ttl: 60_000)
 ```
 
 ### Options

data/lib/redis-read-write-locks.rb

@@ -0,0 +1 @@
+require_relative "redis_read_write_locks"

data/lib/redis_read_write_locks/base_lock.rb

@@ -2,7 +2,7 @@ require "securerandom"
 
 module RedisReadWriteLocks
   class BaseLock
-    DEFAULT_TTL = 30
+    DEFAULT_TTL = 30_000
     RETRY_INTERVAL = 0.01
 
     attr_reader :name, :token
@@ -20,11 +20,11 @@ module RedisReadWriteLocks
     end
 
     # Non-blocking: returns true/false.
-    # With timeout: retries for timeout seconds, returns true or raises LockTimeoutError.
+    # With timeout: retries for timeout milliseconds, returns true or raises LockTimeoutError.
     def acquire(timeout: nil)
       return try_acquire if timeout.nil?
 
-      deadline = Time.now.to_f + timeout
+      deadline = Time.now.to_f + timeout / 1000.0
       loop do
         return true if try_acquire
         raise LockTimeoutError, "Timeout acquiring #{lock_type} lock '#{@name}'" if Time.now.to_f >= deadline
@@ -61,7 +61,11 @@ module RedisReadWriteLocks
     end
 
     def eval_script(script, keys:, argv:)
-      @redis.eval(script, keys: keys, argv: argv)
+      if @redis.respond_to?(:eval)
+        @redis.eval(script, keys: keys, argv: argv)
+      else
+        @redis.call("EVAL", script, keys.length, *keys, *argv)
+      end
     end
   end
 end

data/lib/redis_read_write_locks/client.rb

@@ -5,14 +5,14 @@ module RedisReadWriteLocks
       @default_ttl = default_ttl
     end
 
-    def read_lock(name, ttl: @default_ttl, &block)
+    def read_lock(name, ttl: @default_ttl, timeout: nil, &block)
       lock = ReadLock.new(redis: @redis, name: name, ttl: ttl)
-      block ? lock.synchronize(&block) : lock
+      block ? lock.synchronize(timeout: timeout, &block) : lock
     end
 
-    def write_lock(name, ttl: @default_ttl, &block)
+    def write_lock(name, ttl: @default_ttl, timeout: nil, &block)
       lock = WriteLock.new(redis: @redis, name: name, ttl: ttl)
-      block ? lock.synchronize(&block) : lock
+      block ? lock.synchronize(timeout: timeout, &block) : lock
     end
   end
 end

data/lib/redis_read_write_locks/read_lock.rb

@@ -12,7 +12,7 @@ module RedisReadWriteLocks
 
     def try_acquire
       now = Time.now.to_i
-      expiry = now + @ttl
+      expiry = now + @ttl / 1000
 
       result = eval_script(
         LockScripts::ACQUIRE_READ,

data/lib/redis_read_write_locks/version.rb

@@ -1,3 +1,3 @@
 module RedisReadWriteLocks
-  VERSION = "0.1.0"
+  VERSION = "0.3.0"
 end

data/lib/redis_read_write_locks/write_lock.rb

@@ -14,7 +14,7 @@ module RedisReadWriteLocks
       result = eval_script(
         LockScripts::ACQUIRE_WRITE,
         keys: [writer_key, readers_key],
-        argv: [@token, @ttl, Time.now.to_i],
+        argv: [@token, @ttl / 1000, Time.now.to_i],
       )
 
       @acquired = result == 1

data/redis-read-write-locks.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |spec|
   spec.files = Dir["lib/**/*.rb", "*.gemspec", "LICENSE", "README.md"]
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "redis", ">= 4.0"
-
+  spec.add_development_dependency "redis", ">= 4.0"
+  spec.add_development_dependency "redis-client"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rake", "~> 13.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-read-write-locks
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Umbrellio
@@ -16,13 +16,27 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: redis-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- lib/redis-read-write-locks.rb
 - lib/redis_read_write_locks.rb
 - lib/redis_read_write_locks/base_lock.rb
 - lib/redis_read_write_locks/client.rb