resque_jobs_tree 0.3.2 → 0.3.3

data/lib/resque_jobs_tree/job.rb

@@ -7,7 +7,7 @@ class ResqueJobsTree::Job
       node.perform.call resources
     end
 
-    private
+    protected
 
     def after_perform_enqueue_parent *args
       node, resources = node_and_resources(args)

data/lib/resque_jobs_tree/version.rb

@@ -1,3 +1,3 @@
 module ResqueJobsTree
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/test/node_test.rb

@@ -123,7 +123,7 @@ class NodeTest < MiniTest::Unit::TestCase
   def test_launch_continue_on_failure
     tree = ResqueJobsTree::Factory.create :tree1 do
       root :job1 do
-        perform { raise 'an unexpected failure' }
+        perform { raise ExpectedException, 'an expected failure' }
         childs { [:job2] }
         node :job2, continue_on_failure: true do
           perform { raise 'an expected failure' }
@@ -131,7 +131,7 @@ class NodeTest < MiniTest::Unit::TestCase
       end
     end
     resources = [1, 2, 3]
-    assert_raises RuntimeError, 'an unexpected failure' do
+    assert_raises ExpectedException do
       tree.launch resources
     end
     assert_equal [], Resque.keys
@@ -143,12 +143,12 @@ class NodeTest < MiniTest::Unit::TestCase
         perform {}
         childs { [:job2] }
         node :job2 do
-          perform { raise 'an unexpected failure' }
+          perform { raise ExpectedException, 'an expected exception'}
         end
       end
     end
     resources = [1, 2, 3]
-    assert_raises RuntimeError, 'an unexpected failure' do
+    assert_raises ExpectedException do
       tree.launch *resources
     end
     assert_equal [], Resque.keys
@@ -157,7 +157,7 @@ class NodeTest < MiniTest::Unit::TestCase
   def test_root_failure
     tree = ResqueJobsTree::Factory.create :tree1 do
       root :job1 do
-        perform { raise 'an unexpected failure' }
+        perform { raise ExpectedException, 'an expected exception' }
         childs { [:job2] }
         node :job2 do
           perform {}
@@ -165,7 +165,7 @@ class NodeTest < MiniTest::Unit::TestCase
       end
     end
     resources = [1, 2, 3]
-    assert_raises RuntimeError, 'an unexpected failure' do
+    assert_raises ExpectedException do
       tree.launch resources
     end
     assert_equal [], Resque.keys

data/test/test_helper.rb

@@ -32,22 +32,7 @@ class Model
   end
 end
 
-
-# Run resque callbacks in inline mode
-class ResqueJobsTree::Job
-  class << self
-    def perform_with_hook *args
-      begin
-        perform_without_hook *args
-        after_perform_enqueue_parent *args
-      rescue => exception
-        on_failure_cleanup exception, *args
-      end
-    end
-    alias_method :perform_without_hook, :perform
-    alias_method :perform, :perform_with_hook
-  end
-end
+class ExpectedException < Exception ; end
 
 class MiniTest::Unit::TestCase
 
@@ -84,7 +69,7 @@ class MiniTest::Unit::TestCase
   def create_nested_tree
     @tree = ResqueJobsTree::Factory.create :tree1 do
       root :job1 do
-        perform { raise 'job1' }
+        perform { raise ExpectedException, 'job1' }
         childs { [ [:job2] ] }
         node :job2, continue_on_failure: true do
           perform { raise 'job2' }

data/test/tree_test.rb

@@ -50,7 +50,7 @@ class TreeTest < MiniTest::Unit::TestCase
 
   def test_on_failure
     create_tree_with_on_failure_hook
-    assert_raises RuntimeError, 'called form on_failure block' do
+    assert_raises ExpectedException do
       @tree.launch
     end
   end
@@ -62,21 +62,61 @@ class TreeTest < MiniTest::Unit::TestCase
 
   def test_nested_tree
     create_nested_tree
-    @tree.launch
-    assert_raises NoMethodError do
+    assert_raises RuntimeError do # job4 error !
+      @tree.launch
+    end
+    assert_raises NoMethodError do # job3 error !
       Resque.enqueue_to 'tree1', ResqueJobsTree::Job, 'tree1', 'job3'
     end
   end
 
+  def test_async_tree
+    tree = ResqueJobsTree::Factory.create :tree1 do
+      root :job1 do
+        perform { raise 'should not arrive here' }
+        childs { [ [:job2], [:job3] ] }
+        node :job2, async: true do
+          perform {}
+        end
+        node :job3 do
+          perform {}
+        end
+      end
+    end
+    tree.launch
+    assert_equal ["ResqueJobsTree:Node:[\"tree1\",\"job2\"]"],
+      Resque.redis.smembers("ResqueJobsTree:Node:[\"tree1\",\"job1\"]:childs")
+  end
+
+  def test_async_tree_with_fail
+    tree = ResqueJobsTree::Factory.create :tree1 do
+      root :job1 do
+        perform { raise 'should not arrive here' }
+        childs { [ [:job2], [:job3] ] }
+        node :job2, async: true do
+          perform {}
+        end
+        node :job3, continue_on_failure: true do
+          perform { raise ExpectedException, 'an expected failure' }
+        end
+      end
+    end
+    assert_raises ExpectedException do
+      tree.launch
+    end
+    assert_equal ["ResqueJobsTree:Node:[\"tree1\",\"job2\"]"],
+      Resque.redis.smembers("ResqueJobsTree:Node:[\"tree1\",\"job1\"]:childs")
+  end
+
   private
 
   def create_tree_with_on_failure_hook
     @tree = ResqueJobsTree::Factory.create :tree1 do
       root :job1 do
-        perform { raise 'expected failure' }
+        perform { raise ExpectedException, 'job1' }
       end
       on_failure do
-        raise 'called form on_failure block'
+        raise ExpectedException, 'called from on_failure block'
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque_jobs_tree
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors: