sidekiq-cron 2.0.0.rc2 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2fa6abcb1076d5e510764b33d0cfdd18d18fd1e585d79c63d300e37a1e0e6db
-  data.tar.gz: 4a04a46b7444879c6291a52e783ece82fa3488fe042106eef525ac81cd6a2d72
+  metadata.gz: bf984d9ac3e15500e5d146f99178d6310b5764e397d3d98ccb9661dc437b88c0
+  data.tar.gz: 89bd805d369b10b78fcb9e82ef8747743ab415fd3dc55f9a927215092b9bcd39
 SHA512:
-  metadata.gz: bfd60ceaa0999e67bcc3a123ea767c8ed222a70621f688b0456f189386065570160e53cae1810dcc045b33b03101af5d3f9255b3c8afe6d963255ea9004ead06
-  data.tar.gz: b08f12f1ce7ca1495013c9eae44b4469371b2d3aeb6e81675c044133391ce411c6f1f4e71206776632a37b58d7594842ea38a0e2cb94ee18f32a70409b20249a
+  metadata.gz: a6c5995218160d696554156e7f88723021cb51b407ad01f42ecfcfd306010f50d61a02435a00d1fb2c193e2611cfd84eaf9bf620e05eadbb094ea51dbfe45d2d
+  data.tar.gz: 2455bc30bb2aba3969f8ede6a18a20e38559b152366290aeba8611c76465173ff4ef904da043624a4d6e78754f82b922c10d9df8a4668b45e122925d9bda2451

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to this project will be documented in this file.
 
