resque-durable 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06e9f2c661904146837eb00fb32749a8b98f97d5b0823ade9f4d5728415dd296
-  data.tar.gz: 65eb84b6a2cde6fd3aaafe3bee4168a61ab8bfb1837f01b61759f9895970adf9
+  metadata.gz: 760558bccac1af452b42796868cdbda6a57b3354df3741cc33f005d34f4fd2cc
+  data.tar.gz: 1683df8484d77ef28c279b4ed7e7231685c84885f0eef64e89a0c914355a319f
 SHA512:
-  metadata.gz: 2fa7e0802df25c44b81a8e38ac019a33a3479d08fbeed792204d8d1e173618cbe898d45ae08f0b3abf43e9018d831b07207b47740b5fc3ae369a2b55f94739a8
-  data.tar.gz: 5c90519a2aaee23758d39d0cab29d6108a8b0d639b4ba151b003ee0e5b2e9c0f95a4628a5a973124091b33f0ae66415884552b9807143481c7e1b53984c69b56
+  metadata.gz: 3d11699c2d98c648c69cf514b535bd2ef6f8f04197bb6e1732d613b474ecf6bf4ff1e5bcc8392d7ff687e078a7670690cfe3d97b62acce5a3b6c38845bff09f3
+  data.tar.gz: 8d94395d6e1413a0052d8a68126bbc70470826e1e2833b12a718497f596469d0c4f576df30eb5fda45838fd15be9ae068a181480a42d0b5ca6d8b0b026fe21c2

data/lib/resque/durable/{queue_audit.rb → queue_audit_methods.rb}

@@ -3,36 +3,42 @@ require 'active_support/core_ext'
 
 module Resque
   module Durable
-    class QueueAudit < ActiveRecord::Base
+    module QueueAuditMethods
+      extend ActiveSupport::Concern
+
       JobCollision = Class.new(StandardError)
 
-      self.table_name = :durable_queue_audits
-      # id
-      # enqueued_id
-      # queue_name
-      # payload
-      # enqueue_count
-      # enqueued_at
-      # completed_at
-      # timeout_at
-      # updated_at
-      # created_at
-      DEFAULT_DURATION = 10.minutes
+      included do
+        self.table_name = :durable_queue_audits
+        # id
+        # enqueued_id
+        # queue_name
+        # payload
+        # enqueue_count
+        # enqueued_at
+        # completed_at
+        # timeout_at
+        # updated_at
+        # created_at
 
-      validates_inclusion_of :duration, :in => 1.minute.to_i..3.hours.to_i
+        validates_inclusion_of :duration, :in => 1.minute.to_i..3.hours.to_i
 
-      scope :older_than, ->(date) { where('created_at < ?', date).limit(10000) }
+        scope :older_than, ->(date) { where('created_at < ?', date).limit(10000) }
 
-      scope :failed, -> {
-        where(completed_at: nil)
-          .where('timeout_at < ?', Time.now.utc)
-          .order('timeout_at asc')
-          .limit(500)
-      }
+        scope :failed, -> {
+          where(completed_at: nil)
+            .where('timeout_at < ?', Time.now.utc)
+            .order('timeout_at asc')
+            .limit(500)
+        }
 
-      scope :complete, -> { where('completed_at is not null') }
+        scope :complete, -> { where('completed_at is not null') }
+      end
 
-      module Recovery
+      class_methods do
+        def initialize_by_klass_and_args(job_klass, args)
+          new(:job_klass => job_klass, :payload => args, :enqueued_id => GUID.generate)
+        end
 
         def recover
           failed.each do |audit|
@@ -48,12 +54,6 @@ module Resque
         def cleanup(date)
           older_than(date).delete_all
         end
-
-      end
-      extend Recovery
-
-      def self.initialize_by_klass_and_args(job_klass, args)
-        new(:job_klass => job_klass, :payload => args, :enqueued_id => GUID.generate)
       end
 
       def job_klass

data/lib/resque/durable/version.rb

@@ -0,0 +1,5 @@
+module Resque
+  module Durable
+    VERSION = "4.2.0"
+  end
+end

data/lib/resque/durable.rb

@@ -1,8 +1,9 @@
+require_relative 'durable/queue_audit_methods'
+
 module Resque
   module Durable
     autoload :GUID,       'resque/durable/guid'
     autoload :Monitor,    'resque/durable/monitor'
-    autoload :QueueAudit, 'resque/durable/queue_audit'
     autoload :BackgroundHeartbeat, 'resque/durable/background_heartbeat'
 
     def self.extended(base)
@@ -86,6 +87,10 @@ module Resque
       @requeue_immediately = true
     end
 
+    def disable_requeue_immediately
+      @requeue_immediately = false
+    end
+
     def build_audit(args)
       auditor.initialize_by_klass_and_args(self, args)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-durable
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Eric Chapweske
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-27 00:00:00.000000000 Z
+date: 2024-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,26 +17,26 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.27'
 - !ruby/object:Gem::Dependency
@@ -57,16 +57,16 @@ dependencies:
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
 description: 
 email: 
 executables: []
@@ -77,7 +77,8 @@ files:
 - lib/resque/durable/background_heartbeat.rb
 - lib/resque/durable/guid.rb
 - lib/resque/durable/monitor.rb
-- lib/resque/durable/queue_audit.rb
+- lib/resque/durable/queue_audit_methods.rb
+- lib/resque/durable/version.rb
 homepage: https://github.com/zendesk/resque-durable
 licenses:
 - MIT
@@ -90,14 +91,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Resque queue backed by database audits, with automatic retry