dalliance 0.5.1 → 0.8.2

data/spec/dalliance/synchronous_spec.rb

@@ -35,6 +35,61 @@ RSpec.describe DallianceModel do
     end
   end
 
+  context 'reprocess' do
+    context 'without having already processed' 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.*/
+          )
+      end
+    end
+
+    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
+
+      it 'calls the dalliance_reprocess method' do
+        expect { subject.dalliance_background_reprocess }
+          .to change(subject, :reprocessed_count)
+          .from(0)
+          .to(1)
+      end
+
+      it 'can call the dalliance_reprocess method many times in succession' do
+        expect { 10.times { subject.dalliance_background_reprocess } }
+          .to change(subject, :reprocessed_count)
+          .from(0)
+          .to(10)
+      end
+
+      it 'sets the dalliance_status to completed' do
+        expect { subject.dalliance_background_reprocess }
+          .not_to change { subject.reload.dalliance_status }
+          .from('completed')
+      end
+
+      it 'sets the dalliance_progress to 100' do
+        expect { subject.dalliance_background_reprocess }
+          .not_to change { subject.reload.dalliance_progress }
+          .from(100)
+      end
+
+      it 'increases the total processing time counter' do
+        original_duration = subject.dalliance_duration
+        subject.dalliance_background_reprocess
+        Delayed::Worker.new(:queues => [:dalliance]).work_off
+        subject.reload
+
+        expect(subject.dalliance_duration).to be_between(original_duration, Float::INFINITY)
+      end
+    end
+  end
+
   context "raise error" do
     before(:all) do
       DallianceModel.dalliance_options[:dalliance_method] = :dalliance_error_method
@@ -121,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

data/spec/spec_helper.rb

@@ -4,10 +4,12 @@ require 'bundler/setup'
 #Automatically included in a rails app...
 require 'active_support'
 
+# rubocop:disable Lint/SuppressedException
 begin
   require 'active_job'
 rescue LoadError
 end
+# rubocop:enable Lint/SuppressedException
 
 require 'state_machine'
 require 'byebug'

data/spec/support/active_record.rb

@@ -35,9 +35,10 @@ ActiveRecord::Schema.define do
   create_table :dalliance_models, :force => true do |t|
     t.text    :dalliance_error_hash
     t.string  :dalliance_status, :string, :null => false, :default => 'pending'
-    t.integer :dalliance_duration
+    t.decimal :dalliance_duration
 
     t.boolean :successful, :default => false
+    t.integer :reprocessed_count, default: 0
   end
 end
 
@@ -47,12 +48,17 @@ class DallianceModel < ActiveRecord::Base
   include Dalliance::Glue
 
   dalliance :dalliance_success_method,
+            reprocess_method: :dalliance_reprocess_method,
             :logger => nil
 
   def dalliance_success_method
     update_attribute(:successful, true)
   end
 
+  def dalliance_reprocess_method
+    update_attribute(:reprocessed_count, self.reprocessed_count + 1)
+  end
+
   def dalliance_error_method
     raise RuntimeError
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dalliance
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Eric Sullivan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2021-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler-audit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.78'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.78'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: " Background processing for ActiveRecord using a 'delayable' worker and
   a state_machine "
 email:
@@ -122,6 +164,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - Appraisals
@@ -131,20 +174,16 @@ files:
 - Rakefile
 - config/locales/en.yml
 - dalliance.gemspec
-- gemfiles/rails_3.1.gemfile
-- gemfiles/rails_3.1.gemfile.lock
-- gemfiles/rails_3.2.gemfile
-- gemfiles/rails_3.2.gemfile.lock
-- gemfiles/rails_4.0.gemfile
-- gemfiles/rails_4.0.gemfile.lock
-- gemfiles/rails_4.1.gemfile
-- gemfiles/rails_4.1.gemfile.lock
-- 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
+- gemfiles/rails_6.1.gemfile
+- gemfiles/rails_6.1.gemfile.lock
 - lib/dalliance.rb
 - lib/dalliance/engine.rb
 - lib/dalliance/progress_meter.rb
@@ -167,7 +206,7 @@ files:
 homepage: https://github.com/annkissam/dalliance
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -182,9 +221,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: dalliance
-rubygems_version: 2.6.14
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6
+signing_key:
 specification_version: 4
 summary: Wrapper for an ActiveRecord model with a single ascynhronous method
 test_files:

data/gemfiles/rails_3.1.gemfile

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

data/gemfiles/rails_3.1.gemfile.lock

