chained_job 0.4.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2754a3795b49b29119699d834fa7fd30a3618c5c9b9e4e13c0d806f1e681b1c7
-  data.tar.gz: cd5a4e01156701bb5c232a67d1731bc592b4caafd3bc1c09ec11e23acb10efd3
+  metadata.gz: 818800b980eebd353e45811df72d640740f5fc2e5cd994f5d3e1297151e4c0b8
+  data.tar.gz: 11262d0b15f247b32db77e76590186aabe332e39f9dabef876e2db015bb3f714
 SHA512:
-  metadata.gz: 012b685a5f4b0a457d70125e4d49f1fba4634650ec8b684d34cffafe35b4327807de56670ec6026ec87a773fdb641477452474205629104be846d6757ff9444c
-  data.tar.gz: 122694c013a12d28b1c781b8b593bcf7e1dd40209642d8c3879a69821792c0258dadaf0f7b3b1dd06990ae802489256699a42abbb8eed2cadbfe2e3efc0099dc
+  metadata.gz: 1d3598a379c3e8a19cd16e1004cca085a6736f258173c918d0d39a8bd4b7a0cfd283797fc3412d017dbde0efcb2080595344f01ba358ff421cd5e2a1b6e754e3
+  data.tar.gz: d144c5e5f36895ca6d80eb2d8df85a52149036d2b3cffd6829e9ffb37d89c5615f7b074996d6c0237f32eedcdf031baf24fc7788aeba073cb3bf6bc81c6f1a9f

data/lib/chained_job/clean_up_queue.rb

@@ -4,16 +4,16 @@ require 'chained_job/helpers'
 
 module ChainedJob
   class CleanUpQueue
-    def self.run(job_class)
-      new(job_class).run
+    def self.run(job_arguments_key)
+      new(job_arguments_key).run
     end
 
     TRIM_STEP_SIZE = 1_000
 
-    attr_reader :job_class
+    attr_reader :job_arguments_key
 
-    def initialize(job_class)
-      @job_class = job_class
+    def initialize(job_arguments_key)
+      @job_arguments_key = job_arguments_key
     end
 
     # rubocop:disable Metrics/AbcSize
@@ -39,7 +39,7 @@ module ChainedJob
     end
 
     def job_key
-      @job_key ||= Helpers.job_key(job_class)
+      @job_key ||= Helpers.job_key(job_arguments_key)
     end
   end
 end

data/lib/chained_job/helpers.rb

@@ -4,8 +4,8 @@ module ChainedJob
   module Helpers
     module_function
 
-    def job_key(job_class)
-      "chained_job:#{job_class}"
+    def job_key(job_arguments_key)
+      "chained_job:#{job_arguments_key}"
     end
 
     def redis_key(job_key, tag)

data/lib/chained_job/middleware.rb

@@ -9,16 +9,20 @@ module ChainedJob
       base.queue_as ChainedJob.config.queue if ChainedJob.config.queue
     end
 
-    def perform(worker_id = nil, tag = nil)
+    def perform(args = {}, worker_id = nil, tag = nil)
+      unless Hash === args
+        # backward compatibility
+        args, worker_id, tag = {}, args, worker_id
+      end
       if worker_id
-        ChainedJob::Process.run(self, worker_id, tag)
+        ChainedJob::Process.run(args, self, job_arguments_key, worker_id, tag)
       else
-        ChainedJob::StartChains.run(self.class, arguments_array, parallelism)
+        ChainedJob::StartChains.run(args, self.class, job_arguments_key, arguments_array(args), parallelism)
       end
     end
 
-    def arguments_array
-      options = { job_class: self.class }
+    def arguments_array(args)
+      options = { job_class: self.class, args: args }
       ChainedJob.config.around_array_of_job_arguments.call(options) { array_of_job_arguments }
     end
 
@@ -29,5 +33,9 @@ module ChainedJob
     def parallelism
       raise NoMethodError, 'undefined method parallelism'
     end
+
+    def job_arguments_key
+      self.class
+    end
   end
 end

data/lib/chained_job/process.rb

@@ -4,14 +4,16 @@ require 'chained_job/helpers'
 
 module ChainedJob
   class Process
-    def self.run(job_instance, worker_id, job_tag)
-      new(job_instance, worker_id, job_tag).run
+    def self.run(args, job_instance, job_arguments_key, worker_id, job_tag)
+      new(args, job_instance, job_arguments_key, worker_id, job_tag).run
     end
 
-    attr_reader :job_instance, :worker_id, :job_tag
+    attr_reader :args, :job_instance, :job_arguments_key, :worker_id, :job_tag
 
-    def initialize(job_instance, worker_id, job_tag)
+    def initialize(args, job_instance, job_arguments_key, worker_id, job_tag)
+      @args = args
       @job_instance = job_instance
+      @job_arguments_key = job_arguments_key
       @worker_id = worker_id
       @job_tag = job_tag
     end
@@ -21,7 +23,7 @@ module ChainedJob
         return finished_worker unless argument
 
         job_instance.process(argument)
-        job_instance.class.perform_later(worker_id, job_tag)
+        job_instance.class.perform_later(args, worker_id, job_tag)
       end
     end
 
@@ -32,7 +34,7 @@ module ChainedJob
     end
 
     def options
-      @options ||= { job_class: job_instance.class, worker_id: worker_id }
+      @options ||= { job_class: job_instance.class, worker_id: worker_id, args: args }
     end
 
     def finished_worker
@@ -48,7 +50,19 @@ module ChainedJob
     end
 
     def argument
-      @argument ||= ChainedJob.redis.lpop(redis_key)
+      @argument ||= deserialized_argument
+    end
+
+    def deserialized_argument
+      return unless serialized_argument
+
+      Marshal.load(serialized_argument)
+    end
+
+    def serialized_argument
+      return @serialized_argument if defined?(@serialized_argument)
+
+      @serialized_argument = ChainedJob.redis.lpop(redis_key)
     end
 
     def redis_key
@@ -56,7 +70,7 @@ module ChainedJob
     end
 
     def job_key
-      Helpers.job_key(job_instance.class)
+      Helpers.job_key(job_arguments_key)
     end
   end
 end

data/lib/chained_job/start_chains.rb

@@ -6,14 +6,16 @@ require 'chained_job/store_job_arguments'
 
 module ChainedJob
   class StartChains
-    def self.run(job_class, array_of_job_arguments, parallelism)
-      new(job_class, array_of_job_arguments, parallelism).run
+    def self.run(args, job_class, job_arguments_key, array_of_job_arguments, parallelism)
+      new(args, job_class, job_arguments_key, array_of_job_arguments, parallelism).run
     end
 
-    attr_reader :job_class, :array_of_job_arguments, :parallelism
+    attr_reader :args, :job_class, :job_arguments_key, :array_of_job_arguments, :parallelism
 
-    def initialize(job_class, array_of_job_arguments, parallelism)
+    def initialize(args, job_class, job_arguments_key, array_of_job_arguments, parallelism)
+      @args = args
       @job_class = job_class
+      @job_arguments_key = job_arguments_key
       @array_of_job_arguments = array_of_job_arguments
       @parallelism = parallelism
     end
@@ -23,15 +25,15 @@ module ChainedJob
       with_hooks do
         log_chained_job_cleanup
 
-        ChainedJob::CleanUpQueue.run(job_class)
+        ChainedJob::CleanUpQueue.run(job_arguments_key)
 
         next unless array_of_job_arguments.count.positive?
 
-        ChainedJob::StoreJobArguments.run(job_class, job_tag, array_of_job_arguments)
+        ChainedJob::StoreJobArguments.run(job_arguments_key, job_tag, array_of_job_arguments)
 
         log_chained_job_start
 
-        parallelism.times { |worked_id| job_class.perform_later(worked_id, job_tag) }
+        parallelism.times { |worked_id| job_class.perform_later(args, worked_id, job_tag) }
       end
     end
     # rubocop:enable Metrics/AbcSize
@@ -47,6 +49,7 @@ module ChainedJob
         job_class: job_class,
         array_of_job_arguments: array_of_job_arguments,
         parallelism: parallelism,
+        args: args,
       }
     end
 

data/lib/chained_job/store_job_arguments.rb

@@ -4,14 +4,14 @@ require 'chained_job/helpers'
 
 module ChainedJob
   class StoreJobArguments
-    def self.run(job_class, job_tag, array_of_job_arguments)
-      new(job_class, job_tag, array_of_job_arguments).run
+    def self.run(job_arguments_key, job_tag, array_of_job_arguments)
+      new(job_arguments_key, job_tag, array_of_job_arguments).run
     end
 
-    attr_reader :job_class, :job_tag, :array_of_job_arguments
+    attr_reader :job_arguments_key, :job_tag, :array_of_job_arguments
 
-    def initialize(job_class, job_tag, array_of_job_arguments)
-      @job_class = job_class
+    def initialize(job_arguments_key, job_tag, array_of_job_arguments)
+      @job_arguments_key = job_arguments_key
       @job_tag = job_tag
       @array_of_job_arguments = array_of_job_arguments
     end
@@ -20,7 +20,7 @@ module ChainedJob
       set_tag_list
 
       array_of_job_arguments.each_slice(config.arguments_batch_size) do |sublist|
-        ChainedJob.redis.rpush(redis_key, sublist)
+        ChainedJob.redis.rpush(redis_key, serialize(sublist))
       end
 
       ChainedJob.redis.expire(redis_key, config.arguments_queue_expiration)
@@ -41,7 +41,11 @@ module ChainedJob
     end
 
     def job_key
-      @job_key ||= Helpers.job_key(job_class)
+      @job_key ||= Helpers.job_key(job_arguments_key)
+    end
+
+    def serialize(arguments)
+      arguments.map { |argument| Marshal.dump(argument) }
     end
 
     def config

data/lib/chained_job/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ChainedJob
-  VERSION = '0.4.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chained_job
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Mantas Kūjalis
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -53,25 +53,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-vinted
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
 description: Chained job allows you to define an array of queued jobs that should
   be run in sequence after the main job has been executed successfully.
 email:
-- mantas.kujalis@vinted.com
-- titas@vinted.com
+- backend@vinted.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -104,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Chained job helper