dalliance 0.5.0 → 0.8.1

data/lib/dalliance/version.rb

@@ -1,8 +1,8 @@
 module Dalliance
   module VERSION
     MAJOR = 0
-    MINOR = 5
-    TINY  = 0
+    MINOR = 8
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/dalliance/workers/delayed_job.rb

@@ -1,15 +1,20 @@
 module Dalliance
   module Workers
-    if defined?(Rails) && ::Rails::VERSION::MAJOR >= 4 && ::Rails::VERSION::MINOR >= 2
+    if defined?(Rails)
       class DelayedJob < ::ActiveJob::Base
         queue_as :dalliance
 
-        def self.enqueue(instance, queue = 'dalliance')
-          Dalliance::Workers::DelayedJob.set(queue: queue).perform_later(instance.class.name, instance.id)
+        def self.enqueue(instance, queue = 'dalliance', perform_method)
+          Dalliance::Workers::DelayedJob
+            .set(queue: queue)
+            .perform_later(instance.class.name, instance.id, perform_method.to_s)
         end
 
-        def perform(instance_klass, instance_id)
-          instance_klass.constantize.find(instance_id).dalliance_process(true)
+        def perform(instance_klass, instance_id, perform_method)
+          instance_klass
+            .constantize
+            .find(instance_id)
+            .send(perform_method, true)
         end
 
         #Delayed job automatically retries, so rescue the error
@@ -18,13 +23,19 @@ module Dalliance
         end
       end
     else
-      class DelayedJob < Struct.new(:instance_klass, :instance_id)
-        def self.enqueue(instance, queue = 'dalliance')
-          ::Delayed::Job.enqueue(self.new(instance.class.name, instance.id), :queue => queue)
+      class DelayedJob < Struct.new(:instance_klass, :instance_id, :perform_method)
+        def self.enqueue(instance, queue = 'dalliance', perform_method)
+          ::Delayed::Job.enqueue(
+            self.new(instance.class.name, instance.id, perform_method),
+            :queue => queue
+          )
         end
 
         def perform
-          instance_klass.constantize.find(instance_id).dalliance_process(true)
+          instance_klass
+            .constantize
+            .find(instance_id)
+            .send(perform_method, true)
         end
 
         #Delayed job automatically retries, so rescue the error

data/lib/dalliance/workers/resque.rb

@@ -1,15 +1,20 @@
 module Dalliance
   module Workers
-    if defined?(Rails) && ::Rails::VERSION::MAJOR >= 4 && ::Rails::VERSION::MINOR >= 2
+    if defined?(Rails)
       class Resque < ::ActiveJob::Base
         queue_as :dalliance
 
-        def self.enqueue(instance, queue = 'dalliance')
-          Dalliance::Workers::Resque.set(queue: queue).perform_later(instance.class.name, instance.id)
+        def self.enqueue(instance, queue = 'dalliance', perform_method)
+          Dalliance::Workers::Resque
+            .set(queue: queue)
+            .perform_later(instance.class.name, instance.id, perform_method.to_s)
         end
 
-        def perform(instance_klass, instance_id)
-          instance_klass.constantize.find(instance_id).dalliance_process(true)
+        def perform(instance_klass, instance_id, perform_method)
+          instance_klass
+            .constantize
+            .find(instance_id)
+            .send(perform_method, true)
         end
 
         #Resque fails, so don't rescue the error
@@ -19,12 +24,15 @@ module Dalliance
       end
     else
       class Resque
-        def self.enqueue(instance, queue = 'dalliance')
-          ::Resque.enqueue_to(queue, self, instance.class.name, instance.id)
+        def self.enqueue(instance, queue = 'dalliance', perform_method)
+          ::Resque.enqueue_to(queue, self, instance.class.name, instance.id, perform_method.to_s)
         end
 
-        def self.perform(instance_klass, instance_id)
-          instance_klass.constantize.find(instance_id).dalliance_process(true)
+        def self.perform(instance_klass, instance_id, perform_method)
+          instance_klass
+            .constantize
+            .find(instance_id)
+            .send(perform_method, true)
         end
 
         #Resque fails, so don't rescue the error

data/spec/dalliance/asynchronous_delayed_job_spec.rb

@@ -77,6 +77,48 @@ RSpec.describe DallianceModel do
       expect(subject.dalliance_duration).not_to eq(nil)
     end
 
+    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
+
+      before do
+        subject.dalliance_process
+        subject.reload
+      end
+
+      it 'successfully runs the dalliance_reprocess method' do
+        subject.dalliance_background_reprocess
+        Delayed::Worker.new(:queues => [:dalliance]).work_off
+        subject.reload
+
+        expect(subject).to be_successful
+        expect(Delayed::Job.count).to eq(0)
+        expect(subject.reprocessed_count).to eq(1)
+      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
+
+      it "resets the dalliance_status to 'pending'" do
+        subject.update_column(:dalliance_status, 'processing_error')
+        expect { subject.dalliance_background_reprocess }
+          .to change(subject, :dalliance_status)
+          .to('pending')
+
+        Delayed::Worker.new(:queues => [:dalliance]).work_off
+        expect(subject).to be_successful
+      end
+    end
+
     context "another_queue" do
       let(:queue) { 'dalliance_2'}
 

data/spec/dalliance/asynchronous_resque_spec.rb

@@ -114,6 +114,60 @@ RSpec.describe DallianceModel do
     end
   end
 
+  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
+
+    before do
+      subject.dalliance_process
+      subject.reload
+    end
+
+    it 'successfully runs the dalliance_reprocess method' do
+      Resque::Stat.clear(:processed)
+      Resque::Stat.clear(:failed)
+
+      subject.dalliance_background_reprocess
+      Resque::Worker.new(:dalliance).process
+      subject.reload
+
+      aggregate_failures do
+        expect(subject).to be_successful
+        expect(Resque.size(:dalliance)).to eq(0)
+        expect(Resque::Stat[:processed]).to eq(1)
+        expect(Resque::Stat[:failed]).to eq(0)
+        expect(subject.reprocessed_count).to eq(1)
+      end
+    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
+
+    it "resets the dalliance_status to 'pending'" do
+      subject.update_column(:dalliance_status, 'processing_error')
+
+      Resque::Stat.clear(:processed)
+      Resque::Stat.clear(:failed)
+
+      expect { subject.dalliance_background_reprocess }
+        .to change(subject, :dalliance_status)
+        .to('pending')
+
+      Resque::Worker.new(:dalliance).process
+
+      expect(subject).to be_successful
+    end
+  end
+
   context "raise error" do
     before(:all) do
       DallianceModel.dalliance_options[:dalliance_method] = :dalliance_error_method

data/spec/dalliance/dalliance_spec.rb

@@ -21,7 +21,7 @@ RSpec.describe 'Dalliance' do
 
   context "human_attribute_name" do
     it "should display the correct locale" do
-      expect(DallianceModel.human_attribute_name(:dalliance_status)).to eq ('Status')
+      expect(DallianceModel.human_attribute_name(:dalliance_status)).to eq('Status')
     end
   end
 
@@ -44,7 +44,7 @@ RSpec.describe 'Dalliance' do
       end
 
       context "w/ args" do
-        let(:queue) { Proc.new{ |a,b,c| 'dalliance_2' } }
+        let(:queue) { Proc.new{ |_a,_b,_c| 'dalliance_2' } }
 
         specify{ expect(subject.processing_queue).to eq(queue.call) }
       end

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

@@ -6,7 +6,7 @@ ActiveRecord::Migration.verbose = false
 
 ActiveRecord::Schema.define do
   create_table :dalliance_progress_meters, :force => true do |t|
-    t.belongs_to :dalliance_progress_model, :polymorphic => true
+    t.belongs_to :dalliance_progress_model, :polymorphic => true, index: { name: "by_dalliance_progress_model" }
 
     t.integer :current_count
     t.integer :total_count
@@ -15,7 +15,7 @@ ActiveRecord::Schema.define do
     t.timestamps null: false
   end
 
-  add_index     :dalliance_progress_meters, [:dalliance_progress_model_id, :dalliance_progress_model_type], :name => 'by_dalliance_progress_model'
+  # add_index     :dalliance_progress_meters, [:dalliance_progress_model_id, :dalliance_progress_model_type], :name => 'by_dalliance_progress_model'
 
   create_table :delayed_jobs, :force => true do |table|
     table.integer  :priority, :default => 0
@@ -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.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Eric Sullivan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2020-11-30 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.1.4
+        version: '6.1'
   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.1.4
+        version: '6.1'
 - !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,14 @@ 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
 - lib/dalliance.rb
 - lib/dalliance/engine.rb
 - lib/dalliance/progress_meter.rb
@@ -167,7 +204,7 @@ files:
 homepage: https://github.com/annkissam/dalliance
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -182,9 +219,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: