remote_lock 1.0.0 → 1.1.0

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/HouseTrip/remote_lock.png)](https://travis-ci.org/HouseTrip/remote_lock)
+[![Build Status](https://travis-ci.org/HouseTrip/remote_lock.png)](https://travis-ci.org/HouseTrip/remote_lock) [![Code Climate](https://codeclimate.com/github/HouseTrip/remote_lock.png)](https://codeclimate.com/github/HouseTrip/remote_lock)
 
 remote_lock
 ===========
@@ -12,7 +12,7 @@ Installation
 ------------
 
 ```shell
-gem install remote-lock
+gem install remote_lock
 ```
 
 Initialization

data/lib/remote_lock/adapters/redis.rb

@@ -4,8 +4,25 @@ module RemoteLock::Adapters
   class Redis < Base
 
     def store(key, expires_in_seconds)
-      @connection.setnx(key, uid).tap do |status|
-        @connection.expire(key, expires_in_seconds) if status
+      # The previous implementation used SETNX and EXPIRE in sequence to set the
+      # lock. in case a previous client failed between SETNX and EXPIRE below,
+      # the key may not expire.
+      # We wrap setting the value and its expiry timestamp in a transaction.
+      #
+      # Caveat emptor: Redis transactions are *very* different from SQL
+      # transactions.
+
+      # cancel the next transaction if another client touches our key past
+      # this point
+      @connection.watch(key)
+
+      # check if another client has the key.
+      # it's important to still run a transaction to clear the watch.
+      have_competition = @connection.exists(key)
+
+      !! @connection.multi do
+        break if have_competition
+        @connection.setex(key, expires_in_seconds, uid)
       end
     end
 

data/lib/remote_lock/version.rb

@@ -1,3 +1,3 @@
 class RemoteLock
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/adapters/redis_spec.rb

@@ -20,6 +20,15 @@ module RemoteLock::Adapters
           redis.get(test_key).should eq uid
         end
 
+        it 'return truthy on success' do
+          adapter.store(test_key, 100).should be_true
+        end
+
+        it 'return falsy on failure' do
+          redis.set(test_key, uid)
+          adapter.store(test_key, 100).should be_false
+        end
+
         context "expiry" do
           it "should expire the key after the time is over" do
             adapter.store(test_key, 1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remote_lock
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -170,7 +170,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 589636169546274691
+      hash: -816774539149081442
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 589636169546274691
+      hash: -816774539149081442
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23