dynamodb-sidekiq-scheduler 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44238e2d235ddfb9e7d9afd49f11ed04818fed695fe89f8c6a5582fdaf6fd7b8
-  data.tar.gz: 15a508861db4aa29f69dfe8caf6dce4dd49d57f47999bb148cf0a1d2f88c1857
+  metadata.gz: edfdd3c98244e64bedb7799d4ef3c26f4b155cb9941b3506566364ff28ccd819
+  data.tar.gz: b8c5723d85a3ae4b53cc6e64768cf7c54ead6463734d9f0ea26b9bcb6e7af4a9
 SHA512:
-  metadata.gz: 3e9a24d3c229f41eedd44ac00922c6ce8eaa75be5757f290c70b6d51fb205dee4552b328e4836a5b85d7c89b6d8eb033a8fa382e725e400259a592e20a2e951d
-  data.tar.gz: c8750a1a82c076d84a54cfabcdf02b463b061e2d7eddc45c87d6f5d28200d55b2eaa0d1040c6de2f9d716c25e8a45cc1ae29da6eb91f178f71d202f55da6b200
+  metadata.gz: 2a86e0424c481068e135dd48fe6b51ece4d331c0f7649d6f1faf087a03d671598675525bc16c909e456adda54cd164d51b5f6569ab52ee474b7a840709d19e7a
+  data.tar.gz: 3d7df3c11fce1677a47260272da36f02ca89518818bc54e8cbfe19ea473b1a753b2d857f9a5d50ac9c435f59b4a6a688771b110b680803e650fef04ccc2fd39f

data/CHANGELOG.md

@@ -1,3 +1,35 @@
+# 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)
@@ -11,7 +43,7 @@
  
 # 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.
 
@@ -64,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

@@ -37,7 +37,7 @@ gem install sidekiq-scheduler
 require 'sidekiq-scheduler'
 
 class HelloWorld
-  include Sidekiq::Worker
+  include Sidekiq::Job
 
   def perform
     puts 'Hello world'
@@ -45,6 +45,8 @@ 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
 
@@ -55,6 +57,9 @@ end
       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
