hirefire-resource 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c60897b8911c796781d34001ae15a6eaa7a10baa884803858a235941acfbf438
-  data.tar.gz: 52ea32f6080f388bac51855b68720dda3399127dba93180f559e22b458338737
+  metadata.gz: 1d0159499127d61d2281f345a3c4b50cb1a975012aed540d34a6463b53d5cc77
+  data.tar.gz: 6424c3fd3462880b0e2a635ddde4fefdce30740b4eee3edaabf7ff9d29a0a895
 SHA512:
-  metadata.gz: d747c2ea92b9e9de7da34223ae65a1e04d3fd7a1c1f6f931ba8681b960c6060f117f2783650d9d3d4152b26a7ea5dfa0558d14e9137fb6a47799d29288ec7c26
-  data.tar.gz: f515e6eeba0c96c3f0bce84c797ad21af39824cdc015f74ef011e3dad1d6124e08010e6c7609aebf27cd8a9470fec7f2a3c766d6b9cea9c2fba0b33cfef35497
+  metadata.gz: 60f7e44322babde5329e98b57c0698cd0ac9824f98cb4d83de30cd9dc750fdfb8845ddd8916a754d62011f397a2565afe437dd71b1d8f36ab4d8fa6f634cde96
+  data.tar.gz: f40b10e7e7d7a24824970f19a235619feec0171c374ca5a16ff5263c3a36996a44ad3088ab6aacee7cf8bf9abdf6175d8faa43cb5fc7bc2f4d255ce3ace0dd08

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.0.4
+
+* Add support for `good_job ~> 4`, for the `job_queue_size`, `job_queue_latency` and `queue` (deprecated) macros.
+
 ## v1.0.3
 
 * Add support for `que ~> 0` and `que ~> 1`, in addition to `que ~> 2`, for both the `job_queue_size` and `job_queue_latency` macros.

data/lib/hirefire/macro/deprecated/good_job.rb

@@ -1,11 +1,15 @@
 # frozen_string_literal: true
 
+require "hirefire/macro/helpers/good_job"
+
 module HireFire
   module Macro
     module Deprecated
       # Provides backward compatibility with the deprecated GoodJob macro.
       # For new implementations, refer to {HireFire::Macro::GoodJob}.
       module GoodJob
+        include HireFire::Macro::Helpers::GoodJob
+
         # Retrieves the total number of jobs in the specified queue(s) using GoodJob.
         #
         # This method queries the PostgreSQL database through GoodJob. It's capable
@@ -21,8 +25,7 @@ module HireFire
         # @example Counting jobs in the "default" queue
         #   HireFire::Macro::GoodJob.queue("default")
         def queue(*queues)
-          base_class = defined?(::GoodJob::Execution) ? ::GoodJob::Execution : ::GoodJob::Job
-          scope = base_class.only_scheduled.unfinished
+          scope = good_job_class.only_scheduled.unfinished
           scope = scope.where(queue_name: queues) if queues.any?
           scope.count
         end

data/lib/hirefire/macro/good_job.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
+require_relative "helpers/good_job"
 require_relative "deprecated/good_job"
 
 module HireFire
   module Macro
     module GoodJob
-      extend HireFire::Macro::Deprecated::GoodJob
       extend HireFire::Utility
+      extend HireFire::Macro::Helpers::GoodJob
+      extend HireFire::Macro::Deprecated::GoodJob
       extend self
 
       # Calculates the maximum job queue latency using GoodJob. If no queues are specified, it
@@ -23,9 +25,9 @@ module HireFire
       #   HireFire::Macro::GoodJob.job_queue_latency(:default, :mailer)
       def job_queue_latency(*queues)
         queues = normalize_queues(queues, allow_empty: true)
-        query = ::GoodJob::Execution
+        query = good_job_class
         query = query.where(queue_name: queues) if queues.any?
-        query = query.where(finished_at: nil)
+        query = query.where(performed_at: nil)
         query = query.where(scheduled_at: ..Time.now).or(query.where(scheduled_at: nil))
         query = query.order(scheduled_at: :asc, created_at: :asc)
 
@@ -50,9 +52,9 @@ module HireFire
       #   HireFire::Macro::GoodJob.job_queue_size(:default, :mailer)
       def job_queue_size(*queues)
         queues = normalize_queues(queues, allow_empty: true)
-        query = ::GoodJob::Execution
+        query = good_job_class
         query = query.where(queue_name: queues) if queues.any?
-        query = query.where(finished_at: nil)
+        query = query.where(performed_at: nil)
         query = query.where(scheduled_at: ..Time.now).or(query.where(scheduled_at: nil))
         query.count
       end

data/lib/hirefire/macro/helpers/good_job.rb

@@ -0,0 +1,19 @@
+module HireFire
+  module Macro
+    module Helpers
+      module GoodJob
+        def self.included(base)
+          base.send(:private, :good_job_class)
+        end
+
+        def good_job_class
+          if Gem::Version.new(::GoodJob::VERSION) >= Gem::Version.new("4.0.0")
+            ::GoodJob::Job
+          else
+            ::GoodJob::Execution
+          end
+        end
+      end
+    end
+  end
+end

data/lib/hirefire/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HireFire
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hirefire-resource
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-23 00:00:00.000000000 Z
+date: 2024-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -50,6 +50,7 @@ files:
 - lib/hirefire/macro/deprecated/resque.rb
 - lib/hirefire/macro/deprecated/sidekiq.rb
 - lib/hirefire/macro/good_job.rb
+- lib/hirefire/macro/helpers/good_job.rb
 - lib/hirefire/macro/que.rb
 - lib/hirefire/macro/queue_classic.rb
 - lib/hirefire/macro/resque.rb
@@ -86,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: HireFire integration library for Ruby applications