+## 2.0.1
+
+- Fix usage of ActiveJob::Base.queue_name (https://github.com/sidekiq-cron/sidekiq-cron/pull/517)
+- Fix: Add quotes to Japanese translations containing multi-byte symbols (https://github.com/sidekiq-cron/sidekiq-cron/pull/515)
+
+## 2.0.0
+
+Sidekiq-Cron v2 is here! In this release we refactored some internals, plus:
+
+- Review web UI translations for all available locales (https://github.com/sidekiq-cron/sidekiq-cron/pull/506)
+- Fix detection of ActiveJob in Sidekiq v7.3.3+ (https://github.com/sidekiq-cron/sidekiq-cron/pull/510)
+- Add retry job configuration option to set Sidekiq retry job option (https://github.com/sidekiq-cron/sidekiq-cron/pull/509)
+
+Please take a look to the RC1 and RC2 changes too if you are coming from the v1.X series.
+
 ## 2.0.0.rc2
 
 - Remove support for Sidekiq < 6.5 (https://github.com/sidekiq-cron/sidekiq-cron/pull/480)

data/Gemfile

@@ -4,3 +4,6 @@ gemspec
 
 # To test different Sidekiq versions
 gem "sidekiq", ENV.fetch("SIDEKIQ_VERSION", ">= 6")
+
+# To test different Active Job versions
+gem "activejob", ENV.fetch("ACTIVE_JOB_VERSION", "~> 7")

data/README.md

@@ -50,6 +50,7 @@ gem "sidekiq-cron"
   'namespace' => 'YourNamespace', # groups jobs together in a namespace (Default value is 'default'),
   'source' => 'dynamic', # source of the job, `schedule`/`dynamic` (default: `dynamic`)
   'queue' => 'name of queue',
+  'retry' => '5', # Sidekiq (not supported by ActiveJob) number of retries, or false to discard on first failure
   'args' => '[Array or Hash] of arguments which will be passed to perform method',
   'date_as_argument' => true, # add the time of execution as last argument of the perform method
   'active_job' => true,  # enqueue job through Active Job interface
@@ -68,16 +69,16 @@ All configuration options:
 
 ```ruby
 Sidekiq::Cron.configure do |config|
-  config.cron_poll_interval = 10
-  config.cron_schedule_file = 'config/my_schedule.yml'
-  config.default_namespace = 'statistics'
-  config.natural_cron_parsing_mode = :single
-  config.reschedule_grace_period = 100
-  config.cron_history_size = 50
+  config.cron_poll_interval = 10 # Default is 30
+  config.cron_schedule_file = 'config/my_schedule.yml' # Default is 'config/schedule.yml'
+  config.cron_history_size = 20 # Default is 10
+  config.default_namespace = 'statistics' # Default is 'default'
+  config.natural_cron_parsing_mode = :strict # Default is :single
+  config.reschedule_grace_period = 300 # Default is 60
 end
 ```
 
-If you are using Rails, add them inside an initializer (`config/initializers/sidekiq-cron.rb`).
+If you are using Rails, you should add the above block inside an initializer (`config/initializers/sidekiq-cron.rb`).
 
 ### Time, cron and Sidekiq-Cron
 

data/lib/sidekiq/cron/job.rb

@@ -61,6 +61,7 @@ module Sidekiq
           @message = args["message"]
           message_data = Sidekiq.load_json(@message) || {}
           @queue = message_data['queue'] || "default"
+          @retry = message_data['retry']
         elsif @klass
           message_data = {
             "class" => @klass.to_s,
@@ -69,10 +70,10 @@ module Sidekiq
 
           # Get right data for message,
           # only if message wasn't specified before.
-          klass_data = get_job_class_options(@klass)
+          klass_data = get_job_options(@klass, @args)
           message_data = klass_data.merge(message_data)
 
-          # Override queue if set in config,
+          # Override queue and retry if set in config,
           # only if message is hash - can be string (dumped JSON).
           if args['queue']
             @queue = message_data['queue'] = args['queue']
@@ -80,6 +81,12 @@ module Sidekiq
             @queue = message_data['queue'] || "default"
           end
 
+          if args['retry'] != nil
+            @retry = message_data['retry'] = args['retry']
+          else
+            @retry = message_data['retry']
+          end
+
           @message = message_data
         end
 
@@ -147,7 +154,7 @@ module Sidekiq
       end
 
       def is_active_job?(klass = nil)
-        @active_job || defined?(ActiveJob::Base) && (klass || Sidekiq::Cron::Support.constantize(@klass.to_s)) < ActiveJob::Base
+        @active_job || defined?(::ActiveJob::Base) && (klass || Sidekiq::Cron::Support.constantize(@klass.to_s)) < ::ActiveJob::Base
       rescue NameError
         false
       end
@@ -166,7 +173,7 @@ module Sidekiq
       end
 
       def enqueue_sidekiq_worker(klass_const)
-        klass_const.set(queue: queue_name_with_prefix).perform_async(*enqueue_args)
+        klass_const.set(queue: queue_name_with_prefix, retry: @retry).perform_async(*enqueue_args)
       end
 
       # Sidekiq worker message.
@@ -181,16 +188,16 @@ module Sidekiq
 
         if !"#{@active_job_queue_name_delimiter}".empty?
           queue_name_delimiter = @active_job_queue_name_delimiter
-        elsif defined?(ActiveJob::Base) && defined?(ActiveJob::Base.queue_name_delimiter) && !ActiveJob::Base.queue_name_delimiter.empty?
-          queue_name_delimiter = ActiveJob::Base.queue_name_delimiter
+        elsif defined?(::ActiveJob::Base) && defined?(::ActiveJob::Base.queue_name_delimiter) && !::ActiveJob::Base.queue_name_delimiter.empty?
+          queue_name_delimiter = ::ActiveJob::Base.queue_name_delimiter
         else
           queue_name_delimiter = '_'
         end
 
         if !"#{@active_job_queue_name_prefix}".empty?
           queue_name = "#{@active_job_queue_name_prefix}#{queue_name_delimiter}#{@queue}"
-        elsif defined?(ActiveJob::Base) && defined?(ActiveJob::Base.queue_name_prefix) && !"#{ActiveJob::Base.queue_name_prefix}".empty?
-          queue_name = "#{ActiveJob::Base.queue_name_prefix}#{queue_name_delimiter}#{@queue}"
+        elsif defined?(::ActiveJob::Base) && defined?(::ActiveJob::Base.queue_name_prefix) && !"#{::ActiveJob::Base.queue_name_prefix}".empty?
+          queue_name = "#{::ActiveJob::Base.queue_name_prefix}#{queue_name_delimiter}#{@queue}"
         else
           queue_name = @queue
         end
@@ -422,6 +429,7 @@ module Sidekiq
           active_job: @active_job ? "1" : "0",
           queue_name_prefix: @active_job_queue_name_prefix,
           queue_name_delimiter: @active_job_queue_name_delimiter,
+          retry: @retry.nil? || @retry.is_a?(Numeric) ? @retry : @retry.to_s,
           last_enqueue_time: serialized_last_enqueue_time,
           symbolize_args: symbolize_args? ? "1" : "0",
         }
@@ -785,7 +793,7 @@ module Sidekiq
         end
       end
 
-      def get_job_class_options(klass)
+      def get_job_options(klass, args)
         klass = klass.is_a?(Class) ? klass : begin
           Sidekiq::Cron::Support.constantize(klass)
         rescue NameError
@@ -796,7 +804,9 @@ module Sidekiq
           # Unknown class
           {"queue"=>"default"}
         elsif is_active_job?(klass)
-          {"queue"=>klass.queue_name}
+          job = klass.new(args)
+
+          {"queue"=>job.queue_name}
         else
           klass.get_sidekiq_options
         end

data/lib/sidekiq/cron/locales/de.yml

@@ -1,13 +1,22 @@
 de:
-  Job: Job
+  AreYouSureDeleteCronJob: Sind Sie sicher, dass sie den Cronjob %{job} löschen wollen?
+  AreYouSureDeleteCronJobs: Sind Sie sicher, dass Sie ALLE Cron-Jobs löschen möchten?
+  AreYouSureEnqueueCronJob: Sind Sie sicher, dass Sie den %{job} Cron-Job einreihen möchten?
+  AreYouSureEnqueueCronJobs: Sind Sie sicher, dass Sie ALLE Cron-Jobs einreihen möchten?
   Cron: Cron
   CronJobs: Cronjobs
+  CronString: Cron
+  DeleteAll: Alle löschen
+  Description: Beschreibung
+  Disable: Deaktivieren
+  DisableAll: Alle deaktivieren
+  Enable: Aktivieren
+  EnableAll: Alle aktivieren
+  EnqueueAll: Alle einreihen
   EnqueueNow: In Warteschlange
-  'Cron string': Cron
-  AreYouSureDeleteCronJob: Sind Sie sicher, dass sie den Cronjob %{job} löschen wollen?
+  Job: Job
+  LastEnqueued: Eingereiht
   NoCronJobsWereFound: Keine Cronjobs gefunden
-  Enable: Aktivieren
-  Disable: Deaktivieren
-  'Last enqueued': Eingereiht
+  NoHistoryWereFound: Keine Historie gefunden
   disabled: deaktiviert
   enabled: aktiviert

data/lib/sidekiq/cron/locales/en.yml

@@ -1,22 +1,22 @@
 en:
-  Job: Job
+  AreYouSureDeleteCronJob: Are you sure you want to delete the %{job} cron job?
+  AreYouSureDeleteCronJobs: Are you sure you want to delete ALL cron jobs?
+  AreYouSureEnqueueCronJob: Are you sure you want to enqueue the %{job} cron job?
+  AreYouSureEnqueueCronJobs: Are you sure you want to enqueue ALL cron jobs?
   Cron: Cron
   CronJobs: Cron Jobs
-  EnqueueNow: Enqueue Now
-  EnableAll: Enable All
+  CronString: Cron
+  DeleteAll: Delete All
+  Description: Description
+  Disable: Disable
   DisableAll: Disable All
+  Enable: Enable
+  EnableAll: Enable All
   EnqueueAll: Enqueue All
-  DeleteAll: Delete All
-  'Cron string': Cron
-  AreYouSureEnqueueCronJobs: Are you sure you want to enqueue ALL cron jobs?
-  AreYouSureEnqueueCronJob: Are you sure you want to enqueue the %{job} cron job?
-  AreYouSureDeleteCronJobs: Are you sure you want to delete ALL cron jobs?
-  AreYouSureDeleteCronJob: Are you sure you want to delete the %{job} cron job?
+  EnqueueNow: Enqueue Now
+  Job: Job
+  LastEnqueued: Last enqueued
   NoCronJobsWereFound: No cron jobs were found
-  Enable: Enable
-  Disable: Disable
-  'Last enqueued': Last enqueued
+  NoHistoryWereFound: No history were found
   disabled: disabled
   enabled: enabled
-  NoHistoryWereFound: No history were found
-  Description: Description

data/lib/sidekiq/cron/locales/id.yml

@@ -1,22 +1,22 @@
 id:
-  Job: Job
+  AreYouSureDeleteCronJob: Apakah Anda yakin ingin menghapus cron job %{job}?
+  AreYouSureDeleteCronJobs: Apakah Anda yakin ingin menghapus SEMUA cron job?
+  AreYouSureEnqueueCronJob: Apakah Anda yakin ingin menambahkan cron job %{job} ke antrian?
+  AreYouSureEnqueueCronJobs: Apakah Anda yakin ingin menambahkan SEMUA cron job ke antrian?
   Cron: Cron
-  CronJobs: Cron Job
-  EnqueueNow: Tambahkan ke Antrian Sekarang
-  EnableAll: Aktifkan Semua
+  CronJobs: Cron Jobs
+  CronString: Cron
+  DeleteAll: Hapus Semua
+  Description: Deskripsi
+  Disable: Nonaktifkan
   DisableAll: Nonaktifkan Semua
+  Enable: Aktifkan
+  EnableAll: Aktifkan Semua
   EnqueueAll: Tambahkan Semua ke Antrian
-  DeleteAll: Hapus Semua
-  'Cron string': Cron string
-  AreYouSureEnqueueCronJobs: Apakah Anda yakin ingin menambahkan SEMUA cron job ke antrian?
-  AreYouSureEnqueueCronJob: Apakah Anda yakin ingin menambahkan cron job %{job} ke antrian?
-  AreYouSureDeleteCronJobs: Apakah Anda yakin ingin menghapus SEMUA cron job?
-  AreYouSureDeleteCronJob: Apakah Anda yakin ingin menghapus cron job %{job}?
+  EnqueueNow: Tambahkan ke Antrian Sekarang
+  Job: Job
+  LastEnqueued: Terakhir kali ditambahkan ke antrian
   NoCronJobsWereFound: Tidak ada cron job
-  Enable: Aktifkan
-  Disable: Nonaktifkan
-  'Last enqueued': Terakhir kali ditambahkan ke antrian
+  NoHistoryWereFound: Tidak ada riwayat
   disabled: dinonaktifkan
   enabled: diaktifkan
-  NoHistoryWereFound: Tidak ada riwayat
-  Description: Deskripsi

data/lib/sidekiq/cron/locales/it.yml

@@ -1,23 +1,22 @@
 it:
-  Job: Job
+  AreYouSureDeleteCronJob: Vuoi cancellare il cron job '%{job}'?
+  AreYouSureDeleteCronJobs: Vuoi cancellare TUTTI i cron job?
+  AreYouSureEnqueueCronJob: Vuoi accodare il cron job '%{job}'?
+  AreYouSureEnqueueCronJobs: Vuoi accodare TUTTI i cron job?
   Cron: Cron
-  CronJobs: Cron job
-  EnqueueNow: Accoda
-  EnableAll: Attiva tutto
+  CronJobs: Cron Jobs
+  CronString: Cron
+  DeleteAll: Cancella tutto
+  Description: Descrizione
+  Disable: Disattiva
   DisableAll: Disattiva tutto
+  Enable: Attiva
+  EnableAll: Attiva tutto
   EnqueueAll: Accoda tutto
-  DeleteAll: Cancella tutto
-  "Cron string": Cron
-  AreYouSureEnqueueCronJobs: Vuoi accodare TUTTI i cron job?
-  AreYouSureEnqueueCronJob: "Vuoi accodare il cron job '%{job}'?"
-  AreYouSureDeleteCronJobs: Vuoi cancellare TUTTI i cron job?
-  AreYouSureDeleteCronJob: "Vuoi cancellare il cron job '%{job}'?"
+  EnqueueNow: Accoda
+  Job: Job
+  LastEnqueued: Ultimo accodamento
   NoCronJobsWereFound: Nessun cron job trovato
-  Enable: Attiva
-  Disable: Disattiva
-  "Last enqueued": Ultimo accodamento
+  NoHistoryWereFound: Nessun evento in cronologia
   disabled: disattivato
   enabled: attivato
-  NoHistoryWereFound: Nessun evento in cronologia
-  Description: Descrizione
-  Message: Payload

data/lib/sidekiq/cron/locales/ja.yml

@@ -1,18 +1,22 @@
 ja:
-  Job: ジョブ
+  AreYouSureDeleteCronJob: "本当に%{job}のcronジョブを削除しますか？"
+  AreYouSureDeleteCronJobs: "本当にすべてのcronジョブを削除しますか？"
+  AreYouSureEnqueueCronJob: "%{job} の クロン ジョブをキューに入れてもよろしいですか？"
+  AreYouSureEnqueueCronJobs: "すべての クロン ジョブをキューに入れてもよろしいですか？"
   Cron: Cron
   CronJobs: Cronジョブ
-  EnqueueNow: すぐにキューに入れる
-  EnableAll: すべて有効にする
+  CronString: Cron
+  DeleteAll: すべて削除
+  Description: 説明
+  Disable: 無効にする
   DisableAll: すべて無効にする
+  Enable: 有効にする
+  EnableAll: すべて有効にする
   EnqueueAll: すべてキューに入れる
-  DeleteAll: すべて削除
-  'Cron string': Cron
-  AreYouSureDeleteCronJobs: 本当にすべてのcronジョブを削除しますか？
-  AreYouSureDeleteCronJob: 本当に%{job}のcronジョブを削除しますか？
+  EnqueueNow: すぐにキューに入れる
+  Job: ジョブ
+  LastEnqueued: 最後のキュー
   NoCronJobsWereFound: Cronジョブが見つかりませんでした
-  Enable: 有効にする
-  Disable: 無効にする
-  'Last enqueued': 最後のキュー
+  NoHistoryWereFound: 履歴が見つかりませんでした
   disabled: 無効
   enabled: 有効

data/lib/sidekiq/cron/locales/pt.yml

@@ -1,22 +1,22 @@
 pt:
-  Job: Tarefa
+  AreYouSureDeleteCronJob: Tem certeza de que deseja excluir a tarefa %{job}?
+  AreYouSureDeleteCronJobs: Tem certeza de que deseja excluir TODOS as tarefas?
+  AreYouSureEnqueueCronJob: Tem certeza de que deseja enfileirar a tarefa %{job}?
+  AreYouSureEnqueueCronJobs: Tem certeza de que deseja enfileirar TODOS as tarefas?
   Cron: Cron
   CronJobs: Tarefas do Cron
-  EnqueueNow: Enfileirar agora
-  EnableAll: Habilitar todos
+  CronString: Cron
+  DeleteAll: Excluir todos
+  Description: Descrição
+  Disable: Desabilitar
   DisableAll: Desabilitar todos
+  Enable: Habilitar
+  EnableAll: Habilitar todos
   EnqueueAll: Enfileirar todos
-  DeleteAll: Excluir todos
-  'Cron string': Cron
-  AreYouSureEnqueueCronJobs: Tem certeza de que deseja enfileirar TODOS as tarefas?
-  AreYouSureEnqueueCronJob: Tem certeza de que deseja enfileirar a tarefa %{job}?
-  AreYouSureDeleteCronJobs: Tem certeza de que deseja excluir TODOS as tarefas?
-  AreYouSureDeleteCronJob: Tem certeza de que deseja excluir a tarefa %{job}?
+  EnqueueNow: Enfileirar agora
+  Job: Tarefa
+  LastEnqueued: Último enfileirado
   NoCronJobsWereFound: Nenhuma tarefa foi encontrada
-  Enable: Habilitar
-  Disable: Desabilitar
-  'Last enqueued': Último enfileirado
+  NoHistoryWereFound: Nenhum histórico foi encontrado
   disabled: desabilitado
   enabled: habilitado
-  NoHistoryWereFound: Nenhum histórico foi encontrado
-  Description: Descrição

data/lib/sidekiq/cron/locales/ru.yml

@@ -1,14 +1,22 @@
 ru:
-  Job: Задача
+  AreYouSureDeleteCronJob: Вы действительно хотите удалить задачу «%{job}»?
+  AreYouSureDeleteCronJobs: Вы уверены, что хотите удалить ВСЕ cron-задачи?
+  AreYouSureEnqueueCronJob: Вы уверены, что хотите добавить в очередь cron-задачу %{job}?
+  AreYouSureEnqueueCronJobs: Вы уверены, что хотите добавить в очередь ВСЕ cron-задачи?
   Cron: Cron
   CronJobs: Периодические задачи
-  Name: Название
-  'Cron string': Периодичность (синтаксис Cron)
+  CronString: Периодичность (синтаксис Cron)
+  DeleteAll: Удалить все
+  Description: Описание
+  Disable: Отключить
+  DisableAll: Отключить все
+  Enable: Включить
+  EnableAll: Включить все
+  EnqueueAll: Добавить все в очередь
   EnqueueNow: Запустить
-  AreYouSureDeleteCronJob: Вы действительно хотите удалить задачу «%{job}»?
+  Job: Задача
+  LastEnqueued: Последний запуск
   NoCronJobsWereFound: Не найдено периодических задач
-  Enable: Включить
-  Disable: Отключить
-  'Last enqueued': Последний запуск
+  NoHistoryWereFound: История не найдена
   disabled: отключено
   enabled: включено

data/lib/sidekiq/cron/locales/zh-CN.yml

@@ -1,19 +1,22 @@
 zh-CN:
-  Job: 任务
+  AreYouSureDeleteCronJob: 你确定删除定时任务（%{job}）吗？
+  AreYouSureDeleteCronJobs: 你确定删除所有的定时任务吗？
+  AreYouSureEnqueueCronJob: 您确定要将 %{job} 的 定时任务 任务加入队列吗？
+  AreYouSureEnqueueCronJobs: 您确定要将所有 定时任务 任务加入队列吗？
   Cron: 定时任务
   CronJobs: 定时任务列表
-  EnqueueNow: 立刻执行
-  EnableAll: 启用所有
+  CronString: 定时策略
+  DeleteAll: 删除所有
+  Description: 描述
+  Disable: 禁用
   DisableAll: 禁用所有
+  Enable: 启用
+  EnableAll: 启用所有
   EnqueueAll: 执行所有
-  DeleteAll: 删除所有
-  'Cron string': 定时策略
-  AreYouSureDeleteCronJobs: 你确定删除所有的定时任务吗？
-  AreYouSureDeleteCronJob: 你确定删除定时任务（%{job}）吗？
+  EnqueueNow: 立刻执行
+  Job: 任务
+  LastEnqueued: 放入队列时间
   NoCronJobsWereFound: 没有定时任务
-  Enable: 启用
-  Disable: 禁用
-  'Last enqueued': 放入队列时间
+  NoHistoryWereFound: 未找到历史记录
   disabled: 已禁用
   enabled: 已启用
-

data/lib/sidekiq/cron/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Cron
-    VERSION = "2.0.0.rc2"
+    VERSION = "2.0.1"
   end
 end

data/lib/sidekiq/cron/views/cron.erb

@@ -8,20 +8,20 @@
   <div class='col-sm-7 pull-right h2'>
     <% if @cron_jobs.size > 0 %>
       <form action="<%= root_path %>cron/namespaces/<%= @current_namespace %>/all/delete" method="post" class="pull-right">
-        <%= csrf_tag if respond_to?(:csrf_tag) %>
+        <%= csrf_tag %>
         <input class="btn btn-danger" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSureDeleteCronJobs') %>" />
       </form>
       <form action="<%= root_path %>cron/namespaces/<%= @current_namespace %>/all/disable" method="post" class="pull-right">
-        <%= csrf_tag if respond_to?(:csrf_tag) %>
-        <input class="btn btn-warn" type="submit" name="enque" value="<%= t('DisableAll') %>" />
+        <%= csrf_tag %>
+        <input class="btn btn-warn" type="submit" name="enqueue" value="<%= t('DisableAll') %>" />
       </form>
       <form action="<%= root_path %>cron/namespaces/<%= @current_namespace %>/all/enable" method="post" class="pull-right">
-        <%= csrf_tag if respond_to?(:csrf_tag) %>
-        <input class="btn btn-warn" type="submit" name="enque" value="<%= t('EnableAll') %>" />
+        <%= csrf_tag %>
+        <input class="btn btn-warn" type="submit" name="enqueue" value="<%= t('EnableAll') %>" />
       </form>
-      <form action="<%= root_path %>cron/namespaces/<%= @current_namespace %>/all/enque" method="post" class="pull-right">
-        <%= csrf_tag if respond_to?(:csrf_tag) %>
-        <input class="btn btn-warn" type="submit" name="enque" value="<%= t('EnqueueAll') %>" data-confirm="<%= t('AreYouSureEnqueueCronJobs') %>" />
+      <form action="<%= root_path %>cron/namespaces/<%= @current_namespace %>/all/enqueue" method="post" class="pull-right">
+        <%= csrf_tag %>
+        <input class="btn btn-warn" type="submit" name="enqueue" value="<%= t('EnqueueAll') %>" data-confirm="<%= t('AreYouSureEnqueueCronJobs') %>" />
       </form>
     <% end %>
   </div>
@@ -31,7 +31,7 @@
 <div class='row'>
   <div class="col-sm-12 summary_bar">
     <ul class="list-unstyled summary row">
-      <% @namespaces.sort_by { |namespace| namespace[:name] }.each do |namespace| %>
+      <% Sidekiq::Cron::Namespace.all_with_count.sort_by { |namespace| namespace[:name] }.each do |namespace| %>
         <li class="col-sm-1">
           <a href="<%= root_path %>cron/namespaces/<%= namespace[:name] %>">
             <span class="count"><%= namespace[:count] %></span>
@@ -50,8 +50,8 @@
     <tr>
       <th><%= t('Status') %></th>
       <th width="50%"><%= t('Name') %></th>
-      <th><%= t('Cron string') %></th>
-      <th><%= t('Last enqueued') %></th>
+      <th><%= t('CronString') %></th>
+      <th><%= t('LastEnqueued') %></th>
       <th width="180"><%= t('Actions') %></th>
     </tr>
     </thead>
@@ -80,25 +80,25 @@
           <td class="<%= klass %>"><%= job.last_enqueue_time ? relative_time(job.last_enqueue_time) : "-" %></td>
           <td class="<%= klass %>">
             <% if job.status == 'enabled' %>
-              <form action="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>/enque" method="post">
-                <%= csrf_tag if respond_to?(:csrf_tag) %>
-                <input class='btn btn-warn btn-xs pull-left' type="submit" name="enque" value="<%= t('EnqueueNow') %>" data-confirm="<%= t('AreYouSureEnqueueCronJob', :job => job.name) %>"/>
+              <form action="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>/enqueue" method="post">
+                <%= csrf_tag %>
+                <input class='btn btn-warn btn-xs pull-left' type="submit" name="enqueue" value="<%= t('EnqueueNow') %>" data-confirm="<%= t('AreYouSureEnqueueCronJob', :job => job.name) %>"/>
               </form>
               <form action="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>/disable" method="post">
-                <%= csrf_tag if respond_to?(:csrf_tag) %>
+                <%= csrf_tag %>
                 <input class='btn btn-warn btn-xs pull-left' type="submit" name="disable" value="<%= t('Disable') %>"/>
               </form>
             <% else %>
-              <form action="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>/enque" method="post">
-                <%= csrf_tag if respond_to?(:csrf_tag) %>
-                <input class='btn btn-warn btn-xs pull-left' type="submit" name="enque" value="<%= t('EnqueueNow') %>" data-confirm="<%= t('AreYouSureEnqueueCronJob', :job => job.name) %>"/>
+              <form action="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>/enqueue" method="post">
+                <%= csrf_tag %>
+                <input class='btn btn-warn btn-xs pull-left' type="submit" name="enqueue" value="<%= t('EnqueueNow') %>" data-confirm="<%= t('AreYouSureEnqueueCronJob', :job => job.name) %>"/>
               </form>
               <form action="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>/enable" method="post">
-                <%= csrf_tag if respond_to?(:csrf_tag) %>
+                <%= csrf_tag %>
                 <input class='btn btn-warn btn-xs pull-left' type="submit" name="enable" value="<%= t('Enable') %>"/>
               </form>
               <form action="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>/delete" method="post">
-                <%= csrf_tag if respond_to?(:csrf_tag) %>
+                <%= csrf_tag %>
                 <input class='btn btn-xs btn-danger pull-left help-block' type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteCronJob', :job => job.name) %>"/>
               </form>
             <% end %>

data/lib/sidekiq/cron/views/cron_show.erb

@@ -7,22 +7,22 @@
   </div>
   <div class="span col-sm-7 pull-right h2">
     <% cron_job_path = "#{root_path}cron/namespaces/#{@current_namespace}/jobs/#{CGI.escape(@job.name).gsub('+', '%20')}" %>
-    <form action="<%= cron_job_path %>/enque?redirect=<%= cron_job_path %>" class="pull-right" method="post">
-      <%= csrf_tag if respond_to?(:csrf_tag) %>
-      <input class="btn btn-warn pull-left" name="enque" type="submit" value="<%= t('EnqueueNow') %>" data-confirm="<%= t('AreYouSureEnqueueCronJob', :job => @job.name) %>" />
+    <form action="<%= cron_job_path %>/enqueue?redirect=<%= cron_job_path %>" class="pull-right" method="post">
+      <%= csrf_tag %>
+      <input class="btn btn-warn pull-left" name="enqueue" type="submit" value="<%= t('EnqueueNow') %>" data-confirm="<%= t('AreYouSureEnqueueCronJob', :job => @job.name) %>" />
     </form>
     <% if @job.status == 'enabled' %>
       <form action="<%= cron_job_path %>/disable?redirect=<%= cron_job_path %>" class="pull-right" method="post">
-        <%= csrf_tag if respond_to?(:csrf_tag) %>
+        <%= csrf_tag %>
         <input class="btn btn-warn pull-left" name="disable" type="submit" value="<%= t('Disable') %>" />
       </form>
     <% else %>
       <form action="<%= cron_job_path %>/enable?redirect=<%= cron_job_path %>" class="pull-right" method="post">
-        <%= csrf_tag if respond_to?(:csrf_tag) %>
+        <%= csrf_tag %>
         <input class="btn btn-warn pull-left" name="enable" type="submit" value="<%= t('Enable') %>" />
       </form>
       <form action="<%= cron_job_path %>/delete" class="pull-right" method="post">
-        <%= csrf_tag if respond_to?(:csrf_tag) %>
+        <%= csrf_tag %>
         <input class="btn btn-danger pull-left" data-confirm="<%= t('AreYouSureDeleteCronJob', :job => @job.name) %>" name="delete" type="submit" value="<%= t('Delete') %>" />
       </form>
     <% end %>

data/lib/sidekiq/cron/web_extension.rb

@@ -9,70 +9,66 @@ module Sidekiq
           def namespace_redirect_path
             "#{root_path}cron/namespaces/#{route_params[:namespace]}"
           end
+
+          def redirect_to_previous_or_default
+            redirect params['redirect'] || namespace_redirect_path
+          end
+
+          def render_erb(view)
+            views_path = File.join(File.expand_path("..", __FILE__), "views")
+            erb(File.read(File.join(views_path, "#{view}.erb")))
+          end
         end
 
-        # Index page of cron jobs.
+        # Index page.
         app.get '/cron' do
-          view_path = File.join(File.expand_path("..", __FILE__), "views")
-
           @current_namespace = 'default'
+          @cron_jobs = Sidekiq::Cron::Job.all(@current_namespace)
 
-          @namespaces = Sidekiq::Cron::Namespace.all_with_count
-
-          # Not passing namespace takes all the jobs from the default one.
-          @cron_jobs = Sidekiq::Cron::Job.all
-
-          render(:erb, File.read(File.join(view_path, "cron.erb")))
+          render_erb(:cron)
         end
 
+        # Detail page for a specific namespace.
         app.get '/cron/namespaces/:name' do
-          view_path = File.join(File.expand_path("..", __FILE__), "views")
-
           @current_namespace = route_params[:name]
-
-          @namespaces = Sidekiq::Cron::Namespace.all_with_count
-
           @cron_jobs = Sidekiq::Cron::Job.all(@current_namespace)
 
-          render(:erb, File.read(File.join(view_path, "cron.erb")))
+          render_erb(:cron)
         end
 
         # Display job detail + jid history.
         app.get '/cron/namespaces/:namespace/jobs/:name' do
-          view_path = File.join(File.expand_path("..", __FILE__), "views")
-
           @current_namespace = route_params[:namespace]
-          @job_name = route_params[:name]
-
-          @namespaces = Sidekiq::Cron::Namespace.all_with_count
-
-          @job = Sidekiq::Cron::Job.find(@job_name, @current_namespace)
+          @job = Sidekiq::Cron::Job.find(route_params[:name], @current_namespace)
 
           if @job
-            render(:erb, File.read(File.join(view_path, "cron_show.erb")))
+            render_erb(:cron_show)
           else
             redirect namespace_redirect_path
           end
         end
 
         # Enqueue all cron jobs.
-        app.post '/cron/namespaces/:namespace/all/enque' do
+        app.post '/cron/namespaces/:namespace/all/enqueue' do
           Sidekiq::Cron::Job.all(route_params[:namespace]).each(&:enqueue!)
-          redirect params['redirect'] || namespace_redirect_path
+
+          redirect_to_previous_or_default
         end
 
         # Enqueue cron job.
-        app.post '/cron/namespaces/:namespace/jobs/:name/enque' do
+        app.post '/cron/namespaces/:namespace/jobs/:name/enqueue' do
           if job = Sidekiq::Cron::Job.find(route_params[:name], route_params[:namespace])
             job.enqueue!
           end
-          redirect params['redirect'] || namespace_redirect_path
+
+          redirect_to_previous_or_default
         end
 
         # Delete all schedules.
         app.post '/cron/namespaces/:namespace/all/delete' do
           Sidekiq::Cron::Job.all(route_params[:namespace]).each(&:destroy)
-          redirect params['redirect'] || namespace_redirect_path
+
+          redirect_to_previous_or_default
         end
 
         # Delete schedule.
@@ -80,13 +76,15 @@ module Sidekiq
           if job = Sidekiq::Cron::Job.find(route_params[:name], route_params[:namespace])
             job.destroy
           end
-          redirect params['redirect'] || namespace_redirect_path
+
+          redirect_to_previous_or_default
         end
 
         # Enable all jobs.
         app.post '/cron/namespaces/:namespace/all/enable' do
           Sidekiq::Cron::Job.all(route_params[:namespace]).each(&:enable!)
-          redirect params['redirect'] || namespace_redirect_path
+
+          redirect_to_previous_or_default
         end
 
         # Enable job.
@@ -94,13 +92,15 @@ module Sidekiq
           if job = Sidekiq::Cron::Job.find(route_params[:name], route_params[:namespace])
             job.enable!
           end
-          redirect params['redirect'] || namespace_redirect_path
+
+          redirect_to_previous_or_default
         end
 
         # Disable all jobs.
         app.post '/cron/namespaces/:namespace/all/disable' do
           Sidekiq::Cron::Job.all(route_params[:namespace]).each(&:disable!)
-          redirect params['redirect'] || namespace_redirect_path
+
+          redirect_to_previous_or_default
         end
 
         # Disable job.
@@ -108,7 +108,8 @@ module Sidekiq
           if job = Sidekiq::Cron::Job.find(route_params[:name], route_params[:namespace])
             job.disable!
           end
-          redirect params['redirect'] || namespace_redirect_path
+
+          redirect_to_previous_or_default
         end
       end
     end

data/lib/sidekiq/cron.rb

@@ -14,6 +14,17 @@ module Sidekiq
     end
 
     class Configuration
+      # The interval, in seconds, at which to poll for scheduled cron jobs.
+      # This determines how frequently the scheduler checks for jobs to enqueue.
+      attr_accessor :cron_poll_interval
+
+      # The path to a YAML file containing multiple cron job schedules.
+      attr_accessor :cron_schedule_file
+
+      # The maximum number of recent cron job execution histories to retain.
+      # This value controls how many past job executions are stored.
+      attr_accessor :cron_history_size
+
       # The default namespace is used when no namespace is specified.
       attr_accessor :default_namespace
 
@@ -26,29 +37,18 @@ module Sidekiq
       # The poller will not enqueue jobs that are late by more than this amount of seconds.
       # Defaults to 60 seconds.
       #
-      # This is useful when sidekiq (and sidekiq-cron) is not used in zero downtime deployments and
-      # when the deployment is done and sidekiq-cron starts to catch up, it will consider older
+      # This is useful when Sidekiq (and Sidekiq-Cron) is not used in zero downtime deployments and
+      # when the deployment is done and Sidekiq-Cron starts to catch up, it will consider older
       # jobs that missed their schedules during the deployment. E.g., jobs that run once a day.
       attr_accessor :reschedule_grace_period
 
-      # The maximum number of recent cron job execution histories to retain.
-      # This value controls how many past job executions are stored.
-      attr_accessor :cron_history_size
-
-      # The interval, in seconds, at which to poll for scheduled cron jobs.
-      # This determines how frequently the scheduler checks for jobs to enqueue.
-      attr_accessor :cron_poll_interval
-
-      # The path to a YAML file containing multiple cron job schedules.
-      attr_accessor :cron_schedule_file
-
       def initialize
+        @cron_poll_interval = 30
+        @cron_schedule_file = 'config/schedule.yml'
+        @cron_history_size = 10
         @default_namespace = 'default'
         @natural_cron_parsing_mode = :single
         @reschedule_grace_period = 60
-        @cron_history_size = 10
-        @cron_poll_interval = 30
-        @cron_schedule_file = 'config/schedule.yml'
       end
 
       def natural_cron_parsing_mode=(mode)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cron
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc2
+  version: 2.0.1
 platform: ruby
 authors:
 - Ondrej Bartas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-19 00:00:00.000000000 Z
+date: 2024-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cronex