dalliance 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17d8f3041b798bd3d9ecffe845c0448716006fa138b2f287e2b6bf9d23398de6
-  data.tar.gz: 93e622fd2d04e5bca69d186921e7c37c458a7939a7264737ecb025949af2f61a
+  metadata.gz: 35460471fcbc38a777b1c2c1fc85fcaf125c43011cd43a619cde99c35b2344fe
+  data.tar.gz: 76e1ce25a3c16717b13b8c077706d66338c6cd5af2012e513fe0a16777f0d3b7
 SHA512:
-  metadata.gz: 5c6c450cce286913f4ff051ebe7cbdc2f3d6f7fc3035609e3feb83d86dc3b6e3c1d05156016ca60106e9f6ed9186735081e6ed0808c7d4908c3970277a529e54
-  data.tar.gz: 1538a6fdc3c75bb24e13ab63e2da7135c40ec74295e15b827b3045c966e5e97acf2e7d1d4db92af7c1ada1e969c54a32740d178c0ef8d80817386640fcc5b590
+  metadata.gz: aec679732b1385ef1ed52b2affbc098ea350cdf5cc348b454bbaddaa0161c1ba8589fd54924494082dedae324c5a9bc8783cb672c9df2de830aac7a9b2067d2c
+  data.tar.gz: 4ed750521ad5b32f0adbc69da26ef5c2e6a58871140e0f10a2e19d4d8cddd0c4562d91040ddeef2845e610734c110c7a17222bf10970869f3b7a6c7a91b12573

data/Appraisals

@@ -1,11 +1,3 @@
-appraise "rails-5.0" do
-  gem "rails", "~> 5.0.0"
-end
-
-appraise "rails-5.1" do
-  gem "rails", "~> 5.1.0"
-end
-
 appraise "rails-5.2" do
   gem "rails", "~> 5.2.2"
 end

data/dalliance.gemspec

@@ -5,8 +5,8 @@ require "dalliance/version"
 Gem::Specification.new do |s|
   s.name        = "dalliance"
   s.version     = Dalliance::VERSION::STRING
-  s.authors     = ["Eric Sullivan"]
-  s.email       = ["eric.sullivan@annkissam.com"]
+  s.authors     = ["Eric Sullivan", "Nick Clifford", "Sam Carlberg"]
+  s.email       = ["eric.sullivan@annkissam.com", "nicholas.clifford@annkissam.com", "sam.carlberg@annkissam.com"]
   s.homepage    = "https://github.com/annkissam/dalliance"
   s.summary     = %q{ Wrapper for an ActiveRecord model with a single ascynhronous method }
   s.description = %q{ Background processing for ActiveRecord using a 'delayable' worker and a state_machine }
@@ -16,9 +16,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('rails', '>= 5.0', "< 6.2")
+  s.add_dependency('rails', '>= 5.2', "< 6.2")
 
-  s.add_dependency('state_machine')
+  s.add_dependency('aasm')
 
   s.add_development_dependency('rspec', '>= 3.0.0')
   s.add_development_dependency('delayed_job', '>= 3.0.0')

data/gemfiles/rails_5.2.gemfile.lock

@@ -1,13 +1,15 @@
 PATH
   remote: ..
   specs:
-    dalliance (0.8.1)
-      rails (>= 5.0, < 6.2)
-      state_machine
+    dalliance (0.11.0)
+      aasm
+      rails (>= 5.2, < 6.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    aasm (5.2.0)
+      concurrent-ruby (~> 1.0)
     actioncable (5.2.4.1)
       actionpack (= 5.2.4.1)
       nio4r (~> 2.0)
@@ -82,7 +84,9 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
-    mimemagic (0.3.4)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.0)
@@ -175,7 +179,6 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
-    state_machine (1.2.0)
     thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.10)
@@ -206,4 +209,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.17.3
+   2.3.3

data/gemfiles/rails_6.0.gemfile.lock

@@ -1,13 +1,15 @@
 PATH
   remote: ..
   specs:
-    dalliance (0.8.1)
-      rails (>= 5.0, < 6.2)
-      state_machine
+    dalliance (0.11.0)
+      aasm
+      rails (>= 5.2, < 6.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    aasm (5.2.0)
+      concurrent-ruby (~> 1.0)
     actioncable (6.0.2.1)
       actionpack (= 6.0.2.1)
       nio4r (~> 2.0)
@@ -95,7 +97,9 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
-    mimemagic (0.3.4)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.0)
@@ -190,7 +194,6 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
-    state_machine (1.2.0)
     thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.10)
@@ -222,4 +225,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.17.3
+   2.3.3

data/gemfiles/rails_6.1.gemfile.lock

@@ -1,13 +1,15 @@
 PATH
   remote: ..
   specs:
-    dalliance (0.8.1)
-      rails (>= 5.0, < 6.2)
-      state_machine
+    dalliance (0.11.0)
+      aasm
+      rails (>= 5.2, < 6.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    aasm (5.2.0)
+      concurrent-ruby (~> 1.0)
     actioncable (6.1.2.1)
       actionpack (= 6.1.2.1)
       activesupport (= 6.1.2.1)
@@ -98,7 +100,9 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (1.0.0)
-    mimemagic (0.3.5)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
     mini_mime (1.0.2)
     mini_portile2 (2.5.0)
     minitest (5.14.3)
@@ -199,7 +203,6 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
-    state_machine (1.2.0)
     thor (1.1.0)
     tilt (2.0.10)
     tzinfo (2.0.4)
@@ -230,4 +233,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.17.3
+   2.3.3

data/lib/dalliance/version.rb

@@ -1,7 +1,7 @@
 module Dalliance
   module VERSION
     MAJOR = 0
-    MINOR = 10
+    MINOR = 11
     TINY  = 0
     PRE   = nil
 

data/lib/dalliance.rb

@@ -1,10 +1,8 @@
 require 'rails'
 
-require 'state_machine'
+require 'aasm'
 require 'benchmark'
 
-require 'dalliance/state_machine'
-
 require 'dalliance/version'
 require 'dalliance/workers'
 require 'dalliance/progress_meter'
@@ -65,8 +63,15 @@ module Dalliance
     end
 
     def detect_worker_class
-      return Dalliance::Workers::DelayedJob if defined? ::Delayed::Job
-      return Dalliance::Workers::Resque     if defined? ::Resque
+      if defined? ::Delayed::Job
+        ActiveSupport::Deprecation.warn(
+          'Support for Delayed::Job will be removed in future versions. ' \
+          'Use Resque instead.'
+        )
+        return Dalliance::Workers::DelayedJob
+      end
+
+      return Dalliance::Workers::Resque if defined? ::Resque
     end
 
     def detect_logger
@@ -81,6 +86,8 @@ module Dalliance
   end
 
   included do
+    include ::AASM
+
     has_one :dalliance_progress_meter, :as => :dalliance_progress_model, :class_name => '::Dalliance::ProgressMeter', :dependent => :destroy
 
     serialize :dalliance_error_hash, Hash
@@ -94,48 +101,48 @@ module Dalliance
     scope :cancel_requested, -> { where(:dalliance_status => 'cancel_requested') }
     scope :cancelled, -> { where(:dalliance_status => 'cancelled') }
 
-    state_machine :dalliance_status, :initial => :pending do
-      state :pending
-      state :processing
-      state :validation_error
-      state :processing_error
-      state :completed
-      state :cancel_requested
-      state :cancelled
+    aasm :dalliance_status, initial: :pending do
+      state :pending, display: 'Pending'
+      state :processing, display: 'Processing'
+      state :validation_error, display: 'Validation Error'
+      state :processing_error, display: 'Processing Error'
+      state :completed, display: 'Completed'
+      state :cancel_requested, display: 'Cancellation Requested'
+      state :cancelled, display: 'Cancelled'
 
       #event :queue_dalliance do
-      #  transition :processing_error => :pending
+      #  transitions from: :processing_error, to: :pending
       #end
 
       event :start_dalliance do
-        transition :pending => :processing
+        transitions from: :pending, to: :processing
       end
 
       event :validation_error_dalliance do
-        transition :processing => :validation_error
+        transitions from: :processing, to: :validation_error
       end
 
       event :error_dalliance do
-        transition all => :processing_error
+        transitions to: :processing_error
       end
 
       event :finish_dalliance do
-        transition [:processing, :cancel_requested] => :completed
+        transitions from: [:processing, :cancel_requested], to: :completed
       end
 
       event :reprocess_dalliance do
-        transition [:validation_error, :processing_error, :completed] => :pending
+        transitions from: [:validation_error, :processing_error, :completed], to: :pending
       end
 
       # Requests the record to stop processing. This does NOT cause processing
       # to stop!  Each model is required to handle cancellation on its own by
       # periodically checking the dalliance status
       event :request_cancel_dalliance do
-        transition [:pending, :processing] => :cancel_requested
+        transitions from: [:pending, :processing], to: :cancel_requested
       end
 
       event :cancelled_dalliance do
-        transition [:cancel_requested] => :cancelled
+        transitions from: [:cancel_requested], to: :cancelled
       end
     end
     #END state_machine(s)
@@ -145,7 +152,9 @@ module Dalliance
 
   module ClassMethods
     def dalliance_status_in_load_select_array
-      state_machine(:dalliance_status).states.sort_by(&:name).map {|state| [state.human_name, state.name.to_s] }
+      aasm(:dalliance_status).states.sort_by(&:name).map do |state|
+        [state.human_name, state.name.to_s]
+      end
     end
 
     def dalliance_durations
@@ -174,9 +183,16 @@ module Dalliance
   def store_dalliance_validation_error!
     self.dalliance_error_hash = {}
 
-    self.errors.each do |attribute, error|
-      self.dalliance_error_hash[attribute] ||= []
-      self.dalliance_error_hash[attribute] << error
+    if defined?(Rails) && Rails.gem_version >= Gem::Version.new('6.1')
+      self.errors.each do |error|
+        self.dalliance_error_hash[error.attribute] ||= []
+        self.dalliance_error_hash[error.attribute] << error.message
+      end
+    else
+      self.errors.each do |attribute, error|
+        self.dalliance_error_hash[attribute] ||= []
+        self.dalliance_error_hash[attribute] << error
+      end
     end
 
     begin
@@ -189,11 +205,7 @@ module Dalliance
 
         self.dalliance_error_hash = { error: 'Persistance Failure: See Logs' }
 
-        if defined?(Rails) && ::Rails::VERSION::MAJOR > 3
-          self.class.where(id: self.id).update_all(dalliance_status: dalliance_status, dalliance_error_hash: dalliance_error_hash )
-        else
-          self.class.where(id: self.id).update_all(dalliance_status: dalliance_status, dalliance_error_hash: dalliance_error_hash.to_yaml )
-        end
+        self.class.where(id: self.id).update_all(dalliance_status: dalliance_status, dalliance_error_hash: dalliance_error_hash )
       # rubocop:disable Lint/SuppressedException
       rescue
       # rubocop:enable Lint/SuppressedException
@@ -209,6 +221,10 @@ module Dalliance
     validation_error? || processing_error? || completed? || cancelled?
   end
 
+  def human_dalliance_status_name
+    I18n.t("activerecord.state_machines.dalliance_status.states.#{dalliance_status}")
+  end
+
   # Cancels the job and removes it from the queue if has not already been taken
   # by a worker.  If the job is processing, it is up to the job implementation
   # to stop and do any necessary cleanup.  If the job does not honor the
@@ -335,11 +351,7 @@ module Dalliance
 
           self.dalliance_error_hash = { error: 'Persistance Failure: See Logs' }
 
-          if defined?(Rails) && ::Rails::VERSION::MAJOR > 3
-            self.class.where(id: self.id).update_all(dalliance_status: dalliance_status, dalliance_error_hash: dalliance_error_hash )
-          else
-            self.class.where(id: self.id).update_all(dalliance_status: dalliance_status, dalliance_error_hash: dalliance_error_hash.to_yaml )
-          end
+          self.class.where(id: self.id).update_all(dalliance_status: dalliance_status, dalliance_error_hash: dalliance_error_hash )
         # rubocop:disable Lint/SuppressedException
         rescue
         # rubocop:enable Lint/SuppressedException

data/spec/dalliance/dalliance_spec.rb

@@ -27,6 +27,13 @@ RSpec.describe 'Dalliance' do
     end
   end
 
+  context "human_dalliance_status_name" do
+    it "should display the correct locale" do
+      subject.dalliance_status = 'validation_error'
+      expect(subject.human_dalliance_status_name).to eq('Validation Error')
+    end
+  end
+
   context "processing_queue" do
     before do
       DallianceModel.dalliance_options[:queue] = queue

data/spec/dalliance/synchronous_spec.rb

@@ -40,8 +40,8 @@ RSpec.describe DallianceModel do
       it 'raises an error' do
         expect { subject.dalliance_background_reprocess }
           .to raise_error(
-            StateMachine::InvalidTransition,
-            /^Cannot transition dalliance_status via :reprocess_dalliance from :pending.*/
+            AASM::InvalidTransition,
+            /^Event 'reprocess_dalliance' cannot transition from 'pending'.*/
           )
       end
     end

data/spec/spec_helper.rb

@@ -11,7 +11,7 @@ rescue LoadError
 end
 # rubocop:enable Lint/SuppressedException
 
-require 'state_machine'
+require 'aasm/rspec'
 require 'byebug'
 
 #Required for testing...

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: dalliance
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Eric Sullivan
+- Nick Clifford
+- Sam Carlberg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,7 +18,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.2'
@@ -26,12 +28,12 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.2'
 - !ruby/object:Gem::Dependency
-  name: state_machine
+  name: aasm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -160,6 +162,8 @@ description: " Background processing for ActiveRecord using a 'delayable' worker
   a state_machine "
 email:
 - eric.sullivan@annkissam.com
+- nicholas.clifford@annkissam.com
+- sam.carlberg@annkissam.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -174,10 +178,6 @@ files:
 - Rakefile
 - config/locales/en.yml
 - dalliance.gemspec
-- gemfiles/rails_5.0.gemfile
-- gemfiles/rails_5.0.gemfile.lock
-- gemfiles/rails_5.1.gemfile
-- gemfiles/rails_5.1.gemfile.lock
 - gemfiles/rails_5.2.gemfile
 - gemfiles/rails_5.2.gemfile.lock
 - gemfiles/rails_6.0.gemfile
@@ -188,7 +188,6 @@ files:
 - lib/dalliance/engine.rb
 - lib/dalliance/progress_meter.rb
 - lib/dalliance/schema.rb
-- lib/dalliance/state_machine.rb
 - lib/dalliance/version.rb
 - lib/dalliance/workers.rb
 - lib/dalliance/workers/delayed_job.rb
@@ -221,8 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Wrapper for an ActiveRecord model with a single ascynhronous method

data/gemfiles/rails_5.0.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "rails", "~> 5.0.0"
-
-group :development, :test do
-  gem "byebug"
-end
-
-gemspec path: "../"

data/gemfiles/rails_5.0.gemfile.lock

@@ -1,201 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    dalliance (0.8.1)
-      rails (>= 5.0, < 6.2)
-      state_machine
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.0.7.2)
-      actionpack (= 5.0.7.2)
-      nio4r (>= 1.2, < 3.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.0.7.2)
-      actionpack (= 5.0.7.2)
-      actionview (= 5.0.7.2)
-      activejob (= 5.0.7.2)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.0.7.2)
-      actionview (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.7.2)
-      activesupport (= 5.0.7.2)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.7.2)
-      activesupport (= 5.0.7.2)
-      globalid (>= 0.3.6)
-    activemodel (5.0.7.2)
-      activesupport (= 5.0.7.2)
-    activerecord (5.0.7.2)
-      activemodel (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
-      arel (~> 7.0)
-    activesupport (5.0.7.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    appraisal (2.2.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (7.1.4)
-    ast (2.4.0)
-    builder (3.2.4)
-    bundler-audit (0.6.1)
-      bundler (>= 1.2.0, < 3)
-      thor (~> 0.18)
-    byebug (11.1.1)
-    concurrent-ruby (1.1.6)
-    crass (1.0.6)
-    delayed_job (4.1.8)
-      activesupport (>= 3.0, < 6.1)
-    delayed_job_active_record (4.1.4)
-      activerecord (>= 3.0, < 6.1)
-      delayed_job (>= 3.0, < 5)
-    diff-lcs (1.3)
-    erubis (2.7.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.8.2)
-      concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
-    loofah (2.4.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    method_source (0.9.2)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.0)
-    mono_logger (1.1.0)
-    multi_json (1.14.1)
-    mustermann (1.1.1)
-      ruby2_keywords (~> 0.0.1)
-    nio4r (2.5.2)
-    nokogiri (1.10.8)
-      mini_portile2 (~> 2.4.0)
-    parallel (1.19.1)
-    parser (2.7.0.3)
-      ast (~> 2.4.0)
-    rack (2.2.2)
-    rack-protection (2.0.8.1)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.0.7.2)
-      actioncable (= 5.0.7.2)
-      actionmailer (= 5.0.7.2)
-      actionpack (= 5.0.7.2)
-      actionview (= 5.0.7.2)
-      activejob (= 5.0.7.2)
-      activemodel (= 5.0.7.2)
-      activerecord (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
-      bundler (>= 1.3.0)
-      railties (= 5.0.7.2)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (5.0.7.2)
-      actionpack (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    redis (4.1.3)
-    redis-namespace (1.7.0)
-      redis (>= 3.0.4)
-    resque (2.0.0)
-      mono_logger (~> 1.0)
-      multi_json (~> 1.0)
-      redis-namespace (~> 1.6)
-      sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
-    rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    rspec_junit_formatter (0.4.1)
-      rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.80.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.7.0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      rexml
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
-    sinatra (2.0.8.1)
-      mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.8.1)
-      tilt (~> 2.0)
-    sprockets (4.0.0)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
-    state_machine (1.2.0)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tilt (2.0.10)
-    tzinfo (1.2.6)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.6.1)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
-    websocket-driver (0.6.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  bundler-audit
-  byebug
-  dalliance!
-  delayed_job (>= 3.0.0)
-  delayed_job_active_record
-  rails (~> 5.0.0)
-  resque
-  rspec (>= 3.0.0)
-  rspec_junit_formatter
-  rubocop (~> 0.78)
-  sqlite3
-
-BUNDLED WITH
-   1.17.3

data/gemfiles/rails_5.1.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "rails", "~> 5.1.0"
-
-group :development, :test do
-  gem "byebug"
-end
-
-gemspec path: "../"

data/gemfiles/rails_5.1.gemfile.lock

@@ -1,201 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    dalliance (0.8.1)
-      rails (>= 5.0, < 6.2)
-      state_machine
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.1.7)
-      actionpack (= 5.1.7)
-      nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.7)
-      actionpack (= 5.1.7)
-      actionview (= 5.1.7)
-      activejob (= 5.1.7)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.1.7)
-      actionview (= 5.1.7)
-      activesupport (= 5.1.7)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.7)
-      activesupport (= 5.1.7)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.7)
-      activesupport (= 5.1.7)
-      globalid (>= 0.3.6)
-    activemodel (5.1.7)
-      activesupport (= 5.1.7)
-    activerecord (5.1.7)
-      activemodel (= 5.1.7)
-      activesupport (= 5.1.7)
-      arel (~> 8.0)
-    activesupport (5.1.7)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    appraisal (2.2.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (8.0.0)
-    ast (2.4.0)
-    builder (3.2.4)
-    bundler-audit (0.6.1)
-      bundler (>= 1.2.0, < 3)
-      thor (~> 0.18)
-    byebug (11.1.1)
-    concurrent-ruby (1.1.6)
-    crass (1.0.6)
-    delayed_job (4.1.8)
-      activesupport (>= 3.0, < 6.1)
-    delayed_job_active_record (4.1.4)
-      activerecord (>= 3.0, < 6.1)
-      delayed_job (>= 3.0, < 5)
-    diff-lcs (1.3)
-    erubi (1.9.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.8.2)
-      concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
-    loofah (2.4.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    method_source (0.9.2)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.0)
-    mono_logger (1.1.0)
-    multi_json (1.14.1)
-    mustermann (1.1.1)
-      ruby2_keywords (~> 0.0.1)
-    nio4r (2.5.2)
-    nokogiri (1.10.8)
-      mini_portile2 (~> 2.4.0)
-    parallel (1.19.1)
-    parser (2.7.0.3)
-      ast (~> 2.4.0)
-    rack (2.2.2)
-    rack-protection (2.0.8.1)
-      rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (5.1.7)
-      actioncable (= 5.1.7)
-      actionmailer (= 5.1.7)
-      actionpack (= 5.1.7)
-      actionview (= 5.1.7)
-      activejob (= 5.1.7)
-      activemodel (= 5.1.7)
-      activerecord (= 5.1.7)
-      activesupport (= 5.1.7)
-      bundler (>= 1.3.0)
-      railties (= 5.1.7)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (5.1.7)
-      actionpack (= 5.1.7)
-      activesupport (= 5.1.7)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    redis (4.1.3)
-    redis-namespace (1.7.0)
-      redis (>= 3.0.4)
-    resque (2.0.0)
-      mono_logger (~> 1.0)
-      multi_json (~> 1.0)
-      redis-namespace (~> 1.6)
-      sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
-    rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    rspec_junit_formatter (0.4.1)
-      rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.80.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.7.0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      rexml
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
-    sinatra (2.0.8.1)
-      mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.8.1)
-      tilt (~> 2.0)
-    sprockets (4.0.0)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
-    state_machine (1.2.0)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tilt (2.0.10)
-    tzinfo (1.2.6)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.6.1)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
-    websocket-driver (0.6.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  bundler-audit
-  byebug
-  dalliance!
-  delayed_job (>= 3.0.0)
-  delayed_job_active_record
-  rails (~> 5.1.0)
-  resque
-  rspec (>= 3.0.0)
-  rspec_junit_formatter
-  rubocop (~> 0.78)
-  sqlite3
-
-BUNDLED WITH
-   1.17.3

data/lib/dalliance/state_machine.rb

@@ -1,15 +0,0 @@
-# Rails 4.1.0 and StateMachine don't play nice
-# https://github.com/pluginaweek/state_machine/issues/295
-require 'state_machine/version'
-
-if defined?(Rails)
-  if StateMachine::VERSION > '1.2.0'
-    # If you see this message, please test removing this file
-    # If it's still required, please bump up the version above
-    Rails.logger.warn "Please remove me, StateMachine version has changed"
-  end
-end
-
-module StateMachine::Integrations::ActiveModel
-  public :around_validation
-end