sidekiq-scheduler 5.0.4 → 5.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17e9ebdeaa24ce323d7b3f94c7481d741e0f0f6d3daeded5eaef94f8b1e09f37
-  data.tar.gz: c8e1d62c30406b7928444bdd05a0668aac6bbb47c1bc6a752ff795dbf67b8bb2
+  metadata.gz: a2d6cf0887d66e27d2ce10ec96eabcb2b89bd89c515af8e38d54b366b38a8df2
+  data.tar.gz: c0da1db9ad45afdaf3b6055ce22ccc24ac90a392f7a2b5787136bbdeb6456fd5
 SHA512:
-  metadata.gz: f94c5008ef8a2ec39837adc8a25145b27c15abf2514ba22f9c2341b1306431aecfcceb877f8b07fe05c0daa09e26e6b4df3f6e10c118893fe78b11ca6b6751cb
-  data.tar.gz: 61e7f37615f1c575d51c0e55593c4a82362829e21533182e60ec7a125fe76273e44bc055f6449a43185c083370eb1e416a0f1031671e537b6b85cec0ff3a218b
+  metadata.gz: 7d845a756d2ba958cfedadcf52f6ba6f19811eb5b88c94fc50989b6a6f2bf523dbc7d2f8eb8e44c9d0c20a483f5896e5c313e5428f2369368de12479a2472163
+  data.tar.gz: 797ebac76066faa408f2f43290f6aead6a4ff335cb966811efdeea5c70c7ca5a4f93e6bda15f864987294e505583999bff64d05f33f2f2b9d0c92f512487d905

data/CHANGELOG.md

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

@@ -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
@@ -494,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.
 
@@ -539,7 +539,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

@@ -2,7 +2,7 @@ require 'sidekiq/web' unless defined?(Sidekiq::Web)
 
 if SidekiqScheduler::SidekiqAdapter::SIDEKIQ_GTE_7_3_0
 
-  # Locale and asset cache is configured in `.regiester`
+  # Locale and asset cache is configured in `.register`
   Sidekiq::Web.register(SidekiqScheduler::Web,
     name: "recurring_jobs",
     tab: ["Recurring Jobs"],
@@ -20,7 +20,7 @@ else
   Sidekiq::Web.tabs['recurring_jobs'] = 'recurring-jobs'
   Sidekiq::Web.locales << File.expand_path("#{File.dirname(__FILE__)}/../../../web/locales")
 
-  Sidekiq::Web.use Rack::Static, urls: ['/stylesheets-scheduler'],
+  Sidekiq::Web.use Rack::Static, urls: ['/recurring_jobs/stylesheets-scheduler'],
                                  root: ASSETS_PATH,
                                  cascade: true,
                                  header_rules: [[:all, { 'cache-control' => 'private, max-age=86400' }]]

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/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.4"
+  VERSION = "5.0.6"
 end

data/web/views/recurring_jobs.erb

@@ -1,7 +1,7 @@
 <% if SidekiqScheduler::SidekiqAdapter::SIDEKIQ_GTE_7_3_0 %>
-<%= style_tag "stylesheets-scheduler/recurring_jobs.css" %>
+<%= style_tag "recurring_jobs/stylesheets-scheduler/recurring_jobs.css" %>
 <% else %>
-<link href="<%= root_path %>stylesheets-scheduler/recurring_jobs.css" media="screen" rel="stylesheet" type="text/css" />
+<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: sidekiq-scheduler
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.0.6
 platform: ruby
 authors:
 - Morton Jonuschat
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-04 00:00:00.000000000 Z
+date: 2024-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -220,7 +220,7 @@ 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
@@ -239,7 +239,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: