dalliance 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44670798d69664a8f7aeffb94d263c695dba015a2104fbad66897fc9ac4cad43
-  data.tar.gz: 9e0c8a2cedbc449b693646332bb0cc6fc7dde070049d1baebaca6d2212f858e1
+  metadata.gz: e585e16bce792017e3427f68b18d991a5cdb3650b33703d56f1703240cfa3e09
+  data.tar.gz: 432c266fa7e05719f8074f615b439d9b9ae94ac06d429b0ff13740fabbb5f0bb
 SHA512:
-  metadata.gz: c4017905c2346ffd4356a459ed24b0ab434285b5e20e001cb4f03c3a8775647b37afbbf67dd29820e92976b4f4293d36f6eb05bd1a3d3f98feca21f0b6684074
-  data.tar.gz: b8a209af9448798a5d32210b7d9cfaa9c6395bea5ec579b0792ffc0fe4e8f04fbfa688c763f5d4f59e781d0b4b1efcbac6139d5cf3e412a54229c79589e2900c
+  metadata.gz: ab1f1ffb14924b56bcca0afe1601ac44489ed32a6bfbc56e4bc417f6849e26574c1c82204b8852db9853bb7437ac9939a9164d0a70e0accdc486136fb7f50398
+  data.tar.gz: 774cd874ad72796d024e2140889bc498332485ce5ec952a424f1ef03763cba580d302275923812882a5954f66a95f86079667b30db19ef37d986cb6b2f715f43

data/lib/dalliance.rb

@@ -236,20 +236,21 @@ module Dalliance
   end
 
   def dalliance_background_reprocess(background_processing = nil)
+    # Reset state to 'pending' before queueing up
+    # Otherwise the model will stay on completed/processing_error until the job
+    # is taken by a worker, which could be a long time after this method is
+    # called.
+    reprocess_dalliance!
     if background_processing || (background_processing.nil? && self.class.dalliance_options[:background_processing])
-      self.class.dalliance_options[:worker_class].enqueue(self, processing_queue, :dalliance_reprocess)
+      self.class.dalliance_options[:worker_class].enqueue(self, processing_queue, :do_dalliance_reprocess)
     else
-      dalliance_reprocess(false)
+      do_dalliance_reprocess(false)
     end
   end
 
   def dalliance_reprocess(background_processing = false)
     reprocess_dalliance!
-
-    do_dalliance_process(
-      perform_method: self.class.dalliance_options[:reprocess_method],
-      background_processing: background_processing
-    )
+    do_dalliance_reprocess(background_processing)
   end
 
   def do_dalliance_process(perform_method:, background_processing: false)
@@ -339,6 +340,19 @@ module Dalliance
     end
   end
 
+  private
+
+  # Executes the reprocessing method defined in the model's dalliance options.
+  #
+  # @param [Boolean] background_processing
+  #   flag if this is called from a background worker. Defaults to false.
+  def do_dalliance_reprocess(background_processing = false)
+    do_dalliance_process(
+      perform_method: self.class.dalliance_options[:reprocess_method],
+      background_processing: background_processing
+    )
+  end
+
   module Glue
     extend ActiveSupport::Concern
 

data/lib/dalliance/version.rb

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

data/spec/dalliance/asynchronous_delayed_job_spec.rb

@@ -107,6 +107,16 @@ RSpec.describe DallianceModel do
 
         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

data/spec/dalliance/asynchronous_resque_spec.rb

@@ -151,6 +151,21 @@ RSpec.describe DallianceModel do
 
       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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dalliance
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Eric Sullivan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-28 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -204,7 +204,7 @@ files:
 homepage: https://github.com/annkissam/dalliance
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -219,9 +219,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Wrapper for an ActiveRecord model with a single ascynhronous method
 test_files: