acidic_job 1.0.0.beta.1 → 1.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85bf301347e6dc78c6c2522dc435e3feec6c06aa79f3b0031b29b7d3300a2f9f
-  data.tar.gz: e0ee892b3e137e50cd4b0dcfcbf16c5a4800bc50e85d934a5b766dee477a0043
+  metadata.gz: d0e5e42007b9069a560d15f86869a6ba8efb9a45866b39d1ba761917f81188ba
+  data.tar.gz: bdfe50d3598ed4466e9c9b5033e53619e0a4c43fb7dbc3c8b869876ad9d57f40
 SHA512:
-  metadata.gz: 10da5b0f01d6b852cc5d083e4671e94707b600a0f95b7122b0f5f249ef71117fbdb77efb988daa7aa02a35ff013f923258ea0463aa2e37a1e21be45ad2be63f5
-  data.tar.gz: 210ff73c0292333978d488e8c31869db626df35f0ca64f728c9ec8b3e867938a52b4ab59bb95a6334a469223bdd5f0c188f9a241e92f07b8383e635c16b1cdaf
+  metadata.gz: 17c7a98093f52614d0c071ef947f2fe6ea361843d3f0d494451b4f77966e3d67d1a53ef37ad75bc229a97ccb898a3cb2d193642f5bae906cd333181e34177f48
+  data.tar.gz: be58b523f666a0d0bec5adef39929441cc1cedc7e0b9f2d5f6cb3ba541284b4ba6b33c76e5a03afa6129fd0ac4658753d2b8d2a210b7be5b1c9847e98478c10e

data/.github/workflows/main.yml

@@ -10,7 +10,8 @@ jobs:
       fail-fast: false
       matrix:
         ruby: ["2.7", "3.0", "3.1"]
-        rails: [ "6.1", "7.0" ]
+        rails: ["6.1", "7.0"]
+        sidekiq: ["6.4", "6.5"]
     services:
       redis:
         image: redis
@@ -23,7 +24,7 @@ jobs:
           - 6379:6379
           
     env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails }}.gemfile
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails }}_sidekiq_${{ matrix.sidekiq }}.gemfile
 
     steps:
       - uses: actions/checkout@v2

data/.gitignore

@@ -14,4 +14,4 @@ slides.md
 /database.sqlite
 /test/combustion/database.sqlite
 /test/combustion/log/test.log
