acidic_job 0.8.0 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8027a99e7fc6d5602e3269445211abefe4b835f69a7a33b0dea1f70fffec642
-  data.tar.gz: 6a38451eb30528b774a2a4ee31ac8f2733dea2035c25c3713ecad873c10759c8
+  metadata.gz: 0caf8232d94c6dd6eef55378cdf0c57849601185978d04df8f1d2bd91aca04e4
+  data.tar.gz: 38ea54d622782ab400fff7c4929be3b77e382440c3de8fdbbf27954a1f5ca98d
 SHA512:
-  metadata.gz: ce9eab1470bb0dbc63d92c2b3f8baa124e9f6a5dde95899248376b893a326ba71e6604d5892950677294d1226eb9e2fd8cc658952dee9222dea7c35c0c2f95f3
-  data.tar.gz: 981613d28454547304c3123250256b74eb80b6af7d3212e138cfbdc3e59c347dfed5c0b96ca95498a511b0391fd893ad0d871ef3dc07939118d3231208370fb3
+  metadata.gz: 75c909396867d246923c752d842a43d8a42328b5558bb0733a6e497096df8513e8cf8e8ca1923428fab4e9dc4394df129e543cb49ef512713e9ba1625f2a3741
+  data.tar.gz: 88755804b761f066a16232a2fd76c1307273112901869dc7f7984e9646816c5b65543c30e6da119838f1e32c8f1bb080f95367f5bda3ca2e58995e161aba33f4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    acidic_job (0.8.0)
+    acidic_job (0.8.3)
       activejob
       activerecord
       activesupport

data/README.md

@@ -153,9 +153,9 @@ class RideCreateJob < AcidicJob::Base
     @params = ride_params
 
     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
+      workflow.step :create_ride_and_audit_record, awaits: awaits: [SomeJob.with('argument_1', keyword: 'value'), AnotherJob.with(1, 2, 3, some: 'thing')]
+      workflow.step :create_stripe_charge
+      workflow.step :send_receipt
     end
   end
 end
@@ -172,9 +172,9 @@ class RideCreateJob < AcidicJob::Base
     @params = ride_params
 
     with_acidic_workflow persisting: { ride: nil } do |workflow|
-      step :create_ride_and_audit_record, awaits: :dynamic_awaits
-      step :create_stripe_charge
-      step :send_receipt
+      workflow.step :create_ride_and_audit_record, awaits: :dynamic_awaits
+      workflow.step :create_stripe_charge
+      workflow.step :send_receipt
     end
   end
 
@@ -228,9 +228,9 @@ class RideCreateJob < AcidicJob::Base
     @params = ride_params
 
     with_acidic_workflow persisting: { ride: nil } do |workflow|
-      step :create_ride_and_audit_record
-      step :create_stripe_charge
-      step :send_receipt
+      workflow.step :create_ride_and_audit_record
+      workflow.step :create_stripe_charge
+      workflow.step :send_receipt
     end
   end
 
@@ -264,9 +264,9 @@ class RideCreateJob < AcidicJob::Base
     @params = ride_params
     
     with_acidic_workflow persisting: { ride: nil } do |workflow|
-      step :create_ride_and_audit_record
-      step :create_stripe_charge
-      step :send_receipt
+      workflow.step :create_ride_and_audit_record
+      workflow.step :create_stripe_charge
+      workflow.step :send_receipt
     end
   end
 
@@ -294,11 +294,11 @@ class ExampleJob < AcidicJob::Base
 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:
+Conversely, a job class can use the `acidic_by_job_arguments` 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 < AcidicJob::Base
-  acidic_by_job_args
+  acidic_by_job_arguments
 
   def perform(arg_1, arg_2)
     # the idempotency key will be based on whatever the values of `arg_1` and `arg_2` are
@@ -348,9 +348,9 @@ class RideCreateJob < AcidicJob::Base
     @params = ride_params
 
     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
+      workflow.step :create_ride_and_audit_record, awaits: [SomeJob.with('argument_1', keyword: 'value')]
+      workflow.step :create_stripe_charge, args: [1, 2, 3], kwargs: { some: 'thing' }
+      workflow.step :send_receipt
     end
   end
 

data/lib/acidic_job/mixin.rb

@@ -18,7 +18,7 @@ module AcidicJob
       # You could unique job runs by the arguments passed to the job (e.g. memoization)
       other.define_singleton_method(:acidic_by_job_arguments) { @acidic_identifier = :job_arguments }
       # Or, you could unique jobs run by any logic you'd like using a block
-      other.define_singleton_method(:acidic_by) { |&block| @acidic_identifier = block }
+      other.define_singleton_method(:acidic_by) { |proc = nil, &block| @acidic_identifier = proc || block }
 
       # We add a callback to ensure that staged, non-workflow jobs are "finished" after they are "performed".
       # This allows us to ensure that we can always inspect whether a run is finished and get correct data
@@ -43,8 +43,12 @@ module AcidicJob
       # `perform_now` runs a job synchronously and immediately
       # `perform_later` runs a job asynchronously and queues it immediately
       # `perform_acidicly` run a job asynchronously and queues it after a successful database commit
-      def perform_acidicly(*args)
-        job = new(*args)
+      def perform_acidicly(*args, **kwargs)
+        job = if kwargs.empty?
+                new(*args)
+              else
+                new(*args, **kwargs)
+              end
 
         Run.stage!(job)
       end
@@ -73,8 +77,7 @@ module AcidicJob
     end
 
     def with_acidic_workflow(persisting: {}, &block)
-      raise UnknownJobAdapter unless (defined?(::AcidicJob::Base) && self.class < ::AcidicJob::Base) ||
-                                     (defined?(::AcidicJob::ActiveKiq) && self.class < ::AcidicJob::ActiveKiq)
+      raise UnknownJobAdapter unless known_job_adapter?
 
       raise RedefiningWorkflow if defined? @workflow_builder
 
@@ -246,5 +249,13 @@ module AcidicJob
         :serializable
       end
     end
+
+    def known_job_adapter?
+      return true if defined?(::AcidicJob::Base) && self.class < ::AcidicJob::Base
+      return true if defined?(::AcidicJob::ActiveKiq) && self.class < ::AcidicJob::ActiveKiq
+      return true if defined?(::ActiveJob) && self.class < ::ActiveJob::Base
+
+      false
+    end
   end
 end

data/lib/acidic_job/perform_wrapper.rb

@@ -8,9 +8,9 @@ module AcidicJob
       @arguments = args
 
       # we don't want to run the `perform` callbacks twice, since ActiveJob already handles that for us
-      if defined?(ActiveJob) && self.class < ActiveJob::Base
+      if defined?(::ActiveJob) && self.class < ::ActiveJob::Base
         super(*args)
-      elsif defined?(Sidekiq) && self.class.include?(Sidekiq::Worker)
+      elsif defined?(::Sidekiq) && self.class.include?(::Sidekiq::Worker)
         run_callbacks :perform do
           super(*args)
         end

data/lib/acidic_job/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AcidicJob
-  VERSION = "0.8.0"
+  VERSION = "0.8.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acidic_job
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.3
 platform: ruby
 authors:
 - fractaledmind
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2022-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob