hirefire-resource 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2472f4d981a95c1869a29eaa7b97429aa2f9f5d8e2a4e1858a167bfc916daee4
-  data.tar.gz: c97478c3f7632dc6ea0c514d6f34894ea0514a1f259c9685e62ed3a63bbba6af
+  metadata.gz: 6ff7b6e9b3b7208480e0d3374e9aceba0c22ced18582d04e9aa4fda185df1753
+  data.tar.gz: 4528ab8e1528521c07e7d7a53f3d40d42a0a6de05d0b61c6e7f390ca03ed10b0
 SHA512:
-  metadata.gz: 2dc43ce87ea0435294d7f86d44a5e99a30e1a913d170fafadcd7292d061c9a8acdc3a9e3646467d789d32aa83becc40ee89a2b2048136e1badf993f4f9e3e25f
-  data.tar.gz: 90e56a5fdddeb1fdb98f891614fdb6cd66b7a6d07c6efd000ced14cb73de9aa44682d4772b6c4c12c1e114271b57600c7f578cb2a9439d79386d42fa2080d1e4
+  metadata.gz: 9cf97173b237ab2bc6ee5810a96fef55e0144331ccad0f750ae9e8edfcc7ef2715507e64bd1a4ae2019eb566ea7c8bb2fdba50cc6146f52824ed02e3212429b3
+  data.tar.gz: 2befdcc2d1a2fd0b3fc664ddff1417e47ebfef5f4e64241c031511fc30c85061e8272395b8eca58e482ff0b0844a816e99242e21191d450347adcf3406128fea

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.0.8
+
+* Fix issue with range notation in ActiveRecord queries for old Rails versions that caused Delayed Job and Good Job macros to always return 0.
+
 ## v1.0.7
 
 * Add support for Sidekiq 8.

data/lib/hirefire/macro/delayed_job.rb

@@ -27,20 +27,15 @@ module HireFire
         #   HireFire::Macro::Delayed::Job.job_queue_latency(:default, :mailer)
         def job_queue_latency(*queues)
           queues = normalize_queues(queues, allow_empty: true)
+          query = ::Delayed::Job.where(failed_at: nil).order(run_at: :asc)
 
-          query =
-            ::Delayed::Job
-              .where(run_at: ..Time.now)
-              .where(failed_at: nil)
-              .order(run_at: :asc)
-
-          if queues.any?
-            case mapper
-            when :active_record
-              query = query.where(queue: queues)
-            when :mongoid
-              query = query.in(queue: queues.to_a)
-            end
+          case mapper
+          when :active_record
+            query = query.where("run_at <= ?", Time.now)
+            query = query.where(queue: queues) if queues.any?
+          when :mongoid
+            query = query.where(run_at: {"$lte" => Time.now})
+            query = query.in(queue: queues.to_a) if queues.any?
           end
 
           if (job = query.first)
@@ -65,19 +60,15 @@ module HireFire
         #   HireFire::Macro::Delayed::Job.job_queue_size(:default, :mailer)
         def job_queue_size(*queues)
           queues = normalize_queues(queues, allow_empty: true)
+          query = ::Delayed::Job.where(failed_at: nil)
 
-          query =
-            ::Delayed::Job
-              .where(run_at: ..Time.now)
-              .where(failed_at: nil)
-
-          if queues.any?
-            case mapper
-            when :active_record
-              query = query.where(queue: queues)
-            when :mongoid
-              query = query.in(queue: queues.to_a)
-            end
+          case mapper
+          when :active_record
+            query = query.where("run_at <= ?", Time.now)
+            query = query.where(queue: queues) if queues.any?
+          when :mongoid
+            query = query.where(run_at: {"$lte" => Time.now})
+            query = query.in(queue: queues.to_a) if queues.any?
           end
 
           query.count

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

@@ -33,9 +33,9 @@ module HireFire
 
             case options[:mapper]
             when :active_record
-              query = ::Delayed::Job.where(failed_at: nil, run_at: ..Time.now.utc)
-              query = query.where(priority: options[:min_priority]..) if options.key?(:min_priority)
-              query = query.where(priority: ..options[:max_priority]) if options.key?(:max_priority)
+              query = ::Delayed::Job.where(failed_at: nil).where("run_at <= ?", Time.now.utc)
+              query = query.where("priority >= ?", options[:min_priority]) if options.key?(:min_priority)
+              query = query.where("priority <= ?", options[:max_priority]) if options.key?(:max_priority)
               query = query.where(queue: queues) unless queues.empty?
               query.count
             when :active_record_2

data/lib/hirefire/macro/good_job.rb

@@ -29,7 +29,7 @@ module HireFire
         query = query.where(queue_name: queues) if queues.any?
         query = query.where(performed_at: nil)
         query = query.where.not(error_event: discarded_enum).or(query.where(error_event: nil)) if error_event_supported?
-        query = query.where(scheduled_at: ..Time.now).or(query.where(scheduled_at: nil))
+        query = query.where("scheduled_at <= ?", Time.now).or(query.where(scheduled_at: nil))
         query = query.order(scheduled_at: :asc, created_at: :asc)
 
         if (job = query.first)
@@ -57,7 +57,7 @@ module HireFire
         query = query.where(queue_name: queues) if queues.any?
         query = query.where(performed_at: nil)
         query = query.where.not(error_event: discarded_enum).or(query.where(error_event: nil)) if error_event_supported?
-        query = query.where(scheduled_at: ..Time.now).or(query.where(scheduled_at: nil))
+        query = query.where("scheduled_at <= ?", Time.now).or(query.where(scheduled_at: nil))
         query.count
       end
     end

data/lib/hirefire/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: hirefire-resource
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Michael van Rooijen
 bindir: bin
 cert_chain: []
-date: 2025-03-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: HireFire integration library for Ruby applications
 test_files: []