@@ -119,6 +124,25 @@ 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. 
+      #
+      # `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
@@ -189,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:
@@ -313,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
@@ -340,7 +364,7 @@ MyRegularJob:
 Then we can conditionally load it via an initializer:
 
 ```ruby
-# config/initializer/sidekiq.rb
+# config/initializers/sidekiq.rb
 if ENV.fetch("IS_SCHEDULER", false)
   Sidekiq.configure_server do |config|
     config.on(:startup) do
@@ -470,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.
 
@@ -515,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

@@ -59,6 +59,17 @@ module SidekiqScheduler
       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

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-scheduler'],
+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

@@ -24,6 +24,15 @@ module SidekiqScheduler
       @scheduler_instance.load_schedule!
     end
 
+    # 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
+
     private
 
     def set_current_scheduler_options(config)

data/lib/sidekiq-scheduler/redis_manager.rb

@@ -106,7 +106,7 @@ module SidekiqScheduler
     #
     # @return [Array] array with all the changed job names
     def self.get_schedule_changes(from, to)
-      Sidekiq.redis { |r| r.zrangebyscore(schedules_changed_key, from, "(#{to}") }
+      SidekiqScheduler::SidekiqAdapter.redis_zrangebyscore(schedules_changed_key, from, "(#{to}")
     end
 
     # Register a schedule change for a given job
@@ -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
@@ -130,9 +130,9 @@ module SidekiqScheduler
     def self.register_job_instance(job_name, time)
       job_key = pushed_job_key(job_name)
       registered, _ = Sidekiq.redis do |r|
-        r.pipelined do |pipeline|
-          pipeline.zadd(job_key, time.to_i, time.to_i)
-          pipeline.expire(job_key, REGISTERED_JOBS_THRESHOLD_IN_SECONDS)
+        r.multi do |m|
+          m.zadd(job_key, time.to_i, time.to_i)
+          m.expire(job_key, REGISTERED_JOBS_THRESHOLD_IN_SECONDS)
         end
       end
 

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.
@@ -58,7 +58,7 @@ module SidekiqScheduler
       self.dynamic = config.dynamic?
       self.dynamic_every = config.dynamic_every?
       self.listened_queues_only = config.listened_queues_only?
-      self.rufus_scheduler_options = config.rufus_scheduler_options
+      self.rufus_scheduler_options = config.rufus_scheduler_options || {}
     end
 
     # the Rufus::Scheduler jobs that are scheduled
@@ -128,6 +128,8 @@ module SidekiqScheduler
             schedule, options = SidekiqScheduler::RufusUtils.normalize_schedule_options(config_interval_type)
 
             rufus_job = new_job(name, interval_type, config, schedule, options)
+            return unless rufus_job
+
             @scheduled_jobs[name] = rufus_job
             SidekiqScheduler::Utils.update_job_next_time(name, rufus_job.next_time)
 
@@ -194,7 +196,7 @@ module SidekiqScheduler
         @rufus_scheduler = nil
       end
 
-      @@scheduled_jobs = {}
+      @scheduled_jobs = {}
 
       rufus_scheduler
     end
@@ -248,6 +250,12 @@ module SidekiqScheduler
       end
     end
 
+    def to_hash
+      {
+        scheduler_config: @scheduler_config.to_hash
+      }
+    end
+
     private
 
     attr_reader :scheduler_config
@@ -256,7 +264,15 @@ module SidekiqScheduler
       options = options.merge({ :job => true, :tags => [name] })
 
       rufus_scheduler.send(interval_type, schedule, options) do |job, time|
-        idempotent_job_enqueue(name, time, SidekiqScheduler::Utils.sanitize_job_config(config)) if job_enabled?(name)
+        if job_enabled?(name)
+          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.to_t), conf)
+          else
+            idempotent_job_enqueue(name, time.to_t, conf)
+          end
+        end
       end
     end
 
@@ -287,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

@@ -4,6 +4,7 @@ module SidekiqScheduler
   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')
 
     def self.fetch_scheduler_config_from_sidekiq(sidekiq_config)
       return {} if sidekiq_config.nil?
@@ -76,5 +77,15 @@ module SidekiqScheduler
         end
       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
+      end
+    end
   end
 end

data/lib/sidekiq-scheduler/utils.rb

@@ -60,9 +60,11 @@ module SidekiqScheduler
     # @param [Array, Hash] args The parameters passed to the klass initializer
     #
     # @return [Object] instance of the class klass
-    def self.initialize_active_job(klass, args)
+    def self.initialize_active_job(klass, args, keyword_argument = false)
       if args.is_a?(Array)
         klass.new(*args)
+      elsif args.is_a?(Hash) && keyword_argument
+        klass.new(**symbolize_keys(args))
       else
         klass.new(args)
       end
@@ -71,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)
@@ -94,7 +96,7 @@ module SidekiqScheduler
         queue: config['queue']
       }.keep_if { |_, v| !v.nil? }
 
-      initialize_active_job(config['class'], config['args']).enqueue(options)
+      initialize_active_job(config['class'], config['args'], config['keyword_argument']).enqueue(options)
     end
 
     # Removes the hash values associated to the rufus metadata keys.
@@ -139,5 +141,41 @@ module SidekiqScheduler
     def self.update_job_last_time(name, last_time)
       SidekiqScheduler::RedisManager.set_job_last_time(name, last_time) if last_time
     end
+
+    # Try to figure out when the cron job was supposed to run.
+    #
+    # Rufus calls the scheduler block with the current time and not the time the block was scheduled to run.
+    # This means under certain conditions you could have a job get scheduled multiple times because `time.to_i` is used
+    # to key the job in redis. If one server is under load and Rufus tries to run the jobs 1 seconds after the other
+    # server then the job will be queued twice.
+    # This method essentially makes a best guess at when this job was supposed to run and return that.
+    #
+    # @param [Fugit::Cron] cron
+    # @param [Time] time
+    #
+    # @return [Time]
+    def self.calc_cron_run_time(cron, time)
+      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
+      previous_diff = time - previous_t
+
+      if next_diff == previous_diff
+        # In the event `time` is exactly between `previous_t` and `next_t` the diff will not be equal to
+        # `cron.rough_frequency`. In that case we round down.
+        cron.rough_frequency == next_diff ? time : previous_t
+      elsif next_diff > previous_diff
+        # We are closer to the previous run time so return that.
+        previous_t
+      else
+        # We are closer to the next run time so return that.
+        next_t
+      end
+    end
   end
 end

data/lib/sidekiq-scheduler/version.rb

@@ -1,3 +1,3 @@
 module SidekiqScheduler
-  VERSION = '0.4'
+  VERSION = "0.5"
 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/{stylesheets-scheduler → recurring_jobs/stylesheets-scheduler}/recurring_jobs.css

@@ -24,6 +24,9 @@
     color: white;
     border: 1px solid #555;
   }
+  .list-group-item-disabled {
+    color: #585454;
+  }
 }
 
 .toggle-all-buttons {

data/web/locales/cs.yml

@@ -1,4 +1,5 @@
 cs:
+  "Recurring Jobs": Pravidelně opakované
   recurring_jobs: Pravidelně opakované
   name: Jméno
   description: Popis

data/web/locales/de.yml

@@ -1,4 +1,5 @@
 de:
+  "Recurring Jobs": Wiederkehrende Jobs
   recurring_jobs: Wiederkehrende Jobs
   name: Name
   description: Beschreibung

data/web/locales/en.yml

@@ -1,4 +1,5 @@
 en:
+  "Recurring Jobs": Recurring Jobs
   recurring_jobs: Recurring Jobs
   name: Name
   description: Description

data/web/locales/es.yml

@@ -1,4 +1,5 @@
 es:
+  "Recurring Jobs": Tareas Recurrentes
   recurring_jobs: Tareas Recurrentes
   name: Nombre
   description: Descripción

data/web/locales/fr.yml

@@ -1,4 +1,5 @@
 fr:
+  "Recurring Jobs": Tâches récurrentes
   recurring_jobs: Tâches récurrentes
   name: Nom
   description: Description
@@ -7,7 +8,10 @@ fr:
   queue: Queue
   arguments: Arguments
   enqueue_now: Ajouter à la queue
-  next_time: Quand
+  last_time: Dernière fois
+  next_time: Prochaine fois
   no_next_time: Pas d'exécution prévue pour cette tâche
   disable: Désactiver
   enable: Activer
+  disable_all: Tout désactiver
+  enable_all: Tout activer

data/web/locales/gd.yml

@@ -0,0 +1,17 @@
+gd:
+  "Recurring Jobs": Obraichean ath-chùrsach
+  recurring_jobs: Obraichean ath-chùrsach
+  name: Ainm
+  description: Tuairisgeul
+  interval: Eadaramh
+  class: Clas
+  queue: Ciudha
+  arguments: Argamaidean
+  enqueue_now: Cuir sa chiudha an-dràsta
+  last_time: An t-àm mu dheireadh
+  next_time: An t-ath-àm
+  no_next_time: chan eil ath-ghnìomhachadh aig an obair seo
+  disable: Cuir à comas
+  enable: Cuir an comas
+  disable_all: Cuir na h-uile à comas
+  enable_all: Cuir na h-uile an comas

data/web/locales/it.yml

@@ -1,4 +1,5 @@
 it:
+  "Recurring Jobs": Job ricorrenti
   recurring_jobs: Job ricorrenti
   name: Nome
   description: Descrizione

data/web/locales/ja.yml

@@ -1,4 +1,5 @@
 ja:
+  "Recurring Jobs": 定期ジョブ
   recurring_jobs: 定期ジョブ
   name: 名前
   description: 説明

data/web/locales/nl.yml

@@ -1,4 +1,5 @@
 nl:
+  "Recurring Jobs": Herhalende taken
   recurring_jobs: Herhalende taken
   name: Naam
   description: Beschrijving

data/web/locales/pl.yml

@@ -1,4 +1,5 @@
 pl:
+  "Recurring Jobs": Okresowe
   recurring_jobs: Okresowe
   name: Nazwa
   description: Opis

data/web/locales/pt-BR.yml

@@ -1,4 +1,5 @@
 pt-BR:
+  "Recurring Jobs": Jobs Recorrentes
   recurring_jobs: Jobs Recorrentes
   name: Nome
   description: Descrição

data/web/locales/ru.yml

@@ -1,4 +1,5 @@
 ru:
+  "Recurring Jobs": Расписание задач
   recurring_jobs: Расписание задач
   name: Название
   description: Описание

data/web/locales/sv.yml

@@ -1,4 +1,5 @@
 sv:
+  "Recurring Jobs": Återkommande jobb
   recurring_jobs: Återkommande jobb
   name: Namn
   description: Beskrivning

data/web/locales/zh-cn.yml

@@ -1,4 +1,5 @@
 zh-cn:
+  "Recurring Jobs": 周期作业
   recurring_jobs: 周期作业
   name: 名称
   description: 描述

data/web/views/recurring_jobs.erb

@@ -1,43 +1,7 @@
-<%# This view is a copy from the sidekiq web view, with just a few new actions (remove, edit, new)  %>
-<% if Sidekiq::VERSION >= '6.0.0' %>
-  <link href="<%= root_path %>stylesheets-scheduler/recurring_jobs.css" media="screen" rel="stylesheet" type="text/css" />
+<% if SidekiqScheduler::SidekiqAdapter::SIDEKIQ_GTE_7_3_0 %>
+<%= style_tag "recurring_jobs/stylesheets-scheduler/recurring_jobs.css" %>
 <% else %>
-  <style>
-      .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;
-      }
-
-      .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;
-          }
-      }
-  </style>
+<link href="<%= root_path %>recurring_jobs/stylesheets-scheduler/recurring_jobs.css" media="screen" rel="stylesheet" type="text/css" />
 <% end %>
 
 <div class="row">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamodb-sidekiq-scheduler
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - Morton Jonuschat
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-25 00:00:00.000000000 Z
+date: 2024-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -46,20 +46,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
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -214,12 +200,13 @@ files:
 - lib/sidekiq-scheduler/version.rb
 - lib/sidekiq-scheduler/web.rb
 - lib/sidekiq/scheduler.rb
-- web/assets/stylesheets-scheduler/recurring_jobs.css
+- web/assets/recurring_jobs/stylesheets-scheduler/recurring_jobs.css
 - web/locales/cs.yml
 - web/locales/de.yml
 - web/locales/en.yml
 - web/locales/es.yml
 - web/locales/fr.yml
+- web/locales/gd.yml
 - web/locales/it.yml
 - web/locales/ja.yml
 - web/locales/nl.yml
@@ -233,7 +220,8 @@ files:
 homepage: https://sidekiq-scheduler.github.io/sidekiq-scheduler/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -249,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Light weight job scheduling extension for Sidekiq