dalliance 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ceb1bcc758ad39970b608af9112dfb735f7408edc7d97caf818654d5fca558db
-  data.tar.gz: eed4e050d077b5cdf74b8d8997e917423229199904740a06028e2d3daca89c66
+  metadata.gz: 17d8f3041b798bd3d9ecffe845c0448716006fa138b2f287e2b6bf9d23398de6
+  data.tar.gz: 93e622fd2d04e5bca69d186921e7c37c458a7939a7264737ecb025949af2f61a
 SHA512:
-  metadata.gz: 9bbddd1d2685d64b7a2ccd0d5d610f5d7d44d249ef59d0c0d76198e4c0733340dc89dc506b9c084c1f667ec7370830560854575b1dc0079d63a16cc630ba0093
-  data.tar.gz: f60a961960220bfe1973d12a1c4440bd87d1ae6d2cbfd71c57e2308d66e58e0887a5aee8513bde25316bb50765d12dbb4d42105b04d3d8dedab4465e7a63634b
+  metadata.gz: 5c6c450cce286913f4ff051ebe7cbdc2f3d6f7fc3035609e3feb83d86dc3b6e3c1d05156016ca60106e9f6ed9186735081e6ed0808c7d4908c3970277a529e54
+  data.tar.gz: 1538a6fdc3c75bb24e13ab63e2da7135c40ec74295e15b827b3045c966e5e97acf2e7d1d4db92af7c1ada1e969c54a32740d178c0ef8d80817386640fcc5b590

data/lib/dalliance/version.rb

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

data/lib/dalliance/workers/delayed_job.rb

@@ -14,6 +14,18 @@ module Dalliance
           # NOP
         end
 
+        def self.queued?(instance, queue)
+          queued_jobs =
+            Delayed::Job.where(queue: queue)
+              .pluck(:handler)
+              .map(&YAML.method(:load))
+
+          queued_jobs.any? do |job_wrapper|
+            job_wrapper.job_data['arguments'].first(2) ==
+              [instance.class.name, instance.id]
+          end
+        end
+
         def perform(instance_klass, instance_id, perform_method)
           instance_klass
             .constantize
@@ -39,6 +51,18 @@ module Dalliance
           # NOP
         end
 
+        def self.queued?(instance, queue)
+          queued_jobs =
+            Delayed::Job.where(queue: queue)
+              .pluck(:handler)
+              .map(&YAML.method(:load))
+
+          queued_jobs.any? do |job_wrapper|
+            job_wrapper.job_data['arguments'].first(2) ==
+              [instance.class.name, instance.id]
+          end
+        end
+
         def perform
           instance_klass
             .constantize

data/lib/dalliance/workers/resque.rb

@@ -27,6 +27,24 @@ module Dalliance
           end
         end
 
+        def self.queued?(instance, queue_name)
+          # All current jobs in the queue
+          queued_jobs =
+            ::Resque.redis.everything_in_queue(queue_name)
+              .map(&::Resque.method(:decode))
+
+          queued_jobs.any? do |job_info_hash|
+            args = job_info_hash['args']
+            next unless args.is_a?(Array)
+
+            arg = args[0]
+            next unless arg.is_a?(Hash)
+
+            arg.fetch('arguments', []).first(2) ==
+              [instance.class.name, instance.id]
+          end
+        end
+
         def perform(instance_klass, instance_id, perform_method)
           instance_klass
             .constantize
@@ -62,6 +80,24 @@ module Dalliance
           end
         end
 
+        def self.queued?(instance, queue_name)
+          # All current jobs in the queue
+          queued_jobs =
+            ::Resque.redis.everything_in_queue(queue_name)
+              .map(&::Resque.method(:decode))
+
+          queued_jobs.any? do |job_info_hash|
+            args = job_info_hash['args']
+            next unless args.is_a?(Array)
+
+            arg = args[0]
+            next unless arg.is_a?(Hash)
+
+            arg.fetch('arguments', []).first(2) ==
+              [instance.class.name, instance.id]
+          end
+        end
+
         def self.perform(instance_klass, instance_id, perform_method)
           instance_klass
             .constantize

data/lib/dalliance.rb

@@ -256,6 +256,19 @@ module Dalliance
     end
   end
 
