state_machine_job 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 399f472130b3ee8015808ca3295f2802c5610bce
-  data.tar.gz: 038d38a55ee2d05627a6a0392d3e957bb1ab06b6
+SHA256:
+  metadata.gz: 7321f4a9acadaf04e7ae9e042984c0236a515d75afb4fa4c099285c8fa315081
+  data.tar.gz: 7cb0105c55838f3d0e2814ccb5c0e2e867d787b81ab3c04ca90eef416f69bb63
 SHA512:
-  metadata.gz: 2eca4e96a81540fc28e25cfa7bd005478254b434cc0a78f04489c94f529da5796260f14d477e04bb857b2ee3f78b7430a8f87b0f06006788a7f6fe8b03c67659
-  data.tar.gz: 94668d80123330fa26e56ecc1e4c1918c46afff64d3afae6ad953a010273458ac69279204d7ad9454edf3d94117adc931cd16588ce86ded59adf0b1a3aeb7d0d
+  metadata.gz: 32a5ee63e8d498fcc5457700f554451b02b243069d9ff92f22cebe96f1382e31030c775a3ddf5a45bc9db36174098dba177206b8cfd1fa568e5fce024e7b7c98
+  data.tar.gz: cecc86f4fc4dbdc206128251c2cb987f68ff392128397682f8f535970c8c9ed7a0c7de234dc0f745a04806db79fec298b91b743a2ae6f5e2d7f897e690a805ce

data/CHANGELOG.md

@@ -1,24 +1,15 @@
 # CHANGELOG
 
-### Version 1.0.0
+### Version 2.0.0
 
-2017-08-02
+2018-07-27
 
-[Compare changes](http://github.com/codevise/state_machine_job/compare/0-x-stable...v1.0.0)
+[Compare changes](http://github.com/codevise/state_machine_job/compare/1-x-stable...v2.0.0)
 
-- Do not silence exceptions. Ensure state machine can transition to
-  failed state by invoking error result event, but then re-raise
-  exception, so they show up in the Resque error list. Jobs are still
-  free to rescue exceptions themselves and return an error result
-  instead.
-  ([#5](https://github.com/codevise/state_machine_job/pull/5))
-- Add backtrace info to exception logging
-  ([#3](https://github.com/codevise/state_machine_job/pull/3))
-- Restrict activesupport to < 5 for now
-  ([#4](https://github.com/codevise/state_machine_job/pull/4))
-- Use sinatra 1 in development and tests for ruby 2.1 compatibility
-  ([#6](https://github.com/codevise/state_machine_job/pull/6))
+- Breaking change: Decouple from Resque and use Active Job. See README
+  for updated usage instructions.
+  ([#9](https://github.com/codevise/state_machine_job/pull/9))
 
 See
-[0-x-stable branch](https://github.com/codevise/state_machine_job/blob/0-x-stable/CHANGELOG.md)
+[1-x-stable branch](http://github.com/codevise/state_machine_job/blob/1-x-stable/CHANGELOG.md)
 for previous changes.

data/Gemfile

@@ -2,6 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in state_machine_job.gemspec
 gemspec
-
-# Sinatra 2 requires Ruby 2.2
-gem 'sinatra', '~> 1.0'

data/README.md

@@ -3,8 +3,8 @@
 [![Gem Version](https://badge.fury.io/rb/state_machine_job.svg)](http://badge.fury.io/rb/state_machine_job)
 [![Build Status](https://travis-ci.org/codevise/state_machine_job.svg?branch=master)](https://travis-ci.org/codevise/state_machine_job)
 
-Enqueue resque jobs on state machine transitions and change state
-according to job result.
+Enqueue jobs on state machine transitions and change state according
+to job result.
 
 ## Installation
 
@@ -12,19 +12,15 @@ Add this line to your application's Gemfile:
 
     gem 'state_machine_job'
 
-Requires the [resque-logger](https://github.com/salizzar/resque-logger)
-gem to be present and configured.
-
 ## Usage
 
-Extend your resque job with the `StateMachineJob` mixin and provide a
-`perform_with_result` class method instead of the normal `perform`
-method:
+Include the `StateMachineJob` mixin in your job and provide a
+`perform_with_result` method instead of the normal `perform` method:
 
-    class SomeJob
-      extend StateMachineJob
+    class SomeJob < ApplicationJob
+      include StateMachineJob
 
-      def self.perform_with_result(record, payload)
+      def perform_with_result(record, payload)
         # do something
         :ok
       end
@@ -61,8 +57,8 @@ event or by manually updateing the attribute), `SomeJob` will
 automatically be enqueued. If `perform_with_result` returns `:ok`, the
 state machine transitions to the `'done'` state. You can specify as
 many results as you want. Note that any exception raised by
-`perform_with_result` is rescued and translated to the result
-`:error`.
+`perform_with_result` leads to a state machine transition as if the
+result had been `:error`. The exception is not rescued, though.
 
 ### Passing custom Payload
 
@@ -117,8 +113,7 @@ You can tell the state machine to retry a job based on its result:
 
 When `perform_with_result` returns the result `:pending`, the state
 machine will remain in the `runnning` state and enqueue a delayed
-job. This functionality requires the [`resque-scheduler`](https://github.com/resque/resque-scheduler)
-gem.
+job. This feature uses the Active Job `set(wait: n)` functionality.
 
 ### Retrying Jobs Based on State
 

data/lib/state_machine_job.rb

@@ -1,40 +1,27 @@
 require 'state_machine_job/version'
 require 'state_machine_job/macro'
 
-require 'resque'
-require 'resque/plugins/logger'
-require 'resque_logger'
-
 module StateMachineJob
-  include Resque::Plugins::Logger
-
-  def perform(model_name, id, payload = {})
-    logger.info "#{self.name} - perform for #{model_name} #{id}"
-
-    record = model_name.constantize.find_by_id(id)
-
-    if record
-      begin
-        result = perform_with_result(record, payload)
-      rescue Exception => e
-        result = :error
-
-        logger.error "#{self.name} - exception for #{model_name} #{id}: #{e.inspect}"
-        e.backtrace.each { |line| logger.info(line) }
-
-        raise
-      ensure
-        logger.info "#{self.name} - result #{result} for #{model_name} #{id}"
-        record.send(event_name(result))
-      end
-    else
-      logger.info "#{self.name} - #{model_name} #{id} not found. Skipping job."
+  def perform(record, payload = {})
+    record_name = "#{record.class.name} #{record.id}"
+    logger.info "perform for #{record_name}"
+
+    begin
+      result = perform_with_result(record, payload)
+    rescue StandardError
+      result = :error
+      raise
+    ensure
+      logger.info "result #{result} for #{record_name}"
+      record.send(StateMachineJob.result_method_name(self.class, result))
     end
   end
 
-  private
+  def self.result_event_name(job, result)
+    [job.name.underscore.split('/'), result].flatten.join('_').to_sym
+  end
 
-  def event_name(result)
-    ([self.name.underscore.split('/'), result].flatten.join('_') + '!').to_sym
+  def self.result_method_name(job, result)
+    "#{result_event_name(job, result)}!"
   end
 end

data/lib/state_machine_job/macro.rb

@@ -1,15 +1,14 @@
 module StateMachineJob
   module Macro
-    def job(job_class, queue = Resque, &block)
-      Job.new(job_class, self, queue).instance_eval(&block)
+    def job(job_class, &block)
+      JobDSL.new(job_class, self).instance_eval(&block)
     end
 
-    class Job
-      def initialize(job, state_machine, queue)
+    class JobDSL
+      def initialize(job, state_machine)
         @job = job
         @state_machine = state_machine
-        @queue = queue
-        @payload = lambda do |*args|
+        @payload = lambda do |*|
           {}
         end
       end
@@ -38,7 +37,7 @@ module StateMachineJob
         on_enter_state = @on_enter_state
 
         if options[:state]
-          @state_machine.event(job_result_event_name(job_result)) do
+          @state_machine.event(StateMachineJob.result_event_name(@job, job_result)) do
             if options[:retry_if_state]
               transition options[:retry_if_state] => on_enter_state
             end
@@ -46,34 +45,23 @@ module StateMachineJob
             transition(all => options[:state], :if => options[:if])
           end
         elsif options[:retry_after]
-          @state_machine.define_helper :instance, retry_job_method_name(job_result) do |machine, object|
-            @queue.enqueue_in(options[:retry_after], @job, object.class.name, object.id, @payload.call(object))
+          @state_machine.define_helper :instance, StateMachineJob.result_method_name(@job, job_result) do |_machine, object|
+            @job.set(wait: options[:retry_after]).perform_later(object, @payload.call(object))
           end
         end
       end
 
       def on_enter(state)
-        job, state_machine, queue = @job, @state_machine, @queue
         @on_enter_state = state
 
         @state_machine.after_transition @state_machine.any => state do |object|
-          queue.enqueue(job, object.class.name, object.id, @payload.call(object))
+          @job.perform_later(object, @payload.call(object))
         end
       end
 
       def payload(&block)
         @payload = block
       end
-
-      private
-
-      def retry_job_method_name(result)
-        "#{job_result_event_name(result)}!"
-      end
-
-      def job_result_event_name(result)
-        [@job.name.underscore.split('/'), result].flatten.join('_').to_sym
-      end
     end
   end
 end

data/lib/state_machine_job/version.rb

@@ -1,3 +1,3 @@
 module StateMachineJob
-  VERSION = '1.0.0'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/spec/spec_helper.rb

@@ -1,10 +1,16 @@
-require 'rspec'
+require 'action_controller/railtie'
+require 'rspec/rails'
 
 PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')).freeze
 $LOAD_PATH << File.join(PROJECT_ROOT, 'lib')
 
 require 'active_support/inflector'
+require 'active_model'
+require 'active_job'
 require 'state_machine'
 require 'state_machine_job'
 
-Dir[File.join(PROJECT_ROOT, 'spec', 'support', '**', '*.rb')].each { |file| require(file) }
+ActiveJob::Base.logger = Logger.new(nil)
+ActiveJob::Base.queue_adapter = :test
+
+GlobalID.app = :test

data/spec/state_machine_job/macro_spec.rb

@@ -1,100 +1,109 @@
 require 'spec_helper'
 
+require 'rspec/rails/matchers/active_job'
+require 'timecop'
+
 module StateMachineJob
   describe Macro do
-    class TestJob
+    class TestJob < ActiveJob::Base
+      include StateMachineJob
     end
 
-    it 'enques job with model name, record id and payload arguments when entering on_enter state' do
-      queue = double('queue')
-      model = Class.new do
-        attr_accessor :some_attribute
+    class BaseModel
+      include ActiveModel::Model
+      include GlobalID::Identification
 
-        def initialize(some_attribute)
-          self.some_attribute = some_attribute
-          super()
-        end
+      attr_accessor :id
 
-        def id
-          43
-        end
+      cattr_accessor :instances
 
-        state_machine :initial => :idle do
-          extend StateMachineJob::Macro
+      def initialize(*)
+        super
+        instances[id] = self
+      end
 
-          state :idle
-          state :running
-          state :done
-          state :failed
+      def self.find(id)
+        instances.fetch(id.to_i)
+      end
+    end
 
-          event :run do
-            transition :idle => :running
-          end
+    before do
+      BaseModel.instances = {}
+    end
 
-          job TestJob, queue do
-            on_enter :running
-            payload do |record|
-              {:some_attribute => record.some_attribute}
-            end
-            result :ok => :done
+    class Model < BaseModel
+      attr_accessor :state, :some_attribute
+
+      state_machine initial: :idle do
+        extend StateMachineJob::Macro
+
+        state :idle
+        state :running
+        state :done
+        state :failed
+
+        event :run do
+          transition idle: :running
+        end
+
+        job TestJob do
+          on_enter :running
+          payload do |record|
+            {some_attribute: record.some_attribute}
           end
+          result ok: :done
         end
       end
-      record = model.new('value')
+    end
 
-      def model.name
-        'Model'
-      end
+    it 'enques job with record and payload arguments when entering on_enter state' do
+      record = Model.new(id: 5, some_attribute: 'value')
 
-      expect(queue).to receive(:enqueue).with(TestJob, 'Model', 43, {:some_attribute => 'value'})
       record.run
-    end
 
-    it 'enques job after retry time with model name, record id and payload arguments when retry after result event is invoked' do
-      queue = double('queue')
-      model = Class.new do
-        attr_accessor :some_attribute
+      expect(TestJob).to have_been_enqueued.with(record, some_attribute: 'value')
+    end
 
-        def initialize(some_attribute)
-          self.some_attribute = some_attribute
-          super()
-        end
+    class ModelWithRetry < BaseModel
+      attr_accessor :state, :some_attribute
 
-        def id
-          43
-        end
+      state_machine initial: :idle do
+        extend StateMachineJob::Macro
 
-        state_machine :initial => :idle do
-          extend StateMachineJob::Macro
+        state :idle
+        state :running
+        state :done
+        state :failed
 
-          state :idle
-          state :running
-          state :done
-          state :failed
+        event :run do
+          transition idle: :running
+        end
 
-          job TestJob, queue do
-            on_enter :running
-            payload do |record|
-              {:some_attribute => record.some_attribute}
-            end
-            result :failed, :retry_after => 60
-            result :ok => :done
+        job TestJob do
+          on_enter :running
+          payload do |record|
+            {some_attribute: record.some_attribute}
           end
+          result ok: :done
+          result :failed, retry_after: 60
         end
       end
-      record = model.new('value')
+    end
 
-      def model.name
-        'Model'
-      end
+    it 'enques job after retry time with record and payload when result event is invoked' do
+      Timecop.freeze do
+        record = ModelWithRetry.new(id: 5, some_attribute: 'value')
+
+        record.state_machine_job_test_job_failed!
 
-      expect(queue).to receive(:enqueue_in).with(60, TestJob, 'Model', 43, {:some_attribute => 'value'})
-      record.state_machine_job_test_job_failed!
+        expect(TestJob).to have_been_enqueued
+          .at(60.seconds.from_now).with(record, some_attribute: 'value')
+      end
     end
 
     it 'has event for job result which transitions to result state' do
       object = Class.new do
-        state_machine :initial => :idle  do
+        state_machine initial: :idle do
           extend StateMachineJob::Macro
 
           state :idle
@@ -103,12 +112,12 @@ module StateMachineJob
           state :failed
 
           event :run do
-            transition :idle => :running
+            transition idle: :running
           end
 
           job TestJob do
             on_enter :running
-            result :ok => :done
+            result ok: :done
           end
         end
       end.new
@@ -121,7 +130,7 @@ module StateMachineJob
 
     it 'result supports state option signature' do
       object = Class.new do
-        state_machine :initial => :idle  do
+        state_machine initial: :idle do
           extend StateMachineJob::Macro
 
           state :idle
@@ -129,12 +138,12 @@ module StateMachineJob
           state :done
 
           event :run do
-            transition :idle => :running
+            transition idle: :running
           end
 
           job TestJob do
             on_enter :running
-            result :ok, :state => :done
+            result :ok, state: :done
           end
         end
       end.new
@@ -148,12 +157,12 @@ module StateMachineJob
     it 'result raises descriptive error when trying to use hash only signature with additional options' do
       expect {
         Class.new do
-          state_machine :initial => :idle  do
+          state_machine initial: :idle do
             extend StateMachineJob::Macro
 
             job TestJob do
               on_enter :running
-              result :ok => :done, :if => true
+              result ok: :done, if: true
             end
           end
         end
@@ -162,13 +171,8 @@ module StateMachineJob
 
     describe ':if option' do
       it 'allows skipping matching results' do
-        queue = double('queue')
         object = Class.new do
-          def id
-            43
-          end
-
-          state_machine :initial => :idle  do
+          state_machine initial: :idle do
             extend StateMachineJob::Macro
 
             state :idle
@@ -177,13 +181,13 @@ module StateMachineJob
             state :other
 
             event :run do
-              transition :idle => :running
+              transition idle: :running
             end
 
-            job TestJob, queue do
+            job TestJob do
               on_enter :running
-              result :ok, :state => :done, :if => lambda { false }
-              result :ok, :state => :other
+              result :ok, state: :done, if: -> { false }
+              result :ok, state: :other
             end
           end
         end.new
@@ -195,13 +199,8 @@ module StateMachineJob
       end
 
       it 'uses matching results if condition is truthy' do
-        queue = double('queue')
         object = Class.new do
-          def id
-            43
-          end
-
-          state_machine :initial => :idle  do
+          state_machine initial: :idle do
             extend StateMachineJob::Macro
 
             state :idle
@@ -210,13 +209,13 @@ module StateMachineJob
             state :other
 
             event :run do
-              transition :idle => :running
+              transition idle: :running
             end
 
-            job TestJob, queue do
+            job TestJob do
               on_enter :running
-              result :ok, :state => :done, :if => lambda { true }
-              result :ok, :state => :other
+              result :ok, state: :done, if: -> { true }
+              result :ok, state: :other
             end
           end
         end.new
@@ -230,12 +229,12 @@ module StateMachineJob
       it 'raises descriptive error when used in combination with :retry_after option' do
         expect {
           Class.new do
-            state_machine :initial => :idle  do
+            state_machine initial: :idle do
               extend StateMachineJob::Macro
 
               job TestJob do
                 on_enter :running
-                result :ok, :state => :done, :if => true, :retry_after => 100
+                result :ok, state: :done, if: true, retry_after: 100
               end
             end
           end
@@ -244,34 +243,31 @@ module StateMachineJob
     end
 
     describe ':retry_if_state option' do
-      it 'returns to on_enter state if state matches option when job finishes' do
-        queue = double('queue')
-        object = Class.new do
-          def id
-            43
-          end
+      class ModelWithRetryIfState < BaseModel
+        attr_accessor :state, :some_attribute
 
-          state_machine :initial => :idle  do
-            extend StateMachineJob::Macro
+        state_machine initial: :idle do
+          extend StateMachineJob::Macro
 
-            state :idle
-            state :running
-            state :done
-            state :failed
+          state :idle
+          state :running
+          state :done
+          state :failed
 
-            event :run do
-              transition :idle => :running
-              transition :running => :rerun_required
-            end
+          event :run do
+            transition idle: :running
+            transition running: :rerun_required
+          end
 
-            job TestJob, queue do
-              on_enter :running
-              result :ok, :state => :done, :retry_if_state => :rerun_required
-            end
+          job TestJob do
+            on_enter :running
+            result :ok, state: :done, retry_if_state: :rerun_required
           end
-        end.new
+        end
+      end
 
-        expect(queue).to receive(:enqueue).with(TestJob, nil, 43, {})
+      it 'returns to on_enter state if state matches option when job finishes' do
+        object = ModelWithRetryIfState.new(id: 43)
 
         object.state = :running
         object.run
@@ -281,31 +277,7 @@ module StateMachineJob
       end
 
       it 'returns to result state if state does not match option when job finishes' do
-        queue = double('queue')
-        object = Class.new do
-          def id
-            43
-          end
-
-          state_machine :initial => :idle  do
-            extend StateMachineJob::Macro
-
-            state :idle
-            state :running
-            state :done
-            state :failed
-
-            event :run do
-              transition :idle => :running
-              transition :running => :rerun_required
-            end
-
-            job TestJob, queue do
-              on_enter :running
-              result :ok, :state => :done, :retry_if_state => :rerun_required
-            end
-          end
-        end.new
+        object = ModelWithRetryIfState.new(id: 43)
 
         object.state = :running
         object.state_machine_job_test_job_ok
@@ -316,11 +288,11 @@ module StateMachineJob
       it 'raises descriptive error when on_enter is used after result' do
         expect {
           Class.new do
-            state_machine :initial => :idle  do
+            state_machine initial: :idle do
               extend StateMachineJob::Macro
 
               job TestJob do
-                result :ok, :state => :done, :retry_if_state => :rerun_required
+                result :ok, state: :done, retry_if_state: :rerun_required
                 on_enter :running
               end
             end
@@ -331,12 +303,12 @@ module StateMachineJob
       it 'raises descriptive error when used in combination with :retry_after option' do
         expect {
           Class.new do
-            state_machine :initial => :idle  do
+            state_machine initial: :idle do
               extend StateMachineJob::Macro
 
               job TestJob do
                 on_enter :running
-                result :ok, :state => :done, :retry_if_state => :rerun_required, :retry_after => 100
+                result :ok, state: :done, retry_if_state: :rerun_required, retry_after: 100
               end
             end
           end
@@ -347,11 +319,11 @@ module StateMachineJob
     it 'does not raise exception if on_enter is used after result without :retry_if_state option' do
       expect {
         Class.new do
-          state_machine :initial => :idle  do
+          state_machine initial: :idle do
             extend StateMachineJob::Macro
 
             job TestJob do
-              result :ok, :state => :done
+              result :ok, state: :done
               on_enter :running
             end
           end

data/spec/state_machine_job_spec.rb

@@ -1,118 +1,64 @@
 require 'spec_helper'
 
 describe StateMachineJob do
-  class TestQueue
-    def enqueue(job, *args)
-      job.perform(*args)
-    end
+  class TestJob < ActiveJob::Base
+    include StateMachineJob
 
-    def self.instance
-      @instance ||= TestQueue.new
-    end
+    def perform_with_result(record, payload); end
   end
 
-  class TestJob1
-    @queue = 'test_job_1'
-    extend StateMachineJob
-  end
+  class Model
+    def id
+      3
+    end
+
+    def test_job_ok!; end
 
-  class TestJob2
-    @queue = 'test_job_2'
-    extend StateMachineJob
+    def test_job_error!; end
   end
 
   class SomeError < StandardError; end
 
-  class Model
-    state_machine :initial => :idle do
-      extend StateMachineJob::Macro
-
-      state :idle
-      state :first_running
-      state :second_running
-      state :done
-      state :failed
-
-      event :run do
-        transition :idle => :first_running
-      end
-
-      job TestJob1, TestQueue.instance do
-        on_enter :first_running
-        payload do |object|
-          {:n => 1}
-        end
-        result :ok => :second_running
-        result :error => :failed
-      end
-
-      job TestJob2, TestQueue.instance do
-        on_enter :second_running
-        payload do |object|
-          {:n => 2}
-        end
-        result :ok => :done
-        result :error => :failed
-      end
-    end
-  end
-
-  it 'calls find on model and passes record and payload to perform_with_result method' do
-    model = Model.new
+  it 'passes record and payload to perform_with_result method' do
+    record = Model.new
+    payload = {n: 1}
+    job = TestJob.new
 
-    allow(model).to receive(:id).and_return(5)
-    allow(Model).to receive(:find_by_id).and_return(model)
-    expect(TestJob1).to receive(:perform_with_result).with(model, {:n => 1}).and_return(:ok)
-    expect(TestJob2).to receive(:perform_with_result).with(model, {:n => 2}).and_return(:ok)
+    expect(job).to receive(:perform_with_result)
+      .with(record, payload).and_return(:ok)
 
-    model.run
+    job.perform(record, payload)
   end
 
   it 'invokes job result event on record' do
-    model = Model.new
+    record = Model.new
+    job = TestJob.new
 
-    allow(model).to receive(:id).and_return(5)
-    allow(Model).to receive(:find_by_id).and_return(model)
-    allow(TestJob1).to receive(:perform_with_result).and_return(:ok)
-    allow(TestJob2).to receive(:perform_with_result).and_return(:ok)
+    allow(job).to receive(:perform_with_result).and_return(:ok)
+    expect(record).to receive(:test_job_ok!)
 
-    expect(model).to receive(:test_job1_ok!)
-
-    model.run
+    job.perform(record)
   end
 
   it 'lets exception bubble raised by perform_with_result' do
-    model = Model.new
+    record = Model.new
+    job = TestJob.new
 
-    allow(model).to receive(:id).and_return(5)
-    allow(Model).to receive(:find_by_id).and_return(model)
-    allow(TestJob1).to receive(:perform_with_result).and_raise(SomeError)
+    allow(job).to receive(:perform_with_result).and_raise(SomeError)
 
-    expect {
-      model.run
-    }.to raise_error(SomeError)
+    expect { job.perform(record) }.to raise_error(SomeError)
   end
 
   it 'invokes error job result event on record if perform_with_result raises' do
-    model = Model.new
-
-    allow(model).to receive(:id).and_return(5)
-    allow(Model).to receive(:find_by_id).and_return(model)
-    allow(TestJob1).to receive(:perform_with_result).and_raise(SomeError)
+    record = Model.new
+    job = TestJob.new
 
-    expect(model).to receive(:test_job1_error!)
+    allow(job).to receive(:perform_with_result).and_raise(SomeError)
+    expect(record).to receive(:test_job_error!)
 
     begin
-      model.run
-    rescue SomeError
+      job.perform(record)
+    rescue SomeError # rubocop:disable Lint/HandleExceptions
     end
   end
-
-  it 'job is skipped if record cannot be found' do
-    allow(Model).to receive(:find_by_id).and_return(nil)
-
-    expect {
-      TestJob1.perform(Model.name, -1, {})
-    }.not_to raise_exception
-  end
 end

data/state_machine_job.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = StateMachineJob::VERSION
   spec.authors       = ["Codevise Solutions Ltd."]
   spec.email         = ["info@codevise.de"]
-  spec.description   = %q{State Machine + Resque.}
-  spec.summary       = %q{Resque jobs class for rails state machines.}
+  spec.description   = %q{State Machine + Active Job}
+  spec.summary       = %q{Trigger jobs via Rails state machines.}
   spec.homepage      = "http://github.com/codevise/state_machine_job"
   spec.licenses    = ['MIT']
 
@@ -20,11 +20,12 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake', '< 13'
-  spec.add_development_dependency 'rspec', '~> 3.6'
-  spec.add_development_dependency 'activesupport', '< 5'
+  spec.add_development_dependency 'rspec-rails', '~> 3.7'
+  spec.add_development_dependency 'activesupport', '< 6'
+  spec.add_development_dependency 'activemodel', '< 6'
   spec.add_development_dependency 'semmy', '~> 1.0'
+  spec.add_development_dependency 'timecop', '~> 0.9.1'
 
-  spec.add_runtime_dependency 'resque', '~> 1.25'
-  spec.add_runtime_dependency 'resque-logger', '~> 0.2.0'
+  spec.add_runtime_dependency 'activejob', ['>= 4.2', '< 6']
   spec.add_runtime_dependency 'state_machine', '~> 1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: state_machine_job
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2018-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,33 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '13'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: semmy
   requirement: !ruby/object:Gem::Requirement
@@ -81,33 +95,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: resque
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
-  type: :runtime
+        version: 0.9.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
-  name: resque-logger
+  name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +142,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-description: State Machine + Resque.
+description: State Machine + Active Job
 email:
 - info@codevise.de
 executables: []
@@ -142,7 +162,6 @@ files:
 - spec/spec_helper.rb
 - spec/state_machine_job/macro_spec.rb
 - spec/state_machine_job_spec.rb
-- spec/support/setup_resque_logger.rb
 - state_machine_job.gemspec
 homepage: http://github.com/codevise/state_machine_job
 licenses:
@@ -164,12 +183,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
-summary: Resque jobs class for rails state machines.
+summary: Trigger jobs via Rails state machines.
 test_files:
 - spec/spec_helper.rb
 - spec/state_machine_job/macro_spec.rb
 - spec/state_machine_job_spec.rb
-- spec/support/setup_resque_logger.rb

data/spec/support/setup_resque_logger.rb

@@ -1,11 +0,0 @@
-require 'resque_logger'
-
-log_dir = 'spec/tmp/log'
-FileUtils.mkdir_p(log_dir)
-
-Resque.logger_config = {
-  folder: log_dir,
-  class_name: Logger,
-  level:      Logger::INFO,
-  formatter:  Logger::Formatter.new
-}