sidekiq-superworker 0.1.0 → 0.1.1

data/lib/sidekiq/superworker/dsl_parser.rb

@@ -5,7 +5,8 @@ module Sidekiq
         @dsl_evaluator = DSLEvaluator.new
         @dsl_hash = DSLHash.new
         @record_id = 0
-        block_to_nested_hash(block)
+        nested_hash = block_to_nested_hash(block)
+        @dsl_hash.rewrite_ids_of_nested_hash(nested_hash, 0)
       end
 
       def self.block_to_nested_hash(block)
@@ -17,6 +18,7 @@ module Sidekiq
         while (method_result = fiber.resume)
           method, args, block = method_result
           @record_id += 1
+          method_record_id = @record_id
           if block
             if method == :batch
               nested_hash[@record_id] = { subworker_class: method, arg_keys: args, children: block_to_nested_hash(block) }
@@ -32,14 +34,29 @@ module Sidekiq
           unless [:parallel, :batch].include?(method)
             subworker_class = method.to_s.constantize
             if subworker_class.respond_to?(:is_a_superworker?) && subworker_class.is_a_superworker?
-              parent_record_id = @record_id
-              nested_hash[parent_record_id][:children] = @dsl_hash.rewrite_ids_of_nested_hash(subworker_class.nested_hash, @record_id)
+              children = @dsl_hash.rewrite_ids_of_nested_hash(subworker_class.nested_hash, @record_id)
+              set_children_for_record_id(nested_hash, method_record_id, children)
               @record_id = @dsl_hash.record_id
             end
           end
         end
         nested_hash
       end
+
+      def self.set_children_for_record_id(nested_hash, parent_record_id, children)
+        nested_hash.each do |record_id, value|
+          if record_id == parent_record_id
+            if nested_hash[record_id][:children].present?
+              nested_hash[record_id][:children] = nested_hash[record_id][:children].reverse_merge(children)
+            else
+              nested_hash[record_id][:children] = children
+            end
+          end
+          if value[:children].present?
+            set_children_for_record_id(value[:children], parent_record_id, children)
+          end
+        end
+      end
     end
   end
 end

data/lib/sidekiq/superworker/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Superworker
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-superworker
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq