sidekiq-scheduler 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edad8a00a79398a6bec8ea7a3532fd866637eae6cf3bccea93f916d9dfaff394
-  data.tar.gz: c81477cc85ba7cea519bb6b70f475a7b0b13b308eb4ef742bd08ed8e8221e755
+  metadata.gz: d26f3947b1ef031bc393203e79975cfcc5159d32f7ff3d07a1b3858621d167d4
+  data.tar.gz: f921936d4d0a8f9942e98cc67da8404738af852042e2f8b23e9c818be14c8b26
 SHA512:
-  metadata.gz: 384c6fc946e29fefb46462b44aaa2f563a3a649b57556e317ca24b26ea70614e321e3b8547bd7e9559c267936c606e2ef80758d7b977c33baea09c415e29052b
-  data.tar.gz: 3273a3ee2ca92eedab784cb3cfa36aea7f36767dab7a1148c034193256c09413cb78fda285cd0a4047e7e20ab0216be5a0e631dfc15423725a5174d87c85e18b
+  metadata.gz: 1fdea51e227d0eafcce6cc6973e9e9349788ffd3ff947c3967ca4eceae7fe4c47ec485a72194c36e11b623a3cfa372ba583d6305df57896d7c39fc6c3f687618
+  data.tar.gz: c217f9992d5cb3fcb78d11dae5273cccdae276fd2d6a7c1166b4faf6aae92ad3b8c2253af2f4f94fffca4027fe0c9ca6720386cb7406d592baa514b63ee5f6ef

data/CHANGELOG.md

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

data/README.md

@@ -119,6 +119,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. 
+      #
+      # `flase` 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
@@ -515,7 +534,7 @@ MIT License
 
 ## Copyright
 
-- Copyright 2021 - 2022 Marcelo Lauxen.
+- Copyright 2021 - 2023 Marcelo Lauxen.
 - Copyright 2013 - 2022 Moove-IT.
 - Copyright 2012 Morton Jonuschat.
 - Some parts copyright 2010 Ben VandenBos.

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

@@ -10,5 +10,5 @@ if Sidekiq::VERSION >= '6.0.0'
   Sidekiq::Web.use Rack::Static, urls: ['/stylesheets-scheduler'],
                                  root: ASSETS_PATH,
                                  cascade: true,
-                                 header_rules: [[:all, { 'Cache-Control' => 'public, max-age=86400' }]]
+                                 header_rules: [[:all, { 'cache-control' => 'public, max-age=86400' }]]
 end

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

data/lib/sidekiq-scheduler/sidekiq_adapter.rb

@@ -76,5 +76,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
@@ -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.

data/lib/sidekiq-scheduler/version.rb

@@ -1,3 +1,3 @@
 module SidekiqScheduler
-  VERSION = "5.0.2"
+  VERSION = "5.0.3"
 end

data/web/locales/fr.yml

@@ -7,7 +7,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,16 @@
+gd:
+  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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-scheduler
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Morton Jonuschat
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-27 00:00:00.000000000 Z
+date: 2023-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -220,6 +220,7 @@ files:
 - 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