batch_processor 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 659c17a5da038f05a3389309e38dc00c745eb144ebbdc77e819b992e11cba118
-  data.tar.gz: bcfddd2409ef06579935cc2ecad1093ab9e79dec5ae9838c72724111889f9e32
+  metadata.gz: d8f0faec9d505307050df1903ac8804fe7978a6b02fb6244955a1e421775002a
+  data.tar.gz: 326e449ba11aedb79606c2b47aa232b4205724a6822cdbb709b65f3b8177674f
 SHA512:
-  metadata.gz: 5f88746b5e3f0ac7f7c432b46f3150a73a34286da3008bd0e1db5eb07bdcd72631411ba845a6f8a5d873518b6fdcc14fd63a548b55409ee9015004c8edf41901
-  data.tar.gz: 8ca4cf75df4cad82fa59a364d635679db1275658f19bcf49126257eaf6574dd0733404edab0007f94c21a1a4cd4062a2af868660d00e8fa9f800041a25f83951
+  metadata.gz: 1e0201cbb2edb12428adb676f2b19177a83153de3612372f8d80755bd3278ecf222ab44107835c2d16c6629be6109f2685f5bc4fdc7364fa04ba4d9187979109
+  data.tar.gz: 5c97dae7e460fc3e1e19216befee5b1e09a1d91a540150ce232722898fda74b217c72023a7534e5e54e2d51031a3a9bc1c8ada21d88f498de499ff6f9a0b927b

data/lib/batch_processor/batch/controller.rb

@@ -33,12 +33,8 @@ module BatchProcessor
         private
 
         def batch_callbacks(*events)
-          batch_events = events.map { |event| "batch_#{event}".to_sym }
-
-          define_callbacks_with_handler(*batch_events)
-
-          batch_events.each do |batch_event|
-            set_callback batch_event, :around, ->(_, block) { surveil(batch_event) { block.call } }
+          define_callbacks_for(*events, :batch).each do |batch_event|
+            set_callback batch_event, :around, ->(_, block) { surveil(batch_event, batch_id: batch_id) { block.call } }
           end
         end
       end

data/lib/batch_processor/batch/core.rb

@@ -42,6 +42,14 @@ module BatchProcessor
 
           batch_class.new(batch_id: batch_id)
         end
+
+        private
+
+        def define_callbacks_for(*events, type)
+          callbacks = events.map { |event| "#{type}_#{event}".to_sym }
+          define_callbacks_with_handler(*callbacks)
+          callbacks
+        end
       end
     end
   end

data/lib/batch_processor/batch/job_controller.rb

@@ -10,12 +10,8 @@ module BatchProcessor
         private
 
         def job_callbacks(*events)
-          job_events = events.map { |event| "job_#{event}".to_sym }
-
-          define_callbacks_with_handler(*job_events)
-
-          job_events.each do |job_event|
-            set_callback job_event, :around, ->(_, block) { surveil(job_event) { block.call } }
+          define_callbacks_for(*events, :job).each do |job_event|
+            set_callback job_event, :around, ->(_, block) { surveil(job_event, batch_id: batch_id) { block.call } }
           end
         end
       end

data/lib/batch_processor/batch_job.rb

@@ -5,6 +5,8 @@ module BatchProcessor
   class BatchJob < ActiveJob::Base
     attr_accessor :batch_id
 
+    include Technologic
+
     class BatchAbortedError < StandardError; end
 
     after_enqueue(if: :batch_job?) do |job|
@@ -26,7 +28,10 @@ module BatchProcessor
     def rescue_with_handler(exception)
       batch.job_canceled and return exception if exception.is_a?(BatchAbortedError)
 
-      batch.job_failure if batch_job?
+      if batch_job?
+        error :batch_job_failed, exception: exception, job_id: job_id
+        batch.job_failure
+      end
 
       super
     end

data/lib/batch_processor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BatchProcessor
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batch_processor
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Eric Garside
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-24 00:00:00.000000000 Z
+date: 2019-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.14.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -68,7 +68,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.14.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'