acidic_job 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 041e2488af3dc4780e6112b92195dc805063ebc4c631bd3d7012017efe4e1583
-  data.tar.gz: d035a4d739e3cc7b6f6a2f223aefa7d600ab67dae537814363f16a478dd8c00c
+  metadata.gz: 54586a38aa48a14ef168657659a81b0db14446d011bd76085641dd4fb21f7838
+  data.tar.gz: 849af5f8e34684cd22d454f85ac816e749c3a4dd91ba58dba34ce67931916d3c
 SHA512:
-  metadata.gz: 96792f3e03f71aa19a83773a3eded77de541e6ea72c9aa2ca421f5298aa5e0e234b0705b0a27f417ebdb02b8e0b621ab935571b5ffc728a729c22bff7f97d809
-  data.tar.gz: 7dc53950ebf1d1c425f02f2c12a065cefa71c8c57173a4aa27478d9fcab7ffc0cdc822034da9179d59da9a0c544bd8b7c81108ef4da99a941de4b1d9ec63eb28
+  metadata.gz: fe54d708708a8316020979400dda7afd73480d34597f9416b30218b7307d8e4ce3cfbf65e14e05681810de88e21d131f06f4a3f72549a7dedef62be209b3137d
+  data.tar.gz: 58ba97af8e30c9bff0df8cf4015a3920ce722a5242048469b2224a4d9ca32c67971f03792862c2548515adc33b8407309c386ab1ff1dd509735f420029c11085

data/Gemfile.lock

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

data/lib/acidic_job/active_kiq.rb

@@ -13,11 +13,29 @@ module AcidicJob
     define_callbacks :perform
     include Mixin
 
+    concerning :Configuring do
+      # Configures the job with the given options.
+      def set(options = {}) # :nodoc:
+        self.scheduled_at = options[:wait].seconds.from_now.to_f if options[:wait]
+        self.scheduled_at = options[:wait_until].to_f if options[:wait_until]
+        self.queue_name   = self.class.queue_name_from_part(options[:queue]) if options[:queue]
+
+        self
+      end
+    end
+
     concerning :Initializing do
+      class_methods do
+        def job_or_instantiate(*args)
+          args.first.is_a?(self) ? args.first : new(*args)
+        end
+      end
+
       included do
         attr_accessor :arguments
         attr_accessor :job_id
         attr_accessor :queue_name
+        attr_accessor :scheduled_at
         attr_accessor :sidekiq_options
       end
       ##
@@ -25,8 +43,8 @@ module AcidicJob
       # +args+ are the arguments, if any, that will be passed to the perform method
       # +opts+ are any options to configure the job
       def initialize(*arguments)
-        @arguments  = arguments
-        @job_id     = ::SecureRandom.uuid
+        @arguments = arguments
+        @job_id = ::SecureRandom.uuid
         @sidekiq_options = sidekiq_options_hash || ::Sidekiq.default_job_options
         @queue_name = @sidekiq_options["queue"]
       end
@@ -43,22 +61,33 @@ module AcidicJob
 
     concerning :Performing do
       class_methods do
-        def perform_now(*args, **kwargs)
-          new.perform(*args, **kwargs)
+        def perform_later(*args)
+          perform_async(*args)
+        end
+
+        def perform_now(*args)
+          perform_inline(*args)
         end
       end
 
-      def perform_now(*args, **kwargs)
-        perform(*args, **kwargs)
+      def perform_later(*args)
+        Setter.new(self.class, {}).perform_async(*args)
+      end
+
+      def perform_now(*args)
+        Setter.new(self.class, {}).perform_inline(*args)
       end
 
       def enqueue
-        ::Sidekiq::Client.push(
+        item = {
           "class" => self.class,
           "args" => @arguments,
           "jid" => @job_id,
           "queue" => @queue_name
-        )
+        }
+        item["at"] = @scheduled_at if @scheduled_at
+
+        ::Sidekiq::Client.push(item)
       end
     end
 

data/lib/acidic_job/configured_job.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require "active_job/configured_job"
+
+module AcidicJob
+  class ConfiguredJob < ::ActiveJob::ConfiguredJob
+    def perform_acidicly(...)
+      @job_class.new(...).set(@options).perform_acidicly
+    end
+  end
+end

data/lib/acidic_job/mixin.rb

@@ -10,6 +10,8 @@ module AcidicJob
       # Ensure our `perform` method always runs first to gather parameters
       # and run perform callbacks for Sidekiq workers
       other.prepend PerformWrapper
+      # Ensure both configured and base jobs can be performed acidicly
+      other.include PerformAcidicly
 
       # By default, we unique job runs by the `job_id`
       other.instance_variable_set(:@acidic_identifier, :job_id)
@@ -40,19 +42,6 @@ module AcidicJob
         super
       end
 
-      # `perform_now` runs a job synchronously and immediately
-      # `perform_later` runs a job asynchronously and queues it immediately
-      # `perform_acidicly` run a job asynchronously and queues it after a successful database commit
-      def perform_acidicly(*args, **kwargs)
-        job = if kwargs.empty?
-                new(*args)
-              else
-                new(*args, **kwargs)
-              end
-
-        Run.stage!(job)
-      end
-
       # Instantiate an instance of a job ready for serialization
       def with(...)
         # New delegation syntax (...) was introduced in Ruby 2.7.
@@ -62,12 +51,26 @@ module AcidicJob
         job.queue_name
         job
       end
+
+      def set(options = {})
+        ::AcidicJob::ConfiguredJob.new(self, options)
+      end
     end
 
     def idempotency_key
       IdempotencyKey.new(self).value(acidic_by: acidic_identifier)
     end
 
+    # Configures the job with the given options.
+    def set(options = {}) # :nodoc:
+      self.scheduled_at = options[:wait].seconds.from_now.to_f if options[:wait]
+      self.scheduled_at = options[:wait_until].to_f if options[:wait_until]
+      self.queue_name   = self.class.queue_name_from_part(options[:queue]) if options[:queue]
+      self.priority     = options[:priority].to_i if options[:priority]
+
+      self
+    end
+
     protected
 
     # Short circuits execution by sending execution right to 'finished'.

data/lib/acidic_job/perform_acidicly.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module AcidicJob
+  module PerformAcidicly
+    extend ActiveSupport::Concern
+
+    # `perform_now` runs a job synchronously and immediately
+    # `perform_later` runs a job asynchronously and queues it immediately
+    # `perform_acidicly` run a job asynchronously and queues it after a successful database commit
+
+    class_methods do
+      def perform_acidicly(...)
+        job_or_instantiate(...).perform_acidicly
+      end
+    end
+
+    def perform_acidicly
+      Run.stage!(self)
+    end
+  end
+end

data/lib/acidic_job/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AcidicJob
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
 end

data/lib/acidic_job.rb

@@ -5,6 +5,7 @@ require_relative "acidic_job/errors"
 require_relative "acidic_job/logger"
 require_relative "acidic_job/arguments"
 require_relative "acidic_job/serializer"
+require_relative "acidic_job/configured_job"
 require_relative "acidic_job/workflow_builder"
 require_relative "acidic_job/idempotency_key"
 require_relative "acidic_job/recovery_point"
@@ -14,6 +15,7 @@ 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/perform_acidicly"
 require_relative "acidic_job/extensions/action_mailer"
 require_relative "acidic_job/extensions/noticed"
 require_relative "acidic_job/mixin"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acidic_job
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - fractaledmind
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-18 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -253,6 +253,7 @@ files:
 - lib/acidic_job/active_kiq.rb
 - lib/acidic_job/arguments.rb
 - lib/acidic_job/base.rb
+- lib/acidic_job/configured_job.rb
 - lib/acidic_job/errors.rb
 - lib/acidic_job/extensions/action_mailer.rb
 - lib/acidic_job/extensions/noticed.rb
@@ -260,6 +261,7 @@ files:
 - lib/acidic_job/idempotency_key.rb
 - lib/acidic_job/logger.rb
 - lib/acidic_job/mixin.rb
+- lib/acidic_job/perform_acidicly.rb
 - lib/acidic_job/perform_wrapper.rb
 - lib/acidic_job/processor.rb
 - lib/acidic_job/rails.rb