sidekiq-cron 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b26393b7aa972d9a769d851269600f51c61feff8c3d2b5cbe611eed0e21b704d
-  data.tar.gz: 1822ffdf4ebe54db931394f38acf3eca8552953396d8fc1848aa3ec89d1164d1
+  metadata.gz: 4d751ce0280b4d30f1f43a1e0ed973166c2f398d7ac976e6fea267e66e999bb8
+  data.tar.gz: 352b64238d89eb4eedb0e9c046f9d54f6f298c376804de1066cbdad3481c43af
 SHA512:
-  metadata.gz: 8fe8be5571ecb428191894a7d433fd6b2f8098607ad4de23f7cfe030b71895eed66cc8a218bf53684b235a5422b4895a676963f7bc02ab1deb06fae4982a34db
-  data.tar.gz: b75e0b6928d263590ba7a97beca37205bd50123d0118ee49312a106573bf1a7b640f75c8ef1f76198a3da94fe19a6c9c9fa4bd3d357898590f251732d9a34d43
+  metadata.gz: ee7843b8dd62b31954de3db17c4cef76229050d2c4590bde276c77d6ad2c96bbb523620631ad41574d4b976ace4da6425130b1aa5c4a20986c4d42fdcdde1ef4
+  data.tar.gz: 95e74c836bdae7eb10fe1fe540fdc91ecb730c3a73bc1dd7e578d9324cf448e32054e9ad1b487036119076e966b0df1011978aa34b9215a334d996759d4bb684

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 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)

data/lib/sidekiq/cron/job.rb

@@ -56,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)
@@ -74,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
@@ -428,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
@@ -565,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)

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(ERB.new(IO.read(schedule_file)).result)
+        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.9.0"
+    VERSION = "1.9.1"
   end
 end

data/sidekiq-cron.gemspec

@@ -26,7 +26,7 @@ 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")

data/test/unit/fixtures/schedule_erb.yml

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

data/test/unit/job_test.rb

@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cron
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Ondrej Bartas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-01 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