angry_batch 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b40c1e274e731164e81dc6066fab25c89cb62a6bc9aac8bc2332a3387c061282
-  data.tar.gz: 22999450f01bb673c9729c48a1e52190a2f67771d9a1fe9ef2079f0b622f2780
+  metadata.gz: 8363c90cc908a4ae3fa64957ebfc422580dd91041dfd32d0d2eb7607e9130a62
+  data.tar.gz: b83a95d6938a4ad2e2cc20d3e7fc9edbd0f998e7c1256749d7c2ba6c90f22a04
 SHA512:
-  metadata.gz: fe4deb92e43765b17ab14f2ae0edc013549dc0451c29c79a59661f8e0872fbb129d274d5c9f546e17ce40fdf9fb4c4a9b9aee0bf42a0bc7389efef3649ea75a7
-  data.tar.gz: 12b57e37c3fc89e7b912b2d6907ef89bd97777b3b4656eeb28529b4a8466b416e949b1ab40f5159ba15c59f0728e963dc55d1246bd3af5f28ca0b78b222fbc81
+  metadata.gz: 1ab00df9aef51980652bb56151d43ce16af63aa58a2e41f31badcb90f50b2687c9e74e119f6d77fa9f3113f6fb88aa441e2e0988275ef732942ab20f8f73f2e0
+  data.tar.gz: bba22c7ff6de71cdd1bfe285aeaead5163140536a19e2142e1e163b57dcec50ec0262519b2148a7ebed2db30cc4274d16200c6d0e576372684bf3633568e150a

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Version 1.0.1 - 2026-05-11
+
+- Handle job failures via `after_discard` hook — marks job as `failed` and stores error message
+- Bug fixes
+
 ## Version 1.0.0 - 2025-07-20
 
 - Initial release

data/README.md