+  # Is a job queued to the given processing queue for this record?
+  #
+  # @param queue_name [String]
+  #   the name of the queue to check for jobs.  Defaults to the configured
+  #   processing queue
+  #
+  # @return [Boolean]
+  def queued?(queue_name: processing_queue)
+
+    worker_class = self.class.dalliance_options[:worker_class]
+    worker_class.queued?(self, queue_name)
+  end
+
   #Force background_processing w/ true
   def dalliance_background_process(background_processing = nil)
     if background_processing || (background_processing.nil? && self.class.dalliance_options[:background_processing])

data/spec/dalliance/asynchronous_delayed_job_spec.rb

@@ -44,6 +44,7 @@ RSpec.describe DallianceModel do
 
     it "should call the dalliance_method w/ a Delayed::Worker" do
       subject.dalliance_background_process
+      expect(subject).to be_queued
       Delayed::Worker.new(:queues => [:dalliance]).work_off
       subject.reload
 
@@ -53,6 +54,7 @@ RSpec.describe DallianceModel do
 
     it "should set the dalliance_status to completed" do
       subject.dalliance_background_process
+      expect(subject).to be_queued
       Delayed::Worker.new(:queues => [:dalliance]).work_off
       subject.reload
 
@@ -61,6 +63,7 @@ RSpec.describe DallianceModel do
 
     it "should set the dalliance_progress to 100" do
       subject.dalliance_background_process
+      expect(subject).to be_queued
       Delayed::Worker.new(:queues => [:dalliance]).work_off
       subject.reload
 
@@ -71,6 +74,7 @@ RSpec.describe DallianceModel do
       expect(subject.dalliance_duration).to eq(nil)
 
       subject.dalliance_background_process
+      expect(subject).to be_queued
       Delayed::Worker.new(:queues => [:dalliance]).work_off
       subject.reload
 
@@ -91,6 +95,7 @@ RSpec.describe DallianceModel do
 
       it 'successfully runs the dalliance_reprocess method' do
         subject.dalliance_background_reprocess
+        expect(subject).to be_queued
         Delayed::Worker.new(:queues => [:dalliance]).work_off
         subject.reload
 
@@ -102,6 +107,7 @@ RSpec.describe DallianceModel do
       it 'increases the total processing time counter' do
         original_duration = subject.dalliance_duration
         subject.dalliance_background_reprocess
+        expect(subject).to be_queued
         Delayed::Worker.new(:queues => [:dalliance]).work_off
         subject.reload
 
@@ -128,6 +134,8 @@ RSpec.describe DallianceModel do
 
       it "should NOT call the dalliance_method w/ a Delayed::Worker (different queue)" do
         subject.dalliance_background_process
+        expect(subject).not_to be_queued(queue_name: 'dalliance')
+        expect(subject).to be_queued(queue_name: queue)
         Delayed::Worker.new(:queues => [:dalliance]).work_off
         subject.reload
 

data/spec/dalliance/asynchronous_resque_spec.rb

@@ -97,6 +97,9 @@ RSpec.describe DallianceModel do
 
       it "should NOT call the dalliance_method w/ a Delayed::Worker (different queue)" do
         subject.dalliance_background_process
+
+        expect(subject).to be_queued
+
         Resque::Worker.new(:dalliance).process
         subject.reload
 
@@ -106,6 +109,9 @@ RSpec.describe DallianceModel do
 
       it "should call the dalliance_method w/ a Delayed::Worker (same queue)" do
         subject.dalliance_background_process
+
+        expect(subject).to be_queued
+
         Resque::Worker.new(queue).process
         subject.reload
 
@@ -132,6 +138,9 @@ RSpec.describe DallianceModel do
       Resque::Stat.clear(:failed)
 
       subject.dalliance_background_reprocess
+
+      expect(subject).to be_queued
+
       Resque::Worker.new(:dalliance).process
       subject.reload
 
@@ -141,6 +150,7 @@ RSpec.describe DallianceModel do
         expect(Resque::Stat[:processed]).to eq(1)
         expect(Resque::Stat[:failed]).to eq(0)
         expect(subject.reprocessed_count).to eq(1)
+        expect(subject).not_to be_queued
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dalliance
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Eric Sullivan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails