parallel_workforce 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ef8716bb08d920fb76459016cdb615f50d89e5604066ff01ad723d2b4fb03b4
-  data.tar.gz: 6263caa320d791299cfe76e399f26c23d49414ca8536cef25358fc10dfc5f8a3
+  metadata.gz: 2e38b7ae0d29c7bef029f3188bfaa9e425ce7c0927a3785b01dc760f81c089ca
+  data.tar.gz: 4f29cb1e4de7497342d822f528597a42b3462feb8f0ebcab9eddbed2528e1224
 SHA512:
-  metadata.gz: 9bb0c64bd4fa27720d5db3d174cee1d2954ffba8cbdcc7153c1f644eada79440a8340a49f703f3a32cabb12f6bfbd71f7b9a7a64d7667b9c69a75b54be035b6e
-  data.tar.gz: 2529e7806726359ecd5ca4c5c994863b57eb029576bd1e94577f2dbe658df0cccdccd3a45909384fd6551c2b0b59fb4fb11f1e5a8f3ebf619226a1a2fe2c9e12
+  metadata.gz: d8e78436dadff0af8d50c3b7400f4633374c85abaa790a8148866c4e3b2c2620f4ffa001b6fac0f7ed0257658ad2a836995cc63bb2c48f8a2f6cfb768976baaa
+  data.tar.gz: 242fa4f95c27ca8f9a32b97954d7e5d86022dc44815b8d459023df45a4965a23a0c0f199e5d471993943762c5d5e0e6ad27d8f747cdf6ec6c11bbe3ca45a50b8

data/.rubocop_parallel_workforce.yml

@@ -42,6 +42,9 @@ RSpec/DescribedClass:
 # RSpec/VerifiedDoubles:
 #   Enabled: true
 
+Layout/FirstParameterIndentation:
+  Enabled: false
+
 Layout/AlignHash:
   Enabled: false
 
@@ -135,15 +138,6 @@ Style/GuardClause:
 Style/IfUnlessModifier:
   Enabled: false
 
-Layout/IndentFirstArgument:
-  Enabled: false
-
-Naming/RescuedExceptionsVariableName:
-  Enabled: false
-
-Layout/IndentFirstArrayElement:
-  EnforcedStyle: consistent
-
 Layout/MultilineOperationIndentation:
   Enabled: true
   EnforcedStyle: indented

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    parallel_workforce (2.0.0)
+    parallel_workforce (3.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -146,6 +146,7 @@ GEM
       sprockets (>= 3.0.0)
     thor (0.20.3)
     thread_safe (0.3.6)
+    timecop (0.9.4)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unicode-display_width (1.4.1)
@@ -164,6 +165,7 @@ DEPENDENCIES
   rubocop (~> 0.65)
   rubocop-rspec (~> 1.32)
   sidekiq (~> 4.0)
+  timecop (~> 0.9)
 
 BUNDLED WITH
    1.17.3

data/lib/parallel_workforce/job/active_job.rb

@@ -1,11 +1,14 @@
 module ParallelWorkforce
   module Job
-    class ActiveJob < ActiveJob::Base
+    class ActiveJob < ::ActiveJob::Base
+      include ParallelWorkforce::Job::Util::JobHelper
+
       discard_on Exception if defined?(discard_on)
 
       class << self
         def enqueue_actor(actor_class_name:, result_key:, index:, server_revision:, serialized_actor_args:)
-          perform_later(
+          enqueue_actor_job(
+            :perform_later,
             actor_class_name: actor_class_name,
             result_key: result_key,
             index: index,
@@ -16,7 +19,7 @@ module ParallelWorkforce
       end
 
       def perform(args)
-        ParallelWorkforce::Job::Util::Performer.new(**args.symbolize_keys).perform
+        invoke_performer(args)
       end
     end
   end

data/lib/parallel_workforce/job/active_job_rails.rb

@@ -3,7 +3,8 @@ module ParallelWorkforce
     class ActiveJobRails < ParallelWorkforce::Job::ActiveJob
       class << self
         def enqueue_actor(actor_class_name:, result_key:, index:, server_revision:, serialized_actor_args:)
-          perform_later(
+          enqueue_actor_job(
+            :perform_later,
             actor_class_name: actor_class_name,
             result_key: result_key,
             index: index,
@@ -15,10 +16,7 @@ module ParallelWorkforce
       end
 
       def perform(args)
-        args.symbolize_keys!
-        Time.use_zone(args.delete(:time_zone_name)) do
-          ParallelWorkforce::Job::Util::Performer.new(**args).perform
-        end
+        invoke_performer_with_time_zone_name(args)
       end
     end
   end

data/lib/parallel_workforce/job/sidekiq.rb

@@ -2,12 +2,14 @@ module ParallelWorkforce
   module Job
     class Sidekiq
       include ::Sidekiq::Worker
+      include ParallelWorkforce::Job::Util::JobHelper
 
       sidekiq_options retry: false
 
       class << self
         def enqueue_actor(actor_class_name:, result_key:, index:, server_revision:, serialized_actor_args:)
-          perform_async(
+          enqueue_actor_job(
+            :perform_async,
             actor_class_name: actor_class_name,
             result_key: result_key,
             index: index,
@@ -18,8 +20,7 @@ module ParallelWorkforce
       end
 
       def perform(args)
-        args = args.each_with_object({}) { |(k, v), result| result[k.to_sym] = v }
-        ParallelWorkforce::Job::Util::Performer.new(**args).perform
+        invoke_performer(args)
       end
     end
   end

data/lib/parallel_workforce/job/sidekiq_rails.rb

@@ -3,7 +3,8 @@ module ParallelWorkforce
     class SidekiqRails < ParallelWorkforce::Job::Sidekiq
       class << self
         def enqueue_actor(actor_class_name:, result_key:, index:, server_revision:, serialized_actor_args:)
-          perform_async(
+          enqueue_actor_job(
+            :perform_async,
             actor_class_name: actor_class_name,
             result_key: result_key,
             index: index,
@@ -15,10 +16,7 @@ module ParallelWorkforce
       end
 
       def perform(args)
-        args.symbolize_keys!
-        Time.use_zone(args.delete(:time_zone_name)) do
-          ParallelWorkforce::Job::Util::Performer.new(**args).perform
-        end
+        invoke_performer_with_time_zone_name(args)
       end
     end
   end

data/lib/parallel_workforce/job/util/job_helper.rb

@@ -0,0 +1,60 @@
+module ParallelWorkforce
+  module Job
+    module Util
+      module JobHelper
+        def self.included(klass)
+          klass.extend(ClassMethods)
+        end
+
+        module ClassMethods
+          def build_serialized_actor_args_key(result_key, index)
+            "#{result_key}:#{index}:serialized-actor-args"
+          end
+
+          def enqueue_actor_job(enqueue_method, **kwargs)
+            serialized_actor_args = kwargs.delete(:serialized_actor_args)
+
+            ::ParallelWorkforce.configuration.redis_connector.with do |redis|
+              redis.setex(
+                build_serialized_actor_args_key(kwargs[:result_key], kwargs[:index]),
+                ::ParallelWorkforce.configuration.job_key_expiration,
+                serialized_actor_args,
+              )
+            end
+
+            send(
+              enqueue_method,
+              **kwargs,
+            )
+          end
+        end
+
+        def invoke_performer(args)
+          args.transform_keys!(&:to_sym)
+
+          serialized_actor_args = ParallelWorkforce.configuration.redis_connector.with do |redis|
+            serialized_actor_args_key = self.class.build_serialized_actor_args_key(args[:result_key], args[:index])
+
+            redis.getset(serialized_actor_args_key, nil).tap do
+              redis.del(serialized_actor_args_key)
+            end
+          end
+
+          raise "Unable to locate serialized data required for Performer" if serialized_actor_args.nil?
+
+          args[:serialized_actor_args] = serialized_actor_args
+
+          ParallelWorkforce::Job::Util::Performer.new(**args).perform
+        end
+
+        def invoke_performer_with_time_zone_name(args)
+          args.transform_keys!(&:to_sym)
+
+          Time.use_zone(args.delete(:time_zone_name)) do
+            invoke_performer(args)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/parallel_workforce/requires.rb

@@ -2,6 +2,7 @@ require_relative "version"
 require_relative "executor"
 require_relative "configuration"
 require_relative "job/util/performer"
+require_relative "job/util/job_helper"
 require_relative "redis_connector/redis_pool"
 require_relative "revision_builder/files_hash"
 require_relative "serializer/marshal"

data/lib/parallel_workforce/version.rb

@@ -1,3 +1,3 @@
 module ParallelWorkforce
-  VERSION = "2.0.0".freeze
+  VERSION = "3.0.0".freeze
 end

data/parallel_workforce.gemspec

@@ -44,5 +44,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "~> 0.65"
   spec.add_development_dependency "rubocop-rspec", "~> 1.32"
   spec.add_development_dependency "sidekiq", "~> 4.0"
+  spec.add_development_dependency "timecop", "~> 0.9"
 end
 # rubocop:enable Metrics/BlockLength

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_workforce
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Michael Pearce
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-12 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: Simplify parallel code execution into workers.
 email:
 - michael.p@enjoy.com
@@ -163,6 +177,7 @@ files:
 - lib/parallel_workforce/job/active_job_rails.rb
 - lib/parallel_workforce/job/sidekiq.rb
 - lib/parallel_workforce/job/sidekiq_rails.rb
+- lib/parallel_workforce/job/util/job_helper.rb
 - lib/parallel_workforce/job/util/performer.rb
 - lib/parallel_workforce/redis_connector/redis_pool.rb
 - lib/parallel_workforce/redis_connector/sidekiq_redis_pool.rb
@@ -194,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Simplify parallel code execution into workers