@@ -1,9 +1,9 @@
 # AngryBatch
 
 ![Build Status](https://github.com/RStankov/AngryBatch/actions/workflows/main.yml/badge.svg)
+[![Gem Version](https://badge.fury.io/rb/angry_batch.svg)](http://badge.fury.io/rb/angry_batch)
 
-
-**AngryBatch** is a lightweight batching utility for [ActiveJob](https://guides.rubyonrails.org/active_job_basics.html) that lets you group multiple jobs into a batch and trigger follow-up jobs when all jobs in the batch are done.
+**AngryBatch** is a batching utility for [ActiveJob](https://guides.rubyonrails.org/active_job_basics.html) that lets you group multiple jobs into a batch and trigger follow-up jobs when all jobs in the batch are done.
 
 ## Installation
 
@@ -61,6 +61,14 @@ queue.enqueue SomeJob, argument3
 in the queue.perform_later
 ```
 
+### Cleaning completed jobs
+
+`AngryBatch` stores jobs in the database. You have to run `AngryBatch::CleanupCronJob` in a cron to clean the records.
+
+```
+AngryBatch::CleanupCronJob.perform
+```
+
 ### Example
 
 **Example 1**

data/lib/angry_batch/batch.rb

@@ -32,40 +32,36 @@ class AngryBatch::Batch < ActiveRecord::Base
 
   class << self
     def expired
-      completed = where('state = ? AND updated_at < ?', :completed, 2.days.ago)
-      failed = where('state = ? AND updated_at < ?', :failed, 4.weeks.ago)
-      pending = where('state = ? AND updated_at < ?', :pending, 4.weeks.ago)
-
-      completed.or(failed).or(pending)
+      completed.where(updated_at: ...2.days.ago)
+        .or(failed.where(updated_at: ...4.weeks.ago))
+        .or(pending.where(updated_at: ...4.weeks.ago))
     end
   end
 
   def check_status_of_jobs
-    return unless pending?
-    return unless jobs_count == jobs.finished.count
-
-    self.finished_at = Time.current
+    handlers_to_enqueue = with_lock do
+      return unless pending?
+      return unless jobs_count == jobs.finished.count
 
-    if jobs.failed.none?
-      update! state: 'completed'
+      self.finished_at = Time.current
 
-      enqueue_handlers(complete_handlers)
-    else
-      update! state: 'failed'
-
-      enqueue_handlers(failure_handlers)
+      if jobs.failed.none?
+        update! state: 'completed'
+        complete_handlers
+      else
+        update! state: 'failed'
+        failure_handlers
+      end
     end
+
+    enqueue_handlers(handlers_to_enqueue)
   end
 
   private
 
   def enqueue_handlers(handlers)
     handlers.each do |(job_class, job_arguments)|
-      if job_arguments.nil?
-        job_class.constantize.perform_later
-      else
-        job_class.constantize.perform_later(*ActiveJob::Arguments.deserialize(job_arguments))
-      end
+      job_class.constantize.perform_later(*ActiveJob::Arguments.deserialize(job_arguments || []))
     end
   end
 end

data/lib/angry_batch/batchable.rb

@@ -5,5 +5,9 @@ module AngryBatch::Batchable
     base.after_perform do |job|
       AngryBatch::Handle.job_completed(job)
     end
+
+    base.after_discard do |job, exception|
+      AngryBatch::Handle.job_failed(job, exception)
+    end
   end
 end

data/lib/angry_batch/builder.rb

@@ -9,31 +9,32 @@ class AngryBatch::Builder
       failure_handlers: [],
     )
     @jobs = []
+    @performed = false
   end
 
   def performed?
-    @batch.persisted?
+    @performed
   end
 
   delegate :empty?, to: :@jobs
 
   def on_complete(job_class, *, **)
     raise AngryBatch::BatchArgumentError, 'Batch is already running' if performed?
-    raise AngryBatch::BatchArgumentError, "#{job_class} be a subclass of ActiveJob::Base" unless job_class.is_a?(Class) && job_class < ActiveJob::Base
+    raise AngryBatch::BatchArgumentError, "#{job_class} must be a subclass of ActiveJob::Base" unless job_class.is_a?(Class) && job_class < ActiveJob::Base
 
     @batch.complete_handlers << [job_class, job_class.new(*, **).serialize['arguments']]
   end
 
   def on_failure(job_class, *, **)
     raise AngryBatch::BatchArgumentError, 'Batch is already running' if performed?
-    raise AngryBatch::BatchArgumentError, "#{job_class} be a subclass of ActiveJob::Base" unless job_class.is_a?(Class) && job_class < ActiveJob::Base
+    raise AngryBatch::BatchArgumentError, "#{job_class} must be a subclass of ActiveJob::Base" unless job_class.is_a?(Class) && job_class < ActiveJob::Base
 
     @batch.failure_handlers << [job_class, job_class.new(*, **).serialize['arguments']]
   end
 
   def enqueue(job_class, *, **)
-    raise AngryBatch::BatchArgumentError, 'Batch is already running' unless @batch.new_record?
-    raise AngryBatch::BatchArgumentError, "#{job_class} be a subclass of ActiveJob::Base" unless job_class.is_a?(Class) && job_class < ActiveJob::Base
+    raise AngryBatch::BatchArgumentError, 'Batch is already running' if performed?
+    raise AngryBatch::BatchArgumentError, "#{job_class} must be a subclass of ActiveJob::Base" unless job_class.is_a?(Class) && job_class < ActiveJob::Base
     raise AngryBatch::BatchArgumentError, "#{job_class} must include AngryBatch::Batchable" unless job_class.included_modules.include?(AngryBatch::Batchable)
 
     @jobs << job_class.new(*, **)
@@ -43,20 +44,32 @@ class AngryBatch::Builder
     raise AngryBatch::BatchArgumentError, 'Batch is empty' if empty?
     raise AngryBatch::BatchArgumentError, 'Batch is already running' if performed?
 
-    @batch.save!
+    ActiveRecord::Base.transaction(requires_new: true) do
+      @batch.save!
 
-    @jobs.each do |job|
-      @batch.jobs.create!(
-        active_job_idx: job.job_id,
-        active_job_class: job.class.name,
-        active_job_arguments: job.serialize['arguments'],
-      )
+      @jobs.each do |job|
+        @batch.jobs.create!(
+          active_job_idx: job.job_id,
+          active_job_class: job.class.name,
+          active_job_arguments: job.serialize['arguments'],
+        )
+      end
 
-      job.enqueue
+      @batch.update!(state: 'pending')
     end
 
-    @batch.update!(state: 'pending')
-    @batch.reload
+    @performed = true
+    @jobs.each(&:enqueue)
     @batch.check_status_of_jobs
+  rescue
+    unless @performed
+      @batch = AngryBatch::Batch.new(
+        label: @batch.label,
+        state: 'scheduling',
+        complete_handlers: @batch.complete_handlers,
+        failure_handlers: @batch.failure_handlers,
+      )
+    end
+    raise
   end
 end

data/lib/angry_batch/handle.rb

@@ -9,9 +9,29 @@ module AngryBatch::Handle
     return if record.blank?
 
     record.with_lock do
+      return if record.failed?
+
       record.update!(state: 'completed')
     end
 
-    record.batch.check_status_of_jobs
+    record.batch&.check_status_of_jobs
+  rescue ActiveRecord::RecordNotFound
+    nil
+  end
+
+  def job_failed(job, exception = nil)
+    record = AngryBatch::Job.find_by(active_job_idx: job.job_id)
+
+    return if record.blank?
+
+    record.with_lock do
+      return if record.completed?
+
+      record.update!(state: 'failed', error_message: exception&.message)
+    end
+
+    record.batch&.check_status_of_jobs
+  rescue ActiveRecord::RecordNotFound
+    nil
   end
 end

data/lib/angry_batch/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AngryBatch
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: angry_batch
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Radoslav Stankov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-07-20 00:00:00.000000000 Z
+date: 2026-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -259,7 +259,6 @@ files:
 - lib/angry_batch/version.rb
 - lib/generators/angry_batch/install_generator.rb
 - lib/generators/angry_batch/templates/create_angry_batch_tables.rb
-- sig/angry_batch.rbs
 homepage: https://github.com/RStankov/AngryBatch
 licenses:
 - MIT

data/sig/angry_batch.rbs

@@ -1,4 +0,0 @@
-module AngryBatch
-  VERSION: String
-  # See the writing guide of rbs: https://github.com/ruby/rbs#guides
-end