que-scheduler 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97c2b6fc33ff2ee357b0270dae679c66b50064eb8548f0e3be24c07ea504d939
-  data.tar.gz: c1ea678b7540e3f02ac5c7eee3416d20238819eb4050bb2f3d6e7183f342022a
+  metadata.gz: ba72652aebf9c4fb8c0f07702d03fdb2a119c54ed4b900c309acdf5a7200bdc4
+  data.tar.gz: a83083a1c0fb05be711857c255bd18c1870f707522d070363def5b2de22271b3
 SHA512:
-  metadata.gz: cdb0c8db5b2b9ab99e6a1e8b04a9710a8c19913ebdcc528ed71e0b27f3dad7231887fc8415d85a5aea3bd91304f7682402530a9612ee77037ecf04b2ea050d80
-  data.tar.gz: 4aed1036ef3f2d9937b8928ec0ccb6e6fc14651d8803cbaaddf52b3d0c3da3a7b744a4aa5db5a898440cef9edd45f77325009552fe3b7c5c9bbe9448b701e34f
+  metadata.gz: caf4f8b82b646f78cf133d8bc8bf78eed5609517a29275a0c27558c05732435393b51479a825b1004c6d980cd3365657b6ff7a7e7393f61497579ad4dbaf769c
+  data.tar.gz: 49eb2acebbe74606970f06d2df9cdff5dbf482233382f9237c459f3ccc5e61d6cee065fd6060974e04f748a6c72391db3369ac966aa5e60a1f3a621bdd6d9cc8

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
@@ -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 = "5.0.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: 5.0.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