redis_support 0.0.16 → 0.0.17

data/lib/redis_support/locks.rb

@@ -16,6 +16,19 @@ module RedisSupport
       release_redis_lock( key_to_lock )
     end
 
+    # Attempt to lock a block of code so it can only be accessed by one
+    # thread in our system at a time. Skips the block if it cannot lock.
+    #
+    # See 'acquire_redis_lock_nonblock' for details on parameters.
+    #
+    # Returns nothing.
+    def redis_lock_nonblock( key_to_lock, expiration = 30 )
+      lock_acquired = acquire_redis_lock_nonblock( key_to_lock, expiration )
+      yield if lock_acquired
+    ensure
+      release_redis_lock( key_to_lock ) if lock_acquired
+    end
+
     # Throttle a block of code so it is only executed at most every
     # `expiration` seconds. The block is skipped if it has been run
     # more recently.
@@ -112,7 +125,7 @@ module RedisSupport
     #
     # Returns the timestamp.
     def timeout_i( timeout )
-      timeout.seconds.from_now.to_i
+      Time.now.to_i + timeout.to_i
     end
   end
 end

data/test/test_redis_support.rb

@@ -108,9 +108,24 @@ context "Redis Support" do
   end
 
   test "registered keys should show up in keystruct" do
-   ["test:redis", "test:redis:VAR", "test:redis:VAR_ONE:VAR_TWO:append"].each do |key|
-     assert TestClass::Keys.keystructs.include?(key)
-   end
+    ["test:redis", "test:redis:VAR", "test:redis:VAR_ONE:VAR_TWO:append"].each do |key|
+      assert TestClass::Keys.keystructs.include?(key)
+    end
+  end
+
+  test "redis_lock_nonblock performs as expected" do
+    class Zoo
+      include RedisSupport
+    end
+
+    Zoo.redis_lock_nonblock("example:key") do
+      assert Zoo.has_redis_lock?("example:key")
+      Zoo.redis_lock_nonblock("example:key") do
+        assert(false, 'Second nonblocking lock should not have been acquired')
+      end
+      assert Zoo.has_redis_lock?("example:key")
+    end
+    assert !Zoo.has_redis_lock?("example:key")
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redis_support
 version: !ruby/object:Gem::Version 
-  hash: 63
-  prerelease: 
+  hash: 61
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 16
-  version: 0.0.16
+  - 17
+  version: 0.0.17
 platform: ruby
 authors: 
 - Brian P O'Rourke
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 -08:00
+date: 2011-12-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Redis Support module