sidekiq-cron 2.0.0.rc1 → 2.0.0

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/namespace.rb

@@ -1,5 +1,3 @@
-require 'sidekiq'
-
 module Sidekiq
   module Cron
     class Namespace

data/lib/sidekiq/cron/poller.rb

@@ -1,20 +1,12 @@
 # frozen_string_literal: true
 
-require 'sidekiq'
-require 'sidekiq/cron'
 require 'sidekiq/scheduled'
-require 'sidekiq/options'
 
 module Sidekiq
   module Cron
     # The Poller checks Redis every N seconds for scheduled cron jobs.
     class Poller < Sidekiq::Scheduled::Poller
       def initialize(config = nil)
-        if Gem::Version.new(Sidekiq::VERSION) < Gem::Version.new('6.5.0')
-          # Old version of Sidekiq does not accept a config argument.
-          @config = config
-        end
-
         super
       end
 
@@ -40,7 +32,7 @@ module Sidekiq
       private
 
       def enqueue_job(job, time = Time.now.utc)
-        job.test_and_enque_for_time! time if job && job.valid?
+        job.test_and_enqueue_for_time! time if job && job.valid?
       rescue => ex
         # Problem somewhere in one job.
         Sidekiq.logger.error "CRON JOB: #{ex.message}"

data/lib/sidekiq/cron/schedule_loader.rb

@@ -1,9 +1,5 @@
-require 'sidekiq'
-require 'sidekiq/cron/job'
-require 'sidekiq/options'
-
 Sidekiq.configure_server do |config|
-  schedule_file = Sidekiq::Options[:cron_schedule_file] || 'config/schedule.yml'
+  schedule_file = Sidekiq::Cron.configuration.cron_schedule_file
 
   if File.exist?(schedule_file)
     config.on(:startup) do

data/lib/sidekiq/cron/support.rb

@@ -1,8 +1,7 @@
-# https://github.com/rails/rails/blob/352865d0f835c24daa9a2e9863dcc9dde9e5371a/activesupport/lib/active_support/inflector/methods.rb#L270
-
 module Sidekiq
   module Cron
     module Support
+      # Inspired by Active Support Inflector
       def self.constantize(camel_cased_word)
         names = camel_cased_word.split("::".freeze)
 

data/lib/sidekiq/cron/version.rb

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

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

@@ -5,23 +5,23 @@
       <small><%= @current_namespace %></small>
     </h3>
   </div>
-  <div class='col-sm-7 pull-right' style="margin-top: 20px; margin-bottom: 10px;">
+  <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>
@@ -47,63 +47,59 @@
 <% if @cron_jobs.size > 0 %>
   <table class="table table-hover table-bordered table-striped table-white">
     <thead>
+    <tr>
       <th><%= t('Status') %></th>
-      <th><%= t('Name') %></th>
-      <th><%= t('Cron string') %></th>
-      <th><%= t('Last enqueued') %></th>
-      <th width="180"><%= t('Actions')%></th>
+      <th width="50%"><%= t('Name') %></th>
+      <th><%= t('CronString') %></th>
+      <th><%= t('LastEnqueued') %></th>
+      <th width="180"><%= t('Actions') %></th>
+    </tr>
     </thead>
 
     <tbody>
-      <% @cron_jobs.sort{|a,b| a.sort_name <=> b.sort_name }.each_with_index do |job, index| %>
-        <% style = "#{job.status == 'disabled' ? "background: #ecc; color: #585454;": ""}" %>
+      <% @cron_jobs.sort{ |a,b| a.sort_name <=> b.sort_name }.each do |job| %>
+        <% klass = (job.status == 'disabled') ? 'bg-danger text-muted' : '' %>
+        <% escaped_job_name = CGI.escape(job.name).gsub('+', '%20') %>
         <tr>
-          <td style="<%= style %>"><%= t job.status %></td>
-          <td style="<%= style %>">
-            <a href="<%= root_path %>cron/namespaces/<%= @current_namespace %>/jobs/<%= CGI.escape(job.name).gsub('+', '%20') %>" title="<%= job.description %>">
-              <b style="<%= style %>"><%= job.name %></b>
+          <td class="<%= klass %>"><%= t job.status %></td>
+          <td class="<%= klass %>">
+            <a href="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>" title="<%= job.description %>">
+              <b class="<%= klass %>"><%= job.name %></b>
             </a>
-            <hr style="margin:3px;border:0;">
-            <small>
+            <br/>
             <% if job.message and job.message.to_s.size > 100 %>
