sidekiq-superworker 0.1.6 → 0.1.8

data/README.md

@@ -68,6 +68,28 @@ Install and run the migration:
 Usage
 -----
 
+First, define a superworker in a file that's included during the initialization of the app. If you're using Rails, you might do this in an initializer:
+
+```ruby
+# config/initializers/superworkers.rb
+
+Superworker.create(:MySuperworker, :user_id, :comment_id) do
+  Worker1 :user_id, :comment_id
+  Worker2 :comment_id
+end
+
+Superworker.create(:MyOtherSuperworker, :comment_id) do
+  Worker2 :comment_id
+  Worker3 :comment_id
+end
+```
+
+To run a superworker, call perform_async:
+
+```ruby
+MySuperworker.perform_async(23, 852)
+```
+
 ### Arguments
 
 You can define any number of arguments for the superworker and pass them to different subworkers as you see fit:

data/lib/sidekiq/superworker.rb

@@ -1,5 +1,6 @@
 require 'sidekiq'
 require 'activerecord-import'
+require 'pry'
 
 directory = File.dirname(File.absolute_path(__FILE__))
 require "#{directory}/client_ext.rb"

data/lib/sidekiq/superworker/dsl_hash.rb

@@ -53,7 +53,9 @@ module Sidekiq
             parent_id: parent_id
           }
           if value[:subworker_class] == :batch
-            @records[id][:children_ids] = children_ids_for_batch(value[:children], arg_values[0])
+            @arg_keys_to_arg_keys ||= Hash[@args.keys.map { |key| [key, key] }]
+            batch_keys_to_iteration_keys = @arg_keys_to_arg_keys.merge(arg_values[0])
+            @records[id][:children_ids] = children_ids_for_batch(value[:children], batch_keys_to_iteration_keys)
           end
 
           @records[last_id][:next_id] = id if @records[last_id]
@@ -120,11 +122,8 @@ module Sidekiq
       def get_batch_iteration_arg_value_arrays(batch_keys_to_iteration_keys)
         batch_keys = batch_keys_to_iteration_keys.keys
         batch_keys_to_batch_values = @args.slice(*(batch_keys))
-
         batch_values = batch_keys_to_batch_values.values
-        first_batch_value = batch_values.shift
-        batch_values = first_batch_value.zip(*batch_values)
-        batch_values
+        batch_values_to_batch_arrays(batch_values)
       end
 
       def rewrite_ids_of_nested_hash(nested_hash)
@@ -139,6 +138,20 @@ module Sidekiq
         end
         new_hash
       end
+
+      def batch_values_to_batch_arrays(values)
+        arrays = values.map { |value| value.is_a?(Array) ? value : [value] }
+        max_length = arrays.map(&:length).max
+        arrays.map! do |array|
+          if array.length < max_length
+            repetition_count = (max_length / array.length).ceil
+            array = (array * repetition_count).take(max_length)
+          end
+          array
+        end
+        first_array = arrays.shift
+        first_array.zip(*arrays)
+      end
     end
   end
 end

data/lib/sidekiq/superworker/server/middleware.rb

@@ -7,14 +7,16 @@ module Sidekiq
         end
 
         def call(worker, item, queue)
-          begin
-            return_value = yield
-          rescue Exception => exception
-            @processor.error(worker, item, queue, exception)
-            raise exception
+          ActiveRecord::Base.connection_pool.with_connection do
+            begin
+              return_value = yield
+            rescue Exception => exception
+              @processor.error(worker, item, queue, exception)
+              raise exception
+            end
+            @processor.complete(item)
+            return_value
           end
-          @processor.complete(item)
-          return_value
         end
       end
     end

data/lib/sidekiq/superworker/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Superworker
-    VERSION = '0.1.6'
+    VERSION = '0.1.8'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-superworker
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq