sidekiq-cron 1.8.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7df934577b0740b3e977ffd0e361f6333de6958921659d78bf4c4e4a0015aad9
-  data.tar.gz: 6ae3317c56ff984bf0b651df9117121b4cf67cf36d715eee56a7521f47fe0770
+  metadata.gz: 4d751ce0280b4d30f1f43a1e0ed973166c2f398d7ac976e6fea267e66e999bb8
+  data.tar.gz: 352b64238d89eb4eedb0e9c046f9d54f6f298c376804de1066cbdad3481c43af
 SHA512:
-  metadata.gz: 8948ce194538c052c1761b921a4df485bc99ab5ce9b2e4c12b576d90e10bb6bb1691d7fe111d8ecc6b54e3324d53b8c5c45c0be561d58c4adb4414f08db576b8
-  data.tar.gz: 2fcccab9c996fe7a6c79c0090875dd81fca30ba6de130af3cf300d1d745e0212e056afe4ea05a8912191703cddf47800f5e3ea6092e1e751091ecf4a3baffc15
+  metadata.gz: ee7843b8dd62b31954de3db17c4cef76229050d2c4590bde276c77d6ad2c96bbb523620631ad41574d4b976ace4da6425130b1aa5c4a20986c4d42fdcdde1ef4
+  data.tar.gz: 95e74c836bdae7eb10fe1fe540fdc91ecb730c3a73bc1dd7e578d9324cf448e32054e9ad1b487036119076e966b0df1011978aa34b9215a334d996759d4bb684

data/CHANGELOG.md

@@ -2,43 +2,54 @@
 
 All notable changes to this project will be documented in this file.
 
+## 1.9.1
+
+- Always enqueue via Active Job interface when defined in cron job config (https://github.com/sidekiq-cron/sidekiq-cron/pull/381)
+- Fix schedule.yml YAML load errors on Ruby 3.1 (https://github.com/sidekiq-cron/sidekiq-cron/pull/386)
+- Require Fugit v1.8 to refactor internals (https://github.com/sidekiq-cron/sidekiq-cron/pull/385)
+
+## 1.9.0
+
+- Sidekiq v7 support (https://github.com/sidekiq-cron/sidekiq-cron/pull/369)
+- Add support for ERB templates in the auto schedule loader (https://github.com/sidekiq-cron/sidekiq-cron/pull/373)
+
 ## 1.8.0
 
-- Fix deprecation warnings with redis-rb v4.8.0 (https://github.com/ondrejbartas/sidekiq-cron/pull/356)
-- Fix poller affecting Sidekiq scheduled set poller (https://github.com/ondrejbartas/sidekiq-cron/pull/359)
-- Fix default polling interval (https://github.com/ondrejbartas/sidekiq-cron/pull/362)
-- Add italian locale (https://github.com/ondrejbartas/sidekiq-cron/pull/367)
-- Allow disabling of cron polling (https://github.com/ondrejbartas/sidekiq-cron/pull/368)
+- Fix deprecation warnings with redis-rb v4.8.0 (https://github.com/sidekiq-cron/sidekiq-cron/pull/356)
+- Fix poller affecting Sidekiq scheduled set poller (https://github.com/sidekiq-cron/sidekiq-cron/pull/359)
+- Fix default polling interval (https://github.com/sidekiq-cron/sidekiq-cron/pull/362)
+- Add italian locale (https://github.com/sidekiq-cron/sidekiq-cron/pull/367)
+- Allow disabling of cron polling (https://github.com/sidekiq-cron/sidekiq-cron/pull/368)
 
 ## 1.7.0
 
-- Enable to use cron notation in natural language (ie `every 30 minutes`) (https://github.com/ondrejbartas/sidekiq-cron/pull/312)
-- Fix `date_as_argument` feature to add timestamp argument at every cron job execution (https://github.com/ondrejbartas/sidekiq-cron/pull/329)
-- Introduce `Sidekiq::Options` to centralize reading/writing options from different Sidekiq versions (https://github.com/ondrejbartas/sidekiq-cron/pull/341)
-- Make auto schedule loading compatible with Array format (https://github.com/ondrejbartas/sidekiq-cron/pull/345)
+- Enable to use cron notation in natural language (ie `every 30 minutes`) (https://github.com/sidekiq-cron/sidekiq-cron/pull/312)
+- Fix `date_as_argument` feature to add timestamp argument at every cron job execution (https://github.com/sidekiq-cron/sidekiq-cron/pull/329)
+- Introduce `Sidekiq::Options` to centralize reading/writing options from different Sidekiq versions (https://github.com/sidekiq-cron/sidekiq-cron/pull/341)
+- Make auto schedule loading compatible with Array format (https://github.com/sidekiq-cron/sidekiq-cron/pull/345)
 
 ## 1.6.0
 
-- Adds support for auto-loading the `config/schedule.yml` file (https://github.com/ondrejbartas/sidekiq-cron/pull/337)
-- Fix `Sidekiq.options` deprecation warning (https://github.com/ondrejbartas/sidekiq-cron/pull/338)
+- Adds support for auto-loading the `config/schedule.yml` file (https://github.com/sidekiq-cron/sidekiq-cron/pull/337)
+- Fix `Sidekiq.options` deprecation warning (https://github.com/sidekiq-cron/sidekiq-cron/pull/338)
 
 ## 1.5.1
 
--  Fixes an issue that prevented the gem to work in previous Sidekiq versions (https://github.com/ondrejbartas/sidekiq-cron/pull/335)
+-  Fixes an issue that prevented the gem to work in previous Sidekiq versions (https://github.com/sidekiq-cron/sidekiq-cron/pull/335)
 
 ## 1.5.0
 
-- Integrate Sidekiq v6.5 breaking changes (https://github.com/ondrejbartas/sidekiq-cron/pull/331)
-- Add portuguese translations (https://github.com/ondrejbartas/sidekiq-cron/pull/332)
+- Integrate Sidekiq v6.5 breaking changes (https://github.com/sidekiq-cron/sidekiq-cron/pull/331)
+- Add portuguese translations (https://github.com/sidekiq-cron/sidekiq-cron/pull/332)
 
 ## 1.4.0
 
-- Fix buttons order in job show view (https://github.com/ondrejbartas/sidekiq-cron/pull/302)
-- Dark Mode support in UI (https://github.com/ondrejbartas/sidekiq-cron/pull/317/282)
-- Remove invocation of deprecated Redis functionality (https://github.com/ondrejbartas/sidekiq-cron/pull/318)
-- Internal code cleanup (https://github.com/ondrejbartas/sidekiq-cron/pull/317)
-- Optimize gem size (https://github.com/ondrejbartas/sidekiq-cron/pull/322)
-- Fix "Show All" button on cron jobs view with Sidekiq 6.3.0+ (https://github.com/ondrejbartas/sidekiq-cron/pull/321)
+- Fix buttons order in job show view (https://github.com/sidekiq-cron/sidekiq-cron/pull/302)
+- Dark Mode support in UI (https://github.com/sidekiq-cron/sidekiq-cron/pull/317/282)
+- Remove invocation of deprecated Redis functionality (https://github.com/sidekiq-cron/sidekiq-cron/pull/318)
+- Internal code cleanup (https://github.com/sidekiq-cron/sidekiq-cron/pull/317)
+- Optimize gem size (https://github.com/sidekiq-cron/sidekiq-cron/pull/322)
+- Fix "Show All" button on cron jobs view with Sidekiq 6.3.0+ (https://github.com/sidekiq-cron/sidekiq-cron/pull/321)
 - Documentation updates
 
 ## 1.3.0
@@ -48,12 +59,12 @@ All notable changes to this project will be documented in this file.
 - Fix deprecation warning for Redis 4.6.x
 - Fix different response from Redis#exists in different Redis versions
 - All PRs:
-  - https://github.com/ondrejbartas/sidekiq-cron/pull/275
-  - https://github.com/ondrejbartas/sidekiq-cron/pull/287
-  - https://github.com/ondrejbartas/sidekiq-cron/pull/309
-  - https://github.com/ondrejbartas/sidekiq-cron/pull/299
-  - https://github.com/ondrejbartas/sidekiq-cron/pull/314
-  - https://github.com/ondrejbartas/sidekiq-cron/pull/288
+  - https://github.com/sidekiq-cron/sidekiq-cron/pull/275
+  - https://github.com/sidekiq-cron/sidekiq-cron/pull/287
+  - https://github.com/sidekiq-cron/sidekiq-cron/pull/309
+  - https://github.com/sidekiq-cron/sidekiq-cron/pull/299
+  - https://github.com/sidekiq-cron/sidekiq-cron/pull/314
+  - https://github.com/sidekiq-cron/sidekiq-cron/pull/288
 
 ## 1.2.0
 
@@ -122,9 +133,3 @@ All notable changes to this project will be documented in this file.
 - Suport for Active Job
 - Sidekiq cron web ui needs to be loaded by: require 'sidekiq/cron/web'
 - Add load_from_hash! and load_from_array! which cleanup jobs before adding new ones
-
-## 0.1.1
-
-- Add Web front-end with enabled/disable job, enqueue now, delete job
-- Add cron poller - enqueue cron jobs
-- Add cron job - save all needed data to Redis

data/README.md

@@ -1,9 +1,8 @@
 # Sidekiq-Cron
 
 [![Gem Version](https://badge.fury.io/rb/sidekiq-cron.svg)](https://badge.fury.io/rb/sidekiq-cron)
-[![Build Status](https://github.com/ondrejbartas/sidekiq-cron/workflows/CI/badge.svg?branch=master)](https://github.com/ondrejbartas/sidekiq-cron/actions)
+[![Build Status](https://github.com/sidekiq-cron/sidekiq-cron/workflows/CI/badge.svg?branch=master)](https://github.com/sidekiq-cron/sidekiq-cron/actions)
 [![Coverage Status](https://coveralls.io/repos/github/ondrejbartas/sidekiq-cron/badge.svg?branch=master)](https://coveralls.io/github/ondrejbartas/sidekiq-cron?branch=master)
-[![Join the chat at https://gitter.im/ondrejbartas/sidekiq-cron](https://badges.gitter.im/ondrejbartas/sidekiq-cron.svg)](https://gitter.im/ondrejbartas/sidekiq-cron?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 > A scheduling add-on for [Sidekiq](https://sidekiq.org/)
 
@@ -21,10 +20,6 @@ Works with ActiveJob (Rails 4.2+).
 
 You don't need Sidekiq PRO, you can use this gem with plain Sidekiq.
 
-## Upgrade from < 0.6 to 1.0
-
-Please be aware that Sidekiq-Cron < 1.0 was relying on rufus-scheduler < 3.5. Using those older versions with rufus-scheduler >= 3.5 ends up with jobs failing on creation. Sidekiq-Cron 1.0 includes a patch that switches from rufus-scheduler to rufus-scheduler's core dependency, fugit.
-
 ## Changelog
 
 Before upgrading to a new version, please read our [Changelog](CHANGELOG.md).
@@ -53,12 +48,13 @@ gem "sidekiq-cron"
 
 ## Getting Started
 
-**Job properties:**
+ ### Job properties
 
 ```ruby
 {
+  # MANDATORY
   'name' => 'name_of_job', # must be uniq!
-  'cron' => '1 * * * *',  # execute at 1 minute of every hour, ex: 12:01, 13:01, 14:01, 15:01, ... (HH:MM)
+  'cron' => '1 * * * *',  # execute at 1 minute of every hour, ex: 12:01, 13:01, 14:01, ...
   'class' => 'MyClass',
   # OPTIONAL
   'queue' => 'name of queue',
@@ -105,7 +101,7 @@ For example: `"*/30 * * * * *"` would schedule a job to run every 30 seconds.
 Note that if you plan to schedule jobs with second precision you may need to override the default schedule poll interval so it is lower than the interval of your jobs:
 
 ```ruby
-Sidekiq[:cron_poll_interval] = 10
+Sidekiq::Options[:cron_poll_interval] = 10
 ```
 
 The default value at time of writing is 30 seconds. See [under the hood](#under-the-hood) for more details.
@@ -154,7 +150,7 @@ class HardWorker
   end
 end
 
-Sidekiq::Cron::Job.create(name: 'Hard worker - every 5min', cron: '*/5 * * * *', class: 'HardWorker') # execute at every 5 minutes, ex: 12:05, 12:10, 12:15...etc
+Sidekiq::Cron::Job.create(name: 'Hard worker - every 5min', cron: '*/5 * * * *', class: 'HardWorker') # execute at every 5 minutes
 # => true
 ```
 
@@ -240,10 +236,9 @@ second_job:
 
 There are multiple ways to load the jobs from a YAML file
 
-1. The gem will automatically load the jobs mentioned in `config/schedule.yml` file.
-2. When you want to load jobs from a different filename, mention the filename in sidekiq configuration,
-i.e. `cron_schedule_file: "config/users_schedule.yml"`
-3. Load the file manually as follows
+1. The gem will automatically load the jobs mentioned in `config/schedule.yml` file (it supports ERB)
+2. When you want to load jobs from a different filename, mention the filename in sidekiq configuration, i.e. `cron_schedule_file: "config/users_schedule.yml"`
+3. Load the file manually as follows:
 
 ```ruby
 # config/initializers/sidekiq.rb
@@ -311,7 +306,7 @@ job.enque!
 Just start Sidekiq workers by running:
 
 ```
-$ sidekiq
+$ bundle exec sidekiq
 ```
 
 ### Web UI for Cron Jobs
@@ -332,16 +327,16 @@ Sidekiq-Cron adds itself into this start procedure and starts another thread wit
 Sidekiq-Cron is checking jobs to be enqueued every 30s by default, you can change it by setting:
 
 ```ruby
-Sidekiq[:cron_poll_interval] = 10
+Sidekiq::Options[:cron_poll_interval] = 10
 ```
 
 Sidekiq-Cron is safe to use with multiple Sidekiq processes or nodes. It uses a Redis sorted set to determine that only the first process who asks can enqueue scheduled jobs into the queue.
 
-When running with many Sidekiq processes, the polling can add significant load to Redis. You can disable polling on some processes by setting `Sidekiq[:cron_poll_interval] = 0` on these processes.
+When running with many Sidekiq processes, the polling can add significant load to Redis. You can disable polling on some processes by setting `Sidekiq::Options[:cron_poll_interval] = 0` on these processes.
 
 ## Contributing
 
-**Thanks to all [contributors](https://github.com/ondrejbartas/sidekiq-cron/graphs/contributors), you’re awesome and this wouldn’t be possible without you!**
+**Thanks to all [contributors](https://github.com/sidekiq-cron/sidekiq-cron/graphs/contributors), you’re awesome and this wouldn’t be possible without you!**
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.

data/lib/sidekiq/cron/job.rb

@@ -13,18 +13,17 @@ module Sidekiq
       LAST_ENQUEUE_TIME_FORMAT = '%Y-%m-%d %H:%M:%S %z'
 
       # Use the exists? method if we're on a newer version of Redis.
-      REDIS_EXISTS_METHOD = Gem.loaded_specs['redis'].version < Gem::Version.new('4.2') ? :exists : :exists?
+      REDIS_EXISTS_METHOD = Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("7.0.0") || Gem.loaded_specs['redis'].version < Gem::Version.new('4.2') ? :exists : :exists?
 
       # Crucial part of whole enqueuing job.
       def should_enque? time
-        enqueue = false
         enqueue = Sidekiq.redis do |conn|
           status == "enabled" &&
             not_past_scheduled_time?(time) &&
             not_enqueued_after?(time) &&
-            conn.zadd(job_enqueued_key, formated_enqueue_time(time), formated_last_time(time))
+            conn.zadd(job_enqueued_key, formatted_enqueue_time(time), formatted_last_time(time))
         end
-        enqueue
+        enqueue == true || enqueue == 1
       end
 
       # Remove previous information about run times,
@@ -57,7 +56,7 @@ module Sidekiq
 
         jid =
           if klass_const
-            if defined?(ActiveJob::Base) && klass_const < ActiveJob::Base
+            if is_active_job?(klass_const)
               enqueue_active_job(klass_const).try :provider_job_id
             else
               enqueue_sidekiq_worker(klass_const)
@@ -75,8 +74,8 @@ module Sidekiq
         Sidekiq.logger.debug { "enqueued #{@name}: #{@message}" }
       end
 
-      def is_active_job?
-        @active_job || defined?(ActiveJob::Base) && Sidekiq::Cron::Support.constantize(@klass.to_s) < ActiveJob::Base
+      def is_active_job?(klass = nil)
+        @active_job || defined?(ActiveJob::Base) && (klass || Sidekiq::Cron::Support.constantize(@klass.to_s)) < ActiveJob::Base
       rescue NameError
         false
       end
@@ -159,9 +158,9 @@ module Sidekiq
       # }
       #
       def self.load_from_hash hash
-        array = hash.inject([]) do |out,(key, job)|
+        array = hash.map do |key, job|
           job['name'] = key
-          out << job
+          job
         end
         load_from_array array
       end
@@ -401,18 +400,18 @@ module Sidekiq
       def to_hash
         {
           name: @name,
-          klass: @klass,
+          klass: @klass.to_s,
           cron: @cron,
           description: @description,
           args: @args.is_a?(String) ? @args : Sidekiq.dump_json(@args || []),
-          date_as_argument: @date_as_argument,
+          date_as_argument: date_as_argument? ? "1" : "0",
           message: @message.is_a?(String) ? @message : Sidekiq.dump_json(@message || {}),
           status: @status,
-          active_job: @active_job,
+          active_job: @active_job ? "1" : "0",
           queue_name_prefix: @active_job_queue_name_prefix,
           queue_name_delimiter: @active_job_queue_name_delimiter,
-          last_enqueue_time: @last_enqueue_time,
-          symbolize_args: @symbolize_args,
+          last_enqueue_time: @last_enqueue_time.to_s,
+          symbolize_args: symbolize_args? ? "1" : "0",
         }
       end
 
@@ -429,15 +428,7 @@ module Sidekiq
           errors << "'cron' must be set"
         else
           begin
-            c = Fugit.do_parse(@cron)
-
-            # Since `Fugit.do_parse` might yield a Fugit::Duration or an EtOrbi::EoTime
-            # https://github.com/floraison/fugit#fugitparses
-            if c.is_a?(Fugit::Cron)
-              @parsed_cron = c
-            else
-              errors << "'cron' -> #{@cron.inspect} -> not a cron but a #{c.class}"
-            end
+            @parsed_cron = Fugit.do_parse_cronish(@cron)
           rescue => e
             errors << "'cron' -> #{@cron.inspect} -> #{e.class}: #{e.message}"
           end
@@ -472,7 +463,8 @@ module Sidekiq
 
           # Add information about last time! - don't enque right after scheduler poller starts!
           time = Time.now.utc
-          conn.zadd(job_enqueued_key, time.to_f.to_s, formated_last_time(time).to_s) unless conn.public_send(REDIS_EXISTS_METHOD, job_enqueued_key)
+          exists = conn.public_send(REDIS_EXISTS_METHOD, job_enqueued_key)
+          conn.zadd(job_enqueued_key, time.to_f.to_s, formatted_last_time(time).to_s) unless exists == true || exists == 1
         end
         Sidekiq.logger.info { "Cron Jobs - added job with name: #{@name}" }
       end
@@ -539,20 +531,19 @@ module Sidekiq
         parsed_cron.previous_time(now.utc).utc
       end
 
-      def formated_enqueue_time now = Time.now.utc
+      def formatted_enqueue_time now = Time.now.utc
         last_time(now).getutc.to_f.to_s
       end
 
-      def formated_last_time now = Time.now.utc
+      def formatted_last_time now = Time.now.utc
         last_time(now).getutc.iso8601
       end
 
       def self.exists? name
-        out = false
-        Sidekiq.redis do |conn|
-          out = conn.public_send(REDIS_EXISTS_METHOD, redis_key(name))
+        out = Sidekiq.redis do |conn|
+          conn.public_send(REDIS_EXISTS_METHOD, redis_key(name))
         end
-        out
+        out == true || out == 1
       end
 
       def exists?
@@ -566,19 +557,7 @@ module Sidekiq
       private
 
       def parsed_cron
-        @parsed_cron ||= begin
-                           c = Fugit.parse(@cron)
-
-                           # Since `Fugit.parse` might yield a Fugit::Duration or an EtOrbi::EoTime
-                           # https://github.com/floraison/fugit#fugitparses
-                           if c.is_a?(Fugit::Cron)
-                             c
-                           else
-                             errors << "'cron' -> #{@cron.inspect} -> not a cron but a #{c.class}"
-                           end
-                         rescue => e
-                           errors << "'cron' -> #{@cron.inspect} -> #{e.class}: #{e.message}"
-                         end
+        @parsed_cron ||= Fugit.parse_cronish(@cron)
       end
 
       def not_enqueued_after?(time)
@@ -672,7 +651,7 @@ module Sidekiq
 
       # Give Hash returns array for using it for redis.hmset
       def hash_to_redis hash
-        hash.inject([]){ |arr,kv| arr + [kv[0], kv[1]] }
+        hash.flat_map{ |key, value| [key, value || ""] }
       end
     end
   end

data/lib/sidekiq/cron/launcher.rb

@@ -14,11 +14,11 @@ module Sidekiq
       attr_reader :cron_poller
 
       # Add cron poller and execute normal initialize of Sidekiq launcher.
-      def initialize(options)
-        options[:cron_poll_interval] = DEFAULT_POLL_INTERVAL if options[:cron_poll_interval].nil?
+      def initialize(config)
+        config[:cron_poll_interval] = DEFAULT_POLL_INTERVAL if config[:cron_poll_interval].nil?
 
-        @cron_poller = Sidekiq::Cron::Poller.new(options) if options[:cron_poll_interval] > 0
-        super(options)
+        @cron_poller = Sidekiq::Cron::Poller.new(config) if config[:cron_poll_interval] > 0
+        super
       end
 
       # Execute normal run of launcher and run cron poller.

data/lib/sidekiq/cron/poller.rb

@@ -7,12 +7,12 @@ module Sidekiq
   module Cron
     # The Poller checks Redis every N seconds for sheduled cron jobs.
     class Poller < Sidekiq::Scheduled::Poller
-      def initialize(options = {})
+      def initialize(config = nil)
         if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('6.5.0')
           super
         else
           # Old version of Sidekiq does not accept a config argument.
-          @config = options
+          @config = config
           super()
         end
       end

data/lib/sidekiq/cron/schedule_loader.rb

@@ -8,7 +8,7 @@ if Sidekiq.server?
 
     if File.exist?(schedule_file)
       config.on(:startup) do
-        schedule = YAML.load_file(schedule_file)
+        schedule = Sidekiq::Cron::Support.load_yaml(ERB.new(IO.read(schedule_file)).result)
         if schedule.kind_of?(Hash)
           Sidekiq::Cron::Job.load_from_hash schedule
         elsif schedule.kind_of?(Array)

data/lib/sidekiq/cron/support.rb

@@ -32,6 +32,14 @@ module Sidekiq
           end
         end
       end
+
+      def self.load_yaml(src)
+        if Psych::VERSION > "4.0"
+          YAML.safe_load(src, permitted_classes: [Symbol], aliases: true)
+        else
+          YAML.load(src)
+        end
+      end
     end
   end
 end

data/lib/sidekiq/cron/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Cron
-    VERSION = "1.8.0"
+    VERSION = "1.9.1"
   end
 end

data/lib/sidekiq/options.rb

@@ -3,16 +3,23 @@ require 'sidekiq'
 module Sidekiq
   module Options
     def self.[](key)
-      new_version? ? Sidekiq[key] : Sidekiq.options[key]
+      options_field ? Sidekiq.public_send(options_field)[key] : Sidekiq[key]
     end
 
     def self.[]=(key, value)
-      new_version? ? Sidekiq[key] = value : Sidekiq.options[key] = value
+      options_field ? Sidekiq.public_send(options_field)[key] = value : Sidekiq[key] = value
     end
 
-    # sidekiq --version >= 6.5.0
-    def self.new_version?
-      @new_version ||= Sidekiq.respond_to?(:[])
+    def self.options_field
+      return @options_field unless @options_field.nil?
+      sidekiq_version = Gem::Version.new(Sidekiq::VERSION)
+      @options_field = if sidekiq_version >= Gem::Version.new('7.0')
+        :default_configuration
+      elsif sidekiq_version >= Gem::Version.new('6.5')
+        false
+      else
+        :options
+      end
     end
   end
 end

data/sidekiq-cron.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version = Sidekiq::Cron::VERSION
   s.summary = "Scheduler/Cron for Sidekiq jobs"
   s.description = "Enables to set jobs to be run in specified time (using CRON notation or natural language)"
-  s.homepage = "https://github.com/ondrejbartas/sidekiq-cron"
+  s.homepage = "https://github.com/sidekiq-cron/sidekiq-cron"
   s.authors = ["Ondrej Bartas"]
   s.email = "ondrej@bartas.cz"
   s.licenses = ["MIT"]
@@ -26,12 +26,11 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.6"
 
-  s.add_dependency("fugit", "~> 1")
+  s.add_dependency("fugit", "~> 1.8")
   s.add_dependency("sidekiq", ">= 4.2.1")
 
   s.add_development_dependency("minitest", "~> 5.15")
   s.add_development_dependency("mocha", "~> 1.14")
-  s.add_development_dependency("redis-namespace", "~> 1.8")
   s.add_development_dependency("rack", "~> 2.2")
   s.add_development_dependency("rack-test", "~> 1.1")
   s.add_development_dependency("rake", "~> 13.0")

data/test/integration/performance_test.rb

@@ -2,16 +2,13 @@ require './test/test_helper'
 require 'benchmark'
 
 describe 'Performance Poller' do
-  X = 10000
-  before do
-    REDIS.with { |c| c.respond_to?(:redis) ? c.redis.flushdb : c.flushdb }
-    Sidekiq.redis = REDIS
+  JOBS_NUMBER = 10_000
+  MAX_SECONDS = 60
 
+  before do
     # Clear all previous saved data from Redis.
     Sidekiq.redis do |conn|
-      conn.keys("cron_job*").each do |key|
-        conn.del(key)
-      end
+      conn.flushdb
     end
 
     args = {
@@ -20,17 +17,17 @@ describe 'Performance Poller' do
       klass: "CronTestClass"
     }
 
-    X.times do |i|
+    JOBS_NUMBER.times do |i|
       Sidekiq::Cron::Job.create(args.merge(name: "Test#{i}"))
     end
 
-    @poller = Sidekiq::Cron::Poller.new
+    @poller = Sidekiq::Cron::Poller.new(Sidekiq.const_defined?(:Config) ? Sidekiq::Config.new : {})
     now = Time.now.utc + 3600
     enqueued_time = Time.new(now.year, now.month, now.day, now.hour, 10, 5)
     Time.stubs(:now).returns(enqueued_time)
   end
 
-  it 'should enqueue 10000 jobs in less than 50s' do
+  it "should enqueue #{JOBS_NUMBER} jobs in less than #{MAX_SECONDS}s" do
     Sidekiq.redis do |conn|
       assert_equal 0, conn.llen("queue:default"), 'Queue should be empty'
     end
@@ -40,10 +37,10 @@ describe 'Performance Poller' do
     }
 
     Sidekiq.redis do |conn|
-      assert_equal X, conn.llen("queue:default"), 'Queue should be full'
+      assert_equal JOBS_NUMBER, conn.llen("queue:default"), 'Queue should be full'
     end
 
     puts "Performance test finished in #{bench.real}"
-    assert_operator bench.real, :<, 50
+    assert_operator bench.real, :<, MAX_SECONDS
   end
 end

data/test/test_helper.rb

@@ -3,31 +3,25 @@ ENV['RACK_ENV'] = 'test'
 
 require 'simplecov'
 SimpleCov.start do
-  add_filter "/test/"
-  add_group 'SidekiqCron', 'lib/'
+  add_filter "test/"
+  add_group 'Sidekiq-Cron', 'lib/'
 end
 
 require "minitest/autorun"
 require "rack/test"
 require 'mocha/minitest'
 require 'sidekiq'
-require "sidekiq-pro" if ENV['SIDEKIQ_PRO_VERSION']
 require 'sidekiq/web'
 require "sidekiq/cli"
+require 'sidekiq-cron'
+require 'sidekiq/cron/web'
 
 Sidekiq.logger.level = Logger::ERROR
-
-redis_url = ENV['REDIS_URL'] || 'redis://0.0.0.0:6379'
-REDIS = Sidekiq::RedisConnection.create(:url => redis_url, :namespace => 'testy')
-
 Sidekiq.configure_client do |config|
-  config.redis = { :url => redis_url, :namespace => 'testy' }
+  config.redis = { url: ENV['REDIS_URL'] || 'redis://0.0.0.0:6379' }
 end
 
-require 'sidekiq-cron'
-require 'sidekiq/cron/web'
-
-# For testing os symbilize args!
+# For testing symbolize args
 class Hash
   def symbolize_keys
     transform_keys { |key| key.to_sym rescue key }

data/test/unit/fixtures/schedule_erb.yml

@@ -0,0 +1,6 @@
+---
+default: &default
+  cron: <%= "every day at 5 pm" %>
+  class: <%= "DailyJob" %>
+
+daily_job: *default

data/test/unit/job_test.rb

@@ -178,11 +178,11 @@ describe "Cron Job" do
     end
 
     it 'returns formatted_last_time' do
-      assert_equal '2015-01-02T02:04:00Z', @job.formated_last_time(@time)
+      assert_equal '2015-01-02T02:04:00Z', @job.formatted_last_time(@time)
     end
 
-    it 'returns formated_enqueue_time' do
-      assert_equal '1420164240.0', @job.formated_enqueue_time(@time)
+    it 'returns formatted_enqueue_time' do
+      assert_equal '1420164240.0', @job.formatted_enqueue_time(@time)
     end
   end
 
@@ -581,6 +581,36 @@ describe "Cron Job" do
           @job.enque!
         end
       end
+
+      describe 'with active_job == true' do
+        before do
+          @args.merge!(active_job: true)
+        end
+
+        describe 'with active_job job class' do
+          before do
+            @job = Sidekiq::Cron::Job.new(@args.merge(klass: 'ActiveJobCronTestClass'))
+          end
+
+          it 'enques via active_job interface' do
+            @job.expects(:enqueue_active_job)
+                .returns(ActiveJobCronTestClass.new)
+            @job.enque!
+          end
+        end
+
+        describe 'with non sidekiq job class' do
+          before do
+            @job = Sidekiq::Cron::Job.new(@args.merge(klass: 'CronTestClass'))
+          end
+
+          it 'enques via active_job interface' do
+            @job.expects(:enqueue_active_job)
+                .returns(ActiveJobCronTestClass.new)
+            @job.enque!
+          end
+        end
+      end
     end
 
     describe 'active job with queue_name_prefix' do

data/test/unit/launcher_test.rb

@@ -3,7 +3,7 @@ require './test/test_helper'
 describe 'Cron launcher' do
   describe 'initialization' do
     before do
-      Sidekiq[:cron_poll_interval] = nil
+      Sidekiq::Options[:cron_poll_interval] = nil
     end
 
     it 'initializes poller with default poll interval when not configured' do
@@ -11,7 +11,7 @@ describe 'Cron launcher' do
         assert_equal Sidekiq::Cron::Launcher::DEFAULT_POLL_INTERVAL, options[:cron_poll_interval]
       end
 
-      Sidekiq::Launcher.new(Sidekiq)
+      Sidekiq::Launcher.new(Sidekiq.respond_to?(:default_configuration) ? Sidekiq.default_configuration : Sidekiq)
     end
 
     it 'initializes poller with the configured poll interval' do
@@ -19,15 +19,15 @@ describe 'Cron launcher' do
         assert_equal 99, options[:cron_poll_interval]
       end
 
-      Sidekiq[:cron_poll_interval] = 99
-      Sidekiq::Launcher.new(Sidekiq)
+      Sidekiq::Options[:cron_poll_interval] = 99
+      Sidekiq::Launcher.new(Sidekiq.respond_to?(:default_configuration) ? Sidekiq.default_configuration : Sidekiq)
     end
 
     it 'does not initialize the poller when interval is 0' do
       Sidekiq::Cron::Poller.expects(:new).never
 
-      Sidekiq[:cron_poll_interval] = 0
-      Sidekiq::Launcher.new(Sidekiq)
+      Sidekiq::Options[:cron_poll_interval] = 0
+      Sidekiq::Launcher.new(Sidekiq.respond_to?(:default_configuration) ? Sidekiq.default_configuration : Sidekiq)
     end
   end
 end

data/test/unit/poller_test.rb

@@ -2,17 +2,11 @@ require './test/test_helper'
 
 describe 'Cron Poller' do
   before do
-    REDIS.with { |c| c.respond_to?(:redis) ? c.redis.flushdb : c.flushdb }
-    Sidekiq.redis = REDIS
-
     # Clear all previous saved data from Redis.
     Sidekiq.redis do |conn|
-      conn.keys("cron_job*").each do |key|
-        conn.del(key)
-      end
+      conn.flushdb
     end
 
-
     @args = {
       name: "Test",
       cron: "*/2 * * * *",
@@ -20,7 +14,7 @@ describe 'Cron Poller' do
     }
     @args2 = @args.merge(name: 'with_queue', klass: 'CronTestClassWithQueue', cron: "*/10 * * * *")
 
-    @poller = Sidekiq::Cron::Poller.new
+    @poller = Sidekiq::Cron::Poller.new(Sidekiq.const_defined?(:Config) ? Sidekiq::Config.new : {})
   end
 
   it 'not enqueue any job - new jobs' do

data/test/unit/schedule_loader_test.rb

@@ -2,7 +2,7 @@ require './test/test_helper'
 
 describe 'ScheduleLoader' do
   before do
-    Sidekiq.options[:lifecycle_events][:startup].clear
+    Sidekiq::Options[:lifecycle_events][:startup].clear
   end
 
   describe 'Schedule is defined in hash' do
@@ -13,7 +13,7 @@ describe 'ScheduleLoader' do
 
     it 'calls Sidekiq::Cron::Job.load_from_hash' do
       Sidekiq::Cron::Job.expects(:load_from_hash)
-      Sidekiq.options[:lifecycle_events][:startup].first.call
+      Sidekiq::Options[:lifecycle_events][:startup].first.call
     end
   end
 
@@ -25,7 +25,7 @@ describe 'ScheduleLoader' do
 
     it 'calls Sidekiq::Cron::Job.load_from_array' do
       Sidekiq::Cron::Job.expects(:load_from_array)
-      Sidekiq.options[:lifecycle_events][:startup].first.call
+      Sidekiq::Options[:lifecycle_events][:startup].first.call
     end
   end
 
@@ -37,9 +37,22 @@ describe 'ScheduleLoader' do
 
     it 'raises an error' do
       e = assert_raises StandardError do
-        Sidekiq.options[:lifecycle_events][:startup].first.call
+        Sidekiq::Options[:lifecycle_events][:startup].first.call
       end
       assert_equal 'Not supported schedule format. Confirm your test/unit/fixtures/schedule_string.yml', e.message
     end
   end
+
+  describe 'Schedule is defined using ERB' do
+    it 'properly parses the schedule file' do
+      Sidekiq::Options[:cron_schedule_file] = 'test/unit/fixtures/schedule_erb.yml'
+      load 'sidekiq/cron/schedule_loader.rb'
+
+      Sidekiq::Options[:lifecycle_events][:startup].first.call
+
+      job = Sidekiq::Cron::Job.find("daily_job")
+      assert_equal job.klass, "DailyJob"
+      assert_equal job.cron, "every day at 5 pm"
+    end
+  end
 end

data/test/unit/web_extension_test.rb

@@ -12,8 +12,7 @@ describe 'Cron web' do
   before do
     env 'rack.session', { csrf: TOKEN }
     env 'HTTP_X_CSRF_TOKEN', TOKEN
-    REDIS.with { |c| c.respond_to?(:redis) ? c.redis.flushdb : c.flushdb }
-    Sidekiq.redis = REDIS
+    Sidekiq.redis { |c| c.flushdb }
   end
 
   let(:job_name) { "TestNameOfCronJob" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cron
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Ondrej Bartas
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-03 00:00:00.000000000 Z
+date: 2022-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fugit
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
-- !ruby/object:Gem::Dependency
-  name: redis-namespace
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +160,7 @@ files:
 - test/integration/performance_test.rb
 - test/test_helper.rb
 - test/unit/fixtures/schedule_array.yml
+- test/unit/fixtures/schedule_erb.yml
 - test/unit/fixtures/schedule_hash.yml
 - test/unit/fixtures/schedule_string.yml
 - test/unit/job_test.rb
@@ -181,11 +168,11 @@ files:
 - test/unit/poller_test.rb
 - test/unit/schedule_loader_test.rb
 - test/unit/web_extension_test.rb
-homepage: https://github.com/ondrejbartas/sidekiq-cron
+homepage: https://github.com/sidekiq-cron/sidekiq-cron
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -200,8 +187,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Scheduler/Cron for Sidekiq jobs
 test_files: []