-              <% if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("6.3.0") %>
-                <button data-toggle="job_<%= index %>" class="btn btn-warn btn-xs"><%= t('ShowAll')%></button>
-                <div class="toggle" id="job_<%= index %>" style="display: inline;"><%= job.message[0..100] + "... " %></div>
-                <div class="toggle" id="job_<%= index %>_full" style="display: none;"><%= job.message %></div>
-              <% else %>
-                <button data-toggle="collapse" data-target=".worker_<%= index %>" class="btn btn-warn btn-xs"><%= t('ShowAll')%></button>
-                <div class="toggle worker_<%= index %>" style="display: inline;"><%= job.message[0..100] + "... " %></div>
-                <div class="toggle worker_<%= index %>" style="display: none;"><%= job.message %></div>
-              <% end %>
+              <details>
+                <summary class="btn btn-warn btn-xs">Show message</summary>
+                <p><small><%= job.message %></small></p>
+              </details>
             <% else %>
-              <%= job.message %>
+              <small><%= job.message %></small>
             <% end %>
-            </small>
           </td>
-          <td style="<%= style %>"><b><%= job.human_cron %><br/><small><%= job.cron.gsub(" ", "&nbsp;") %></small></b></td>
-          <td style="<%= style %>"><%= job.last_enqueue_time ? relative_time(job.last_enqueue_time) : "-" %></td>
-          <td style="<%= style %>">
+          <td class="<%= klass %>"><b><%= job.human_cron %><br/><small><%= job.cron.gsub(" ", "&nbsp;") %></small></b></td>
+          <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/<%= @current_namespace %>/jobs/<%= CGI.escape(job.name).gsub('+', '%20') %>/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/<%= @current_namespace %>/jobs/<%= CGI.escape(job.name).gsub('+', '%20') %>/disable" method="post">
-                <%= csrf_tag if respond_to?(:csrf_tag) %>
+              <form action="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>/disable" method="post">
+                <%= 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/<%= @current_namespace %>/jobs/<%= CGI.escape(job.name).gsub('+', '%20') %>/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') %>"/>
+              <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/<%= @current_namespace %>/jobs/<%= CGI.escape(job.name).gsub('+', '%20') %>/enable" method="post">
-                <%= csrf_tag if respond_to?(:csrf_tag) %>
+              <form action="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>/enable" method="post">
+                <%= 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/<%= @current_namespace %>/jobs/<%= CGI.escape(job.name).gsub('+', '%20') %>/delete" method="post">
-                <%= csrf_tag if respond_to?(:csrf_tag) %>
-                <input class='btn btn-xs btn-danger pull-left' type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteCronJob', :job => job.name) %>"/>
+              <form action="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>/delete" method="post">
+                <%= 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 %>
           </td>

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

@@ -5,25 +5,25 @@
       <small><%= @job.name %></small>
     </h3>
   </div>
-  <div class="span col-sm-7 pull-right" style="margin-top: 20px; margin-bottom: 10px;">
+  <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 %>" method="post">
-        <%= csrf_tag if respond_to?(:csrf_tag) %>
+      <form action="<%= cron_job_path %>/disable?redirect=<%= cron_job_path %>" class="pull-right" method="post">
+        <%= 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 %>" method="post">
-        <%= csrf_tag if respond_to?(:csrf_tag) %>
+      <form action="<%= cron_job_path %>/enable?redirect=<%= cron_job_path %>" class="pull-right" method="post">
+        <%= csrf_tag %>
         <input class="btn btn-warn pull-left" name="enable" type="submit" value="<%= t('Enable') %>" />
       </form>
-      <form action="<%= cron_job_path %>/delete" method="post">
-        <%= csrf_tag if respond_to?(:csrf_tag) %>
-        <input class="btn btn-danger" data-confirm="<%= t('AreYouSureDeleteCronJob', :job => @job.name) %>" name="delete" type="submit" value="<%= t('Delete') %>" />
+      <form action="<%= cron_job_path %>/delete" class="pull-right" method="post">
+        <%= 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 %>
   </div>

data/lib/sidekiq/cron/web.rb

@@ -1,7 +1,17 @@
 require "sidekiq/cron/web_extension"
 require "sidekiq/cron/job"
+require "sidekiq/cron/namespace"
 
 if defined?(Sidekiq::Web)
-  Sidekiq::Web.register Sidekiq::Cron::WebExtension
-  Sidekiq::Web.tabs["Cron"] = "cron"
+  if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('7.3.0')
+    Sidekiq::Web.register(
+      Sidekiq::Cron::WebExtension, # Class which contains the HTTP actions, required
+      name: "cron", # the name of the extension, used to namespace assets
+      tab: "Cron", # labels(s) of the UI tabs
+      index: "cron", # index route(s) for each tab
+    )
+  else
+    Sidekiq::Web.register Sidekiq::Cron::WebExtension
+    Sidekiq::Web.tabs["Cron"] = "cron"
+  end
 end

