que-scheduler 7.2.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdd3f8eb6dccc6c82cb4ce97f0a64f7acf30394cdc4d7f7f299d86680209777a
-  data.tar.gz: ac8c0c66d2fb3def5887a6f7cc27b6577c28692b55549fd067e09ad6767fe68e
+  metadata.gz: 77e19a08d2c15c1f6c40f0c3b924f5f72316fcf9827e3f99bcfff7a0df759b71
+  data.tar.gz: 7be4dbc6187cbbe530540bc64e2f4051f12cb0fc23ca4f69275dfd70d966e828
 SHA512:
-  metadata.gz: 384c9a75444bac91293d13f4bcfa9c79418df2b43d537a8707b1996705c27d44d44422a7af90135ec34311d872096fa06a1ac32eefbf5bf770223673019c2606
-  data.tar.gz: 1f6e7fa846f34937010560a8905c84b56f2e67f87acafd9d0b72d83503f9ec32b36b7ad9c1d77f7396cd7e8ccfe0564a494d2992bb82430fc4ff3cfab76a6f46
+  metadata.gz: be271ad6ca3d25ddf106352a44933cb1400381c006d1e7c15b1467093adec05f78e57beaf2eb51cba197ccf30b800561d74eb27d7dee367eb9af2106197c129c
+  data.tar.gz: abedfcada9b8fc855542844b2c5325a3d518523176d4070e8e912036934d6118d65e7627cf0c29cada59ca68c3f35eb9705872525a4d349ff7cdd460ba343084

data/README.md

@@ -5,7 +5,6 @@ que-scheduler
 [![specs workflow](https://github.com/hlascelles/que-scheduler/actions/workflows/specs.yml/badge.svg)](https://github.com/hlascelles/que-scheduler/actions)
 [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 [![Coverage Status](https://coveralls.io/repos/github/hlascelles/que-scheduler/badge.svg?branch=master)](https://coveralls.io/github/hlascelles/que-scheduler?branch=master)
-[![Code Climate Maintainability](https://api.codeclimate.com/v1/badges/710d2fc5202f95d76e8a/maintainability)](https://codeclimate.com/github/hlascelles/que-scheduler/maintainability)
 
 ## Description
 
@@ -317,9 +316,10 @@ A full changelog can be found here: [CHANGELOG.md](https://github.com/hlascelles
 
 ## System requirements
 
-Your [postgres](https://www.postgresql.org/) database must be at least version 9.6.0.
+Your [postgres](https://www.postgresql.org/) database must be at least version 14. que-scheduler is tested against version 17.
 
-The latest version of que-scheduler supports Ruby 3.0 and above.
+The latest version of que-scheduler supports Ruby 4.0 and above, and Rails 8.0 and above.
+que-scheduler versions below 8.0.0 work with Ruby 3.1 and Rails 6.0.
 que-scheduler versions below 4.4.0 work with Ruby 2.7.
 que-scheduler versions below 4.2.3 work with Ruby 2.5 and Ruby 2.6.
 

data/lib/que/scheduler/configuration.rb

@@ -1,6 +1,5 @@
 # typed: true
 
-require "pathname"
 require "que"
 require "sorbet-runtime"
 require_relative "db_support"

data/lib/que/scheduler/db_support.rb

@@ -19,14 +19,12 @@ module Que
         sig { params(enqueued_job: Que::Job).returns(Integer) }
         def job_id(enqueued_job) = T.cast(job_attributes(enqueued_job).fetch(:job_id), Integer)
 
-        # Between Que versions the result of Que execute changed keys from strings to symbols.
-        # Here we wrap the concept and make sure either way produces symbols
         sig do
           params(str: String, args: T::Array[T.anything])
             .returns(T::Array[T::Hash[Symbol, T.anything]])
         end
         def execute(str, args = [])
-          normalise_array_of_hashes(Que.execute(str, args))
+          T.cast(Que.execute(str, args), T::Array[T::Hash[Symbol, T.anything]])
         end
 
         sig do
@@ -55,11 +53,6 @@ module Que
         private def que_version_object
           @que_version_object ||= T.must(Gem.loaded_specs["que"]).version
         end
-
-        sig { params(array: T::Array[T.anything]).returns(T::Array[T::Hash[Symbol, T.anything]]) }
-        private def normalise_array_of_hashes(array)
-          array.map { |row| T.cast(row, T::Hash[T.any(String, Symbol), T.anything]).to_h.transform_keys(&:to_sym) }
-        end
       end
     end
   end

data/lib/que/scheduler/defined_job.rb

@@ -8,7 +8,7 @@ require_relative "types"
 # This is the definition of one scheduleable job in the que-scheduler config yml file.
 module Que
   module Scheduler
-    class DefinedJob < Hashie::Dash # rubocop:disable Metrics/ClassLength -- shrinks with T::Struct
+    class DefinedJob < Hashie::Dash
       include Hashie::Extensions::Dash::PropertyTranslation
       extend T::Sig
 
@@ -91,29 +91,9 @@ module Que
       sig { params(options: T::Hash[Symbol, T.anything]).void }
       private def validate_job_class_related(options)
         # Only support known job engines
-        unless Que::Scheduler::ToEnqueue.valid_job_class?(job_class)
-          err_field(:job_class, options, "Job #{job_class} was not a supported job type")
-        end
+        return if Que::Scheduler::ToEnqueue.valid_job_class?(job_class)
 
-        # queue name is only supported for a subrange of ActiveJob versions. Print this out as a
-        # warning.
-        if queue &&
-           Que::Scheduler::ToEnqueue.active_job_defined? &&
-           job_class < ::ActiveJob::Base &&
-           T.must(Que::Scheduler::ToEnqueue.active_job_version) < Gem::Version.create("6.0.3")
-          puts <<~ERR
-            WARNING from que-scheduler....
-            Between versions 4.2.3 and 6.0.2 (inclusive) Rails did not support setting queue names
-            on que jobs with ActiveJob, so que-scheduler cannot support it.
-            See removed in Rails 4.2.3
-              https://github.com/rails/rails/pull/19498
-            And readded in Rails 6.0.3
-              https://github.com/rails/rails/pull/38635
-
-            Please remove all "queue" keys from ActiveJobs defined in the que-scheduler.yml config.
-            Specifically #{queue} for job #{name}.
-          ERR
-        end
+        err_field(:job_class, options, "Job #{job_class} was not a supported job type")
       end
 
       sig { params(field: Symbol, options: T::Hash[Symbol, T.anything], reason: String).returns(T.noreturn) }

data/lib/que/scheduler/to_enqueue.rb

@@ -42,21 +42,6 @@ module Que
           Object.const_defined?(:ActiveJob)
         end
 
-        sig { returns(T.nilable(Gem::Version)) }
-        def active_job_version
-          Gem.loaded_specs["activejob"]&.version
-        end
-
-        sig { returns(T::Boolean) }
-        def active_job_version_supports_queues?
-          # Supporting queue name in ActiveJob was removed in Rails 4.2.3
-          # https://github.com/rails/rails/pull/19498
-          # and readded in Rails 6.0.3
-          # https://github.com/rails/rails/pull/38635
-          version = ToEnqueue.active_job_version
-          !version.nil? && version >= Gem::Version.create("6.0.3")
-        end
-
         sig { params(job_class: Class).returns(T.nilable(T.class_of(ToEnqueue))) }
         private def type_from_job_class(job_class)
           types.each do |type, implementation|
@@ -90,7 +75,7 @@ module Que
           args
         )
 
-        return nil if job.nil? || !job # nil in Rails < 6.1, false after.
+        return nil if job.nil? || !job
 
         # Now read the just inserted job back out of the DB to get the actual values that will
         # be used when the job is worked.
@@ -107,7 +92,7 @@ module Que
       def enqueue
         job = enqueue_active_job
 
-        return nil if job.nil? || !job # nil in Rails < 6.1, false after.
+        return nil if job.nil? || !job
 
         enqueued_values = calculate_enqueued_values(job)
         EnqueuedJobType.new(enqueued_values)
@@ -121,9 +106,6 @@ module Que
 
         scheduled_at = self.class.extract_scheduled_at(data[:scheduled_at])
 
-        # Rails didn't support queues for ActiveJob for a while
-        used_queue = data[:queue_name] if ToEnqueue.active_job_version_supports_queues?
-
         # We can't get the priority out of the DB, as the returned `job` doesn't give us access
         # to the underlying ActiveJob that was scheduled. We have no option but to assume
         # it was what we told it to use. If no priority was specified, we must assume it was
@@ -132,7 +114,7 @@ module Que
 
         {
           args: data.fetch(:arguments),
-          queue: used_queue,
+          queue: data[:queue_name],
           priority: assume_used_priority,
           run_at: scheduled_at,
           job_class: job_class.to_s,
@@ -162,20 +144,10 @@ module Que
       class << self
         extend T::Sig
 
-        # ActiveJob scheduled_at is returned as a float, or a string post Rails 7.1,
-        # and we want a Time for consistency
-        sig { params(scheduled_at: T.anything).returns(T.nilable(ActiveSupport::TimeWithZone)) }
+        # ActiveJob serialises scheduled_at as an ISO 8601 string; we want a Time
+        sig { params(scheduled_at: T.nilable(String)).returns(T.nilable(ActiveSupport::TimeWithZone)) }
         def extract_scheduled_at(scheduled_at)
-          # rubocop:disable Style/EmptyElse
-          case scheduled_at
-          when Float
-            Que::Scheduler::TimeZone.time_zone.at(scheduled_at)
-          when String
-            Que::Scheduler::TimeZone.time_zone.parse(scheduled_at)
-          else
-            nil
-          end
-          # rubocop:enable Style/EmptyElse
+          scheduled_at && Que::Scheduler::TimeZone.time_zone.parse(scheduled_at)
         end
       end
     end

data/lib/que/scheduler/version.rb

@@ -2,6 +2,6 @@
 
 module Que
   module Scheduler
-    VERSION = "7.2.0".freeze
+    VERSION = "8.0.0".freeze
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: que-scheduler
 version: !ruby/object:Gem::Version
-  version: 7.2.0
+  version: 8.0.0
 platform: ruby
 authors:
 - Harry Lascelles
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: fugit
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +103,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '9.0'
@@ -114,7 +113,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '9.0'
@@ -132,20 +131,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: base64
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: climate_control
   requirement: !ruby/object:Gem::Requirement
@@ -188,20 +173,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: dememoize
   requirement: !ruby/object:Gem::Requirement
@@ -230,20 +201,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mutex_m
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -478,7 +435,6 @@ metadata:
   source_code_uri: https://github.com/hlascelles/que-scheduler/
   bug_tracker_uri: https://github.com/hlascelles/que-scheduler/issues
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -486,15 +442,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '4.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 4.0.20
 specification_version: 4
 summary: A cron scheduler for Que
 test_files: []