hirefire-resource 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7b610268d577eb8e6f9a45e515e01484f15a6d8ad57c82073dac2ccd89ae84f
-  data.tar.gz: 2bf77a2f62178e7f77b956d81344005aff9b247b09252e577f669a685c599417
+  metadata.gz: c60897b8911c796781d34001ae15a6eaa7a10baa884803858a235941acfbf438
+  data.tar.gz: 52ea32f6080f388bac51855b68720dda3399127dba93180f559e22b458338737
 SHA512:
-  metadata.gz: 42acb0f1d897f2ad80305d4618943d55e1b8a47bd7caad542ed799e52862572f6e97c247440955b6b80ddd4062df64e35635754bf3e053df63910820f88599fd
-  data.tar.gz: 99706744f9945b01b8498fb19408785df2351367e8358f505e153462f582ef32f413855e75b99e428cf9fd1fa692cf8e00ef9c0850e4745aa4ea3fdf6320edf2
+  metadata.gz: d747c2ea92b9e9de7da34223ae65a1e04d3fd7a1c1f6f931ba8681b960c6060f117f2783650d9d3d4152b26a7ea5dfa0558d14e9137fb6a47799d29288ec7c26
+  data.tar.gz: f515e6eeba0c96c3f0bce84c797ad21af39824cdc015f74ef011e3dad1d6124e08010e6c7609aebf27cd8a9470fec7f2a3c766d6b9cea9c2fba0b33cfef35497

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 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/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.3"
 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.3
 platform: ruby
 authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-13 00:00:00.000000000 Z
+date: 2024-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: HireFire integration library for Ruby applications