data/lib/sidekiq/cron/web_extension.rb

@@ -4,68 +4,71 @@ module Sidekiq
       def self.registered(app)
         app.settings.locales << File.join(File.expand_path("..", __FILE__), "locales")
 
-        # Index page of cron jobs.
-        app.get '/cron' do
-          view_path = File.join(File.expand_path("..", __FILE__), "views")
+        app.helpers do
+          # This method constructs the URL for the cron jobs page within the specified namespace.
+          def namespace_redirect_path
+            "#{root_path}cron/namespaces/#{route_params[:namespace]}"
+          end
 
-          @current_namespace = 'default'
+          def redirect_to_previous_or_default
+            redirect params['redirect'] || namespace_redirect_path
+          end
 
-          @namespaces = Sidekiq::Cron::Namespace.all_with_count
+          def render_erb(view)
+            views_path = File.join(File.expand_path("..", __FILE__), "views")
+            erb(File.read(File.join(views_path, "#{view}.erb")))
+          end
+        end
 
-          # Not passing namespace takes all the jobs from the default one.
-          @cron_jobs = Sidekiq::Cron::Job.all
+        # Index page.
+        app.get '/cron' do
+          @current_namespace = 'default'
+          @cron_jobs = Sidekiq::Cron::Job.all(@current_namespace)
 
-          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 "#{root_path}cron/namespaces/#{route_params[:namespace]}"
+            redirect namespace_redirect_path
           end
         end
 
-        # Enque all cron jobs.
-        app.post '/cron/namespaces/:namespace/all/enque' do
-          Sidekiq::Cron::Job.all(route_params[:namespace]).each(&:enque!)
-          redirect params['redirect'] || "#{root_path}cron/namespaces/#{route_params[:namespace]}"
+        # Enqueue all cron jobs.
+        app.post '/cron/namespaces/:namespace/all/enqueue' do
+          Sidekiq::Cron::Job.all(route_params[:namespace]).each(&:enqueue!)
+
+          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.enque!
+            job.enqueue!
           end
-          redirect params['redirect'] || "#{root_path}cron"
+
+          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 "#{root_path}cron/namespaces/#{route_params[:namespace]}"
+
+          redirect_to_previous_or_default
         end
 
         # Delete schedule.
@@ -73,13 +76,15 @@ module Sidekiq
           if job = Sidekiq::Cron::Job.find(route_params[:name], route_params[:namespace])
             job.destroy
           end
-          redirect "#{root_path}cron"
+
+          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'] || "#{root_path}cron/namespaces/#{route_params[:namespace]}"
+
+          redirect_to_previous_or_default
         end
 
         # Enable job.
@@ -87,13 +92,15 @@ module Sidekiq
           if job = Sidekiq::Cron::Job.find(route_params[:name], route_params[:namespace])
             job.enable!
           end
-          redirect params['redirect'] || "#{root_path}cron"
+
+          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'] || "#{root_path}cron/namespaces/#{route_params[:namespace]}"
+
+          redirect_to_previous_or_default
         end
 
         # Disable job.
@@ -101,7 +108,8 @@ module Sidekiq
           if job = Sidekiq::Cron::Job.find(route_params[:name], route_params[:namespace])
             job.disable!
           end
-          redirect params['redirect'] || "#{root_path}cron"
+
+          redirect_to_previous_or_default
         end
       end
     end

data/lib/sidekiq/cron.rb

@@ -1,9 +1,3 @@
-require "sidekiq/cron/job"
-require "sidekiq/cron/namespace"
-require "sidekiq/cron/poller"
-require "sidekiq/cron/launcher"
-require "sidekiq/cron/schedule_loader"
-
 module Sidekiq
   module Cron
     class << self
@@ -15,7 +9,22 @@ module Sidekiq
       yield(configuration) if block_given?
     end
 
+    def self.reset!
+      self.configuration = Configuration.new
+    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
 
@@ -28,12 +37,15 @@ 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
 
       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

data/lib/sidekiq/options.rb

@@ -1,5 +1,4 @@
-require 'sidekiq'
-
+# Module to access Sidekiq config
 module Sidekiq
   module Options
     def self.[](key)
@@ -16,13 +15,12 @@ module Sidekiq
 
     def self.options_field
       return @options_field unless @options_field.nil?
+
       sidekiq_version = Gem::Version.new(Sidekiq::VERSION)
       @options_field = if sidekiq_version >= Gem::Version.new('7.0')
         :default_configuration
-      elsif sidekiq_version >= Gem::Version.new('6.5')
-        false
       else
-        :options
+        false
       end
     end
   end