que-scheduler 4.6.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2e01f6eaa026842cf6f2041b3f979e571ca455427cdd70c8609d4f2a6c561a6
-  data.tar.gz: 3acb6027f4d8508f7fc7cbc2e27d55442783f4dcb3d855645bfb5e8db9054ad8
+  metadata.gz: ba72652aebf9c4fb8c0f07702d03fdb2a119c54ed4b900c309acdf5a7200bdc4
+  data.tar.gz: a83083a1c0fb05be711857c255bd18c1870f707522d070363def5b2de22271b3
 SHA512:
-  metadata.gz: e7c0eae15faf60069fc997a37d73c8521ab441e257ec18689d26b5cabc6fb7165a83207c54eee8890e4db43aac673263ef81072f9b7541bbbf12a45c427547ef
-  data.tar.gz: 2218a3e0b28e4d64ad7f7fc807ddff0761c46344b89e762e127dd49e833a5e2c11d6ed59726a8f0eba1b2fa10855b73415dc1a964819de5dcf1109be43d4349a
+  metadata.gz: caf4f8b82b646f78cf133d8bc8bf78eed5609517a29275a0c27558c05732435393b51479a825b1004c6d980cd3365657b6ff7a7e7393f61497579ad4dbaf769c
+  data.tar.gz: 49eb2acebbe74606970f06d2df9cdff5dbf482233382f9237c459f3ccc5e61d6cee065fd6060974e04f748a6c72391db3369ac966aa5e60a1f3a621bdd6d9cc8

data/README.md

@@ -25,9 +25,9 @@ resque-scheduler files, but with additional features.
    will fail if Que is set to execute jobs synchronously, i.e. `Que::Job.run_synchronously = true`.
 
     ```ruby
-    class CreateQueSchedulerSchema < ActiveRecord::Migration
+    class CreateQueSchedulerSchema < ActiveRecord::Migration[6.0]
       def change
-        Que::Scheduler::Migrations.migrate!(version: 7)
+        Que::Scheduler::Migrations.migrate!(version: 8)
       end
     end
     ```
@@ -210,23 +210,25 @@ ie, This will perform all migrations necessary up to the latest version, skippin
 performed.
 
 ```ruby
-class CreateQueSchedulerSchema < ActiveRecord::Migration
+class CreateQueSchedulerSchema < ActiveRecord::Migration[6.0]
   def change
-    Que::Scheduler::Migrations.migrate!(version: 7)
+    Que::Scheduler::Migrations.migrate!(version: 8)
   end
 end
 ```
 
 The changes in past migrations were: 
 
-| Version | Changes                                                                         |
-|:-------:|---------------------------------------------------------------------------------|
-|    1    | Enqueued the main Que::Scheduler. This is the job that performs the scheduling. |
-|    2    | Added the audit table `que_scheduler_audit`.                                    |
-|    3    | Added the audit table `que_scheduler_audit_enqueued`.                           |
-|    4    | Updated the the audit tables to use bigints                                     |
-|    5    | Dropped an unnecessary index                                                    |
-|    6    | Enforced single scheduler job at the trigger level                              |
+| Version | Changes                                                                             |
+|:-------:|-------------------------------------------------------------------------------------|
+|    1    | Enqueued the main Que::Scheduler. This is the job that performs the scheduling.     |
+|    2    | Added the audit table `que_scheduler_audit`.                                        |
+|    3    | Added the audit table `que_scheduler_audit_enqueued`.                               |
+|    4    | Updated the the audit tables to use bigints                                         |
+|    5    | Dropped an unnecessary index                                                        |
+|    6    | Enforced single scheduler job at the trigger level                                  |
+|    7    | Prevent accidental deletion of scheduler job                                        |
+|    8    | Add primary key to audit. Note, this can be a slow migration if you have many rows! |
 
 The changes to the DB ([DDL](https://en.wikipedia.org/wiki/Data_definition_language)) are all 
 captured in the structure.sql so will be re-run in correctly if squashed - except for the actual 

data/lib/que/scheduler/migrations/8/down.sql

@@ -0,0 +1 @@
+ALTER TABLE que_scheduler_audit_enqueued DROP COLUMN "id";

data/lib/que/scheduler/migrations/8/up.sql

@@ -0,0 +1 @@
+ALTER TABLE que_scheduler_audit_enqueued ADD COLUMN id BIGSERIAL PRIMARY KEY;

data/lib/que/scheduler/state_checks.rb

@@ -10,6 +10,7 @@ module Que
           assert_db_migrated
         end
 
+        # rubocop:disable Metrics/MethodLength
         private def assert_db_migrated
           db_version = Que::Scheduler::Migrations.db_version
           return if db_version == Que::Scheduler::Migrations::MAX_VERSION
@@ -47,7 +48,7 @@ module Que
             To bring the db version up to the current one required, add a migration like this. It
             is cumulative, so one line is sufficient to perform all necessary steps.
 
-            class UpdateQueSchedulerSchema < ActiveRecord::Migration
+            class UpdateQueSchedulerSchema < ActiveRecord::Migration[6.0]
               def change
                 Que::Scheduler::Migrations.migrate!(version: #{Que::Scheduler::Migrations::MAX_VERSION})
               end
@@ -57,6 +58,7 @@ module Que
             synchronously. This will fail as que-scheduler needs the above tables to work.
           ERR
         end
+        # rubocop:enable Metrics/MethodLength
       end
     end
   end

data/lib/que/scheduler/to_enqueue.rb

@@ -96,18 +96,7 @@ module Que
         # be used when the job is worked.
         data = JSON.parse(job.to_json, symbolize_names: true)
 
-        # ActiveJob scheduled_at is returned as a float, where we want a Time for consistency
-        scheduled_at =
-          begin
-            scheduled_at_float = data[:scheduled_at]
-            # rubocop:disable Style/EmptyElse
-            if scheduled_at_float
-              Que::Scheduler::TimeZone.time_zone.at(scheduled_at_float)
-            else
-              nil
-            end
-            # rubocop:enable Style/EmptyElse
-          end
+        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?
@@ -142,6 +131,22 @@ module Que
           job_class_set.perform_later(*args)
         end
       end
+
+      class << self
+        # ActiveJob scheduled_at is returned as a float, or a string post Rails 7.1,
+        # and we want a Time for consistency
+        def extract_scheduled_at(scheduled_at)
+          # rubocop:disable Style/EmptyElse
+          if scheduled_at.is_a?(Float)
+            Que::Scheduler::TimeZone.time_zone.at(scheduled_at)
+          elsif scheduled_at.is_a?(String)
+            Que::Scheduler::TimeZone.time_zone.parse(scheduled_at)
+          else
+            nil
+          end
+          # rubocop:enable Style/EmptyElse
+        end
+      end
     end
 
     # A value object returned after a job has been enqueued. This is necessary as Que (normal) and

data/lib/que/scheduler/version.rb

@@ -1,5 +1,5 @@
 module Que
   module Scheduler
-    VERSION = "4.6.0".freeze
+    VERSION = "5.1.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que-scheduler
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Harry Lascelles
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-10 00:00:00.000000000 Z
+date: 2024-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -401,6 +401,8 @@ files:
 - lib/que/scheduler/migrations/6/up.sql
 - lib/que/scheduler/migrations/7/down.sql
 - lib/que/scheduler/migrations/7/up.sql
+- lib/que/scheduler/migrations/8/down.sql
+- lib/que/scheduler/migrations/8/up.sql
 - lib/que/scheduler/schedule.rb
 - lib/que/scheduler/scheduler_job.rb
 - lib/que/scheduler/scheduler_job_args.rb