resque-waiting-room 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9058938da957ee322a1422f2564ada3b40c9b8cd
-  data.tar.gz: c12c80cb78497fe63b84adb9c4763a693d12299c
+  metadata.gz: fc9d18de0b400796244ec7bbcd217f6863e0d7f0
+  data.tar.gz: 6a0aea7bfb129b4727b9f7fd6a2b3117d77418c7
 SHA512:
-  metadata.gz: f0bb708ab5a6dc14381f3d77aa9c0023cd86d3485212fb6df8fa01fb02e896ee2b919b40cd03e4cec9a6e01b3c3715045a7eb79584db0a7e000dd7db2a33de92
-  data.tar.gz: 373883a28538dfc7141000109bb3fb9453cce8907aafac166ccd723b095d84390620d5b2bc7cb5209558c9ba87b9f443356bfcdbd5e7289f05f7e4982826b2f8
+  metadata.gz: a2c8d82aba863078f20afdd7360bd43d47487975cd40d4a638db36defca78f710690331c0a5947d6365adcf1a56beaa90868aacead0c870aafcfc63eea8523cf
+  data.tar.gz: 69c19f6be8c9f303e5e6243721691b55d0fb347b3785c18a58bc6ae6d6130b4a7ad741de861e838b98282c9625118b3c17ff6076ce7491d7e53933517f7bd3be

data/.ruby-version

@@ -1 +1 @@
-2.1.3
+2.1.4

data/README.markdown

@@ -56,6 +56,10 @@ We include a matcher
       end
     end
 
+Run tests with the following command
+
+    bundle exec rake
+
 ## Contributing
 
 1. Fork it
@@ -68,7 +72,8 @@ We include a matcher
 
 - Thomas Devol [@socialchorus](https://github.com/socialchorus) for adding the RSpec matcher
 - Max Dunn [@maxdunn210](https://github.com/maxdunn210) for making me switch Resque 2 specific code in it's own branch
-- Jeff Durand [@johnnyiller](https://github.com/johnnyiller) for the update of has_remaining_performs_key using the latest form set
+- Jeff Durand [@johnnyiller](https://github.com/johnnyiller) for the update of has_remaining_performs_key using the latest form set and the fix for a rare ttl bug
+- Tatsuya Takamura [@ttakamura](https://github.com/ttakamura) for raising the issue on the rare ttl bug
 
 [rq]: http://github.com/resque/resque
 

data/lib/resque/plugins/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module WaitingRoom
-      VERSION = '0.2.2'
+      VERSION = '0.2.3'
     end
   end
 end

data/lib/resque/plugins/waiting_room.rb

@@ -26,16 +26,23 @@ module Resque
       end
 
       def remaining_performs_key?(key)
+        # if true then we will only set a key if it doesn't exist
+        # if false then we will set the key regardless.  If we have
+        # a negative number then redis either doesn't know about the key
+        # or it doesn't have a ttl, either way we want to create a new key
+        # with a new ttl.
+        nx = Resque.redis.ttl(key).to_i > 0
+
         # Redis SET: with the ex and nx option  sets the keys if it doesn't exist,
         # returns true if key was created redis => 2.6 required
-        new_key = Resque.redis.set(key, @max_performs - 1, ex: @period, nx: true)
-        return !new_key
+        # http://redis.io/commands/SET
+        !Resque.redis.set(key, @max_performs - 1, ex: @period, nx: nx)
       end
 
       def repush(*args)
         key = waiting_room_redis_key
         value = Resque.redis.get(key)
-        no_performs_left = value && value != "" && value.to_i <= 0
+        no_performs_left = value && value != '' && value.to_i <= 0
         Resque.push 'waiting_room', class: self.to_s, args: args if no_performs_left
 
         return no_performs_left

data/spec/resque/plugins/waiting_room_spec.rb

@@ -72,21 +72,18 @@ describe Resque::Plugins::WaitingRoom do
 
     it 'should set a redis key' do
       expect(Resque.redis).to receive(:set)
-        .with(@key, @max, ex: @period, nx: true)
+        .with(@key, @max, ex: @period, nx: false)
       DummyJob.remaining_performs_key?(DummyJob.waiting_room_redis_key)
     end
 
     it 'should expire the redis key' do
       expect(Resque.redis).to receive(:set)
-        .with(@key, @max, ex: @period, nx: true)
+        .with(@key, @max, ex: @period, nx: false)
         .and_return(true)
       DummyJob.remaining_performs_key?(DummyJob.waiting_room_redis_key)
     end
 
     it 'should not re-expire the redis key if it is already created' do
-      expect(Resque.redis).to receive(:set)
-        .with(@key, @max, ex: @period, nx: true)
-        .and_return(true)
       DummyJob.remaining_performs_key?(DummyJob.waiting_room_redis_key)
       expect(Resque.redis).to receive(:set)
         .with(@key, @max, ex: @period, nx: true)
@@ -96,7 +93,7 @@ describe Resque::Plugins::WaitingRoom do
 
     it 'should return false if the key is new' do
       expect(Resque.redis).to receive(:set)
-        .with(@key, @max, ex: @period, nx: true)
+        .with(@key, @max, ex: @period, nx: false)
         .and_return(true)
       expect(DummyJob.remaining_performs_key?(DummyJob.waiting_room_redis_key))
         .to eq(false)
@@ -104,7 +101,7 @@ describe Resque::Plugins::WaitingRoom do
 
     it 'should return true if the key was already created' do
       expect(Resque.redis).to receive(:set)
-        .with(@key, @max, ex: @period, nx: true)
+        .with(@key, @max, ex: @period, nx: false)
         .and_return(false)
       expect(DummyJob.remaining_performs_key?(DummyJob.waiting_room_redis_key))
         .to eq(true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-waiting-room
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Julien Blanchard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake