acidic_job 1.0.0.beta.2 → 1.0.0.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0e5e42007b9069a560d15f86869a6ba8efb9a45866b39d1ba761917f81188ba
-  data.tar.gz: bdfe50d3598ed4466e9c9b5033e53619e0a4c43fb7dbc3c8b869876ad9d57f40
+  metadata.gz: 3c63f44eea243551258930cb521408f7691419297922f39f3722d9386764a877
+  data.tar.gz: 2a292f1abba04cf031c524084eb48ce8a4a16084b79614843aba2593edeaae5f
 SHA512:
-  metadata.gz: 17c7a98093f52614d0c071ef947f2fe6ea361843d3f0d494451b4f77966e3d67d1a53ef37ad75bc229a97ccb898a3cb2d193642f5bae906cd333181e34177f48
-  data.tar.gz: be58b523f666a0d0bec5adef39929441cc1cedc7e0b9f2d5f6cb3ba541284b4ba6b33c76e5a03afa6129fd0ac4658753d2b8d2a210b7be5b1c9847e98478c10e
+  metadata.gz: dae8645e4495d7b770fb7fe4a4875d3335a4c47239532cb769701bc18cba1867a3462cf5280d89d0d880841721a7db4091c40e952917d2169fc31067dac6cc98
+  data.tar.gz: 7a25ad55a271707f5444e66df9588594a62751e25310f300580169ae376236cbd9d0f4186bdd184d32b30cbc13953e100666614a7155307bbd4809867f87b534

data/Gemfile.lock

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

data/lib/acidic_job/mixin.rb

@@ -7,19 +7,10 @@ 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
 
-      # Add `deliver_acidicly` to ActionMailer
-      ::ActionMailer::Parameterized::MessageDelivery.include(Extensions::ActionMailer) if defined?(::ActionMailer)
-      ::ActionMailer::MessageDelivery.include(Extensions::ActionMailer) if defined?(::ActionMailer)
-      # Add `deliver_acidicly` to Noticed
-      ::Noticed::Base.include(Extensions::Noticed) if defined?(::Noticed)
-
       # By default, we unique job runs by the `job_id`
       other.instance_variable_set(:@acidic_identifier, :job_id)
       # However, you can customize this behavior on a per job class level
@@ -82,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/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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "rails/railtie"
+
+module AcidicJob
+  class Rails < ::Rails::Railtie
+    initializer "acidic_job.action_mailer_extension" do
+      ::ActiveSupport.on_load(:action_mailer) do
+        # Add `deliver_acidicly` to 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
+
+    generators do
+      require "generators/acidic_job/install_generator"
+    end
+
+    # This hook happens after all initializers are run, just before returning
+    config.after_initialize do
+      if defined?(::Noticed)
+        # Add `deliver_acidicly` to Noticed
+        ::Noticed::Base.include(Extensions::Noticed)
+      end
+    end
+  end
+end

data/lib/acidic_job/version.rb

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

data/lib/acidic_job.rb

@@ -14,27 +14,21 @@ require_relative "acidic_job/workflow_step"
 require_relative "acidic_job/workflow"
 require_relative "acidic_job/processor"
 require_relative "acidic_job/perform_wrapper"
-require_relative "acidic_job/mixin"
-require_relative "acidic_job/base"
-require_relative "acidic_job/active_kiq"
 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 "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.2
+  version: 1.0.0.beta.5
 platform: ruby
 authors:
 - fractaledmind
@@ -261,6 +261,7 @@ files:
 - lib/acidic_job/mixin.rb
 - lib/acidic_job/perform_wrapper.rb
 - lib/acidic_job/processor.rb
+- lib/acidic_job/rails.rb
 - lib/acidic_job/recovery_point.rb
 - lib/acidic_job/run.rb
 - lib/acidic_job/serializer.rb