onyx-resque-retry 0.1.0 → 0.1.1

data/lib/resque/plugins/retry.rb

@@ -129,7 +129,7 @@ module Resque
 
         # call user retry criteria check blocks.
         retry_criteria_checks.each do |criteria_check|
-          should_retry ||= !!criteria_check.call(exception, *args)
+          should_retry ||= !!instance_exec(exception, *args, &criteria_check)
         end
 
         should_retry

data/lib/resque-retry.rb

@@ -4,3 +4,17 @@ require 'resque_scheduler'
 require 'resque/plugins/retry'
 require 'resque/plugins/exponential_backoff'
 require 'resque/failure/multiple_with_retry_suppression'
+
+class Object
+  def instance_exec(*args, &block)
+    mname = "__instance_exec_#{Thread.current.object_id.abs}"
+    class << self; self end.class_eval{ define_method(mname, &block) }
+    begin
+      puts "instance_exec args = #{args.inspect}"
+      ret = send(mname, *args)
+    ensure
+      class << self; self end.class_eval{ undef_method(mname) } rescue nil
+    end
+    ret
+  end
+end

data/test/retry_inheriting_checks_test.rb

@@ -30,4 +30,16 @@ class RetryInheritingChecksTest < Test::Unit::TestCase
     assert_equal 1, klass.retry_criteria_checks.size
     assert_equal 'test', klass.test_value
   end
+
+  def test_retry_criteria_check_should_be_evaluated_under_child_context
+    Resque.enqueue(InheritedJob, 'arg')
+
+    10.times do
+      perform_next_job(@worker)
+    end
+
+    assert_equal 0, BaseJob.retry_attempt, "BaseJob retry attempts"
+    assert_equal 0, InheritedJob.retry_attempt, "InheritedJob retry attempts"
+    assert_equal 5, InheritedRetryJob.retry_attempt, "InheritedRetryJob retry attempts"
+  end
 end

data/test/test_helper.rb

@@ -6,6 +6,7 @@ require 'test/unit'
 require 'rubygems'
 require 'turn'
 require 'simplecov'
+require 'mocha'
 
 SimpleCov.start do
   add_filter "/test/"
@@ -28,11 +29,7 @@ end
 at_exit do
   next if $!
 
-  if defined?(MiniTest)
-    exit_code = MiniTest::Unit.new.run(ARGV)
-  else
-    exit_code = Test::Unit::AutoRunner.run
-  end
+  exit_code = Test::Unit::AutoRunner.run
 
   pid = `ps -e -o pid,command | grep [r]edis-test`.split(" ")[0]
   puts "Killing test redis server..."

data/test/test_jobs.rb

@@ -147,6 +147,58 @@ module RetryModuleDefaultsJob
   end
 end
 
+class AsyncJob
+  extend Resque::Plugins::Retry
+
+  class << self
+    def perform(*opts)
+      process
+    end
+
+    def process
+      raise "Shouldn't be called"
+    end
+  end
+end
+
+class BaseJob < AsyncJob
+  @retry_limit = 0
+  @auto_retry_limit = 5
+  @retry_exceptions = []
+
+  retry_criteria_check do |exception, *args|
+    keep_trying?
+  end
+
+  class << self
+    def keep_trying?
+      retry_attempt < @auto_retry_limit
+    end
+
+    def inherited(subclass)
+      super
+      %w(@retry_exceptions @retry_delay @retry_limit @auto_retry_limit).each do |variable|
+        value = BaseJob.instance_variable_get(variable)
+        value = value.dup rescue value
+        subclass.instance_variable_set(variable, value)
+      end
+    end
+
+    def process
+      raise "Got called #{Time.now}"
+    end
+  end
+end
+
+class InheritedRetryJob < BaseJob
+  @queue = :testing
+end
+
+class InheritedJob < BaseJob
+  @queue = :testing
+  @retry_job_class = InheritedRetryJob
+end
+
 module RetryModuleCustomRetryCriteriaCheck
   extend Resque::Plugins::Retry
   @queue = :testing

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: onyx-resque-retry
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
-- Onyx Team
+- Luke Antins
+- Ryan Carver
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-10-13 00:00:00 -04:00
+date: 2011-10-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -135,18 +136,18 @@ files:
 - Rakefile
 - README.md
 - HISTORY.md
-- test/retry_test.rb
+- test/redis-test.conf
 - test/multiple_failure_test.rb
 - test/retry_inheriting_checks_test.rb
-- test/redis-test.conf
-- test/retry_criteria_test.rb
 - test/resque_test.rb
+- test/test_jobs.rb
+- test/retry_criteria_test.rb
+- test/retry_test.rb
 - test/exponential_backoff_test.rb
 - test/test_helper.rb
-- test/test_jobs.rb
-- lib/resque/failure/multiple_with_retry_suppression.rb
-- lib/resque/plugins/exponential_backoff.rb
 - lib/resque/plugins/retry.rb
+- lib/resque/plugins/exponential_backoff.rb
+- lib/resque/failure/multiple_with_retry_suppression.rb
 - lib/resque-retry.rb
 - lib/resque-retry/server/views/retry.erb
 - lib/resque-retry/server/views/retry_timestamp.erb