sidekiq-scheduler 5.0.5 → 6.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37443909d89f84370b1f475426c6b21564f1e1f97df5e70018f8791eb4a215bb
-  data.tar.gz: 04e0ca34182e9ef7234422d27d3e940f80d6ce1daffe60ae75bb0d244cdd83c2
+  metadata.gz: 912d4874af78cd3092ce7807235712fb38455291243e86b3fab871445a29fbd8
+  data.tar.gz: 0a65678172f220908cae365d54ed8f9912cf65fd47583a37d5ff61752dce3bd9
 SHA512:
-  metadata.gz: 3fdd135d83f6ae7c423d9284ea4a8bfb457b8ca08285abaea604a729b824f392c2c370b618c0a84dad6f9dd86fe301a9f59b742e08447f82ecc29d322750929a
-  data.tar.gz: 3bfc766d6011f10d142da7785c22852c0df8a3df88dc5849494b9a25f711a02af224bb8ae6317721572381b75d170933e0680638760995241e3064f0820462bf
+  metadata.gz: 4a231389e5e216ed5679440f4f1264b32afb8fab63fd78432c0e66f35b94d32f8255d44806762fbba3e4d189588715d5b28cf8655d940de4cd342b8d9be53b16
+  data.tar.gz: fde5cec33e44141229eeded5d5a3d9185310511e8be2f8e80b026483a58beff0f1ed7f4b934f55338a6439a831ae526227548305c4322aba62170ec34e616859

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 6.0.0.beta1
+  - [**ENHANCEMENT**] Adds compatibility with Sidekiq 8 [#497](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/497)
+  - [**BREAKING CHANGE**] Drop support for Sidekiq 7.2 and earlier [#497](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/498)
+
+# 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)
 
@@ -13,7 +22,7 @@
   - [**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**] 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)
 
 
@@ -35,10 +44,10 @@
   - [**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 miliseconds. [#418](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/418)
+  - [**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.
 
@@ -54,7 +63,7 @@
 - [**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)
@@ -91,6 +100,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)
+- [**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 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).
+__Note:__ Current branch contains work of the v6 release, if you are looking for version 2.2.\*, 3.\*, 4.\*, or 5.\*, 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) / [v5-stable](https://github.com/sidekiq-scheduler/sidekiq-scheduler/tree/v5-stable).
 
 ## Installation
 
@@ -37,7 +37,7 @@ gem install sidekiq-scheduler
 require 'sidekiq-scheduler'
 
 class HelloWorld
-  include Sidekiq::Worker
+  include Sidekiq::Job
 
   def perform
     puts 'Hello world'
@@ -58,7 +58,7 @@ __Note:__ In Sidekiq v6.3 `Sidekiq::Job` was introduced as an alias for `Sidekiq
 ```
 
 > [!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). 
+> 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:
 
@@ -125,16 +125,16 @@ The schedule is configured through the `:scheduler:` -> `:schedule` config entry
       # Enable / disable a job. All jobs are enabled by default.
       enabled: true
 
-      # Deconstructs a hash defined as the `args` to keyword arguments. 
+      # 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' } 
+      #   args: { foo: 'bar', hello: 'world' }
       #   keyword_argument: true
       #
       # class MyJob < ActiveJob::Base
@@ -142,7 +142,7 @@ The schedule is configured through the `:scheduler:` -> `:schedule` config entry
       #     # ...
       #   end
       # end
-      keyword_argument: true 
+      keyword_argument: true
 ```
 
 ### Schedule metadata
@@ -337,7 +337,7 @@ You can also override the thread pool size in Rufus Scheduler by setting the fol
 ## 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
@@ -347,7 +347,7 @@ Non-normal conditions that could push a specific job multiple times are:
 
 ### 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. 
+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.
 
@@ -384,7 +384,7 @@ 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. 
+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
 
@@ -397,7 +397,7 @@ Possible solutions include:
 - Zero downtime deploy for sidekiq workers: keep at least one worker up during whole deploy and only restart/shut it down after when new one has started
 - Running scheduler inside your unicorn/rails processes (if you already have zero downtime deploy set up for these)
 
-Each option has it's own pros and cons. 
+Each option has it's own pros and cons.
 
 ## Notes when running multiple Sidekiq processors on the same Redis
 
@@ -480,6 +480,8 @@ run Sidekiq::Web
 
 ![Sidekiq Web Integration](https://github.com/sidekiq-scheduler/sidekiq-scheduler/raw/master/images/recurring-jobs-ui-tab.png)
 
+![Sidekiq Web Integration Dark Mode](https://github.com/sidekiq-scheduler/sidekiq-scheduler/raw/master/images/recurring-jobs-ui-tab-dark.png)
+
 ## ActiveJob integration
 
 When using sidekiq-scheduler with ActiveJob your jobs can just extend `ApplicationJob` as usual, without the `require` and `include` boilerplate. Under the hood Rails will load up the scheduler and include the worker module for you.
@@ -494,7 +496,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.
 
@@ -539,7 +541,7 @@ MIT License
 
 ## Copyright
 
-- Copyright 2021 - 2023 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

@@ -64,7 +64,7 @@ module SidekiqScheduler
         enabled: enabled?,
         dynamic: dynamic?,
         dynamic_every: dynamic_every?,
-        shedule: schedule,
+        schedule: schedule,
         listened_queues_only: listened_queues_only?,
         rufus_scheduler_options: rufus_scheduler_options
       }

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

@@ -1,9 +1,8 @@
 require 'sidekiq/web' unless defined?(Sidekiq::Web)
 
-if SidekiqScheduler::SidekiqAdapter::SIDEKIQ_GTE_7_3_0
-
-  # Locale and asset cache is configured in `.regiester`
-  Sidekiq::Web.register(SidekiqScheduler::Web,
+# Locale and asset cache is configured in `cfg.register`
+Sidekiq::Web.configure do |cfg|
+  cfg.register(SidekiqScheduler::Web,
     name: "recurring_jobs",
     tab: ["Recurring Jobs"],
     index: ["recurring-jobs"],
@@ -11,17 +10,4 @@ if SidekiqScheduler::SidekiqAdapter::SIDEKIQ_GTE_7_3_0
     asset_paths: ["stylesheets-scheduler"]) do |app|
     # add middleware or additional settings here
   end
-
-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' => 'private, max-age=86400' }]]
 end

data/lib/sidekiq-scheduler/redis_manager.rb

@@ -121,7 +121,7 @@ module SidekiqScheduler
       Sidekiq.redis { |r| r.del(schedules_changed_key) unless r.type(schedules_changed_key) == 'zset' }
     end
 
-    # Removes a queued job instance
+    # Registers a queued job instance
     #
     # @param [String] job_name The name of the job
     # @param [Time] time The time at which the job was cleared by the scheduler

data/lib/sidekiq-scheduler/schedule.rb

@@ -65,7 +65,7 @@ module SidekiqScheduler
     end
     alias_method :schedule!, :reload_schedule!
 
-    # Retrive the schedule configuration for the given name
+    # Retrieve the schedule configuration for the given name
     # if the name is nil it returns a hash with all the
     # names end their schedules.
     def get_schedule(name = nil)

data/lib/sidekiq-scheduler/scheduler.rb

@@ -17,7 +17,7 @@ module SidekiqScheduler
     # saying we will have to do it somehow still)
     #
     # NOTE: ^ Keeping this TODO here for now, in a future version of this project
-    # we will remove those attr acessors and use only our config object. For now,
+    # we will remove those attr accessors and use only our config object. For now,
     # let's keep as it is.
 
     # Set to enable or disable the scheduler.
@@ -196,7 +196,7 @@ module SidekiqScheduler
         @rufus_scheduler = nil
       end
 
-      @@scheduled_jobs = {}
+      @scheduled_jobs = {}
 
       rufus_scheduler
     end
@@ -268,9 +268,9 @@ module SidekiqScheduler
           conf = SidekiqScheduler::Utils.sanitize_job_config(config)
 
           if job.is_a?(Rufus::Scheduler::CronJob)
-            idempotent_job_enqueue(name, SidekiqScheduler::Utils.calc_cron_run_time(job.cron_line, time.utc), conf)
+            idempotent_job_enqueue(name, SidekiqScheduler::Utils.calc_cron_run_time(job.cron_line, time.to_t), conf)
           else
-            idempotent_job_enqueue(name, time, conf)
+            idempotent_job_enqueue(name, time.to_t, conf)
           end
         end
       end
@@ -303,12 +303,12 @@ module SidekiqScheduler
     end
 
     # Adds a Hash with schedule metadata as the last argument to call the worker.
-    # It currently returns the schedule time as a Float number representing the milisencods
+    # It currently returns the schedule time as a Float number representing the milliseconds
     # since epoch.
     #
     # @example with hash argument
     #   arguments_with_metadata({value: 1}, scheduled_at: Time.now.round(3))
-    #   #=> [{value: 1}, {scheduled_at: <miliseconds since epoch>}]
+    #   #=> [{value: 1}, {scheduled_at: <milliseconds since epoch>}]
     #
     # @param args [Array|Hash]
     # @param metadata [Hash]

data/lib/sidekiq-scheduler/sidekiq_adapter.rb

@@ -2,89 +2,51 @@ module SidekiqScheduler
   class OptionNotSupportedAnymore < StandardError; end
 
   class SidekiqAdapter
-    SIDEKIQ_GTE_6_5_0 = Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('6.5.0')
-    SIDEKIQ_GTE_7_0_0 = Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('7.0.0')
     SIDEKIQ_GTE_7_3_0 = Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('7.3.0')
+    SIDEKIQ_GTE_8_0_0 = Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('8.0.0')
 
     def self.fetch_scheduler_config_from_sidekiq(sidekiq_config)
       return {} if sidekiq_config.nil?
 
       check_using_old_sidekiq_scheduler_config!(sidekiq_config)
 
-      if SIDEKIQ_GTE_6_5_0
-        sidekiq_config.fetch(:scheduler, {})
-      else
-        sidekiq_config.options.fetch(:scheduler, {})
-      end
+      sidekiq_config.fetch(:scheduler, {})
     end
 
     def self.check_using_old_sidekiq_scheduler_config!(sidekiq_config)
       %i[enabled dynamic dynamic_every schedule listened_queues_only rufus_scheduler_options].each do |option|
-        if SIDEKIQ_GTE_7_0_0
-          if sidekiq_config.key?(option)
-            raise OptionNotSupportedAnymore, ":#{option} option should be under the :scheduler: key"
-          end
-        elsif SIDEKIQ_GTE_6_5_0
-          unless sidekiq_config[option].nil?
-            raise OptionNotSupportedAnymore, ":#{option} option should be under the :scheduler: key"
-          end
-        else
-          if sidekiq_config.options.key?(option)
-            raise OptionNotSupportedAnymore, ":#{option} option should be under the :scheduler: key"
-          end
+        if sidekiq_config.key?(option)
+          raise OptionNotSupportedAnymore, ":#{option} option should be under the :scheduler: key"
         end
       end
     end
 
     def self.start_schedule_manager(sidekiq_config:, schedule_manager:)
-      if SIDEKIQ_GTE_6_5_0
-        sidekiq_config[:schedule_manager] = schedule_manager
-        sidekiq_config[:schedule_manager].start
-      else
-        sidekiq_config.options[:schedule_manager] = schedule_manager
-        sidekiq_config.options[:schedule_manager].start
-      end
+      sidekiq_config[:schedule_manager] = schedule_manager
+      sidekiq_config[:schedule_manager].start
     end
 
     def self.stop_schedule_manager(sidekiq_config:)
-      if SIDEKIQ_GTE_6_5_0
-        sidekiq_config[:schedule_manager].stop
-      else
-        sidekiq_config.options[:schedule_manager].stop
-      end
+      sidekiq_config[:schedule_manager].stop
     end
 
     def self.sidekiq_queues(sidekiq_config)
-      if SIDEKIQ_GTE_7_0_0
-        if sidekiq_config.nil? || (sidekiq_config.respond_to?(:empty?) && sidekiq_config.empty?)
-          Sidekiq.instance_variable_get(:@config).queues.map(&:to_s)
-        else
-          sidekiq_config.queues.map(&:to_s)
-        end
-      elsif SIDEKIQ_GTE_6_5_0
-        Sidekiq[:queues].map(&:to_s)
+      if sidekiq_config.nil? || (sidekiq_config.respond_to?(:empty?) && sidekiq_config.empty?)
+        Sidekiq.instance_variable_get(:@config).queues.map(&:to_s)
       else
-        Sidekiq.options[:queues].map(&:to_s)
+        sidekiq_config.queues.map(&:to_s)
       end
     end
 
     def self.redis_key_exists?(key_name)
       Sidekiq.redis do |r|
-        if SIDEKIQ_GTE_7_0_0
-          r.exists(key_name) > 0
-        else
-          r.exists?(key_name)
-        end
+        r.exists(key_name) > 0
       end
     end
 
     def self.redis_zrangebyscore(key, from, to)
       Sidekiq.redis do |r|
-        if SIDEKIQ_GTE_7_0_0
-          r.zrange(key, from, to, "BYSCORE")
-        else
-          r.zrangebyscore(key, from, to)
-        end
+        r.zrange(key, from, to, "BYSCORE")
       end
     end
   end

data/lib/sidekiq-scheduler/utils.rb

@@ -73,7 +73,7 @@ module SidekiqScheduler
     # Returns true if the enqueuing needs to be done for an ActiveJob
     #  class false otherwise.
     #
-    # @param [Class] klass the class to check is decendant from ActiveJob
+    # @param [Class] klass the class to check is descendant from ActiveJob
     #
     # @return [Boolean]
     def self.active_job_enqueue?(klass)
@@ -155,9 +155,11 @@ module SidekiqScheduler
     #
     # @return [Time]
     def self.calc_cron_run_time(cron, time)
-      time = time.round # remove sub seconds to prevent rounding errors.
-      next_t = cron.next_time(time).utc
-      previous_t = cron.previous_time(time).utc
+      time = time.floor # remove sub seconds to prevent rounding errors.
+      return time if cron.match?(time) # If the time is a perfect match then return it.
+
+      next_t = cron.next_time(time).to_t
+      previous_t = cron.previous_time(time).to_t
       # The `time` var is some point between `previous_t` and `next_t`.
       # Figure out how far off we are from each side in seconds.
       next_diff = next_t - time

data/lib/sidekiq-scheduler/version.rb

@@ -1,3 +1,3 @@
 module SidekiqScheduler
-  VERSION = "5.0.5"
+  VERSION = "6.0.0.beta1"
 end

data/lib/sidekiq-scheduler/web.rb

@@ -6,9 +6,29 @@ module SidekiqScheduler
   # Hook into *Sidekiq::Web* app which adds a new '/recurring-jobs' page
 
   module Web
-    VIEW_PATH = File.expand_path('../../../web/views', __FILE__)
+    VIEW_PATH = File.expand_path(SidekiqAdapter::SIDEKIQ_GTE_8_0_0 ? '../../../web/views' : '../../../web/views/sidekiq73', __FILE__)
+
+    module Helpers
+      def sidekiq_scheduler_fetch_route_param(key)
+        if SidekiqAdapter::SIDEKIQ_GTE_8_0_0
+          route_params(key)
+        else
+          route_params[key]
+        end
+      end
+
+      def sidekiq_scheduler_fetch_url_param(key)
+        if SidekiqAdapter::SIDEKIQ_GTE_8_0_0
+          url_params(key)
+        else
+          params[key]
+        end
+      end
+    end
 
     def self.registered(app)
+      app.helpers(Helpers)
+
       app.get '/recurring-jobs' do
         @presented_jobs = JobPresenter.build_collection(Sidekiq.schedule!)
 
@@ -16,7 +36,7 @@ module SidekiqScheduler
       end
 
       app.post '/recurring-jobs/:name/enqueue' do
-        schedule = Sidekiq.get_schedule(params[:name])
+        schedule = Sidekiq.get_schedule(sidekiq_scheduler_fetch_route_param(:name))
         SidekiqScheduler::Scheduler.instance.enqueue_job(schedule)
         redirect "#{root_path}recurring-jobs"
       end
@@ -24,12 +44,12 @@ module SidekiqScheduler
       app.post '/recurring-jobs/:name/toggle' do
         Sidekiq.reload_schedule!
 
-        SidekiqScheduler::Scheduler.instance.toggle_job_enabled(params[:name])
+        SidekiqScheduler::Scheduler.instance.toggle_job_enabled(sidekiq_scheduler_fetch_route_param(:name))
         redirect "#{root_path}recurring-jobs"
       end
 
       app.post '/recurring-jobs/toggle-all' do
-        SidekiqScheduler::Scheduler.instance.toggle_all_jobs(params[:action] == 'enable')
+        SidekiqScheduler::Scheduler.instance.toggle_all_jobs(sidekiq_scheduler_fetch_url_param(:action) == 'enable')
         redirect "#{root_path}recurring-jobs"
       end
     end

data/lib/sidekiq-scheduler.rb

@@ -1,5 +1,4 @@
 require 'sidekiq'
-require 'tilt/erb'
 
 require_relative 'sidekiq/scheduler'
 require_relative 'sidekiq-scheduler/version'

data/web/assets/recurring_jobs/stylesheets-scheduler/recurring_jobs.css

@@ -1,42 +1,81 @@
-.recurring-jobs { border-top-left-radius: 4px; border-top-right-radius: 4px; }
-.recurring-jobs .title { margin-bottom: 5px; }
-.recurring-jobs .title .name { font-weight: bold;}
-.recurring-jobs .info,
-.recurring-jobs .description { margin-bottom: 5px; }
-.recurring-jobs .actions { margin-bottom: 5px; }
-.recurring-jobs .status,
-.recurring-jobs .description { font-size: 12px; }
-.recurring-jobs .enqueue { margin-bottom: 0.5rem }
-
-.list-group-item {
-  background-color: #f3f3f3;
-  color: #585454;
-  border: 1px solid rgba(0, 0, 0, 0.1);
+.sidekiq-scheduler .job-name {
+  color: var(--color-primary);
+  display: block;
+  font-size: var(--font-size);
+  font-weight: 700;
+}
+
+.sidekiq-scheduler .queue {
+  text-align: right;
+}
+
+.sidekiq-scheduler .btn-xs {
+  padding: 1px 5px;
+  font-size: var(--font-size-small);
+  line-height: 1.5;
+}
+
+.sidekiq-scheduler .description,
+.sidekiq-scheduler .last-time,
+.sidekiq-scheduler .next-time {
+  font-size: var(--font-size-small);
+}
+
+.sidekiq-scheduler .description {
+  padding-top: 10px;
+}
+
+.sidekiq-scheduler .inline {
+  display: inline;
 }
 
-.list-group-item-disabled {
+.sidekiq-scheduler .job-list .job {
+  background-color: var(--color-elevated);
+  border: 1px solid var(--color-border);
+  box-shadow: 0 2px 4px 0 var(--color-shadow);
+  padding: 10px;
+}
+
+.sidekiq-scheduler .column-2 {
+  float: left;
+  width: 50%;
+}
+
+.sidekiq-scheduler .column-3 {
+  float: left;
+  width: 33.33%;
+}
+
+.sidekiq-scheduler .row:after {
+  content: "";
+  display: table;
+  clear: both;
+}
+
+.sidekiq-scheduler .job.disabled-job {
   background-color: #f3d3d3;
+  color: #585454;
 }
 
 @media (prefers-color-scheme: dark) {
-  .list-group-item {
-    background-color: #222;
-    color: white;
-    border: 1px solid #555;
+  .sidekiq-scheduler .job.disabled-job {
+    background-color: #4f0b0b;
   }
 }
 
-.toggle-all-buttons {
-  margin-top: 20px;
-  margin-bottom: 10px;
-  line-height: 45px;
-  text-align: right;
+.sidekiq-scheduler .disabled-job .next-time {
+  text-decoration: line-through;
 }
 
-@media (max-width: 768px) {
-  .toggle-all-buttons {
-    margin-top: 0;
+@media screen and (max-width: 1000px) {
+  .sidekiq-scheduler .column-2,
+  .sidekiq-scheduler .column-3,
+  .sidekiq-scheduler .description {
+    width: 100%;
+    padding: 5px 10px;
+  }
+
+  .sidekiq-scheduler .queue {
     text-align: left;
-    line-height: inherit;
   }
 }

data/web/assets/recurring_jobs/stylesheets-scheduler/recurring_jobs_73.css

@@ -0,0 +1,45 @@
+.recurring-jobs { border-top-left-radius: 4px; border-top-right-radius: 4px; }
+.recurring-jobs .title { margin-bottom: 5px; }
+.recurring-jobs .title .name { font-weight: bold;}
+.recurring-jobs .info,
+.recurring-jobs .description { margin-bottom: 5px; }
+.recurring-jobs .actions { margin-bottom: 5px; }
+.recurring-jobs .status,
+.recurring-jobs .description { font-size: 12px; }
+.recurring-jobs .enqueue { margin-bottom: 0.5rem }
+
+.list-group-item {
+  background-color: #f3f3f3;
+  color: #585454;
+  border: 1px solid rgba(0, 0, 0, 0.1);
+}
+
+.list-group-item-disabled {
+  background-color: #f3d3d3;
+}
+
+@media (prefers-color-scheme: dark) {
+  .list-group-item {
+    background-color: #222;
+    color: white;
+    border: 1px solid #555;
+  }
+  .list-group-item-disabled {
+    color: #585454;
+  }
+}
+
+.toggle-all-buttons {
+  margin-top: 20px;
+  margin-bottom: 10px;
+  line-height: 45px;
+  text-align: right;
+}
+
+@media (max-width: 768px) {
+  .toggle-all-buttons {
+    margin-top: 0;
+    text-align: left;
+    line-height: inherit;
+  }
+}

data/web/views/recurring_jobs.erb

@@ -1,65 +1,62 @@
-<% if SidekiqScheduler::SidekiqAdapter::SIDEKIQ_GTE_7_3_0 %>
-<%= style_tag "recurring_jobs/stylesheets-scheduler/recurring_jobs.css" %>
-<% else %>
-<link href="<%= root_path %>recurring_jobs/stylesheets-scheduler/recurring_jobs.css" media="screen" rel="stylesheet" type="text/css" />
-<% end %>
+<% style_tag "recurring_jobs/stylesheets-scheduler/recurring_jobs.css" %>
 
-<div class="row">
-  <div class="col-sm-6">
-    <h3><%= t('recurring_jobs') %></h3>
-  </div>
-  <div class="col-sm-6 toggle-all-buttons">
-    <form action="<%= root_path %>recurring-jobs/toggle-all" method="post">
+<section class="sidekiq-scheduler">
+  <header>
+    <h2><%= t('recurring_jobs') %></h2>
+    <form action="<%= root_path %>recurring-jobs/toggle-all" method="POST" class="filter">
       <%= csrf_tag %>
-      <button type="submit" class="btn btn-warn btn-xs" name="action" value="enable"><%= t('enable_all') %></button>
-      <button type="submit" class="btn btn-warn btn-xs" name="action" value="disable"><%= t('disable_all') %></button>
+      <div class="btn-group pull-right flip">
+        <button type="submit" class="btn btn-xs btn-warn" name="action" value="enable"><%= t('enable_all') %></button>
+        <button type="submit" class="btn btn-xs btn-warn" name="action" value="disable"><%= t('disable_all') %></button>
+      </div>
     </form>
-  </div>
-</div>
+  </header>
 
-<div class="recurring-jobs">
-  <ul class="list-group">
+  <section class="job-list">
     <% @presented_jobs.each do |job| %>
-      <li class="list-group-item <%= !job.enabled? && "list-group-item-disabled" %>">
-        <div class="title">
-          <div class="row">
-            <div class="col-xs-6">
-              <span class="name"><%= job.name %></span>
-            </div>
-            <div class="col-xs-6 text-right">
-              <a href="<%= root_path %>queues/<%= job.queue %>"><%= job.queue %></a>
-            </div>
+      <section class="job <%= job.enabled? ? "" : "disabled-job" %>">
+        <div class="row">
+          <div class="column-2">
+            <div class="job-name"><%= job.name %></div>
+          </div>
+          <div class="column-2 queue">
+            <a href="<%= root_path %>queues/<%= job.queue %>"><%= job.queue %></a>
           </div>
         </div>
-        <div class="description"><%= job['description'] %></div>
-        <div class="info">
-          <div class="row">
-            <div class="col-md-4 class"><%= job['class'] %></div>
-            <div class="col-md-4 interval text-left"><%= t('interval') %>: <%= job.interval %></div>
-            <div class="col-md-4 args"><%= t('arguments') %>: <%= job['args'] %></div>
+
+        <div class="row">
+          <div class="column-3">
+            <div class="class-name"><%= job['class'] %></div>
+          </div>
+          <div class="column-3">
+            <div><%= t('interval') %>: <%= job.interval %></div>
+          </div>
+          <div class="column-3">
+            <div><%= t('arguments') %>: <%= job['args'] %></div>
           </div>
         </div>
-        <div class="status row">
-          <div class="col-md-4 actions">
-            <form action="<%= root_path %>recurring-jobs/<%= ERB::Util.url_encode(job.name) %>/enqueue" method="post" class="enqueue">
+        <div class="row">
+          <div class="column-3">
+            <form class="inline" action="<%= root_path %>recurring-jobs/<%= ERB::Util.url_encode(job.name) %>/enqueue" method="POST">
               <%= csrf_tag %>
               <input type="submit" class="btn btn-warn btn-xs" value="<%= t('enqueue_now') %>" />
             </form>
-            <form action="<%= root_path %>recurring-jobs/<%= ERB::Util.url_encode(job.name) %>/toggle" method="post">
+            <form class="inline" action="<%= root_path %>recurring-jobs/<%= ERB::Util.url_encode(job.name) %>/toggle" method="POST">
               <%= csrf_tag %>
-              <input type="submit" class="btn <%= job.enabled? ? "btn-primary" : "btn-warn"%> btn-xs" value="<%= job.enabled? ? t('disable') : t('enable') %>" />
+              <input type="submit" class="btn btn-xs <%= job.enabled? ? "btn-inverse" : "btn-warn"%>" value="<%= job.enabled? ? t('disable') : t('enable') %>" />
             </form>
           </div>
-          <div class="col-md-4">
-            <span class="last_time"><%= t('last_time') %>: <%= job.last_time %></span>
+          <div class="column-3">
+            <div class="last-time"><%= t('last_time') %>: <%= job.last_time %></div>
           </div>
-          <div class="col-md-4">
-            <span class="next_time text-right" style="<%= 'text-decoration:line-through' unless job.enabled? %>">
-              <%= t('next_time') %>: <%= job.next_time || t('no_next_time') %>
-            </span>
+          <div class="column-3">
+            <div class="next-time"><%= t('next_time') %>: <%= job.next_time || t('no_next_time') %></div>
           </div>
+
         </div>
-      </li>
+        <div class="description"><%= job['description'] %></div>
+
+      </section>
     <% end %>
-  </ul>
-</div>
+  </section>
+</section>

data/web/views/sidekiq73/recurring_jobs.erb

@@ -0,0 +1,61 @@
+<%= style_tag "recurring_jobs/stylesheets-scheduler/recurring_jobs_73.css" %>
+
+<div class="row">
+  <div class="col-sm-6">
+    <h3><%= t('recurring_jobs') %></h3>
+  </div>
+  <div class="col-sm-6 toggle-all-buttons">
+    <form action="<%= root_path %>recurring-jobs/toggle-all" method="post">
+      <%= csrf_tag %>
+      <button type="submit" class="btn btn-warn btn-xs" name="action" value="enable"><%= t('enable_all') %></button>
+      <button type="submit" class="btn btn-warn btn-xs" name="action" value="disable"><%= t('disable_all') %></button>
+    </form>
+  </div>
+</div>
+
+<div class="recurring-jobs">
+  <ul class="list-group">
+    <% @presented_jobs.each do |job| %>
+      <li class="list-group-item <%= !job.enabled? && "list-group-item-disabled" %>">
+        <div class="title">
+          <div class="row">
+            <div class="col-xs-6">
+              <span class="name"><%= job.name %></span>
+            </div>
+            <div class="col-xs-6 text-right">
+              <a href="<%= root_path %>queues/<%= job.queue %>"><%= job.queue %></a>
+            </div>
+          </div>
+        </div>
+        <div class="description"><%= job['description'] %></div>
+        <div class="info">
+          <div class="row">
+            <div class="col-md-4 class"><%= job['class'] %></div>
+            <div class="col-md-4 interval text-left"><%= t('interval') %>: <%= job.interval %></div>
+            <div class="col-md-4 args"><%= t('arguments') %>: <%= job['args'] %></div>
+          </div>
+        </div>
+        <div class="status row">
+          <div class="col-md-4 actions">
+            <form action="<%= root_path %>recurring-jobs/<%= ERB::Util.url_encode(job.name) %>/enqueue" method="post" class="enqueue">
+              <%= csrf_tag %>
+              <input type="submit" class="btn btn-warn btn-xs" value="<%= t('enqueue_now') %>" />
+            </form>
+            <form action="<%= root_path %>recurring-jobs/<%= ERB::Util.url_encode(job.name) %>/toggle" method="post">
+              <%= csrf_tag %>
+              <input type="submit" class="btn <%= job.enabled? ? "btn-primary" : "btn-warn"%> btn-xs" value="<%= job.enabled? ? t('disable') : t('enable') %>" />
+            </form>
+          </div>
+          <div class="col-md-4">
+            <span class="last_time"><%= t('last_time') %>: <%= job.last_time %></span>
+          </div>
+          <div class="col-md-4">
+            <span class="next_time text-right" style="<%= 'text-decoration:line-through' unless job.enabled? %>">
+              <%= t('next_time') %>: <%= job.next_time || t('no_next_time') %>
+            </span>
+          </div>
+        </div>
+      </li>
+    <% end %>
+  </ul>
+</div>

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-scheduler
 version: !ruby/object:Gem::Version
-  version: 5.0.5
+  version: 6.0.0.beta1
 platform: ruby
 authors:
 - Morton Jonuschat
 - Moove-it
 - Marcelo Lauxen
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-04 00:00:00.000000000 Z
+date: 2025-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -18,20 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
@@ -46,26 +45,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -170,28 +149,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: '1.1'
 description: Light weight job scheduling extension for Sidekiq that adds support for
   queueing jobs in a recurring way.
 email:
@@ -221,6 +186,7 @@ files:
 - lib/sidekiq-scheduler/web.rb
 - lib/sidekiq/scheduler.rb
 - web/assets/recurring_jobs/stylesheets-scheduler/recurring_jobs.css
+- web/assets/recurring_jobs/stylesheets-scheduler/recurring_jobs_73.css
 - web/locales/cs.yml
 - web/locales/de.yml
 - web/locales/en.yml
@@ -236,11 +202,12 @@ files:
 - web/locales/sv.yml
 - web/locales/zh-cn.yml
 - web/views/recurring_jobs.erb
+- web/views/sidekiq73/recurring_jobs.erb
 homepage: https://sidekiq-scheduler.github.io/sidekiq-scheduler/
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -255,8 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Light weight job scheduling extension for Sidekiq
 test_files: []