sidekiq-scheduler 4.0.2 → 5.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46f14eafd933ccc91c36ba3b52babf250a9d17723d8a321b016bad2caaf36262
-  data.tar.gz: d285ce8992b380f98c05860883c54aa504c83df31aeba252297b1c02d35590a6
+  metadata.gz: a2d6cf0887d66e27d2ce10ec96eabcb2b89bd89c515af8e38d54b366b38a8df2
+  data.tar.gz: c0da1db9ad45afdaf3b6055ce22ccc24ac90a392f7a2b5787136bbdeb6456fd5
 SHA512:
-  metadata.gz: fe3a692c9419fe21b60333f4801c519fa9eb96b2c49f4f7ad9f6bb41001ac8c0b9884ffa01c19018fe5101e2419f09af3df93f3efcd4de11b87b108d785a5047
-  data.tar.gz: 264780676f625a002b67b88eb03ee12981a2e222889334799e76c1aefde9ec3d35fad50d645233bd27c195113ea14e5af68ad3d82b4f853e7342f6ae2c3d08c3
+  metadata.gz: 7d845a756d2ba958cfedadcf52f6ba6f19811eb5b88c94fc50989b6a6f2bf523dbc7d2f8eb8e44c9d0c20a483f5896e5c313e5428f2369368de12479a2472163
+  data.tar.gz: 797ebac76066faa408f2f43290f6aead6a4ff335cb966811efdeea5c70c7ca5a4f93e6bda15f864987294e505583999bff64d05f33f2f2b9d0c92f512487d905

data/CHANGELOG.md

