acidic_job 1.0.0.beta.3 → 1.0.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae3f13ed2a45c147047c0f09348bd4e9d5b4ecca9ca87230b1cacdaf0c371102
-  data.tar.gz: f3078b9df6b56f27aad3ed4e18cd361d5f735e871513dd308fdc2d6c18e767de
+  metadata.gz: 9516f1c035c3f7256c178aa23c6966f19420e718f2f0e24d0ec0d751c5e8beb5
+  data.tar.gz: 0dcf21315d4afefbd1861f69aff453b293818b9166fb58fe36ac45b62266ea13
 SHA512:
-  metadata.gz: 37063209e88853721910ab7f0952348c20471eb334327cc18e13a7e688314c813541d6ade50e19934919e5de7126d6e888d1f4b90ebb89a61bc978079d121de0
-  data.tar.gz: 99c717f971401a1e6034c31a7816d3ffa2b31fc91bff705aa408c61a27c172d9f49907bdc44c96563c8276162a03b1eac9b6ceae1da7614b159e530978e2d1de
+  metadata.gz: 1c742edbc7e301b035276a93ca8d68f1118c6899b024ef7edbf0694790ee6804a18ae7e7d1c2a2d89c40b5e05b966a0bee9114a61aeca0307618c8d0715a047f
+  data.tar.gz: 5cfda7f2d2cdc602da3bcb6225e8c38647e79b1f1b08e153e4d524594551fc42ce4116240d4837dee59bf17adbf8390e5d0d036120816e0aa379cadb872c787a

data/Gemfile.lock

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

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,6 +73,9 @@ 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

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.4"
 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acidic_job
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.3
+  version: 1.0.0.beta.4
 platform: ruby
 authors:
 - fractaledmind