acidic_job 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0924564388ca928e9923161a95788dfb393e71f48d82ab6474e221793befc6af'
-  data.tar.gz: 0a06d0e7f933a9e0e319bc698a3ab216502033b9c9df46fa7646cd77bdb1109c
+  metadata.gz: a84bc161e4771a11415d7b9bcc9be10cd703242f43ee69bcc1f139e05e93367c
+  data.tar.gz: 353e0abc18c50d946817e0263517d8efebd6d842a5186f362355da9d2382ac7a
 SHA512:
-  metadata.gz: db1b579a5887707c41534d825d261a024a25cab2c5619af1179d41360af85e8271bf16dc9fb29442aa1442f9d49366dbec60a8d8d3ea010eb15d4a413238fe40
-  data.tar.gz: 1c371720712b4eb34aec5c8b2aba077906100cc0b69bd72624844260c01522dfa4c5d843fea21b08efdc199dedfd08e8966c602b12bd73e04c8615c4e00f7487
+  metadata.gz: 6009e9a0b132da090454d1ea6c70f852c53169f5a5842f5cd982cc7b167df0a20f2a3dd534879c058b6ffbf2a305ba88f39020b1c92c099ae0d4e76f48b905ff
+  data.tar.gz: abee47aaa85eed503f0af7e3c3c27b2f6a3c3ed04fd4456d3a9ff743e097db1215409039cbc4c86dccb07cffb073f2e06dcefbf043cf56dc4ad2a83fc64ff624

data/Gemfile.lock

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

data/lib/acidic_job/mixin.rb

@@ -77,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
 
@@ -250,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.1"
+  VERSION = "0.8.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acidic_job
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - fractaledmind