chained_job 0.2.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21a653ae3a0eaaf596d741a3208b4aee1a7d297700e1d506c7005bf7cd529618
-  data.tar.gz: 03ab75c95d0610a9f192d3f6f7bfc7eeac516f641b4bbc32730ac45d1710f3bc
+  metadata.gz: dd4890f548ef2ee47ff48180b593134f61b83fedc9017733346ab15d518d2c8d
+  data.tar.gz: c315bdee23b062ba3834bd23f8fcf18f07b8c7ca111dff9082d1bd251a5071e7
 SHA512:
-  metadata.gz: fb6be468a09e6824fb2dd21fd8aa8029790a63c145d9f5048b5c29dea2632e85e6b6ebcfb29558e7504982a4ad48261140e6b96b3b8e4ef55726d58a18ed58c0
-  data.tar.gz: 75a1aefe58b764b69d05514bfa47209ec4ff9d3f743379301841d132e15fc60c34f6254e0fae7dfacbca393c973f4ad2809dffcfb5a7041a42e62d3155a95857
+  metadata.gz: 0205f904ea84911f3258ac4798f52077c9e61e6850165db93b01b461ecbbf734d385093741211583aabddffcdda4e2cd4bc560ec10033dde9d5467f0232a28f5
+  data.tar.gz: 1e65c4a589d8db54ab53a76d80da2049a619945ed4a75428edf8aba28309a3e90b9ec222bb916fcd43842c945c38bf7fa9b881e9a5e2adefc90be92562fcf4eb

data/lib/chained_job/config.rb

@@ -12,6 +12,8 @@ module ChainedJob
       :arguments_queue_expiration,
       :around_start_chains,
       :around_chain_process,
+      :around_array_of_job_arguments,
+      :after_worker_finished,
       :debug,
       :logger,
       :redis,
@@ -26,6 +28,8 @@ module ChainedJob
 
       self.around_start_chains = ->(_options, &block) { block.call }
       self.around_chain_process = ->(_options, &block) { block.call }
+      self.around_array_of_job_arguments = ->(_options, &block) { block.call }
+      self.after_worker_finished = ->(_options) {}
 
       self.debug = true
     end

data/lib/chained_job/middleware.rb

@@ -13,10 +13,15 @@ module ChainedJob
       if worker_id
         ChainedJob::Process.run(self, worker_id, tag)
       else
-        ChainedJob::StartChains.run(self.class, array_of_job_arguments, parallelism)
+        ChainedJob::StartChains.run(self.class, arguments_array, parallelism)
       end
     end
 
+    def arguments_array
+      options = { job_class: self.class }
+      ChainedJob.config.around_array_of_job_arguments.call(options) { array_of_job_arguments }
+    end
+
     def array_of_job_arguments
       raise NoMethodError, 'undefined method array_of_job_arguments'
     end

data/lib/chained_job/process.rb

@@ -18,7 +18,7 @@ module ChainedJob
 
     def run
       with_hooks do
-        return log_finished_worker unless argument
+        return finished_worker unless argument
 
         job_instance.process(argument)
         job_instance.class.perform_later(worker_id, job_tag)
@@ -32,7 +32,13 @@ module ChainedJob
     end
 
     def options
-      { job_class: job_instance.class, worker_id: worker_id }
+      @options ||= { job_class: job_instance.class, worker_id: worker_id }
+    end
+
+    def finished_worker
+      log_finished_worker
+
+      ChainedJob.config.after_worker_finished&.call(options)
     end
 
     def log_finished_worker
@@ -42,7 +48,20 @@ module ChainedJob
     end
 
     def argument
-      @argument ||= ChainedJob.redis.lpop(redis_key)
+      @argument ||= deserialized_argument
+    end
+
+    def deserialized_argument
+      Marshal.load(serialized_argument)
+    rescue TypeError, ArgumentError
+      # backward compatibility
+      serialized_argument
+    end
+
+    def serialized_argument
+      return @serialized_argument if defined?(@serialized_argument)
+
+      @serialized_argument = ChainedJob.redis.lpop(redis_key)
     end
 
     def redis_key

data/lib/chained_job/start_chains.rb

@@ -21,6 +21,8 @@ module ChainedJob
     # rubocop:disable Metrics/AbcSize
     def run
       with_hooks do
+        log_chained_job_cleanup
+
         ChainedJob::CleanUpQueue.run(job_class)
 
         next unless array_of_job_arguments.count.positive?
@@ -58,5 +60,11 @@ module ChainedJob
         "processing #{array_of_job_arguments.count} items"
       )
     end
+
+    def log_chained_job_cleanup
+      ChainedJob.logger.info(
+        "#{job_class}:#{job_tag} cleanup"
+      )
+    end
   end
 end

data/lib/chained_job/store_job_arguments.rb

@@ -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)
@@ -44,6 +44,10 @@ module ChainedJob
       @job_key ||= Helpers.job_key(job_class)
     end
 
+    def serialize(arguments)
+      arguments.map { |argument| Marshal.dump(argument) }
+    end
+
     def config
       ChainedJob.config
     end

data/lib/chained_job/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chained_job
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Mantas Kūjalis
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2021-04-22 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