@@ -1,3 +1,79 @@
+# 5.0.6
+  - [**FIX**] Fix typo in `config#to_hash` method [#479](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/479)
+  - [**FIX**] Correctly clear scheduled jobs with Scheduler#clear_schedule! [#485](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/485)
+  - [**FIX**] Fix scheduling of aperiodic cron jobs [#487](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/487) (see [#484](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/484) for more details as well)
+
+# 5.0.5
+  - [**FIX**] Use correct folder structure for assets [#476](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/476)
+
+# 5.0.4
+  - [**FIX**] Ensure rufus-scheduler has a default rufus_scheduler_options value [#434](https://github.com/sidekiq-scheduler/sidekiq-scheduler/issues/426)
+  - [**ENHANCEMENT**] Remove code related to sidekiq < 6 [#443](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/443)
+  - [**ENHANCEMENT**] Change cache-control to `private` [#446](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/446)
+  - [**ENHANCEMENT**] Increase compatibility range with tilt dependency [#458](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/458)
+  - [**ENHANCEMENT**] Ensure we support Ruby 3.3 [#461](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/461)
+  - [**ENHANCEMENT**] Use Redis MULTI command (https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/464)
+  - [**ENHANCEMENT**] Don't attempt to set jon next_time when job is nil [#466](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/466)
+  - [**ENHANCEMENT**] Improvements to prevent jobs been enqueued multiple times due to a delay in job execution [#463](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/463)
+  - [**FIX**] Prevent stack level too deep error by implementing `to_hash` method [#470](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/470)
+  - [**ENHANCEMENT**] Support new Sidekiq model for registering UI plugins [#472](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/472)
+  - [**ENHANCEMENT**] Stop testing against Ruby 2.7 and 3.0 [#472](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/472#discussion_r1663197863)
+  - [**ENHANCEMENT**] Display `at` and `in` in the dashboard [#291](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/291)  
+  - [**ENHANCEMENT**] Docs enhancements [#442](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/442), [#449](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/449), [#457](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/457), [#465](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/465), [58e1835](https://github.com/sidekiq-scheduler/sidekiq-scheduler/commit/58e18351054fc3c264b2b5a684173316f674c386)
+
+
+# 5.0.3
+
+  - [**FIX**] Fix "uppercase character in header name: Cache-Control" [#432](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/432)
+  - [**ENHANCEMENT**] Add gd translation [#433](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/433)
+  - [**ENHANCEMENT**] Add French translation [#435](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/435)
+  - [**FIX**] Remove usage of deprecated Redis command `zrangebyscore` [#437](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/437)
+  - [**ENHANCEMENT**] Add the ability to force a job args hash to be deconstructed to keyword arguments [#440](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/440)
+
+# 5.0.2
+
+  - [**FIX**] Fix YARD docblocks. [#427](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/427)
+  - [**FIX**] Fix dependency requirement on Sidekiq reverted unintentionally. [#429](https://github.com/sidekiq-scheduler/sidekiq-scheduler/issues/429)
+
+# 5.0.1
+
+  - [**ENHANCEMENT**] Adds Ruby 3.2 to the CI matrix. [#420](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/420)
+  - [**DOCS**] README: refer to v5 as released. [#421](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/421)
+  - [**FIX**] Fix dependency on Rails `.present?` method. [#425](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/425)
+ 
+# 5.0.0
+
+  - [**FIX**] Ensure generated scheduled time has a precision of 3 milliseconds. [#418](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/418)
+
+*Note 1:* Check [# 5.0.0.beta1](#500beta1) & [# 5.0.0.beta2](#500beta2) releases for breaking changes.
+
+*Note 2:* Sidekiq Embedding is yet not supported, see [#419](https://github.com/sidekiq-scheduler/sidekiq-scheduler/issues/419) for more details.
+
+
+# 5.0.0.beta2
+
+  - [**FIX**] Drop explicit redis dependency [#416](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/416)
+
+# 5.0.0.beta1
+
+- [**BREAKING CHANGE**] Moves all sidekiq-scheduler config options under the `scheduler` key in the `sidekiq.yml` file [#412](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/412)
+  - If you're migrating from v4 to v5, any `sidekiq-scheduler` config you may have in your `sidekiq.yml` should be moved under the `scheduler` key.
+  - See [#412](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/412) to see which are the config options that you need to move under the `scheduler` key.
+  
+- [**BREAKING CHANGE**] Drop support for EOL Ruby & Sidekiq versions (Ruby: `2.5.x` & `2.6.x`; Sidekiq: `4.x` & `5.x`) [#411](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/411)
+
+- [**FIX**] Add support for Sidekiq 7 [#410](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/410)
+
+
+# 4.0.3
+
+- [**GH Actions**] Add dependabot for GitHub Actions [#390](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/390)
+- [**ENHANCEMENT**] Add «Enable all» and «Disable all» buttons [#398](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/398)
+- [**ENHANCEMENT**] Allow for multiple applications to share a Redis DB [#401](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/401)
+- [**FIX**] Fix metadata for Sidekiq strict_args! [#403](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/403)
+- [**FIX**] Redis 5.0 compatibility [#404](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/404)
+- [**FIX**] Fix the constantize method [#408](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/408)
+
 # 4.0.2
 
 - [**FIX**] Fix sidekiq deprecation warning when Sidekiq 6.5+ [#385](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/385)
@@ -20,6 +96,6 @@
 - [**ENHANCEMENT**] Highlight disabled jobs [#369](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/369)
 - [**BREAKING CHANGE**] Require redis 4.2.0 [#370](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/370)
 - [**FIX**] Fixes redis deprecation warning regarding `exists` [#370](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/370)
-- [**BREAKING CHANGE**] Remove dependecy on thwait and e2mmap [#371](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/371)
+- [**BREAKING CHANGE**] Remove dependency on thwait and e2mmap [#371](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/371)
 - Support Ruby 3.1 [#373](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/373)
 - [**BREAKING CHANGE**] Set rufus_scheduler_options via sidekiq.yml file as configuration option [#375](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/375)

data/README.md

@@ -18,7 +18,7 @@
 `sidekiq-scheduler` is an extension to [Sidekiq](http://github.com/mperham/sidekiq) that
 pushes jobs in a scheduled way, mimicking cron utility.
 
-__Note:__ Current branch contains work of the v4 release, if you are looking for version 2.2.* or 3.*, go to [2.2-stable branch](https://github.com/sidekiq-scheduler/sidekiq-scheduler/tree/2.2-stable) / [v3-stable](https://github.com/sidekiq-scheduler/sidekiq-scheduler/tree/v3-stable).
+__Note:__ Current branch contains work of the v5 release, if you are looking for version 2.2.\*, 3.\*, or 4.\*, go to [2.2-stable branch](https://github.com/sidekiq-scheduler/sidekiq-scheduler/tree/2.2-stable) / [v3-stable](https://github.com/sidekiq-scheduler/sidekiq-scheduler/tree/v3-stable) / [v4-stable](https://github.com/sidekiq-scheduler/sidekiq-scheduler/tree/v4-stable).
 
 ## Installation
 
@@ -45,15 +45,21 @@ class HelloWorld
 end
 ```
 
+__Note:__ In Sidekiq v6.3 `Sidekiq::Job` was introduced as an alias for `Sidekiq::Worker`. `Sidekiq::Worker` has been officially deprecated in Sidekiq v7 although it still exists for backwards compatibility. It is therefore recommended to use `include Sidekiq::Job` in the above example unless an older version of Sidekiq is required.
+
 ``` yaml
 # config/sidekiq.yml
 
-:schedule:
-  hello_world:
-    cron: '0 * * * * *'   # Runs once per minute
-    class: HelloWorld
+:scheduler:
+  :schedule:
+    hello_world:
+      cron: '0 * * * * *'   # Runs once per minute
+      class: HelloWorld
 ```
 
+> [!NOTE]
+> sidekiq-scheduler uses [fugit](https://github.com/floraison/fugit) under the hood, which supports up to six arguments as the cron string, [see](https://github.com/floraison/fugit?tab=readme-ov-file#the-second-extension). 
+
 Run sidekiq:
 
 ``` sh
@@ -83,40 +89,60 @@ Configuration options are placed inside `sidekiq.yml` config file.
 Available options are:
 
 ``` yaml
-:dynamic: <if true the schedule can be modified in runtime [false by default]>
-:dynamic_every: <if dynamic is true, the schedule is reloaded every interval [5s by default]>
-:enabled: <enables scheduler if true [true by default]>
 :scheduler:
+  :dynamic: <if true the schedule can be modified in runtime [false by default]>
+  :dynamic_every: <if dynamic is true, the schedule is reloaded every interval [5s by default]>
+  :enabled: <enables scheduler if true [true by default]>
   :listened_queues_only: <push jobs whose queue is being listened by sidekiq [false by default]>
-:rufus_scheduler_options: <Set custom options for rufus scheduler, like max_work_threads [{} by default]>
+  :rufus_scheduler_options: <Set custom options for rufus scheduler, like max_work_threads [{} by default]>
 ```
 
 ## Schedule configuration
 
-The schedule is configured through the `:schedule` config entry in the sidekiq config file:
+The schedule is configured through the `:scheduler:` -> `:schedule` config entry in the sidekiq config file:
 
 ``` yaml
-:schedule:
-  CancelAbandonedOrders:
-    cron: '0 */5 * * * *'   # Runs when second = 0, every 5 minutes
-
-  queue_documents_for_indexing:
-    cron: '0 0 * * * *'   # Runs every hour
-
-    # By default the job name will be taken as worker class name.
-    # If you want to have a different job name and class name, provide the 'class' option
-    class: QueueDocuments
-
-    queue: slow
-    args: ['*.pdf']
-    description: "This job queues pdf content for indexing in solr"
-
-    # Enable the `metadata` argument which will pass a Hash containing the schedule metadata
-    # as the last argument of the `perform` method. `false` by default.
-    include_metadata: true
-
-    # Enable / disable a job. All jobs are enabled by default.
-    enabled: true
+:scheduler:
+  :schedule:
+    CancelAbandonedOrders:
+      cron: '0 */5 * * * *'   # Runs when second = 0, every 5 minutes
+
+    queue_documents_for_indexing:
+      cron: '0 0 * * * *'   # Runs every hour
+
+      # By default the job name will be taken as worker class name.
+      # If you want to have a different job name and class name, provide the 'class' option
+      class: QueueDocuments
+
+      queue: slow
+      args: ['*.pdf']
+      description: "This job queues pdf content for indexing in solr"
+
+      # Enable the `metadata` argument which will pass a Hash containing the schedule metadata
+      # as the last argument of the `perform` method. `false` by default.
+      include_metadata: true
+
+      # Enable / disable a job. All jobs are enabled by default.
+      enabled: true
+
+      # Deconstructs a hash defined as the `args` to keyword arguments. 
+      #
+      # `false` by default.
+      # 
+      # Example
+      # 
+      # my_job:
+      #   cron: '0 0 * * * *'
+      #   class: MyJob
+      #   args: { foo: 'bar', hello: 'world' } 
+      #   keyword_argument: true
+      #
+      # class MyJob < ActiveJob::Base
+      #   def perform(foo:, hello:)
+      #     # ...
+      #   end
+      # end
+      keyword_argument: true 
 ```
 
 ### Schedule metadata
@@ -157,9 +183,10 @@ Cron, every, and interval types push jobs into sidekiq in a recurrent manner.
 `cron` follows the same pattern as cron utility, with seconds resolution.
 
 ``` yaml
-:schedule:
-  HelloWorld:
-    cron: '0 * * * * *' # Runs when second = 0
+:scheduler:
+  :schedule:
+    HelloWorld:
+      cron: '0 * * * * *' # Runs when second = 0
 ```
 
 `every` triggers following a given frequency:
@@ -186,7 +213,7 @@ At, and in types push jobs only once. `at` schedules in a point in time:
     at: '3001/01/01'
 ```
 
-You can specify any string that `DateTime.parse` and `Chronic` understand. To enable Chronic
+You can specify any string that `DateTime.parse` and `Chronic` understand. To enable [Chronic](https://github.com/mojombo/chronic)
 strings, you must add it as a dependency.
 
 `in` triggers after a time duration has elapsed:
@@ -250,7 +277,8 @@ When `:dynamic` flag is set to `true`, schedule changes are loaded every 5 secon
 
 ``` yaml
 # config/sidekiq.yml
-:dynamic: true
+:scheduler:
+  :dynamic: true
 ```
 
 If `:dynamic` flag is set to `false`, you'll have to reload the schedule manually in sidekiq
@@ -299,8 +327,9 @@ You can also override the thread pool size in Rufus Scheduler by setting the fol
 ---
 ...
 
-rufus_scheduler_options:
-  max_work_threads: 5
+:scheduler:
+  rufus_scheduler_options:
+    max_work_threads: 5
 
 ...
 ```
@@ -308,7 +337,7 @@ rufus_scheduler_options:
 ## Notes about running on Multiple Hosts
 
 Under normal conditions, `cron` and `at` jobs are pushed once regardless of the number of `sidekiq-scheduler` running instances,
-assumming that time deltas between hosts is less than 24 hours.
+assuming that time deltas between hosts is less than 24 hours.
 
 Non-normal conditions that could push a specific job multiple times are:
  - high cpu load + a high number of jobs scheduled at the same time, like 100 jobs
@@ -316,6 +345,47 @@ Non-normal conditions that could push a specific job multiple times are:
 
 `every`, `interval` and `in` jobs will be pushed once per host.
 
+### Suggested setup for Multiple Hosts using Heroku and Rails
+
+Configuration options `every`, `interval` and `in` will push once per host. This may be undesirable. One way to achieve single jobs per the schedule would be to manually designate a host as the scheduler. The goal is to have a single scheduler process running across all your hosts. 
+
+This can be achieved by using an environment variable and controlling the number of dynos. In Rails, you can read this variable during initialization and then conditionally load your config file.
+
+Suppose we are using Rails and have the following schedule:
+
+```yaml
+# config/scheduler.yml
+MyRegularJob:
+  description: "We want this job to run very often, but we do not want to run more of them as we scale"
+  interval: ["1m"]
+  queue: default
+```
+
+Then we can conditionally load it via an initializer:
+
+```ruby
+# config/initializers/sidekiq.rb
+if ENV.fetch("IS_SCHEDULER", false)
+  Sidekiq.configure_server do |config|
+    config.on(:startup) do
+      Sidekiq.schedule = YAML.load_file(File.expand_path("../scheduler.yml", File.dirname(__FILE__)))
+      Sidekiq::Scheduler.reload_schedule!
+    end
+  end
+end
+```
+
+Then you would just need to flag the scheduler process when you start it. If you are using a Procfile, it would look like this:
+
+```yaml
+# Procfile
+web: bin/rails server
+worker: bundle exec sidekiq -q default
+scheduler: IS_SCHEDULER=true bundle exec sidekiq -q default
+```
+
+When running via Heroku, you set your `scheduler` process to have 1 dyno. This will ensure you have at most 1 worker loading the schedule. 
+
 ## Notes on when Sidekiq worker is down
 
 For a `cron`/`at` (and all other) job to be successfully enqueued, you need at least one sidekiq worker with scheduler to be up at that moment. Handling this is up to you and depends on your application.
@@ -345,12 +415,13 @@ Say you have one process with the schedule:
 
 :queues:
   - default
-:schedule:
-  do_something_every_minute:
-    class: DoSomethingJob
-    args: matey
-    queue: :scheduler
-    cron: '0 * * * * * America/Los_Angeles'
+:scheduler:
+  :schedule:
+    do_something_every_minute:
+      class: DoSomethingJob
+      args: matey
+      queue: :scheduler
+      cron: '0 * * * * * America/Los_Angeles'
 ```
 
 And a separate separate configured process without one:
@@ -360,7 +431,8 @@ And a separate separate configured process without one:
   - scheduler
 
 ## NOTE Disable the Scheduler
-:enabled: false
+:scheduler:
+  :enabled: false
 ```
 
 ### Details
@@ -377,6 +449,22 @@ Redis.
 
 See https://github.com/sidekiq-scheduler/sidekiq-scheduler/issues/361 for a more details.
 
+## Notes when running multiple applications in the same Redis database
+
+_NOTE_: **Although we support this option, we recommend having separate redis databases for each application. Choosing this option is at your own risk.**
+
+If you need to run multiple applications with differing schedules, the easiest way is to use a different Redis database per application. Doing that will ensure that each application will have its own schedule, web interface and statistics.
+
+However, you may want to have a set of related applications share the same Redis database in order to aggregate statistics and manage them all in a single web interface. To do this while maintaining a different schedule for each application, you can configure each application to use a different `key_prefix` in Redis. This prevents the applications overwriting each others' schedules and schedule data.
+
+```ruby
+Rails.application.reloader.to_prepare do
+  SidekiqScheduler::RedisManager.key_prefix = "my-app"
+end
+```
+
+Note that this must be set before the schedule is loaded (or it will go into the wrong key). If you are using the web integration, make sure that the prefix is set in the web process so that you see the correct schedule.
+
 ## Sidekiq Web Integration
 
 sidekiq-scheduler provides an extension to the Sidekiq web interface that adds a `Recurring Jobs` page.
@@ -406,7 +494,7 @@ end
 
 ## The Spring preloader and Testing your initializer via Rails console
 
-If you're pulling in your schedule from a YML file via an initializer as shown, be aware that the Spring application preloader included with Rails will interefere with testing via the Rails console.
+If you're pulling in your schedule from a YML file via an initializer as shown, be aware that the Spring application preloader included with Rails will interfere with testing via the Rails console.
 
 **Spring will not reload initializers** unless the initializer is changed.  Therefore, if you're making a change to your YML schedule file and reloading Rails console to see the change, Spring will make it seem like your modified schedule is not being reloaded.
 
@@ -451,7 +539,7 @@ MIT License
 
 ## Copyright
 
-- Copyright 2021 - 2022 Marcelo Lauxen.
+- Copyright 2021 - 2024 Marcelo Lauxen.
 - Copyright 2013 - 2022 Moove-IT.
 - Copyright 2012 Morton Jonuschat.
 - Some parts copyright 2010 Ben VandenBos.

data/lib/sidekiq-scheduler/config.rb

@@ -0,0 +1,91 @@
+module SidekiqScheduler
+  class Config
+    # We have to set the default as nil because the scheduler could be instantiated without
+    # passing the sidekiq config, and in those scenarios we don't want to fail
+    def initialize(sidekiq_config: nil, without_defaults: false)
+      @sidekiq_config = sidekiq_config
+      @scheduler_config = fetch_scheduler_config(sidekiq_config, without_defaults)
+    end
+
+    def enabled?
+      scheduler_config[:enabled]
+    end
+
+    def enabled=(value)
+      scheduler_config[:enabled] = value
+    end
+
+    def dynamic?
+      scheduler_config[:dynamic]
+    end
+
+    def dynamic=(value)
+      scheduler_config[:dynamic] = value
+    end
+
+    def dynamic_every?
+      scheduler_config[:dynamic_every]
+    end
+
+    def dynamic_every=(value)
+      scheduler_config[:dynamic_every] = value
+    end
+
+    def schedule
+      scheduler_config[:schedule]
+    end
+
+    def schedule=(value)
+      scheduler_config[:schedule] = value
+    end
+
+    def listened_queues_only?
+      scheduler_config[:listened_queues_only]
+    end
+
+    def listened_queues_only=(value)
+      scheduler_config[:listened_queues_only] = value
+    end
+
+    def rufus_scheduler_options
+      scheduler_config[:rufus_scheduler_options]
+    end
+
+    def rufus_scheduler_options=(value)
+      scheduler_config[:rufus_scheduler_options] = value
+    end
+
+    def sidekiq_queues
+      SidekiqScheduler::SidekiqAdapter.sidekiq_queues(sidekiq_config)
+    end
+
+    def to_hash
+      {
+        enabled: enabled?,
+        dynamic: dynamic?,
+        dynamic_every: dynamic_every?,
+        schedule: schedule,
+        listened_queues_only: listened_queues_only?,
+        rufus_scheduler_options: rufus_scheduler_options
+      }
+    end
+
+    private
+
+    attr_reader :scheduler_config
+    attr_reader :sidekiq_config
+
+    DEFAULT_OPTIONS = {
+      enabled: true,
+      dynamic: false,
+      dynamic_every: '5s',
+      schedule: {},
+      rufus_scheduler_options: {}
+    }.freeze
+
+    def fetch_scheduler_config(sidekiq_config, without_defaults)
+      conf = SidekiqScheduler::SidekiqAdapter.fetch_scheduler_config_from_sidekiq(sidekiq_config)
+      without_defaults ? conf : DEFAULT_OPTIONS.merge(conf)
+    end
+  end
+end

data/lib/sidekiq-scheduler/extensions/web.rb

@@ -1,14 +1,27 @@
 require 'sidekiq/web' unless defined?(Sidekiq::Web)
 
-ASSETS_PATH = File.expand_path('../../../web/assets', __dir__)
+if SidekiqScheduler::SidekiqAdapter::SIDEKIQ_GTE_7_3_0
 
-Sidekiq::Web.register(SidekiqScheduler::Web)
-Sidekiq::Web.tabs['recurring_jobs'] = 'recurring-jobs'
-Sidekiq::Web.locales << File.expand_path("#{File.dirname(__FILE__)}/../../../web/locales")
+  # Locale and asset cache is configured in `.register`
+  Sidekiq::Web.register(SidekiqScheduler::Web,
+    name: "recurring_jobs",
+    tab: ["Recurring Jobs"],
+    index: ["recurring-jobs"],
+    root_dir: File.expand_path("../../../web", File.dirname(__FILE__)),
+    asset_paths: ["stylesheets-scheduler"]) do |app|
+    # add middleware or additional settings here
+  end
 
-if Sidekiq::VERSION >= '6.0.0'
-  Sidekiq::Web.use Rack::Static, urls: ['/stylesheets'],
+else
+
+  ASSETS_PATH = File.expand_path('../../../web/assets', __dir__)
+
+  Sidekiq::Web.register(SidekiqScheduler::Web)
+  Sidekiq::Web.tabs['recurring_jobs'] = 'recurring-jobs'
+  Sidekiq::Web.locales << File.expand_path("#{File.dirname(__FILE__)}/../../../web/locales")
+
+  Sidekiq::Web.use Rack::Static, urls: ['/recurring_jobs/stylesheets-scheduler'],
                                  root: ASSETS_PATH,
                                  cascade: true,
-                                 header_rules: [[:all, { 'Cache-Control' => 'public, max-age=86400' }]]
+                                 header_rules: [[:all, { 'cache-control' => 'private, max-age=86400' }]]
 end

data/lib/sidekiq-scheduler/job_presenter.rb

@@ -38,7 +38,7 @@ module SidekiqScheduler
     #
     # @return [String] with the job's interval
     def interval
-      @attributes['cron'] || @attributes['interval'] || @attributes['every']
+      @attributes['cron'] || @attributes['interval'] || @attributes['every'] || @attributes['at'] || @attributes['in']
     end
 
     # Returns the queue of the job

data/lib/sidekiq-scheduler/manager.rb

@@ -1,5 +1,3 @@
-require 'redis'
-
 require 'sidekiq-scheduler/schedule'
 require 'sidekiq-scheduler/scheduler'
 
@@ -10,19 +8,12 @@ module SidekiqScheduler
   # from Redis onto the work queues
   #
   class Manager
-    DEFAULT_SCHEDULER_OPTIONS = {
-      enabled: true,
-      dynamic: false,
-      dynamic_every: '5s',
-      schedule: {}
-    }
-
-    def initialize(options)
-      scheduler_options = load_scheduler_options(options)
+    def initialize(config)
+      set_current_scheduler_options(config)
 
-      @scheduler_instance = SidekiqScheduler::Scheduler.new(scheduler_options)
+      @scheduler_instance = SidekiqScheduler::Scheduler.new(config)
       SidekiqScheduler::Scheduler.instance = @scheduler_instance
-      Sidekiq.schedule = scheduler_options[:schedule] if @scheduler_instance.enabled
+      Sidekiq.schedule = config.schedule if @scheduler_instance.enabled
     end
 
     def stop
@@ -33,21 +24,30 @@ module SidekiqScheduler
       @scheduler_instance.load_schedule!
     end
 
-    private
-
-    def load_scheduler_options(options)
-      options[:listened_queues_only] = options.fetch(:scheduler, {})[:listened_queues_only]
-      scheduler_options = DEFAULT_SCHEDULER_OPTIONS.merge(options)
+    # This method is needed to avoid exposing unnecessary information.
+    # Because ActiveSupport's `as_json` traverses instance values to convert the object to a hash
+    # unless it responds to `to_hash`.
+    def to_hash
+      {
+        scheduler: @scheduler_instance.to_hash
+      }
+    end
 
-      current_options = {
-        enabled: SidekiqScheduler::Scheduler.enabled,
-        dynamic: SidekiqScheduler::Scheduler.dynamic,
-        dynamic_every: SidekiqScheduler::Scheduler.dynamic_every,
-        schedule: Sidekiq.schedule,
-        listened_queues_only: SidekiqScheduler::Scheduler.listened_queues_only
-      }.delete_if { |_, value| value.nil? }
+    private
 
-      scheduler_options.merge(current_options)
+    def set_current_scheduler_options(config)
+      enabled = SidekiqScheduler::Scheduler.enabled
+      dynamic = SidekiqScheduler::Scheduler.dynamic
+      dynamic_every = SidekiqScheduler::Scheduler.dynamic_every
+      listened_queues_only = SidekiqScheduler::Scheduler.listened_queues_only
+
+      config.enabled = enabled unless enabled.nil?
+      config.dynamic = dynamic unless dynamic.nil?
+      config.dynamic_every = dynamic_every unless dynamic_every.nil?
+      unless Sidekiq.schedule.nil? || (Sidekiq.schedule.respond_to?(:empty?) && Sidekiq.schedule.empty?)
+        config.schedule = Sidekiq.schedule
+      end
+      config.listened_queues_only = listened_queues_only unless listened_queues_only.nil?
     end
   end
 end