acidic_job 1.0.0.pre12 → 1.0.0.pre13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1af7bca23aa5ead8fed158fb73565736555236bf4515ab73f631a3013e138f12
-  data.tar.gz: cc1118240efe70d71dcd7c2eb07435f3e56934c2c3e8653848a9c3467dc60b83
+  metadata.gz: ff4783bfe9e3ff6a03683ed14a9f21a5227f6114bc5824cdee71a66f252d7fa1
+  data.tar.gz: d905d8ad1848d77ae9fade6b75527ae113675ba3c39b66149c750f9adb64d83b
 SHA512:
-  metadata.gz: 90073b7d2964d65886ca2fd4320481455e04218db92ab3b2ccd65bdffc527b03f8c928c58590ed62cf7734c1702687978dd5f1406ea740f13f1fbccb7c27b48d
-  data.tar.gz: 9f2910c1620f489a1bb5a310821ead5363671aa0ffc9a21f909894f43c2de52b056ee096f17455fb8b34bd55d8f521ca71760df3959b8b0c1f90562c50129ff4
+  metadata.gz: 1af39ccff6bb5d414ab32344887d60f4cf721d9272ec0c98c9686053d3426fd2da98d82b9fe35fd45ebc6b719b8e1df6ce922abbec86653a91bea736f9522696
+  data.tar.gz: f0f8db378646cd3e948a2406c2237b44c9e6a551dafcbe1a687cbfadc5a15713e3b6a177a18ccf81146b024cb64b44085a14c8250fd8b364f16c911d3a202f5b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    acidic_job (1.0.0.pre12)
+    acidic_job (1.0.0.pre13)
       activerecord (>= 6.1.0)
       activesupport
 

data/lib/acidic_job/perform_wrapper.rb

@@ -4,46 +4,19 @@ module AcidicJob
   # NOTE: it is essential that this be a bare module and not an ActiveSupport::Concern
   module PerformWrapper
     def perform(*args, **kwargs)
-      super_method = method(:perform).super_method
+      @__acidic_job_args = args
+      @__acidic_job_kwargs = kwargs
 
       # we don't want to run the `perform` callbacks twice, since ActiveJob already handles that for us
-      if aj_job?
-        __acidic_job_perform_for_aj(super_method, *args, **kwargs)
-      elsif sk_job?
-        __acidic_job_perform_for_sk(super_method, *args, **kwargs)
+      if defined?(ActiveJob) && self.class < ActiveJob::Base
+        super(*args, **kwargs)
+      elsif defined?(Sidekiq) && self.class.include?(Sidekiq::Worker)
+        run_callbacks :perform do
+          super(*args, **kwargs)
+        end
       else
         raise UnknownJobAdapter
       end
     end
-
-    def sk_job?
-      defined?(Sidekiq) && self.class.include?(Sidekiq::Worker)
-    end
-
-    def aj_job?
-      defined?(ActiveJob) && self.class < ActiveJob::Base
-    end
-
-    private
-
-    # don't run `perform` callbacks, as ActiveJob already does this
-    def __acidic_job_perform_for_aj(super_method, *args, **kwargs)
-      __acidic_job_perform_base(super_method, *args, **kwargs)
-    end
-
-    # ensure to run `perform` callbacks
-    def __acidic_job_perform_for_sk(super_method, *args, **kwargs)
-      run_callbacks :perform do
-        __acidic_job_perform_base(super_method, *args, **kwargs)
-      end
-    end
-
-    # capture arguments passed to `perform` to be used by AcidicJob later
-    def __acidic_job_perform_base(super_method, *args, **kwargs)
-      @__acidic_job_args = args
-      @__acidic_job_kwargs = kwargs
-
-      super_method.call(*args, **kwargs)
-    end
   end
 end

data/lib/acidic_job/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AcidicJob
-  VERSION = "1.0.0.pre12"
+  VERSION = "1.0.0.pre13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acidic_job
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre12
+  version: 1.0.0.pre13
 platform: ruby
 authors:
 - fractaledmind
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord