resque-throttler 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09888d1679af9193b4323ac267b2d1488d911d8a
-  data.tar.gz: 287f898deb3c12a723527fe024645dd63f7821de
+  metadata.gz: 2aec65024025fe55d1b9c7b387f9cb748e424c0e
+  data.tar.gz: 452e1de58c438865919553cb0677b14684a5c99a
 SHA512:
-  metadata.gz: b3150786f6c903bb11d1a4386ac943c681411f434a6f4bab42ff9d659bc20754ba762273d06d9de80c8b64a323fdb49333a6029dc7c188e4dc421fd9cbe4bde5
-  data.tar.gz: ecd025b6e2946ea1777af977ee399cc97259269820b2c6280dbed93bbec561544dff2a90ee4bca0678120392a47cd8a2c68ed1db2b81e6054ab819dba776d02a
+  metadata.gz: 0bbb257494f39dcf211b35cd06f303a76178a6ddf9d33a2cb612cceb9173e573ea2454ef8613544ffca1ceb9416edc12db841272afea85861be3ebe67652dca2
+  data.tar.gz: cdd423838bb1ea520f85104fc574ce2dd9f957b78e96eb2648f1e5292e225ac0cd999d78c8a8da2b7ba4892d2b875be0283922ff83b136f574e339b99c527389

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    resque-throttler (0.1.0)
+    resque-throttler (0.1.4)
       resque (~> 1.25)
 
 GEM
@@ -33,7 +33,7 @@ GEM
       rack
     rake (10.3.2)
     redis (3.0.7)
-    redis-namespace (1.5.0)
+    redis-namespace (1.5.1)
       redis (~> 3.0, >= 3.0.4)
     resque (1.25.2)
       mono_logger (~> 1.0)

data/lib/resque/throttler.rb

@@ -31,7 +31,7 @@ module Resque::Plugins
     end
   
     def queue_rate_limited?(queue)
-      @rate_limits[queue.to_s]
+      !!@rate_limits[queue.to_s]
     end
   
     def queue_at_or_over_rate_limit?(queue)
@@ -65,9 +65,16 @@ Resque.extend(Resque::Plugins::Throttler)
 
 class Resque::Job
   
+  def initialize_with_throttler(queue, payload)
+    @throttled = Resque.queue_rate_limited?(queue)
+    @throttler_uuid = SecureRandom.uuid
+    initialize_without_throttler(queue, payload)
+  end
+  alias_method :initialize_without_throttler, :initialize
+  alias_method :initialize, :initialize_with_throttler
+  
   def perform_with_throttler
-    if Resque.queue_rate_limited?(self.queue)
-      @throttler_uuid = SecureRandom.uuid
+    if @throttled
       begin
         # TODO this needs to be wrapped in a transcation
         redis.hmset("throttler:jobs:#{@throttler_uuid}", "started_at", Time.now.to_i)
@@ -86,7 +93,7 @@ class Resque::Job
   # This is added for when there is a dirty exit
   # TODO: testme
   def fail_with_throttler(exception)
-    if defined?(@throttler_uuid)
+    if @throttled
       redis.hmset("throttler:jobs:#{@throttler_uuid}", "ended_at", Time.now.to_i)
     end
     fail_without_throttler(exception)

data/resque-throttler.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "resque-throttler"
-  s.version     = '0.1.4'
+  s.version     = '0.1.5'
   s.licenses    = ['MIT']
   s.authors     = ["Jon Bracy"]
   s.email       = ["jonbracy@gmail.com"]

data/test/resque/job_test.rb

@@ -17,6 +17,21 @@ class Resque::JobTest < Minitest::Test
     Resque.instance_variable_set(:@rate_limits, {})
   end
 
+  test 'Resque::Job::initialize sets up @throttled and @throttler_uuid' do
+    SecureRandom.expects(:uuid).returns("jobuuid").twice
+    Resque.rate_limit(:myqueue, :at => 10, :per => 1)
+        
+    job = Resque::Job.new(:other_queue, { 'class' => 'MyJob', 'args'  => [] })
+    assert_equal 'jobuuid', job.instance_variable_get(:@throttler_uuid)
+    assert_equal  false,    job.instance_variable_get(:@throttled)
+          
+          
+
+    job = Resque::Job.new(:myqueue, { 'class' => 'MyJob', 'args'  => [] })
+    assert_equal 'jobuuid', job.instance_variable_get(:@throttler_uuid)
+    assert_equal  true,     job.instance_variable_get(:@throttled)
+  end
+  
   test "Resque::Job::perform on unthrottled job" do
     Resque.rate_limit(:myqueue, :at => 10, :per => 1)
 
@@ -36,6 +51,7 @@ class Resque::JobTest < Minitest::Test
   end
     
   test "Resque::Job::perform on throttled job" do
+    SecureRandom.expects(:uuid).returns("jobuuid")
     Resque.rate_limit(:myqueue, :at => 10, :per => 1)
 
     job = Resque::Job.new(:myqueue, {
@@ -44,7 +60,6 @@ class Resque::JobTest < Minitest::Test
     })
     
     travel_to Time.now do
-      SecureRandom.expects(:uuid).returns("jobuuid")
       Resque.redis.expects(:hmset).with("throttler:jobs:jobuuid", "started_at", Time.now.to_i).once
       Resque.redis.expects(:sadd).with("throttler:myqueue_uuids", "jobuuid").once
       Resque.redis.expects(:hmset).with("throttler:jobs:jobuuid", "ended_at", Time.now.to_i).once
@@ -54,6 +69,7 @@ class Resque::JobTest < Minitest::Test
   end
   
   test "Resque::Job::perform on throttled job with job that throws error" do
+    SecureRandom.expects(:uuid).returns("jobuuid")
     Resque.rate_limit(:myqueue, :at => 10, :per => 1)
 
     job = Resque::Job.new('myqueue', {
@@ -62,7 +78,6 @@ class Resque::JobTest < Minitest::Test
     })
 
     travel_to Time.now do
-      SecureRandom.expects(:uuid).returns("jobuuid")
       Resque.redis.expects(:hmset).with("throttler:jobs:jobuuid", "started_at", Time.now.to_i).once
       Resque.redis.expects(:sadd).with("throttler:myqueue_uuids", "jobuuid").once
       Resque.redis.expects(:hmset).with("throttler:jobs:jobuuid", "ended_at", Time.now.to_i).once

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-throttler
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jon Bracy