acidic_job 1.0.0.beta.3 → 1.0.0.beta.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae3f13ed2a45c147047c0f09348bd4e9d5b4ecca9ca87230b1cacdaf0c371102
-  data.tar.gz: f3078b9df6b56f27aad3ed4e18cd361d5f735e871513dd308fdc2d6c18e767de
+  metadata.gz: 15f22e01fee75c9785c6d7ac0ef1f38620cd599bd4f05b372bdda1fa0e6045e5
+  data.tar.gz: b9cdb3146ed4752b11b5c7aaccfd02f8cb14e37712212796bf14e2a4bdf03ca2
 SHA512:
-  metadata.gz: 37063209e88853721910ab7f0952348c20471eb334327cc18e13a7e688314c813541d6ade50e19934919e5de7126d6e888d1f4b90ebb89a61bc978079d121de0
-  data.tar.gz: 99c717f971401a1e6034c31a7816d3ffa2b31fc91bff705aa408c61a27c172d9f49907bdc44c96563c8276162a03b1eac9b6ceae1da7614b159e530978e2d1de
+  metadata.gz: 72a327e00a6e066160d73ffda31321af66e6c20a8b2e446f30869f7e3245ec4db704812f9ceda6a8fb02be9454eaddf503476ebf6614d453df15b4ca8a656e65
+  data.tar.gz: 420b38dbb39ba3ed89be0c2b8b5c2305f27f6aea8208ee2dfc689ec729329f676ec43b3cb3ac98481c25985eae13eacc64348900f3389b12f74c56d723143d33

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    acidic_job (1.0.0.beta.3)
+    acidic_job (1.0.0.beta.6)
       activejob
       activerecord
       activesupport

data/lib/acidic_job/errors.rb

@@ -15,4 +15,5 @@ module AcidicJob
   class UnserializableValue < Error; end
   class LockedIdempotencyKey < Error; end
   class MismatchedIdempotencyKeyAndJobArguments < Error; end
+  class MissingBlockArgument < Error; end
 end

data/lib/acidic_job/mixin.rb

@@ -7,9 +7,6 @@ module AcidicJob
     extend ActiveSupport::Concern
 
     def self.wire_up(other)
-      raise UnknownJobAdapter unless (defined?(::ActiveJob::Base) && other < ::ActiveJob::Base) ||
-                                     (defined?(::Sidekiq::Worker) && other.include?(::Sidekiq::Worker))
-
       # Ensure our `perform` method always runs first to gather parameters
       # and run perform callbacks for Sidekiq workers
       other.prepend PerformWrapper
@@ -76,17 +73,17 @@ 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 RedefiningWorkflow if defined? @workflow_builder
 
       @workflow_builder = WorkflowBuilder.new
 
       raise MissingWorkflowBlock, "A block must be passed to `with_acidic_workflow`" unless block_given?
+      raise MissingBlockArgument, "An argument must be passed to the `with_acidic_workflow` block" if block.arity.zero?
 
-      if block.arity.zero?
-        @workflow_builder.instance_exec(&block)
-      else
-        yield @workflow_builder
-      end
+      block.call @workflow_builder
 
       raise NoDefinedSteps if @workflow_builder.steps.empty?
 

data/lib/acidic_job/processor.rb

@@ -69,7 +69,7 @@ module AcidicJob
       when Array
         jobs_or_jobs_getter
       when Symbol, String
-        if @job.respond_to?(jobs_or_jobs_getter)
+        if @job.respond_to?(jobs_or_jobs_getter, _include_private = true)
           @job.method(jobs_or_jobs_getter).call
         else
           raise UnknownAwaitedJob,

data/lib/acidic_job/rails.rb

@@ -5,12 +5,23 @@ require "rails/railtie"
 module AcidicJob
   class Rails < ::Rails::Railtie
     initializer "acidic_job.action_mailer_extension" do
-      ActiveSupport.on_load(:action_mailer) do
+      ::ActiveSupport.on_load(:action_mailer) do
         # Add `deliver_acidicly` to ActionMailer
-        if defined?(::ActionMailer)
-          ::ActionMailer::Parameterized::MessageDelivery.include(::AcidicJob::Extensions::ActionMailer)
-        end
-        ::ActionMailer::MessageDelivery.include(::AcidicJob::Extensions::ActionMailer) if defined?(::ActionMailer)
+        ::ActionMailer::Parameterized::MessageDelivery.include(Extensions::ActionMailer)
+        ::ActionMailer::MessageDelivery.include(Extensions::ActionMailer)
+      end
+    end
+
+    initializer "acidic_job.active_job_serializers" do
+      ::ActiveSupport.on_load(:active_job) do
+        ::ActiveJob::Serializers.add_serializers(
+          Serializers::ExceptionSerializer,
+          Serializers::FinishedPointSerializer,
+          Serializers::JobSerializer,
+          Serializers::RangeSerializer,
+          Serializers::RecoveryPointSerializer,
+          Serializers::WorkerSerializer
+        )
       end
     end
 

data/lib/acidic_job/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AcidicJob
-  VERSION = "1.0.0.beta.3"
+  VERSION = "1.0.0.beta.6"
 end

data/lib/acidic_job.rb

@@ -18,25 +18,17 @@ require_relative "acidic_job/extensions/action_mailer"
 require_relative "acidic_job/extensions/noticed"
 require_relative "acidic_job/mixin"
 require_relative "acidic_job/base"
-require_relative "acidic_job/active_kiq"
+# require_relative "acidic_job/active_kiq"
 
+require "active_job/serializers"
 require_relative "acidic_job/serializers/exception_serializer"
 require_relative "acidic_job/serializers/finished_point_serializer"
 require_relative "acidic_job/serializers/job_serializer"
 require_relative "acidic_job/serializers/range_serializer"
 require_relative "acidic_job/serializers/recovery_point_serializer"
 require_relative "acidic_job/serializers/worker_serializer"
-require "active_job/serializers"
 
 require_relative "acidic_job/rails"
 
 module AcidicJob
-  ::ActiveJob::Serializers.add_serializers(
-    Serializers::ExceptionSerializer,
-    Serializers::FinishedPointSerializer,
-    Serializers::JobSerializer,
-    Serializers::RangeSerializer,
-    Serializers::RecoveryPointSerializer,
-    Serializers::WorkerSerializer
-  )
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acidic_job
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.3
+  version: 1.0.0.beta.6
 platform: ruby
 authors:
 - fractaledmind
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-09 00:00:00.000000000 Z
+date: 2022-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob