resque_jobs_tree 0.3.1 → 0.3.2

data/lib/resque_jobs_tree/node.rb

@@ -58,14 +58,17 @@ class ResqueJobsTree::Node
   end
 
   def find_node_by_name _name
-    return self if name == _name.to_s
-    node_childs.detect{ |node| node.find_node_by_name _name }
+    if name == _name.to_s
+      self
+    else
+      node_childs.inject(nil){|result,node| result ||= node.find_node_by_name _name }
+    end
   end
 
   def validate!
-    if childs.kind_of?(Proc) && node_childs.empty?
+    if (childs.kind_of?(Proc) && node_childs.empty?) || (childs.nil? && !node_childs.empty?)
       raise ResqueJobsTree::NodeInvalid,
-        "node `#{name}` from tree `#{tree.name}` defines childs without child nodes"
+        "node `#{name}` from tree `#{tree.name}` should defines childs and child nodes"
     end
     unless perform.kind_of? Proc
       raise ResqueJobsTree::NodeInvalid,

data/lib/resque_jobs_tree/version.rb

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

data/test/test_helper.rb

@@ -81,4 +81,23 @@ class MiniTest::Unit::TestCase
     Resque.redis
   end
 
+  def create_nested_tree
+    @tree = ResqueJobsTree::Factory.create :tree1 do
+      root :job1 do
+        perform { raise 'job1' }
+        childs { [ [:job2] ] }
+        node :job2, continue_on_failure: true do
+          perform { raise 'job2' }
+          childs { [ [:job3], [:job4] ] }
+          node :job3, async: true do
+            perform {}
+          end
+          node :job4, continue_on_failure: true do
+            perform { raise 'job4' }
+          end
+        end
+      end
+    end
+  end
+
 end

data/test/tree_test.rb

@@ -25,7 +25,9 @@ class TreeTest < MiniTest::Unit::TestCase
   end
 
   def test_find_node_by_name
-    assert_equal @tree.find_node_by_name('job2').name, 'job2'
+    assert_equal 'job2', @tree.find_node_by_name('job2').name
+    create_nested_tree
+    assert_equal 'job4', @tree.find_node_by_name('job4').name
   end
 
   def test_launch
@@ -58,6 +60,14 @@ class TreeTest < MiniTest::Unit::TestCase
     @tree.launch Model.new(1)
   end
 
+  def test_nested_tree
+    create_nested_tree
+    @tree.launch
+    assert_raises NoMethodError do
+      Resque.enqueue_to 'tree1', ResqueJobsTree::Job, 'tree1', 'job3'
+    end
+  end
+
   private
 
   def create_tree_with_on_failure_hook

metadata

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