sidekiq-cron 2.0.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf984d9ac3e15500e5d146f99178d6310b5764e397d3d98ccb9661dc437b88c0
-  data.tar.gz: 89bd805d369b10b78fcb9e82ef8747743ab415fd3dc55f9a927215092b9bcd39
+  metadata.gz: fcff473f7500a6ff2d006bb8af760d697b93aec6090b18e891f63a7b491396e2
+  data.tar.gz: 03a0e5508ee4f31e9c437c253bef8411a25de83deeb6e8c5eb18ccf84e836b50
 SHA512:
-  metadata.gz: a6c5995218160d696554156e7f88723021cb51b407ad01f42ecfcfd306010f50d61a02435a00d1fb2c193e2611cfd84eaf9bf620e05eadbb094ea51dbfe45d2d
-  data.tar.gz: 2455bc30bb2aba3969f8ede6a18a20e38559b152366290aeba8611c76465173ff4ef904da043624a4d6e78754f82b922c10d9df8a4668b45e122925d9bda2451
+  metadata.gz: 10d1500431656322f8f33feeec633bda703f601b98f1bc3e7f35e4ccfc93fef4fa4608d750a488282c0d02d274d9b2775969c1c072ebdd74292b00a6687593b8
+  data.tar.gz: 99aa76218a9acf896e10b801398ba5a6b4935ed33b24bf8fa5be25b0a30bf2c3c5afe2dd7cc30b7ad4b665ed827c1adc9fb48e5bb3987de60513ce334895fbda

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file.
 
+## 2.2.0
+
+- Add support for Sidekiq v8 (https://github.com/sidekiq-cron/sidekiq-cron/pull/531, https://github.com/sidekiq-cron/sidekiq-cron/pull/538)
+- Always show parsed cron expression in web UI (https://github.com/sidekiq-cron/sidekiq-cron/pull/535)
+- Add fallback to .yaml extension (https://github.com/sidekiq-cron/sidekiq-cron/pull/534)
+- Refactor constantize helper to use Object.const_get (https://github.com/sidekiq-cron/sidekiq-cron/pull/541)
+- Allow testing of schedule by library consumers (https://github.com/sidekiq-cron/sidekiq-cron/pull/543)
+
+## 2.1.0
+
+- Add `available_namespaces` configuration option (https://github.com/sidekiq-cron/sidekiq-cron/pull/524)
+- I18n fixes and enhancements (https://github.com/sidekiq-cron/sidekiq-cron/pull/520, https://github.com/sidekiq-cron/sidekiq-cron/pull/522)
+
 ## 2.0.1
 
 - Fix usage of ActiveJob::Base.queue_name (https://github.com/sidekiq-cron/sidekiq-cron/pull/517)

data/Gemfile

@@ -5,5 +5,5 @@ 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")
+# To test different Rails versions
+gem "rails", ENV.fetch("RAILS_VERSION", "~> 7")

data/README.md

@@ -1,7 +1,7 @@
 ![Sidekiq-Cron](logos/cover.png)
 
 [![Gem Version](https://badge.fury.io/rb/sidekiq-cron.svg)](https://badge.fury.io/rb/sidekiq-cron)
-[![Build Status](https://github.com/sidekiq-cron/sidekiq-cron/workflows/CI/badge.svg?branch=master)](https://github.com/sidekiq-cron/sidekiq-cron/actions)
+[![CI](https://github.com/sidekiq-cron/sidekiq-cron/actions/workflows/ci.yml/badge.svg)](https://github.com/sidekiq-cron/sidekiq-cron/actions/workflows/ci.yml)
 [![codecov](https://codecov.io/gh/sidekiq-cron/sidekiq-cron/branch/master/graph/badge.svg?token=VK9IVLIaY8)](https://codecov.io/gh/sidekiq-cron/sidekiq-cron)
 
 > A scheduling add-on for [Sidekiq](https://sidekiq.org/)
@@ -73,6 +73,7 @@ Sidekiq::Cron.configure do |config|
   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.available_namespaces = %w[statistics maintenance billing] # Default is `nil`
   config.natural_cron_parsing_mode = :strict # Default is :single
   config.reschedule_grace_period = 300 # Default is 60
 end
@@ -166,6 +167,24 @@ Sidekiq::Cron.configure do |config|
 end
 ```
 
+#### Renaming namespace
+
+If you rename the namespace of a job that is already running, the gem will not automatically delete the cron job associated with the old namespace. This means you could end up with two cron jobs running simultaneously.
+
+To avoid this, it is recommended to delete all existing cron jobs associated with the old namespace before making the change. You can achieve this with the following code:
+
+```ruby
+Sidekiq::Cron::Job.all('YOUR_OLD_NAMESPACE_NAME').each { |job| job.destroy }
+```
+
+#### Available namespaces
+
+By default, Sidekiq Cron retrieves all existing jobs from Redis to determine the namespaces your application uses. However, this approach may not be suitable for large Redis installations. To address this, you can explicitly specify the list of available namespaces using the `available_namespaces` configuration option.
+
+If `available_namespaces` is set and a job is created with an unexpected namespace, a warning will be printed, and the job will be assigned to the default namespace.
+
+For more details and discussion, see [this issue](https://github.com/sidekiq-cron/sidekiq-cron/issues/516).
+
 #### Usage
 
 When creating a new job, you can optionally give a `namespace` attribute, and then you can pass it too in the `find` or `destroy` methods.
@@ -492,6 +511,45 @@ Sidekiq::Cron.configure do |config|
 end
 ```
 
+## Testing your configuration
+
+You can test your application's configuration by loading the schedule in your test suite. Below is an example using RSpec in a Rails project:
+
+```ruby
+# spec/cron_schedule_spec.rb
+require "rails_helper"
+
+RSpec.describe "Cron Schedule" do
+  let(:schedule_loader) { Sidekiq::Cron::ScheduleLoader.new }
+  let(:all_jobs) { Sidekiq::Cron::Job.all }
+
+  # Confirms that `config.cron_schedule_file` points to a real file.
+  it "has a schedule file" do
+    expect(schedule_loader).to have_schedule_file
+  end
+
+  # Confirms that no jobs in the schedule have an invalid cron string.
+  it "does not return any errors" do
+    expect(schedule_loader.load).to be_empty
+  end
+
+  # May be subject to churn, but adds confidence.
+  it "adds the expected number of jobs" do
+    schedule_loader.load
+    expect(all_jobs.size).to eq 5
+  end
+
+  # Confirms that all job classes exist.
+  it "has a valid class for each added job" do
+    schedule_loader.load
+    # Shows that all classes exist (as we can constantize the names without raising).
+    job_classes = all_jobs.map { |job| job.klass.constantize }
+    # Naive check that classes are sidekiq jobs (as they all have `.perfrom_async`).
+    expect(job_classes).to all(respond_to(:perform_async))
+  end
+end
+```
+
 ## Contributing
 
 **Thanks to all [contributors](https://github.com/sidekiq-cron/sidekiq-cron/graphs/contributors), you’re awesome and this wouldn’t be possible without you!**

data/lib/sidekiq/cron/job.rb

@@ -18,7 +18,7 @@ module Sidekiq
       GLOBALID_KEY = "_sc_globalid"
 
       attr_accessor :name, :namespace, :cron, :description, :klass, :args, :message
-      attr_reader   :last_enqueue_time, :fetch_missing_args, :source
+      attr_reader   :cron_expression_string, :last_enqueue_time, :fetch_missing_args, :source
 
       def initialize input_args = {}
         args = Hash[input_args.map{ |k, v| [k.to_s, v] }]
@@ -26,11 +26,17 @@ module Sidekiq
         @fetch_missing_args = true if @fetch_missing_args.nil?
 
         @name = args["name"]
-        @namespace = args["namespace"] || Sidekiq::Cron.configuration.default_namespace
         @cron = args["cron"]
         @description = args["description"] if args["description"]
         @source = args["source"] == "schedule" ? "schedule" : "dynamic"
 
+        default_namespace = Sidekiq::Cron.configuration.default_namespace
+        @namespace = args["namespace"] || default_namespace
+        if Sidekiq::Cron::Namespace.available_namespaces_provided? && !Sidekiq::Cron::Namespace.all.include?(@namespace) && @namespace != default_namespace
+          Sidekiq.logger.warn { "Cron Jobs - unexpected namespace #{@namespace} encountered. Assigning to default namespace." }
+          @namespace = default_namespace
+        end
+
         # Get class from klass or class.
         @klass = args["klass"] || args["class"]
 
@@ -126,12 +132,7 @@ module Sidekiq
       def enqueue! time = Time.now.utc
         @last_enqueue_time = time
 
-        klass_const =
-            begin
-              Sidekiq::Cron::Support.constantize(@klass.to_s)
-            rescue NameError
-              nil
-            end
+        klass_const = Sidekiq::Cron::Support.safe_constantize(@klass.to_s)
 
         jid =
           if klass_const
@@ -154,9 +155,10 @@ module Sidekiq
       end
 
       def is_active_job?(klass = nil)
-        @active_job || defined?(::ActiveJob::Base) && (klass || Sidekiq::Cron::Support.constantize(@klass.to_s)) < ::ActiveJob::Base
-      rescue NameError
-        false
+        @active_job || defined?(::ActiveJob::Base) && begin
+                                                        klass ||= Sidekiq::Cron::Support.safe_constantize(@klass.to_s)
+                                                        klass ? klass < ::ActiveJob::Base : false
+                                                      end
       end
 
       def date_as_argument?
@@ -594,6 +596,10 @@ module Sidekiq
         @args = parse_args(args)
       end
 
+      def cron_expression_string
+        parsed_cron.to_cron_s
+      end
+
       private
 
       def parsed_cron
@@ -687,7 +693,7 @@ module Sidekiq
       def self.job_keys_from_namespace(namespace = Sidekiq::Cron.configuration.default_namespace)
         Sidekiq.redis do |conn|
           if namespace == '*'
-            namespaces = conn.keys(jobs_key(namespace))
+            namespaces = Sidekiq::Cron.configuration.available_namespaces&.map { jobs_key(_1) } || conn.keys(jobs_key(namespace))
             namespaces.flat_map { |name| conn.smembers(name) }
           else
             conn.smembers(jobs_key(namespace))
@@ -794,11 +800,7 @@ module Sidekiq
       end
 
       def get_job_options(klass, args)
-        klass = klass.is_a?(Class) ? klass : begin
-          Sidekiq::Cron::Support.constantize(klass)
-        rescue NameError
-          # noop
-        end
+        klass = klass.is_a?(Class) ? klass : Sidekiq::Cron::Support.safe_constantize(klass)
 
         if klass.nil?
           # Unknown class

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

@@ -0,0 +1,22 @@
+es:
+  AreYouSureDeleteCronJob: ¿Estás seguro de que quieres borrar el trabajo cron %{job}?
+  AreYouSureDeleteCronJobs: ¿Estás seguro de que quieres borrar TODOS los trabajos cron?
+  AreYouSureEnqueueCronJob: ¿Estás seguro de que quieres poner en cola el trabajo cron %{job}?
+  AreYouSureEnqueueCronJobs: ¿Estás seguro de que quieres poner en cola TODOS los trabajos cron?
+  Cron: Cron
+  CronJobs: Trabajos cron programados
+  CronString: Cron
+  DeleteAll: Borrar todo
+  Description: Descripción
+  Disable: Desactivar
+  DisableAll: Desactivar todos
+  Enable: Activar
+  EnableAll: Activar todos
+  EnqueueAll: Poner todos en cola
+  EnqueueNow: Poner en cola ahora
+  Job: Trabajo
+  LastEnqueued: Último trabajo en cola
+  NoCronJobsWereFound: No se encontraron trabajos
+  NoHistoryWereFound: No se encontró histórico de trabajos
+  disabled: activo
+  enabled: inactivo

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

@@ -1,8 +1,8 @@
 ja:
   AreYouSureDeleteCronJob: "本当に%{job}のcronジョブを削除しますか？"
   AreYouSureDeleteCronJobs: "本当にすべてのcronジョブを削除しますか？"
-  AreYouSureEnqueueCronJob: "%{job} の クロン ジョブをキューに入れてもよろしいですか？"
-  AreYouSureEnqueueCronJobs: "すべての クロン ジョブをキューに入れてもよろしいですか？"
+  AreYouSureEnqueueCronJob: "%{job} の cronジョブをキューに入れてもよろしいですか？"
+  AreYouSureEnqueueCronJobs: "すべての cronジョブをキューに入れてもよろしいですか？"
   Cron: Cron
   CronJobs: Cronジョブ
   CronString: Cron

data/lib/sidekiq/cron/namespace.rb

@@ -2,7 +2,8 @@ module Sidekiq
   module Cron
     class Namespace
       def self.all
-        namespaces = nil
+        namespaces = Sidekiq::Cron.configuration.available_namespaces
+        return namespaces if namespaces
 
         Sidekiq.redis do |conn|
           namespaces = conn.keys('cron_jobs:*').collect do |key|
@@ -38,6 +39,10 @@ module Sidekiq
         end
         out
       end
+
+      def self.available_namespaces_provided?
+        !!Sidekiq::Cron.configuration.available_namespaces
+      end
     end
   end
 end

data/lib/sidekiq/cron/schedule_loader.rb

@@ -1,16 +1,56 @@
-Sidekiq.configure_server do |config|
-  schedule_file = Sidekiq::Cron.configuration.cron_schedule_file
-
-  if File.exist?(schedule_file)
-    config.on(:startup) do
-      schedule = Sidekiq::Cron::Support.load_yaml(ERB.new(IO.read(schedule_file)).result)
-      if schedule.kind_of?(Hash)
-        Sidekiq::Cron::Job.load_from_hash!(schedule, source: "schedule")
-      elsif schedule.kind_of?(Array)
-        Sidekiq::Cron::Job.load_from_array!(schedule, source: "schedule")
-      else
-        raise "Not supported schedule format. Confirm your #{schedule_file}"
+module Sidekiq
+  module Cron
+    class ScheduleLoader
+      def load_schedule
+        if schedule.is_a?(Hash)
+          Sidekiq::Cron::Job.load_from_hash!(schedule, source: "schedule")
+        elsif schedule.is_a?(Array)
+          Sidekiq::Cron::Job.load_from_array!(schedule, source: "schedule")
+        else
+          raise "Not supported schedule format. Confirm your #{schedule_file_name}"
+        end
+      end
+
+      def has_schedule_file?
+        File.exist?(schedule_file_name)
+      end
+
+      private
+
+      def schedule
+        @schedule ||= Sidekiq::Cron::Support.load_yaml(rendered_schedule_template)
+      end
+
+      def rendered_schedule_template
+        ERB.new(schedule_file_content).result
+      end
+
+      def schedule_file_content
+        IO.read(schedule_file_name)
+      end
+
+      def schedule_file_name
+        @schedule_file_name ||= yml_to_yaml_unless_file_exists(schedule_file_name_from_config)
+      end
+
+      def schedule_file_name_from_config
+        Sidekiq::Cron.configuration.cron_schedule_file
+      end
+
+      def yml_to_yaml_unless_file_exists(file_name)
+        if File.exist?(file_name)
+          file_name
+        else
+          file_name.sub(/\.yml$/, ".yaml")
+        end
       end
     end
   end
 end
+
+Sidekiq.configure_server do |config|
+  schedule_loader = Sidekiq::Cron::ScheduleLoader.new
+  break unless schedule_loader.has_schedule_file?
+
+  config.on(:startup) { schedule_loader.load_schedule }
+end

data/lib/sidekiq/cron/support.rb

@@ -1,35 +1,10 @@
 module Sidekiq
   module Cron
     module Support
-      # Inspired by Active Support Inflector
-      def self.constantize(camel_cased_word)
-        names = camel_cased_word.split("::".freeze)
-
-        # Trigger a built-in NameError exception including the ill-formed constant in the message.
-        Object.const_get(camel_cased_word) if names.empty?
-
-        # Remove the first blank element in case of '::ClassName' notation.
-        names.shift if names.size > 1 && names.first.empty?
-
-        names.inject(Object) do |constant, name|
-          if constant == Object
-            constant.const_get(name)
-          else
-            candidate = constant.const_get(name)
-            next candidate if constant.const_defined?(name, false)
-            next candidate unless Object.const_defined?(name)
-
-            # Go down the ancestors to check if it is owned directly. The check
-            # stops when we reach Object or the end of ancestors tree.
-            constant = constant.ancestors.inject(constant) do |const, ancestor|
-              break const    if ancestor == Object
-              break ancestor if ancestor.const_defined?(name, false)
-              const
-            end
-
-            constant.const_get(name, false)
-          end
-        end
+      def self.safe_constantize(klass_name)
+        Object.const_get(klass_name)
+      rescue NameError
+        nil
       end
 
       def self.load_yaml(src)

data/lib/sidekiq/cron/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Cron
-    VERSION = "2.0.1"
+    VERSION = "2.2.0"
   end
 end

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

@@ -1,113 +1,103 @@
-<header class='row'>
-  <div class='col-sm-5 pull-left'>
-    <h3>
+<section>
+  <header>
+    <h2>
       <%= t('CronJobs') %>
-      <small><%= @current_namespace %></small>
-    </h3>
-  </div>
-  <div class='col-sm-7 pull-right h2'>
+      <small>(<%= @current_namespace %>)</small>
+    </h2>
     <% if @cron_jobs.size > 0 %>
-      <form action="<%= root_path %>cron/namespaces/<%= @current_namespace %>/all/delete" method="post" class="pull-right">
-        <%= 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 %>
-        <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 %>
-        <input class="btn btn-warn" type="submit" name="enqueue" value="<%= t('EnableAll') %>" />
-      </form>
-      <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 class="filter">
+        <form action="<%= root_path %>cron/namespaces/<%= @current_namespace %>/all/delete" method="post">
+          <%= 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">
+          <%= csrf_tag %>
+          <input class="btn btn-primary" type="submit" name="enqueue" value="<%= t('DisableAll') %>" />
+        </form>
+        <form action="<%= root_path %>cron/namespaces/<%= @current_namespace %>/all/enable" method="post">
+          <%= csrf_tag %>
+          <input class="btn btn-primary" type="submit" name="enqueue" value="<%= t('EnableAll') %>" />
+        </form>
+        <form action="<%= root_path %>cron/namespaces/<%= @current_namespace %>/all/enqueue" method="post">
+          <%= csrf_tag %>
+          <input class="btn btn-primary" type="submit" name="enqueue" value="<%= t('EnqueueAll') %>" data-confirm="<%= t('AreYouSureEnqueueCronJobs') %>" />
+        </form>
       </form>
     <% end %>
+  </header>
+  <!-- Namespaces -->
+  <div class="cards-container">
+    <% Sidekiq::Cron::Namespace.all_with_count.sort_by { |namespace| namespace[:name] }.each do |namespace| %>
+      <article>
+        <a href="<%= root_path %>cron/namespaces/<%= namespace[:name] %>">
+          <span class="count"><%= namespace[:count] %></span>
+          <span class="desc"><%= namespace[:name] %></span>
+        </a>
+      </article>
+    <% end %>
   </div>
-</header>
-
-<!-- Namespaces -->
-<div class='row'>
-  <div class="col-sm-12 summary_bar">
-    <ul class="list-unstyled summary row">
-      <% 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>
-            <span class="desc"><%= namespace[:name] %></span>
-          </a>
-        </li>
-      <% end %>
-    </ul>
-  </div>
-</div>
-<!-- Namespaces -->
-
-<% if @cron_jobs.size > 0 %>
-  <table class="table table-hover table-bordered table-striped table-white">
-    <thead>
-    <tr>
-      <th><%= t('Status') %></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 do |job| %>
-        <% klass = (job.status == 'disabled') ? 'bg-danger text-muted' : '' %>
-        <% escaped_job_name = CGI.escape(job.name).gsub('+', '%20') %>
+  <!-- Namespaces -->
+  <% if @cron_jobs.size > 0 %>
+    <table class="table table-hover table-bordered table-striped table-white">
+      <thead>
         <tr>
-          <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>
-            <br/>
-            <% if job.message and job.message.to_s.size > 100 %>
-              <details>
-                <summary class="btn btn-warn btn-xs">Show message</summary>
-                <p><small><%= job.message %></small></p>
-              </details>
-            <% else %>
-              <small><%= job.message %></small>
-            <% end %>
-          </td>
-          <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/<%= 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 %>
-                <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 %>/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 %>
-                <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 %>
-                <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>
+          <th><%= t('Status') %></th>
+          <th width="50%"><%= t('Name') %></th>
+          <th><%= t('CronString') %></th>
+          <th><%= t('LastEnqueued') %></th>
+          <th width="180"><%= t('Actions') %></th>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
-<% else %>
-  <div class='alert alert-success'><%= t('NoCronJobsWereFound') %></div>
-<% end %>
-
+      </thead>
+      <tbody>
+        <% @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 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>
+              <br/>
+              <% if job.message and job.message.to_s.size > 100 %>
+                <details>
+                  <p><small><%= job.message %></small></p>
+                </details>
+              <% else %>
+                <small><%= job.message %></small>
+              <% end %>
+            </td>
+            <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 %>">
+              <div class="pagination" style="padding: 0px">
+                <form action="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>/enqueue" method="post">
+                  <%= csrf_tag %>
+                  <input class='btn btn-warn' type="submit" name="enqueue" value="<%= t('EnqueueNow') %>" data-confirm="<%= t('AreYouSureEnqueueCronJob', :job => job.name) %>"/>
+                </form>
+                <% if job.status == 'enabled' %>
+                  <form action="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>/disable" method="post">
+                    <%= csrf_tag %>
+                    <input class='btn btn-warn' type="submit" name="disable" value="<%= t('Disable') %>"/>
+                  </form>
+                <% else %>
+                  <form action="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>/enable" method="post">
+                    <%= csrf_tag %>
+                    <input class='btn btn-warn' 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 %>
+                    <input class='btn btn-danger' type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteCronJob', :job => job.name) %>"/>
+                  </form>
+                <% end %>
+              </div>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  <% else %>
+    <div class='alert alert-success'><%= t('NoCronJobsWereFound') %></div>
+  <% end %>
+</section>

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

@@ -1,92 +1,93 @@
-<header class="row">
-  <div class="span col-sm-5 pull-left">
-    <h3>
-      <%= "#{t('Cron')} #{t('Job')}" %>
-      <small><%= @job.name %></small>
-    </h3>
-  </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 %>/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 %>
-        <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 %>
-        <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">
+<section>
+  <header>
+    <div>
+      <h2>
+        <%= "#{t('Cron')} #{t('Job')}" %>
+        <small><%= @job.name %></small>
+      </h2>
+    </div>
+    <form class="filter">
+      <% cron_job_path = "#{root_path}cron/namespaces/#{@current_namespace}/jobs/#{CGI.escape(@job.name).gsub('+', '%20')}" %>
+      <form action="<%= cron_job_path %>/enqueue?redirect=<%= cron_job_path %>"  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') %>" />
+        <input class="btn btn-primary" name="enqueue" type="submit" value="<%= t('EnqueueNow') %>" data-confirm="<%= t('AreYouSureEnqueueCronJob', :job => @job.name) %>" />
       </form>
-    <% end %>
-  </div>
-</header>
-
-<table class="table table-bordered table-striped">
-  <tbody>
-  <tr>
-    <th><%= t 'Status' %></th>
-    <td><%= @job.status %></td>
-  </tr>
-  <tr>
-    <th><%= t 'Name' %></th>
-    <td><%= @job.name %></td>
-  </tr>
-  <tr>
-    <th><%= t 'Namespace' %></th>
-    <td><%= @job.namespace %></td>
-  </tr>
-  <tr>
-    <th><%= t 'Description' %></th>
-    <td><%= @job.description %></td>
-  </tr>
-  <tr>
-    <th><%= t 'Message' %></th>
-    <td><pre><%= @job.pretty_message %></pre></td>
-  </tr>
-  <tr>
-    <th><%= t 'Cron' %></th>
-    <td><%= @job.cron.gsub(" ", "&nbsp;") %></td>
-  </tr>
-  <tr>
-    <th><%= t 'Last enqueued' %></th>
-    <td><%= @job.last_enqueue_time ? relative_time(@job.last_enqueue_time) : "-" %></td>
-  </tr>
-  </tbody>
-</table>
-
-<header class="row">
-  <div class="col-sm-12">
-    <h4>
-      <%= t 'History' %>
-    </h4>
-  </div>
-</header>
-
-<% if @job.jid_history_from_redis.size > 0 %>
-  <table class="table table-hover table-bordered table-striped">
-    <thead>
-    <tr>
-      <th><%= t 'Enqueued' %></th>
-      <th><%= t 'JID' %></th>
-    </tr>
-    </thead>
+      <% if @job.status == 'enabled' %>
+        <form action="<%= cron_job_path %>/disable?redirect=<%= cron_job_path %>"  method="post">
+          <%= csrf_tag %>
+          <input class="btn btn-primary" name="disable" type="submit" value="<%= t('Disable') %>" />
+        </form>
+      <% else %>
+        <form action="<%= cron_job_path %>/enable?redirect=<%= cron_job_path %>"  method="post">
+          <%= csrf_tag %>
+          <input class="btn btn-primary" name="enable" type="submit" value="<%= t('Enable') %>" />
+        </form>
+        <form action="<%= cron_job_path %>/delete" method="post">
+          <%= csrf_tag %>
+          <input class="btn btn-danger" data-confirm="<%= t('AreYouSureDeleteCronJob', :job => @job.name) %>" name="delete" type="submit" value="<%= t('Delete') %>" />
+        </form>
+      <% end %>
+    </form>
+  </header>
+  <table class="table table-bordered table-striped">
     <tbody>
-    <% @job.jid_history_from_redis.each do |jid_history| %>
       <tr>
-        <td><%= jid_history['enqueued'] %></td>
-        <td><%= jid_history['jid'] %></td>
+        <th><%= t 'Status' %></th>
+        <td><%= @job.status %></td>
+      </tr>
+      <tr>
+        <th><%= t 'Name' %></th>
+        <td><%= @job.name %></td>
+      </tr>
+      <tr>
+        <th><%= t 'Namespace' %></th>
+        <td><%= @job.namespace %></td>
+      </tr>
+      <tr>
+        <th><%= t 'Description' %></th>
+        <td><%= @job.description %></td>
+      </tr>
+      <tr>
+        <th><%= t 'Message' %></th>
+        <td>
+          <pre><%= @job.pretty_message %></pre>
+        </td>
+      </tr>
+      <tr>
+        <th><%= t 'Cron' %></th>
+        <td><%= @job.cron.gsub(" ", "&nbsp;") %></td>
+      </tr>
+      <tr>
+        <th><%= t 'Last enqueued' %></th>
+        <td><%= @job.last_enqueue_time ? relative_time(@job.last_enqueue_time) : "-" %></td>
       </tr>
-    <% end %>
     </tbody>
   </table>
-<% else %>
-  <div class='alert alert-success'><%= t 'NoHistoryWereFound' %></div>
-<% end %>
+  <header>
+    <div>
+      <h4>
+        <%= t 'History' %>
+      </h4>
+    </div>
+  </header>
+  <% if @job.jid_history_from_redis.size > 0 %>
+    <table class="table table-hover table-bordered table-striped">
+      <thead>
+        <tr>
+          <th><%= t 'Enqueued' %></th>
+          <th><%= t 'JID' %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @job.jid_history_from_redis.each do |jid_history| %>
+          <tr>
+            <td><%= jid_history['enqueued'] %></td>
+            <td><%= jid_history['jid'] %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  <% else %>
+    <div class='alert alert-success'><%= t 'NoHistoryWereFound' %></div>
+  <% end %>
+</section>

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

@@ -0,0 +1,113 @@
+<header class='row'>
+  <div class='col-sm-5 pull-left'>
+    <h3>
+      <%= t('CronJobs') %>
+      <small><%= @current_namespace %></small>
+    </h3>
+  </div>
+  <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 %>
+        <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 %>
+        <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 %>
+        <input class="btn btn-warn" type="submit" name="enqueue" value="<%= t('EnableAll') %>" />
+      </form>
+      <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>
+</header>
+
+<!-- Namespaces -->
+<div class='row'>
+  <div class="col-sm-12 summary_bar">
+    <ul class="list-unstyled summary row">
+      <% 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>
+            <span class="desc"><%= namespace[:name] %></span>
+          </a>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+</div>
+<!-- Namespaces -->
+
+<% if @cron_jobs.size > 0 %>
+  <table class="table table-hover table-bordered table-striped table-white">
+    <thead>
+    <tr>
+      <th><%= t('Status') %></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 do |job| %>
+        <% klass = (job.status == 'disabled') ? 'bg-danger text-muted' : '' %>
+        <% escaped_job_name = CGI.escape(job.name).gsub('+', '%20') %>
+        <tr>
+          <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>
+            <br/>
+            <% if job.message and job.message.to_s.size > 100 %>
+              <details>
+                <summary class="btn btn-warn btn-xs">Show message</summary>
+                <p><small><%= job.message %></small></p>
+              </details>
+            <% else %>
+              <small><%= job.message %></small>
+            <% end %>
+          </td>
+          <td class="<%= klass %>"><b><%= job.human_cron %><br/><small><%= job.cron_expression_string.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/<%= 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 %>
+                <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 %>/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 %>
+                <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 %>
+                <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>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class='alert alert-success'><%= t('NoCronJobsWereFound') %></div>
+<% end %>
+

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

@@ -0,0 +1,92 @@
+<header class="row">
+  <div class="span col-sm-5 pull-left">
+    <h3>
+      <%= "#{t('Cron')} #{t('Job')}" %>
+      <small><%= @job.name %></small>
+    </h3>
+  </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 %>/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 %>
+        <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 %>
+        <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 %>
+        <input class="btn btn-danger pull-left" data-confirm="<%= t('AreYouSureDeleteCronJob', :job => @job.name) %>" name="delete" type="submit" value="<%= t('Delete') %>" />
+      </form>
+    <% end %>
+  </div>
+</header>
+
+<table class="table table-bordered table-striped">
+  <tbody>
+  <tr>
+    <th><%= t 'Status' %></th>
+    <td><%= @job.status %></td>
+  </tr>
+  <tr>
+    <th><%= t 'Name' %></th>
+    <td><%= @job.name %></td>
+  </tr>
+  <tr>
+    <th><%= t 'Namespace' %></th>
+    <td><%= @job.namespace %></td>
+  </tr>
+  <tr>
+    <th><%= t 'Description' %></th>
+    <td><%= @job.description %></td>
+  </tr>
+  <tr>
+    <th><%= t 'Message' %></th>
+    <td><pre><%= @job.pretty_message %></pre></td>
+  </tr>
+  <tr>
+    <th><%= t 'Cron' %></th>
+    <td><%= @job.cron.gsub(" ", "&nbsp;") %></td>
+  </tr>
+  <tr>
+    <th><%= t 'Last enqueued' %></th>
+    <td><%= @job.last_enqueue_time ? relative_time(@job.last_enqueue_time) : "-" %></td>
+  </tr>
+  </tbody>
+</table>
+
+<header class="row">
+  <div class="col-sm-12">
+    <h4>
+      <%= t 'History' %>
+    </h4>
+  </div>
+</header>
+
+<% if @job.jid_history_from_redis.size > 0 %>
+  <table class="table table-hover table-bordered table-striped">
+    <thead>
+    <tr>
+      <th><%= t 'Enqueued' %></th>
+      <th><%= t 'JID' %></th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @job.jid_history_from_redis.each do |jid_history| %>
+      <tr>
+        <td><%= jid_history['enqueued'] %></td>
+        <td><%= jid_history['jid'] %></td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class='alert alert-success'><%= t 'NoHistoryWereFound' %></div>
+<% end %>

data/lib/sidekiq/cron/web.rb

@@ -3,7 +3,16 @@ require "sidekiq/cron/job"
 require "sidekiq/cron/namespace"
 
 if defined?(Sidekiq::Web)
-  if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('7.3.0')
+  if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('8.0.0')
+    Sidekiq::Web.configure do |config|
+      config.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
+      )
+    end
+  elsif 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

data/lib/sidekiq/cron/web_extension.rb

@@ -1,25 +1,42 @@
 module Sidekiq
   module Cron
     module WebExtension
-      def self.registered(app)
-        app.settings.locales << File.join(File.expand_path("..", __FILE__), "locales")
-
-        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]}"
+      module Helpers
+        def cron_route_params(key)
+          if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("8.0.0")
+            route_params(key)
+          else
+            route_params[key]
           end
+        end
 
-          def redirect_to_previous_or_default
-            redirect params['redirect'] || namespace_redirect_path
-          end
+        # This method constructs the URL for the cron jobs page within the specified namespace.
+        def namespace_redirect_path
+          "#{root_path}cron/namespaces/#{cron_route_params(:namespace)}"
+        end
 
-          def render_erb(view)
-            views_path = File.join(File.expand_path("..", __FILE__), "views")
-            erb(File.read(File.join(views_path, "#{view}.erb")))
-          end
+        def redirect_to_previous_or_default
+          redirect params['redirect'] || namespace_redirect_path
         end
 
+        def render_erb(view)
+          path = Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("8.0.0") ? "views" : "views/legacy"
+          views_path = File.join(File.expand_path("..", __FILE__), path)
+          erb(File.read(File.join(views_path, "#{view}.erb")))
+        end
+      end
+
+      def self.registered(app)
+        locales = if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("8.0.0")
+                    Sidekiq::Web.configure.locales
+                  else
+                    app.settings.locales
+                  end
+
+        locales << File.join(File.expand_path("..", __FILE__), "locales")
+
+        app.helpers(Helpers)
+
         # Index page.
         app.get '/cron' do
           @current_namespace = 'default'
@@ -30,7 +47,7 @@ module Sidekiq
 
         # Detail page for a specific namespace.
         app.get '/cron/namespaces/:name' do
-          @current_namespace = route_params[:name]
+          @current_namespace = cron_route_params(:name)
           @cron_jobs = Sidekiq::Cron::Job.all(@current_namespace)
 
           render_erb(:cron)
@@ -38,8 +55,8 @@ module Sidekiq
 
         # Display job detail + jid history.
         app.get '/cron/namespaces/:namespace/jobs/:name' do
-          @current_namespace = route_params[:namespace]
-          @job = Sidekiq::Cron::Job.find(route_params[:name], @current_namespace)
+          @current_namespace = cron_route_params(:namespace)
+          @job = Sidekiq::Cron::Job.find(cron_route_params(:name), @current_namespace)
 
           if @job
             render_erb(:cron_show)
@@ -50,14 +67,14 @@ module Sidekiq
 
         # Enqueue all cron jobs.
         app.post '/cron/namespaces/:namespace/all/enqueue' do
-          Sidekiq::Cron::Job.all(route_params[:namespace]).each(&:enqueue!)
+          Sidekiq::Cron::Job.all(cron_route_params(:namespace)).each(&:enqueue!)
 
           redirect_to_previous_or_default
         end
 
         # Enqueue cron job.
         app.post '/cron/namespaces/:namespace/jobs/:name/enqueue' do
-          if job = Sidekiq::Cron::Job.find(route_params[:name], route_params[:namespace])
+          if job = Sidekiq::Cron::Job.find(cron_route_params(:name), cron_route_params(:namespace))
             job.enqueue!
           end
 
@@ -66,14 +83,14 @@ module Sidekiq
 
         # Delete all schedules.
         app.post '/cron/namespaces/:namespace/all/delete' do
-          Sidekiq::Cron::Job.all(route_params[:namespace]).each(&:destroy)
+          Sidekiq::Cron::Job.all(cron_route_params(:namespace)).each(&:destroy)
 
           redirect_to_previous_or_default
         end
 
         # Delete schedule.
         app.post '/cron/namespaces/:namespace/jobs/:name/delete' do
-          if job = Sidekiq::Cron::Job.find(route_params[:name], route_params[:namespace])
+          if job = Sidekiq::Cron::Job.find(cron_route_params(:name), cron_route_params(:namespace))
             job.destroy
           end
 
@@ -82,14 +99,14 @@ module Sidekiq
 
         # Enable all jobs.
         app.post '/cron/namespaces/:namespace/all/enable' do
-          Sidekiq::Cron::Job.all(route_params[:namespace]).each(&:enable!)
+          Sidekiq::Cron::Job.all(cron_route_params(:namespace)).each(&:enable!)
 
           redirect_to_previous_or_default
         end
 
         # Enable job.
         app.post '/cron/namespaces/:namespace/jobs/:name/enable' do
-          if job = Sidekiq::Cron::Job.find(route_params[:name], route_params[:namespace])
+          if job = Sidekiq::Cron::Job.find(cron_route_params(:name), cron_route_params(:namespace))
             job.enable!
           end
 
@@ -98,14 +115,14 @@ module Sidekiq
 
         # Disable all jobs.
         app.post '/cron/namespaces/:namespace/all/disable' do
-          Sidekiq::Cron::Job.all(route_params[:namespace]).each(&:disable!)
+          Sidekiq::Cron::Job.all(cron_route_params(:namespace)).each(&:disable!)
 
           redirect_to_previous_or_default
         end
 
         # Disable job.
         app.post '/cron/namespaces/:namespace/jobs/:name/disable' do
-          if job = Sidekiq::Cron::Job.find(route_params[:name], route_params[:namespace])
+          if job = Sidekiq::Cron::Job.find(cron_route_params(:name), cron_route_params(:namespace))
             job.disable!
           end
 

data/lib/sidekiq/cron.rb

@@ -28,6 +28,17 @@ module Sidekiq
       # The default namespace is used when no namespace is specified.
       attr_accessor :default_namespace
 
+      # List of available namespaces
+      #
+      # If not set, Sidekiq Cron will dynamically fetch available namespaces
+      # by retrieving existing jobs from Redis.
+      #
+      # This dynamic fetching can negatively impact performance in certain cases.
+      # To mitigate this, you can provide the list of namespaces explicitly.
+      # If a job specifies a namespace that is not included in the provided list,
+      # a warning will be logged, and the job will be assigned to the default namespace.
+      attr_accessor :available_namespaces
+
       # The parsing mode when using the natural language cron syntax from the `fugit` gem.
       #
       # :single -- use the first parsed cron line and ignore the rest (default)
@@ -47,6 +58,7 @@ module Sidekiq
         @cron_schedule_file = 'config/schedule.yml'
         @cron_history_size = 10
         @default_namespace = 'default'
+        @available_namespaces = nil
         @natural_cron_parsing_mode = :single
         @reschedule_grace_period = 60
       end

data/sidekiq-cron.gemspec

@@ -33,8 +33,8 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency("minitest", "~> 5.15")
   s.add_development_dependency("mocha", "~> 2.1")
-  s.add_development_dependency("rack", "~> 2.2")
-  s.add_development_dependency("rack-test", "~> 1.1")
+  s.add_development_dependency("rack", ">= 2.2")
+  s.add_development_dependency("rack-test", ">= 1.1")
   s.add_development_dependency("rake", "~> 13.0")
   s.add_development_dependency("simplecov", "~> 0.21")
   s.add_development_dependency("simplecov-cobertura", "~> 2.1")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cron
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Ondrej Bartas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-14 00:00:00.000000000 Z
+date: 2025-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cronex
@@ -104,28 +104,28 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
@@ -190,6 +190,7 @@ files:
 - lib/sidekiq/cron/launcher.rb
 - lib/sidekiq/cron/locales/de.yml
 - lib/sidekiq/cron/locales/en.yml
+- lib/sidekiq/cron/locales/es.yml
 - lib/sidekiq/cron/locales/id.yml
 - lib/sidekiq/cron/locales/it.yml
 - lib/sidekiq/cron/locales/ja.yml
@@ -203,6 +204,8 @@ files:
 - lib/sidekiq/cron/version.rb
 - lib/sidekiq/cron/views/cron.erb
 - lib/sidekiq/cron/views/cron_show.erb
+- lib/sidekiq/cron/views/legacy/cron.erb
+- lib/sidekiq/cron/views/legacy/cron_show.erb
 - lib/sidekiq/cron/web.rb
 - lib/sidekiq/cron/web_extension.rb
 - lib/sidekiq/options.rb