-/gemfiles/rails_6.1.gemfile.lock
+/gemfiles/*.lock

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    acidic_job (1.0.0.beta.1)
+    acidic_job (1.0.0.beta.2)
       activejob
       activerecord
       activesupport
@@ -146,8 +146,6 @@ GEM
     parallel (1.22.1)
     parser (3.1.2.0)
       ast (~> 2.4.1)
-    psych (4.0.4)
-      stringio
     public_suffix (4.0.7)
     racc (1.6.0)
     rack (2.2.4)
@@ -201,10 +199,10 @@ GEM
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
-    sidekiq (6.5.1)
+    sidekiq (6.5.3)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
-      redis (>= 4.2.0)
+      redis (>= 4.5.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -212,7 +210,6 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     sqlite3 (1.4.4)
-    stringio (3.0.2)
     strscan (3.0.3)
     thor (1.2.1)
     timeout (0.3.0)
@@ -222,7 +219,6 @@ GEM
       unf_ext
     unf_ext (0.0.8.2)
     unicode-display_width (2.2.0)
-    warning (1.3.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -238,7 +234,6 @@ DEPENDENCIES
   minitest
   net-smtp
   noticed
-  psych (> 4.0)
   railties
   rake
   rubocop
@@ -247,7 +242,6 @@ DEPENDENCIES
   sidekiq
   simplecov
   sqlite3
-  warning
 
 BUNDLED WITH
-   2.2.32
+   2.3.19

data/README.md

@@ -3,9 +3,9 @@
 [![Gem Version](https://badge.fury.io/rb/acidic_job.svg)](https://badge.fury.io/rb/acidic_job)
 ![main workflow](https://github.com/fractaledmind/acidic_job/actions/workflows/main.yml/badge.svg)
 
-### Idempotent operations for Rails apps (for ActiveJob or Sidekiq)
+## Idempotent operations for Rails apps (for ActiveJob or Sidekiq)
 
-At the conceptual heart of basically any software are "operations"—the discrete actions the software performs. Rails provides a powerful abstraction layer for building operations in the form of `ActiveJob`, or we Rubyists can use the tried and true power of pure `Sidekiq`. With either we can easily trigger from other Ruby code throughout our Rails application (controller actions, model methods, model callbacks, etc.); we can run operations both synchronously (blocking execution and then returning its response to the caller) and asychronously (non-blocking and the caller doesn't know its response); and we can also retry a specific operation if needed seamlessly.
+At the conceptual heart of basically any software are "operations"—the discrete actions the software performs. Rails provides a powerful abstraction layer for building operations in the form of `ActiveJob`, or we Rubyists can use the tried and true power of pure `Sidekiq`. With either we can easily trigger operations from other Ruby code throughout our Rails application (controller actions, model methods, model callbacks, etc.); we can run operations both synchronously (blocking execution and then returning its response to the caller) and asychronously (non-blocking and the caller doesn't know its response); and we can also retry a specific operation if needed seamlessly.
 
 However, in order to ensure that our operational jobs are _robust_, we need to ensure that they are properly [idempotent and transactional](https://github.com/mperham/sidekiq/wiki/Best-Practices#2-make-your-job-idempotent-and-transactional). As stated in the [GitLab Sidekiq Style Guide](https://docs.gitlab.com/ee/development/sidekiq_style_guide.html#idempotent-jobs):
 
@@ -15,14 +15,33 @@ However, in order to ensure that our operational jobs are _robust_, we need to e
 
 This is, of course, far easier said than done. Thus, `AcidicJob`.
 
-`AcidicJob` provides a framework to help you make your operational jobs atomic ⚛️, consistent 🤖, isolated 🕴🏼, and durable ⛰️. Its conceptual framework is directly inspired by a truly wonderful loosely collected series of articles written by Brandur Leach, which together lay out core techniques and principles required to make an HTTP API properly ACIDic:
+`AcidicJob` provides a framework to help you make your operational jobs atomic ⚛️, consistent 🤖, isolated 🕴🏼, and durable ⛰️. Its conceptual framework is directly inspired by a truly wonderful loosely collected series of articles written by [Brandur Leach](https://twitter.com/brandur), which together lay out core techniques and principles required to make an HTTP API properly ACIDic:
 
-1. https://brandur.org/acid
-2. https://brandur.org/http-transactions
-3. https://brandur.org/job-drain
-4. https://brandur.org/idempotency-keys
+1. [Building Robust Systems with ACID and Constraints](https://brandur.org/acid)
+2. [Using Atomic Transactions to Power an Idempotent API](https://brandur.org/http-transactions)
+3. [Transactionally Staged Job Drains in Postgres](https://brandur.org/job-drain)
+4. [Implementing Stripe-like Idempotency Keys in Postgres](https://brandur.org/idempotency-keys)
 
-`AcidicJob` brings these techniques and principles into the world of a standard Rails application.
+Seriously, go and read these articles. `AcidicJob` brings these techniques and principles into the world of a standard Rails application, treating your background jobs like an internal API of sorts. It provides a suite of functionality that empowers you to create complex, robust, and _acidic_ jobs.
+
+## Key Features
+
+* **Transactional Steps**  
+    break your job into a series of steps, each of which will be run within an acidic database transaction, allowing retries to jump back to the last "recovery point".
+* **Steps that Await Jobs**  
+    have workflow steps await other jobs, which will be enqueued and processed independently, and only when they all have finished will the parent job be re-enqueued to continue the workflow
+* **Iterable Steps**  
+    define steps that iterate over some collection fully until moving on to the next step
+* **Persisted Attributes**  
+    when retrying jobs at later steps, we need to ensure that data created in previous steps is still available to later steps on retry.
+* **Transactionally Staged Jobs**  
+    enqueue additional jobs within the acidic transaction safely
+* **Custom Idempotency Keys**  
+    use something other than the job ID for the idempotency key of the job run
+* **Sidekiq Callbacks**  
+    bring ActiveJob-like callbacks into your pure Sidekiq Workers
+* **Run Finished Callbacks**  
+    set callbacks for when a job run finishes fully
 
 ## Installation
 
@@ -48,59 +67,45 @@ rails generate acidic_job:install
 
 ## Usage
 
-`AcidicJob` is a concern that you `include` into your base `ApplicationJob`.
+`AcidicJob` brings the most seamless experience when you inject it into every job in your application. This can be done most easily by simply having your `ApplicationJob` inherit from `AcidicJob::Base` (if using `ActiveJob`; inherit from `AcidicJob::ActiveKiq` if using pure Sidekiq workers):
 
 ```ruby
-class ApplicationJob < ActiveJob::Base
-  include AcidicJob
+class ApplicationJob < AcidicJob::Base
 end
 ```
 
-This is useful because the module needs to be mixed into any and all jobs that you want to either make acidic or enqueue acidicly.
+This is useful because the module needs to be mixed into any and all jobs that you want to either [1] make acidic or [2] enqueue acidicly.
 
-It provides a suite of functionality that empowers you to create complex, robust, and _acidic_ jobs.
+If you only want to inject `AcidicJob` into a single job, you can include our concern `AcidicJob::Mixin` instead:
 
-### TL;DR
-
-#### Key Features
+```ruby
+class SomeJob < ApplicationJob
+  include AcidicJob::Mixin
+end
+```
 
-* **Transactional Steps**  
-    break your job into a series of steps, each of which will be run within an acidic database transaction, allowing retries to jump back to the last "recovery point".
-* **Steps that Await Jobs**  
-    have workflow steps await other jobs, which will be enqueued and processed independently, and only when they all have finished will the parent job be re-enqueued to continue the workflow
-* **Iterable Steps**  
-    define steps that iterate over some collection fully until moving on to the next step
-* **Persisted Attributes**  
-    when retrying jobs at later steps, we need to ensure that data created in previous steps is still available to later steps on retry.
-* **Transactionally Staged Jobs**  
-    enqueue additional jobs within the acidic transaction safely
-* **Custom Idempotency Keys**  
-    use something other than the job ID for the idempotency key of the job run
-* **Sidekiq Callbacks**  
-    bring ActiveJob-like callbacks into your pure Sidekiq Workers
-* **Run Finished Callbacks**  
-    set callbacks for when a job run finishes fully
+## Key Features (in depth)
 
 
 ### Transactional Steps
 
-The first and foundational feature `acidic_job` provides is the `with_acidity` method, which takes a block of transactional step methods (defined via the `step`) method:
+The first and foundational feature `acidic_job` provides is the `with_acidic_workflow` method, which takes a block of transactional step methods (defined via the `step`) method:
 
 ```ruby
-class RideCreateJob < ActiveJob::Base
-  include AcidicJob
-
+class RideCreateJob < AcidicJob::Base
   def perform(user_id, ride_params)
     @user = User.find(user_id)
     @params = ride_params
 
-    with_acidity providing: { ride: nil } do
-      step :create_ride_and_audit_record
-      step :create_stripe_charge
-      step :send_receipt
+    with_acidic_workflow persisting: { ride: nil } do |workflow|
+      workflow.step :create_ride_and_audit_record
+      workflow.step :create_stripe_charge
+      workflow.step :send_receipt
     end
   end
 
+  private
+
   def create_ride_and_audit_record
     # ...
   end
@@ -115,43 +120,39 @@ class RideCreateJob < ActiveJob::Base
 end
 ```
 
-`with_acidity` takes only the `providing:` named parameter and a block where you define the steps of this operation. `step` simply takes the name of a method available in the job. That's all!
+`with_acidic_workflow` takes only the `persisting:` named parameter (optionally) and a block (required) where you define the steps of this operation. `step` simply takes the name of a method available in the job. That's all!
 
-Now, each execution of this job will find or create an `AcidicJob::Run` record, which we leverage to wrap every step in a database transaction. Moreover, this database record allows `acidic_job` to ensure that if your job fails on step 3, when it retries, it will simply jump right back to trying to execute the method defined for the 3rd step, and won't even execute the first two step methods. This means your step methods only need to be idempotent on failure, not on success, since they will never be run again if they succeed.
+Now, each execution of this job will find or create an `AcidicJob::Run` record, which we leverage to wrap every step in a database transaction. Moreover, this database record allows us to ensure that if your job fails on step 3, when it retries, it will simply jump right back to trying to execute the method defined for the 3rd step, _**and won't even execute the first two step methods**_. This means your step methods only need to be idempotent on failure, not on success, since they will never be run again if they succeed.
 
 
 ### Steps that Await Jobs
 
-By simply adding the `awaits` option to your step declarations, you can attach any number of additional, asynchronous jobs to your step. This is profoundly powerful, as it means that you can define a workflow where step 2 is started _if and only if_ step 1 succeeds, but step 1 can have 3 different jobs enqueued on 3 different queues, each running in parallel. Once all 3 jobs succeed, `acidic_job` will re-enqueue the parent job and it will move on to step 2. That's right, you can have workers that are _executed in parallel_, **on separate queues**, and _asynchronously_, but are still **blocking**—as a group—the next step in your workflow! This unlocks incredible power and flexibility for defining and structuring complex workflows and operations.
+By simply adding the `awaits` option to your step declarations, you can attach any number of additional, asynchronous jobs to your step. This is profoundly powerful, as it means that you can define a workflow where step 2 is started _if and only if_ step 1 succeeds, but step 1 can have 3 different jobs enqueued on 3 different queues, each running in parallel. Once (and only once) all 3 jobs succeed, `AcidicJob` will re-enqueue the parent job and it will move on to step 2. That's right, you can have workers that are _executed in parallel_, **on separate queues**, and _asynchronously_, but are still **blocking**—as a group—the next step in your workflow! This unlocks incredible power and flexibility for defining and structuring complex workflows and operations.
 
 ```ruby
-class RideCreateJob < ActiveJob::Base
-  include AcidicJob
-
+class RideCreateJob < AcidicJob::Base
   def perform(user_id, ride_params)
     @user = User.find(user_id)
     @params = ride_params
 
-    with_acidity providing: { ride: nil } do
-      step :create_ride_and_audit_record, awaits: [SomeJob, AnotherJob]
-      step :create_stripe_charge
-      step :send_receipt
+    with_acidic_workflow persisting: { ride: nil } do |workflow|
+      workflow.step :create_ride_and_audit_record, awaits: [SomeJob, AnotherJob]
+      workflow.step :create_stripe_charge
+      workflow.step :send_receipt
     end
   end
 end
 ```
 
-If you need to await a job that takes arguments, you can prepare that job along with its arguments using the `with` class method that `acidic_job` will add to your jobs:
+If you need to await a job that takes arguments, you can prepare that job along with its arguments using the `with` class method that `AcidicJob` will add to your jobs:
 
 ```ruby
-class RideCreateJob < ActiveJob::Base
-  include AcidicJob
-
+class RideCreateJob < AcidicJob::Base
   def perform(user_id, ride_params)
     @user = User.find(user_id)
     @params = ride_params
 
-    with_acidity providing: { ride: nil } do
+    with_acidic_workflow persisting: { ride: nil } do |workflow|
       step :create_ride_and_audit_record, awaits: awaits: [SomeJob.with('argument_1', keyword: 'value'), AnotherJob.with(1, 2, 3, some: 'thing')]
       step :create_stripe_charge
       step :send_receipt
@@ -165,21 +166,20 @@ If your step awaits multiple jobs (e.g. `awaits: [SomeJob, AnotherJob.with('argu
 In some cases, you may need to _dynamically_ determine the collection of jobs that the step should wait for; in these cases, you can pass the name of a method to the `awaits` option:
 
 ```ruby
-class RideCreateJob < ActiveJob::Base
-  include AcidicJob
-  set_callback :finish, :after, :delete_run_record
-
+class RideCreateJob < AcidicJob::Base
   def perform(user_id, ride_params)
     @user = User.find(user_id)
     @params = ride_params
 
-    with_acidity providing: { ride: nil } do
+    with_acidic_workflow persisting: { ride: nil } do |workflow|
       step :create_ride_and_audit_record, awaits: :dynamic_awaits
       step :create_stripe_charge
       step :send_receipt
     end
   end
-  
+
+  private
+
   def dynamic_awaits
     if @params["key"].present?
       [SomeJob.with('argument_1', keyword: 'value')]
@@ -193,41 +193,41 @@ end
 
 ### Iterable Steps
 
-Sometimes our workflows have steps that need to iterate over a collection and perform an action for each item in the collection before moving on to the next step in the workflow. In these cases, we can use the `for_each` option when defining our step to specific the collection, and `acidic_job` will pass each item into your step method for processing, keeping the same transactional guarantees as for any step. This means that if your step encounters an error in processing any item in the collection, when your job is retried, the job will jump right back to that step and right back to that item in the collection to try again.
+Sometimes our workflows have steps that need to iterate over a collection and perform an action for each item in the collection before moving on to the next step in the workflow. In these cases, we can use the `for_each` option when defining our step to bind that method to a specific the collection, and `AcidicJob` will pass each item into your step method for processing, keeping the same transactional guarantees as for any step. This means that if your step encounters an error in processing any item in the collection, when your job is retried, the job will jump right back to that step and right back to that item in the collection to try again.
 
 ```ruby
-class ExampleJob < ActiveJob::Base
-  include AcidicJob
-
+class ExampleJob < AcidicJob::Base
   def perform(record:)
-    with_acidity providing: { collection: [1, 2, 3, 4, 5] } do
-      step :process_item, for_each: :collection
-      step :next_step
+    with_acidic_workflow persisting: { collection: [1, 2, 3, 4, 5] } do |workflow|
+      workflow.step :process_item, for_each: :collection
+      workflow.step :next_step
     end
   end
-  
+
+  private
+
   def process_item(item)
-    # do whatever work needs to be done with this individual item
+    # do whatever work needs to be done with an individual item from `collection`
   end
 end
 ```
 
-**Note:** This feature relies on the "Persisted Attributes" feature detailed below. This means that you can only iterate over collections that ActiveRecord can serialize.
+**Note:** This feature relies on the "Persisted Attributes" feature detailed below. This means that you can only iterate over collections that ActiveJob can serialize. See [the Rails Guide on `ActiveJob`](https://edgeguides.rubyonrails.org/active_job_basics.html#supported-types-for-arguments) for more info.
 
 
 ### Persisted Attributes
 
-Any objects passed to the `providing` option on the `with_acidity` method are made available across retries. This means that you can set an attribute in step 1, access it in step 2, have step 2 fail, have the job retry, jump directly back to step 2 on retry, and have that object still accessible. This is done by serializing all objects to a field on the `AcidicJob::Run` and manually providing getters and setters that sync with the database record.
+The `persisting` option on the `with_acidic_workflow` method allows you to create a cross-step, cross-retry context. This means that you can set an attribute in step 1, access it in step 2, have step 2 fail, have the job retry, jump directly back to step 2 on retry, and have that object still accessible. This is done by serializing all objects to a field on the `AcidicJob::Run` and manually persisting getters and setters that sync with the database record.
 
-```ruby
-class RideCreateJob < ActiveJob::Base
-  include AcidicJob
+The default pattern you should follow when defining your `perform` method is to make any values that your `step` methods need access to, but are present at the start of the `perform` method simply instance variables. You only need to mark attributes that will be set _during a step_ via `persisting`. This means, the initial value will almost always be `nil`. If you need a default initial value, however, you can always provide that value to `persisting`.
 
+```ruby
+class RideCreateJob < AcidicJob::Base
   def perform(user_id, ride_params)
     @user = User.find(user_id)
     @params = ride_params
 
-    with_acidity providing: { ride: nil } do
+    with_acidic_workflow persisting: { ride: nil } do |workflow|
       step :create_ride_and_audit_record
       step :create_stripe_charge
       step :send_receipt
@@ -246,28 +246,24 @@ class RideCreateJob < ActiveJob::Base
 end
 ```
 
-**Note:** This does mean that you are restricted to objects that can be serialized by **`ActiveJob`** (for more info, see [here](https://edgeguides.rubyonrails.org/active_job_basics.html#supported-types-for-arguments)). This means you can persist ActiveRecord models, and any simple Ruby data types, but you can't persist things like Procs or custom class instances, for example.
+**Note:** This does mean that you are restricted to objects that can be serialized by **`ActiveJob`** (for more info, see [the Rails Guide on `ActiveJob`](https://edgeguides.rubyonrails.org/active_job_basics.html#supported-types-for-arguments)). This means you can persist ActiveRecord models, and any simple Ruby data types, but you can't persist things like Procs or custom class instances, for example.
 
 **Note:** You will note the use of `self.ride = ...` in the code sample above. In order to call the attribute setter method that will sync with the database record, you _must_ use this style. `@ride = ...` and/or `ride = ...` will both fail to sync the value with the database record.
 
-The default pattern you should follow when defining your `perform` method is to make any values that your `step` methods need access to, but are present at the start of the `perform` method simply instance variables. You only need to `provide` attributes that will be set _during a step_. This means, the initial value will almost always be `nil`.
-
 
 ### Transactionally Staged Jobs
 
 A standard problem when inside of database transactions is enqueuing other jobs. On the one hand, you could enqueue a job inside of a transaction that then rollbacks, which would leave that job to fail and retry and fail. On the other hand, you could enqueue a job that is picked up before the transaction commits, which would mean the records are not yet available to this job.
 
-In order to mitigate against such issues without forcing you to use a database-backed job queue, `acidic_job` provides `perform_acidicly` and `deliver_acidicly` methods to "transactionally stage" enqueuing other jobs from within a step (whether another ActiveJob or a Sidekiq::Worker or an ActionMailer delivery). These methods will create a new `AcidicJob::Run` record, but inside of the database transaction of the `step`. Upon commit of that transaction, a model callback pushes the job to your actual job queue.  Once the job has been successfully performed, the `AcidicJob::Run` record is deleted so that this table doesn't grow unbounded and unnecessarily.
+In order to mitigate against such issues without forcing you to use a database-backed job queue, `AcidicJob` provides `perform_acidicly` and `deliver_acidicly` methods to "transactionally stage" enqueuing other jobs from within a step (whether another `ActiveJob` or a `Sidekiq::Worker` or an `ActionMailer` delivery). These methods will create a new `AcidicJob::Run` record, but inside of the database transaction of the `step`. Upon commit of that transaction, a model callback pushes the job to your actual job queue.  Once the job has been successfully performed, the `AcidicJob::Run` record is deleted so that this table doesn't grow unbounded and unnecessarily.
 
 ```ruby
-class RideCreateJob < ActiveJob::Base
-  include AcidicJob
-
+class RideCreateJob < AcidicJob::Base
   def perform(user_id, ride_params)
     @user = User.find(user_id)
     @params = ride_params
     
-    with_acidity providing: { ride: nil } do
+    with_acidic_workflow persisting: { ride: nil } do |workflow|
       step :create_ride_and_audit_record
       step :create_stripe_charge
       step :send_receipt
@@ -290,8 +286,7 @@ By default, `AcidicJob` uses the job identifier provided by the queueing system
 Firstly, you can configure your job class to explicitly use either the job identifier or the job arguments as the foundation for the idempotency key. A job class that calls the `acidic_by_job_id` class method (which is the default behavior) will simply make the job run's idempotency key the job's identifier:
 
 ```ruby
-class ExampleJob < ActiveJob::Base
-  include AcidicJob
+class ExampleJob < AcidicJob::Base
   acidic_by_job_id
 
   def perform
@@ -302,8 +297,7 @@ end
 Conversely, a job class can use the `acidic_by_job_args` method to configure that job class to use the arguments passed to the job as the foundation for the job run's idempotency key:
 
 ```ruby
-class ExampleJob < ActiveJob::Base
-  include AcidicJob
+class ExampleJob < AcidicJob::Base
   acidic_by_job_args
 
   def perform(arg_1, arg_2)
@@ -315,48 +309,53 @@ end
 These options cover the two common situations, but sometimes our systems need finer-grained control. For example, our job might take some record as the job argument, but we need to use a combination of the record identifier and record status as the foundation for the idempotency key. In these cases you can pass a `Proc` to an `acidic_by` class method:
 
 ```ruby
-class ExampleJob < ActiveJob::Base
-  include AcidicJob
-  acidic_by ->(record:) { [record.id, record.status] }
+class ExampleJob < AcidicJob::Base
+  acidic_by -> { [@record.id, @record.status] }
 
   def perform(record:)
-    # the idempotency key will be based on whatever the values of `record.id` and `record.status` are
+    @record = record
+
+    # the idempotency key will be based on whatever the values of `@record.id` and `@record.status` are
+    with_acidic_workflow do |workflow|
+      workflow.step :do_something
+    end
   end
 end
 ```
 
-> **Note:** The signature of the `acidic_by` proc _needs to match the signature_ of the job's `perform` method.
+> **Note:** The `acidic_by` proc _will be executed in the context of the job instance_ at the moment the `with_acidic_workflow` method is called. This means it will have access to any instance variables defined in your `perform` method up to that point.
 
 
 ### Sidekiq Callbacks
 
-In order to ensure that `AcidicJob::Staged` records are only destroyed once the related job has been successfully performed, whether it is an ActiveJob or a Sidekiq Worker, `acidic_job` also extends Sidekiq to support the [ActiveJob callback interface](https://edgeguides.rubyonrails.org/active_job_basics.html#callbacks).
+In order to ensure that staged `AcidicJob::Run` records are only destroyed once the related job has been successfully performed, whether it is an ActiveJob or a Sidekiq Worker, `AcidicJob` also extends Sidekiq to support the [ActiveJob callback interface](https://edgeguides.rubyonrails.org/active_job_basics.html#callbacks).
 
-This allows `acidic_job` to use an `after_perform` callback to delete the `AcidicJob::Staged` record, whether you are using the gem with ActiveJob or pure Sidekiq Workers. Of course, this means that you can add your own callbacks to any jobs or workers that include the `AcidicJob` module as well.
+This allows us to use an `after_perform` callback to delete the `AcidicJob::Run` record, whether you are using the gem with ActiveJob or pure Sidekiq Workers. Of course, this means that you can add your own callbacks to any jobs or workers that include the `AcidicJob` module as well.
 
 
 ### Run Finished Callbacks
 
-When working with workflow jobs that make use of the `awaits` feature for a step, it is important to remember that the `after_perform` callback will be called _as soon as the first `awaits` step has enqueued job_, and **not** when the entire job run has finished. `acidic_job` allows the `perform` method to finish so that the queue for the workflow job is cleared to pick up new work while the `awaits` jobs are running. `acidic_job` will automatically re-enqueue the workflow job and progress to the next step when all of the `awaits` jobs have successfully finished. However, this means that `after_perform` **is not necessarily** the same as `after_finish`. In order to provide the opportunity for you to execute callback logic _if and only if_ a job run has finished, we provide callback hooks for the `finish` event.
+When working with workflow jobs that make use of the `awaits` feature for a step, it is important to remember that the `after_perform` callback will be called _as soon as the first `awaits` step has enqueued job_, and **not** when the entire job run has finished. `AcidicJob` allows the `perform` method to finish so that the queue for the workflow job is cleared to pick up new work while the `awaits` jobs are running. `AcidicJob` will automatically re-enqueue the workflow job and progress to the next step when all of the `awaits` jobs have successfully finished. However, this means that `after_perform` **is not necessarily** the same as `after_finish`. In order to provide the opportunity for you to execute callback logic _if and only if_ a job run has finished, we provide callback hooks for the `finish` event.
 
 For example, you could use this hook to immediately clean up the `AcidicJob::Run` database record whenever the workflow job finishes successfully like so:
 
 ```ruby
-class RideCreateJob < ActiveJob::Base
-  include AcidicJob
+class RideCreateJob < AcidicJob::Base
   set_callback :finish, :after, :delete_run_record
 
   def perform(user_id, ride_params)
     @user = User.find(user_id)
     @params = ride_params
 
-    with_acidity providing: { ride: nil } do
+    with_acidic_workflow persisting: { ride: nil } do |workflow|
       step :create_ride_and_audit_record, awaits: [SomeJob.with('argument_1', keyword: 'value')]
       step :create_stripe_charge, args: [1, 2, 3], kwargs: { some: 'thing' }
       step :send_receipt
     end
   end
-  
+
+  private
+
   def delete_run_record
     return unless acidic_job_run.succeeded?
 
@@ -374,11 +373,11 @@ When testing acidic jobs, you are likely to run into `ActiveRecord::TransactionI
 ActiveRecord::TransactionIsolationError: cannot set transaction isolation in a nested transaction
 ```
 
-This error is thrown because by default RSpec and most MiniTest test suites use database transactions to keep the test database clean between tests. The database transaction that is wrapping all of the code executed in your test is run at the standard isolation level, but acidic jobs then try to create another transaction run at a more conservative isolation level. You cannot have a nested transaction that runs at a different isolation level, thus, this error. 
+This error is thrown because by default RSpec and most MiniTest test suites use database transactions to keep the test database clean between tests. The database transaction that is wrapping all of the code executed in your test is run at the standard isolation level, but `AcidicJob` then tries to create another transaction at a more conservative isolation level. You cannot have a nested transaction that runs at a different isolation level, thus, this error. 
 
 In order to avoid this error, you need to ensure firstly that your tests that run your acidic jobs are not using a database transaction and secondly that they use some different strategy to keep your test database clean. The [DatabaseCleaner](https://github.com/DatabaseCleaner/database_cleaner) gem is a commonly used tool to manage different strategies for keeping your test database clean. As for which strategy to use, `truncation` and `deletion` are both safe, but their speed varies based on our app's table structure (see https://github.com/DatabaseCleaner/database_cleaner#what-strategy-is-fastest). Either is fine; use whichever is faster for your app.
 
-In order to make this test setup simpler, `AcidicJob` provides a `TestCase` class that your MiniTest jobs tests can inherit from. It is simple; it inherits from `ActiveJob::TestCase`, sets `use_transactional_tests` to `false`, and ensures `DatabaseCleaner` is run for each of your tests. Moreover, it ensures that the system's original DatabaseCleaner configuration is maintained, options included, except that any `transaction` strategies for any ORMs are replaced with a `deletion` strategy. It does so by storing whatever the system DatabaseCleaner configuration is at the start of `before_setup` phase in an instance variable and then restores that configuration at the end of `after_teardown` phase. In between, it runs the configuration thru a pipeline that selectively replaces any `transaction` strategies with a corresponding `deletion` strategy, leaving any other configured strategies untouched.
+In order to make this test setup simpler, `AcidicJob` provides a `Testing` module that your job tests can include. It is simple; it sets `use_transactional_tests` to `false` (if the test is an `ActiveJob::TestCase`), and ensures a transaction-safe `DatabaseCleaner` strategy is run for each of your tests. Moreover, it ensures that the system's original DatabaseCleaner configuration is maintained, options included, except that any `transaction` strategies for any ORMs are replaced with a `deletion` strategy. It does so by storing whatever the system DatabaseCleaner configuration is at the start of `before_setup` phase in an instance variable and then restores that configuration at the end of `after_teardown` phase. In between, it runs the configuration thru a pipeline that selectively replaces any `transaction` strategies with a corresponding `deletion` strategy, leaving any other configured strategies untouched.
 
 For those of you using RSpec, you can require the `acidic_job/rspec_configuration` file, which will configure RSpec in the exact same way I have used in my RSpec projects to allow me to test acidic jobs with either the `deletion` strategy but still have all of my other tests use the fast `transaction` strategy:
 

data/acidic_job.gemspec

@@ -34,7 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "net-smtp"
   spec.add_development_dependency "noticed"
-  spec.add_development_dependency "psych", "> 4.0"
   spec.add_development_dependency "railties"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rubocop"
@@ -43,7 +42,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sidekiq"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "warning"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

data/gemfiles/{rails_6.1.gemfile → rails_6.1_sidekiq_6.4.gemfile}

@@ -5,4 +5,6 @@ source "https://rubygems.org"
 gem "activemodel", "~> 6.1.0"
 gem "railties", "~> 6.1.0"
 
+gem "sidekiq", "~> 6.4.0"
+
 gemspec path: "../"

data/gemfiles/rails_6.1_sidekiq_6.5.gemfile

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "activemodel", "~> 6.1.0"
+gem "railties", "~> 6.1.0"
+
+gem "sidekiq", "~> 6.5.0"
+
+gemspec path: "../"

data/gemfiles/{rails_7.0.gemfile → rails_7.0_sidekiq_6.4.gemfile}

@@ -5,4 +5,6 @@ source "https://rubygems.org"
 gem "activemodel", "~> 7.0.0"
 gem "railties", "~> 7.0.0"
 
+gem "sidekiq", "~> 6.4.0"
+
 gemspec path: "../"

data/gemfiles/rails_7.0_sidekiq_6.5.gemfile

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "activemodel", "~> 7.0.0"
+gem "railties", "~> 7.0.0"
+
+gem "sidekiq", "~> 6.5.0"
+
+gemspec path: "../"

data/gemfiles/rails_7.1_sidekiq_6.4.gemfile

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "activemodel", "~> 7.1.0"
+gem "railties", "~> 7.1.0"
+
+gem "sidekiq", "~> 6.4.0"
+
+gemspec path: "../"

data/gemfiles/rails_7.1_sidekiq_6.5.gemfile

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "activemodel", "~> 7.1.0"
+gem "railties", "~> 7.1.0"
+
+gem "sidekiq", "~> 6.5.0"
+
+gemspec path: "../"

data/lib/acidic_job/active_kiq.rb

@@ -26,8 +26,8 @@ module AcidicJob
       # +opts+ are any options to configure the job
       def initialize(*arguments)
         @arguments  = arguments
-        @job_id     = SecureRandom.uuid
-        @sidekiq_options = sidekiq_options_hash || Sidekiq.default_job_options
+        @job_id     = ::SecureRandom.uuid
+        @sidekiq_options = sidekiq_options_hash || ::Sidekiq.default_job_options
         @queue_name = @sidekiq_options["queue"]
       end
 

data/lib/acidic_job/extensions/action_mailer.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module AcidicJob
+  module Extensions
+    module ActionMailer
+      extend ActiveSupport::Concern
+
+      def deliver_acidicly(_options = {})
+        job_class = ::ActionMailer::MailDeliveryJob
+        job_args = [@mailer_class.name, @action.to_s, "deliver_now", @params, *@args]
+        job = job_class.new(job_args)
+
+        AcidicJob::Run.stage!(job)
+      end
+    end
+  end
+end