@@ -1,149 +0,0 @@
-PATH
-  remote: ../
-  specs:
-    dalliance (0.3.3)
-      activerecord (>= 3.1, < 5.0)
-      activesupport (>= 3.1, < 5.0)
-      state_machine
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.1.12)
-      actionpack (= 3.1.12)
-      mail (~> 2.4.4)
-    actionpack (3.1.12)
-      activemodel (= 3.1.12)
-      activesupport (= 3.1.12)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.6)
-      rack-cache (~> 1.2)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.4)
-    activemodel (3.1.12)
-      activesupport (= 3.1.12)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.12)
-      activemodel (= 3.1.12)
-      activesupport (= 3.1.12)
-      arel (~> 2.2.3)
-      tzinfo (~> 0.3.29)
-    activeresource (3.1.12)
-      activemodel (= 3.1.12)
-      activesupport (= 3.1.12)
-    activesupport (3.1.12)
-      multi_json (~> 1.0)
-    appraisal (1.0.2)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (2.2.3)
-    builder (3.0.4)
-    byebug (9.0.5)
-    delayed_job (4.0.6)
-      activesupport (>= 3.0, < 5.0)
-    delayed_job_active_record (4.0.3)
-      activerecord (>= 3.0, < 5.0)
-      delayed_job (>= 3.0, < 4.1)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    hike (1.2.3)
-    i18n (0.7.0)
-    json (1.8.2)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25.1)
-    mono_logger (1.1.0)
-    multi_json (1.10.1)
-    polyglot (0.3.5)
-    rack (1.3.10)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-protection (1.5.3)
-      rack
-    rack-ssl (1.3.4)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (3.1.12)
-      actionmailer (= 3.1.12)
-      actionpack (= 3.1.12)
-      activerecord (= 3.1.12)
-      activeresource (= 3.1.12)
-      activesupport (= 3.1.12)
-      bundler (~> 1.0)
-      railties (= 3.1.12)
-    railties (3.1.12)
-      actionpack (= 3.1.12)
-      activesupport (= 3.1.12)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (10.4.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    redis (3.2.0)
-    redis-namespace (1.5.1)
-      redis (~> 3.0, >= 3.0.4)
-    resque (1.25.2)
-      mono_logger (~> 1.0)
-      multi_json (~> 1.0)
-      redis-namespace (~> 1.3)
-      sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    sinatra (1.3.3)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    sprockets (2.0.5)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.10)
-    state_machine (1.2.0)
-    thor (0.14.6)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.42)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  byebug
-  dalliance!
-  delayed_job (>= 3.0.0)
-  delayed_job_active_record
-  rails (~> 3.1.0)
-  resque
-  rspec (>= 3.0.0)
-  sqlite3
-
-BUNDLED WITH
-   1.13.1

data/gemfiles/rails_3.2.gemfile.lock

@@ -1,146 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    dalliance (0.4.0)
-      rails (>= 3.2, <= 5.1.4)
-      state_machine
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.2.21)
-      actionpack (= 3.2.21)
-      mail (~> 2.5.4)
-    actionpack (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.21)
-      activesupport (= 3.2.21)
-      builder (~> 3.0.0)
-    activerecord (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
-    activesupport (3.2.21)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    appraisal (1.0.2)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (3.0.3)
-    builder (3.0.4)
-    byebug (9.0.5)
-    delayed_job (4.0.6)
-      activesupport (>= 3.0, < 5.0)
-    delayed_job_active_record (4.0.3)
-      activerecord (>= 3.0, < 5.0)
-      delayed_job (>= 3.0, < 4.1)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    hike (1.2.3)
-    i18n (0.7.0)
-    journey (1.0.4)
-    json (1.8.2)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25.1)
-    mono_logger (1.1.0)
-    multi_json (1.10.1)
-    polyglot (0.3.5)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-protection (1.5.3)
-      rack
-    rack-ssl (1.3.4)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (3.2.21)
-      actionmailer (= 3.2.21)
-      actionpack (= 3.2.21)
-      activerecord (= 3.2.21)
-      activeresource (= 3.2.21)
-      activesupport (= 3.2.21)
-      bundler (~> 1.0)
-      railties (= 3.2.21)
-    railties (3.2.21)
-      actionpack (= 3.2.21)
-      activesupport (= 3.2.21)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.4.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    redis (3.2.0)
-    redis-namespace (1.5.1)
-      redis (~> 3.0, >= 3.0.4)
-    resque (1.25.2)
-      mono_logger (~> 1.0)
-      multi_json (~> 1.0)
-      redis-namespace (~> 1.3)
-      sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    sinatra (1.4.5)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    sprockets (2.2.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.10)
-    state_machine (1.2.0)
-    thor (0.19.1)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.42)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  byebug
-  dalliance!
-  delayed_job (>= 3.0.0)
-  delayed_job_active_record
-  rails (~> 3.2.0)
-  resque
-  rspec (>= 3.0.0)
-  sqlite3
-
-BUNDLED WITH
-   1.16.0