hirefire-resource 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7b610268d577eb8e6f9a45e515e01484f15a6d8ad57c82073dac2ccd89ae84f
-  data.tar.gz: 2bf77a2f62178e7f77b956d81344005aff9b247b09252e577f669a685c599417
+  metadata.gz: 1d0159499127d61d2281f345a3c4b50cb1a975012aed540d34a6463b53d5cc77
+  data.tar.gz: 6424c3fd3462880b0e2a635ddde4fefdce30740b4eee3edaabf7ff9d29a0a895
 SHA512:
-  metadata.gz: 42acb0f1d897f2ad80305d4618943d55e1b8a47bd7caad542ed799e52862572f6e97c247440955b6b80ddd4062df64e35635754bf3e053df63910820f88599fd
-  data.tar.gz: 99706744f9945b01b8498fb19408785df2351367e8358f505e153462f582ef32f413855e75b99e428cf9fd1fa692cf8e00ef9c0850e4745aa4ea3fdf6320edf2
+  metadata.gz: 60f7e44322babde5329e98b57c0698cd0ac9824f98cb4d83de30cd9dc750fdfb8845ddd8916a754d62011f397a2565afe437dd71b1d8f36ab4d8fa6f634cde96
+  data.tar.gz: f40b10e7e7d7a24824970f19a235619feec0171c374ca5a16ff5263c3a36996a44ad3088ab6aacee7cf8bf9abdf6175d8faa43cb5fc7bc2f4d255ce3ace0dd08

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 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.
+
 ## v1.0.2
 
 * Add support for dashes in `HireFire::Worker` names to match the Procfile process naming format. `HireFire::Worker` is implicitly used when configuring HireFire using the `HireFire::Configuration#dyno` method.

data/README.md

@@ -38,10 +38,11 @@ For more information, visit our [home page][HireFire].
 ## Release
 
 1. Update the `HireFire::VERSION` constant.
-2. Ensure that `CHANGELOG.md` is up-to-date.
-3. Commit changes with `git commit`.
-4. Create a `git tag` matching the new version (e.g., `v1.0.0`).
-5. Push the new git tag. Continuous Integration will handle the distribution process.
+2. Update Gemfile locks with `bundle` and `bundle exec appraisal`.
+3. Ensure that `CHANGELOG.md` is up-to-date.
+4. Commit changes with `git commit`.
+5. Create a `git tag` matching the new version (e.g., `v1.0.0`).
+6. Push the new git tag. Continuous Integration will handle the distribution process.
 
 ## License
 

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/macro/que.rb

@@ -9,6 +9,8 @@ module HireFire
       extend HireFire::Utility
       extend self
 
+      VERSION_1_0_0 = Gem::Version.new("1.0.0")
+
       # Calculates the maximum job queue latency using Que. If no queues are specified, it
       # measures latency across all available queues.
       #
@@ -22,17 +24,11 @@ module HireFire
       # @example Calculate latency across "default" and "mailer" queues
       #   HireFire::Macro::Que.job_queue_latency(:default, :mailer)
       def job_queue_latency(*queues)
-        query = <<~SQL
-          SELECT run_at FROM que_jobs
-          WHERE run_at <= NOW()
-          AND finished_at IS NULL
-          AND expired_at IS NULL
-          #{filter_by_queues_if_any(queues)}
-          ORDER BY run_at ASC LIMIT 1
-        SQL
-
-        result = ::Que.execute(query).first
-        result ? (Time.now - result[:run_at].to_time) : 0.0
+        if version < VERSION_1_0_0
+          job_queue_latency_v0(*queues)
+        else
+          job_queue_latency_v1_v2(*queues)
+        end
       end
 
       # Calculates the total job queue size using Que. If no queues are specified, it
@@ -48,18 +44,75 @@ module HireFire
       # @example Calculate size across "default" and "mailer" queues
       #   HireFire::Macro::Que.job_queue_size(:default, :mailer)
       def job_queue_size(*queues)
+        if version < VERSION_1_0_0
+          job_queue_size_v0(*queues)
+        else
+          job_queue_size_v1_v2(*queues)
+        end
+      end
+
+      private
+
+      def job_queue_latency_v0(*queues)
         query = <<~SQL
-          SELECT COUNT(*) AS total FROM que_jobs
+          SELECT run_at
+          FROM que_jobs
+          WHERE run_at <= NOW()
+          #{filter_by_queues_if_any(queues)}
+          ORDER BY run_at ASC
+          LIMIT 1
+        SQL
+
+        query_job_queue_latency(query)
+      end
+
+      def job_queue_latency_v1_v2(*queues)
+        query = <<~SQL
+          SELECT run_at
+          FROM que_jobs
           WHERE run_at <= NOW()
           AND finished_at IS NULL
           AND expired_at IS NULL
           #{filter_by_queues_if_any(queues)}
+          ORDER BY run_at ASC
+          LIMIT 1
         SQL
 
-        ::Que.execute(query).first.fetch(:total).to_i
+        query_job_queue_latency(query)
       end
 
-      private
+      def job_queue_size_v0(*queues)
+        query = <<~SQL
+          SELECT COUNT(*) AS job_queue_size
+          FROM que_jobs
+          WHERE run_at <= NOW()
+          #{filter_by_queues_if_any(queues)}
+        SQL
+
+        query_job_queue_size(query)
+      end
+
+      def job_queue_size_v1_v2(*queues)
+        query = <<~SQL
+          SELECT COUNT(*) AS job_queue_size
+          FROM que_jobs
+          WHERE run_at <= NOW()
+          AND finished_at IS NULL
+          AND expired_at IS NULL
+          #{filter_by_queues_if_any(queues)}
+        SQL
+
+        query_job_queue_size(query)
+      end
+
+      def query_job_queue_latency(query)
+        result = ::Que.execute(query).first
+        result ? (Time.now - result[:run_at].to_time) : 0.0
+      end
+
+      def query_job_queue_size(query)
+        ::Que.execute(query).first.fetch(:job_queue_size).to_i
+      end
 
       def filter_by_queues_if_any(queues)
         queues = normalize_queues(queues, allow_empty: true)
@@ -70,6 +123,10 @@ module HireFire
       def sanitize_sql(value)
         "'" + value.to_s.gsub(/['"\\]/, '\\\\\\&') + "'"
       end
+
+      def version
+        Gem::Version.new(defined?(::Que::Version) ? ::Que::Version : ::Que::VERSION)
+      end
     end
   end
 end

data/lib/hirefire/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HireFire
-  VERSION = "1.0.2"
+  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.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-13 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.3
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: HireFire integration library for Ruby applications