dalliance 0.7.0 → 0.8.0

data/lib/dalliance.rb

@@ -197,7 +197,7 @@ module Dalliance
   def validate_dalliance_status
     unless error_or_completed?
       errors.add(:dalliance_status, :invalid)
-      if defined?(Rails) && ::Rails::VERSION::MAJOR == 5 && ::Rails::VERSION::MINOR >= 0
+      if defined?(Rails)
         throw(:abort)
       else
         return false

data/lib/dalliance/version.rb

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

data/lib/dalliance/workers/delayed_job.rb

@@ -1,6 +1,6 @@
 module Dalliance
   module Workers
-    if defined?(Rails) && ((::Rails::VERSION::MAJOR == 4 && ::Rails::VERSION::MINOR >= 2) || ::Rails::VERSION::MAJOR >= 5)
+    if defined?(Rails)
       class DelayedJob < ::ActiveJob::Base
         queue_as :dalliance
 

data/lib/dalliance/workers/resque.rb

@@ -1,6 +1,6 @@
 module Dalliance
   module Workers
-    if defined?(Rails) && ((::Rails::VERSION::MAJOR == 4 && ::Rails::VERSION::MINOR >= 2) || ::Rails::VERSION::MAJOR >= 5)
+    if defined?(Rails)
       class Resque < ::ActiveJob::Base
         queue_as :dalliance
 

data/spec/dalliance/asynchronous_delayed_job_spec.rb

@@ -79,6 +79,7 @@ RSpec.describe DallianceModel do
 
     context 'reprocess' do
       before(:all) do
+        DallianceModel.dalliance_options[:dalliance_method] = :dalliance_success_method
         DallianceModel.dalliance_options[:worker_class] = Dalliance::Workers::DelayedJob
         DallianceModel.dalliance_options[:queue] = 'dalliance'
       end

data/spec/dalliance/asynchronous_resque_spec.rb

@@ -116,6 +116,7 @@ RSpec.describe DallianceModel do
 
   context 'reprocess' do
     before :all do
+      DallianceModel.dalliance_options[:dalliance_method] = :dalliance_success_method
       DallianceModel.dalliance_options[:worker_class] = Dalliance::Workers::Resque
       DallianceModel.dalliance_options[:queue] = 'dalliance'
     end

data/spec/dalliance/synchronous_spec.rb

@@ -48,6 +48,7 @@ RSpec.describe DallianceModel do
 
     context 'when the model has already processed' do
       before do
+        DallianceModel.dalliance_options[:dalliance_method] = :dalliance_success_method
         subject.dalliance_background_process
         subject.reload
       end
@@ -175,7 +176,7 @@ RSpec.describe DallianceModel do
     end
   end
 
-   context "destroy" do
+  context "destroy" do
     it "should return false when pending?" do
       subject.update_column(:dalliance_status, 'pending')
       expect(subject.destroy).to be_falsey

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dalliance
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Eric Sullivan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
@@ -174,14 +174,14 @@ files:
 - Rakefile
 - config/locales/en.yml
 - dalliance.gemspec
-- gemfiles/rails_4.2.gemfile
-- gemfiles/rails_4.2.gemfile.lock
 - 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
+- gemfiles/rails_6.0.gemfile.lock
 - lib/dalliance.rb
 - lib/dalliance/engine.rb
 - lib/dalliance/progress_meter.rb

data/gemfiles/rails_4.2.gemfile.lock

@@ -1,165 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    dalliance (0.5.1)
-      rails (>= 3.2, < 5.3)
-      state_machine
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.2.9)
-      actionpack (= 4.2.9)
-      actionview (= 4.2.9)
-      activejob (= 4.2.9)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.9)
-      actionview (= 4.2.9)
-      activesupport (= 4.2.9)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.9)
-      activesupport (= 4.2.9)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.9)
-      activesupport (= 4.2.9)
-      globalid (>= 0.3.0)
-    activemodel (4.2.9)
-      activesupport (= 4.2.9)
-      builder (~> 3.1)
-    activerecord (4.2.9)
-      activemodel (= 4.2.9)
-      activesupport (= 4.2.9)
-      arel (~> 6.0)
-    activesupport (4.2.9)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    appraisal (2.2.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (6.0.4)
-    builder (3.2.3)
-    byebug (10.0.2)
-    concurrent-ruby (1.1.5)
-    crass (1.0.4)
-    delayed_job (4.1.5)
-      activesupport (>= 3.0, < 5.3)
-    delayed_job_active_record (4.1.3)
-      activerecord (>= 3.0, < 5.3)
-      delayed_job (>= 3.0, < 5)
-    diff-lcs (1.3)
-    erubis (2.7.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (0.9.5)
-      concurrent-ruby (~> 1.0)
-    loofah (2.2.3)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    mini_mime (1.0.1)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    mono_logger (1.1.0)
-    multi_json (1.13.1)
-    nokogiri (1.10.3)
-      mini_portile2 (~> 2.4.0)
-    rack (1.6.8)
-    rack-protection (1.5.3)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.9)
-      actionmailer (= 4.2.9)
-      actionpack (= 4.2.9)
-      actionview (= 4.2.9)
-      activejob (= 4.2.9)
-      activemodel (= 4.2.9)
-      activerecord (= 4.2.9)
-      activesupport (= 4.2.9)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.9)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.9)
-      activesupport (>= 4.2.0, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (4.2.9)
-      actionpack (= 4.2.9)
-      activesupport (= 4.2.9)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.3.2)
-    redis (4.1.0)
-    redis-namespace (1.6.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)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
-    state_machine (1.2.0)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tilt (2.0.9)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  byebug
-  dalliance!
-  delayed_job (>= 3.0.0)
-  delayed_job_active_record
-  rails (~> 4.2.0)
-  resque
-  rspec (>= 3.0.0)
-  sqlite3
-
-BUNDLED WITH
-   1.17.3