resque_jobs_tree 0.5.2 → 0.5.3

data/lib/resque_jobs_tree/node.rb

@@ -25,7 +25,7 @@ class ResqueJobsTree::Node
   end
 
   def after_perform
-    run_callback(:after_perform)
+    run_callback :after_perform
     if root?
       tree.finish
     else
@@ -38,6 +38,7 @@ class ResqueJobsTree::Node
 
   def on_failure
     if definition.options[:continue_on_failure]
+      run_callback :on_failure
       after_perform
     else
       root.tree.on_failure
@@ -92,7 +93,7 @@ class ResqueJobsTree::Node
     callback_block = definition.send callback
     callback_block.call(*resources) if callback_block.kind_of? Proc
   rescue
-    if callback == :after_perform
+    if [:after_perform, :on_failure].include? callback
       puts "[ResqueJobsTree::Tree] after_perform callback of node #{definition.tree.name}##{name} has failed."\
            " Continuing for cleanup."
     else

data/lib/resque_jobs_tree/version.rb

@@ -1,3 +1,3 @@
 module ResqueJobsTree
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/test/process_test.rb

@@ -100,6 +100,34 @@ class ProcessTest < MiniTest::Unit::TestCase
     assert_redis_empty
   end
 
+  def test_launch_continue_on_failure_with_on_failure_block
+    Resque.inline = false
+    tree_definition = ResqueJobsTree::Factory.create :tree1 do
+      root :job1 do
+        perform do
+          Resque.redis.rpush 'history', 'tree1 job1 perform'
+        end
+        childs { [:job2] }
+        node :job2, continue_on_failure: true do
+          perform do
+            Resque.redis.rpush 'history', 'tree1 job2 perform'
+            raise 'an expected failure'
+          end
+          on_failure do
+            Resque.redis.rpush 'history', 'tree1 job2 on_failure'
+          end
+        end
+      end
+    end
+    tree_definition.spawn([1, 2, 3]).launch
+    assert_raises RuntimeError, 'an expected failure' do
+      run_resque_workers tree_definition.name
+    end
+    run_resque_workers tree_definition.name
+    assert_equal ['tree1 job2 perform','tree1 job2 on_failure', 'tree1 job1 perform'], redis.lrange('history', 0, -1)
+    redis.del 'history'
+  end
+
   def test_root_failure
     Resque.inline = false
     tree_definition = ResqueJobsTree::Factory.create :tree1 do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque_jobs_tree
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler