mission_control-jobs 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0516069c5660225d8cc418be4c2898ae247004ff150e9bf491b74fa7b1111a79'
-  data.tar.gz: 16b68f33818169e31b3701d84e3e53d8b5069e07c4b5e84303c0917212bc45fc
+  metadata.gz: 2296e3b78c4cd2ca39de903ff7eaf2b198147b596fdc615143b3a58ea7d0e940
+  data.tar.gz: 7a3289d51f83098ef40a2ae8768b838f3d695617ea312a9704627a37d4159ae8
 SHA512:
-  metadata.gz: 9290598911e316cb5e70f6cb23757704b1966c291d4e928fc3f94f0c50b03191d00fb8a8170ee0b154a36235c43b16b686b05b0629467d3575807e28ef57331c
-  data.tar.gz: 2136cc09bcaa59e3a8dbfd6d19984bcb2d82d1b44c8870cf7019330af08b0b26a112079013eaa5df86e705efc50161851b0cc6094a173e778e672961426ac0e6
+  metadata.gz: 198595c5e3d82916c17d175ee542412e1cfe7dd718394f1f1878049dbaf0dc718b84ba6c01ee74e716060747ff3e947175170b43c69884299d1c1a114d26e2ec
+  data.tar.gz: 3f4fecc8444f2f8aea8d6aa5cd91361b2daf128e59e6a5d4fe0a41f2bb8b46fe3aed12cbf2fbc8254e7c0c39a768db6bc4aef81a45b35c43e1b0a61a38c3c980

data/README.md

@@ -65,6 +65,7 @@ This library extends Active Job with a querying interface and the following sett
 ## Adapter Specifics
 
 - **Resque**: Queue pausing is supported only if you have `resque-pause` installed in your project
+- **Solid Queue**: Requires version >= 0.5.
 
 ## Advanced configuration
 

data/app/helpers/mission_control/jobs/application_helper.rb

@@ -3,6 +3,6 @@ module MissionControl::Jobs
     # Explicit helper inclusion because ApplicationController inherits from the host app.
     #
     # We can't rely on +config.action_controller.include_all_helpers = true+ in the host app.
-    include DatesHelper, JobsHelper, NavigationHelper, UiHelper
+    include DatesHelper, JobsHelper, NavigationHelper, InterfaceHelper
   end
 end

data/app/helpers/mission_control/jobs/{ui_helper.rb → interface_helper.rb}

@@ -1,4 +1,4 @@
-module MissionControl::Jobs::UiHelper
+module MissionControl::Jobs::InterfaceHelper
   def blank_status_notice(message)
     tag.div message, class: "mt-6 has-text-centered is-size-3 has-text-grey"
   end

data/lib/active_job/queue_adapters/solid_queue_ext/recurring_tasks.rb

@@ -4,36 +4,29 @@ module ActiveJob::QueueAdapters::SolidQueueExt::RecurringTasks
   end
 
   def recurring_tasks
-    tasks = recurring_tasks_from_dispatchers
-    last_enqueued_at_times = recurring_task_last_enqueued_at(tasks.keys)
+    tasks = SolidQueue::RecurringTask.all
+    last_enqueued_at_times = recurring_task_last_enqueued_at(tasks.map(&:key))
 
-    recurring_tasks_from_dispatchers.collect do |task_id, task_attrs|
-      recurring_task_attributes_from_solid_queue_task_attributes(task_attrs).merge \
-        id: task_id,
-        last_enqueued_at: last_enqueued_at_times[task_id]
+    tasks.collect do |task|
+      recurring_task_attributes_from_solid_queue_recurring_task(task).merge \
+        last_enqueued_at: last_enqueued_at_times[task.key]
     end
   end
 
   def find_recurring_task(task_id)
-    if task_attrs = recurring_tasks_from_dispatchers[task_id]
-      recurring_task_attributes_from_solid_queue_task_attributes(task_attrs).merge \
-        id: task_id,
-        last_enqueued_at: recurring_task_last_enqueued_at(task_id).values&.first
+    if task = SolidQueue::RecurringTask.find_by(key: task_id)
+      recurring_task_attributes_from_solid_queue_recurring_task(task).merge \
+        last_enqueued_at: recurring_task_last_enqueued_at(task.key).values&.first
     end
   end
 
   private
-    def recurring_tasks_from_dispatchers
-      SolidQueue::Process.where(kind: "Dispatcher").flat_map do |process|
-        process.metadata["recurring_schedule"]
-      end.compact.reduce({}, &:merge)
-    end
-
-    def recurring_task_attributes_from_solid_queue_task_attributes(task_attributes)
+    def recurring_task_attributes_from_solid_queue_recurring_task(task)
       {
-        job_class_name: task_attributes["class_name"],
-        arguments: task_attributes["arguments"],
-        schedule: task_attributes["schedule"]
+        id: task.key,
+        job_class_name: task.class_name,
+        arguments: task.arguments,
+        schedule: task.schedule
       }
     end
 

data/lib/active_job/queue_adapters/solid_queue_ext.rb

@@ -118,7 +118,7 @@ module ActiveJob::QueueAdapters::SolidQueueExt
         ActiveJob::ExecutionError.new \
           error_class: solid_queue_job.failed_execution.exception_class,
           message: solid_queue_job.failed_execution.message,
-          backtrace: solid_queue_job.failed_execution.backtrace
+          backtrace: solid_queue_job.failed_execution.backtrace || []
       end
     end
 

data/lib/mission_control/jobs/version.rb

@@ -1,5 +1,5 @@
 module MissionControl
   module Jobs
-    VERSION = "0.2.2"
+    VERSION = "0.3.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mission_control-jobs
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
 platform: ruby
 authors:
 - Jorge Manrubia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-06 00:00:00.000000000 Z
+date: 2024-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -310,9 +310,9 @@ files:
 - app/controllers/mission_control/jobs/workers_controller.rb
 - app/helpers/mission_control/jobs/application_helper.rb
 - app/helpers/mission_control/jobs/dates_helper.rb
+- app/helpers/mission_control/jobs/interface_helper.rb
 - app/helpers/mission_control/jobs/jobs_helper.rb
 - app/helpers/mission_control/jobs/navigation_helper.rb
-- app/helpers/mission_control/jobs/ui_helper.rb
 - app/javascript/mission_control/jobs/application.js
 - app/javascript/mission_control/jobs/controllers/application.js
 - app/javascript/mission_control/jobs/controllers/form_controller.js