Merge pull request #8 from Kaligo/longkt90-patch-1

Allow to upgrade to sidekiq 8

Author: longkt90

.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_PATH: "vendor/bundle"

.github/workflows/ci.yml

@@ -0,0 +1,27 @@
+on: [push]
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - "3.4"
+          - "3.3"
+          - "3.2"
+        gemfile:
+          - "Gemfile.sidekiq.7"
+          - "Gemfile.sidekiq.8"
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+      RUBY_VERSION: $${ matrix.ruby }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run unit tests
+        run: bundle exec rspec

.gitignore

@@ -1,2 +1,5 @@
 *.gem
 *.gemspec.lock
+Gemfile.*.lock
+Gemfile.lock
+vendor/bundle/*

CHANGELOG.md

@@ -1,4 +1,8 @@
 # Change Log
+## 2.4.0
+- Switch rspec to test for mutiple sidekiq version
+- Support both sidekiq 8 and 7
+
 ## 2.3.0
 - Add alert and prevent job run when user leaves optional params empty in between other non-empty optional params.
 

Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'http://rubygems.org'
 
 gemspec

Gemfile.sidekiq.7

@@ -0,0 +1,5 @@
+source 'http://rubygems.org'
+
+gemspec
+
+gem 'sidekiq', '~> 7.0'

Gemfile.sidekiq.8

@@ -0,0 +1,5 @@
+source 'http://rubygems.org'
+
+gemspec
+
+gem 'sidekiq', '~> 8.0'

Jenkinsfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake'
 require 'rspec/core/rake_task'
 
@@ -7,4 +9,4 @@ RSpec::Core::RakeTask.new(:spec) do |t|
 end
 
 desc 'Run tests'
-task :default => :spec
+task default: :spec

Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sidekiq'
 require 'sidekiq/web'
 
@@ -10,7 +12,6 @@
 require 'sidekiq_adhoc_job/web'
 
 module SidekiqAdhocJob
-
   StringUtil ||= Utils::String
 
   module Strategies
@@ -29,10 +30,20 @@ def self.config
   end
 
   def self.init
-    SidekiqAdhocJob::WorkerClassesLoader.load(@_config.module_names, load_paths: @_config.load_paths, strategy: @_config.strategy)
+    SidekiqAdhocJob::WorkerClassesLoader.load(@_config.module_names, load_paths: @_config.load_paths,
+                                                                     strategy: @_config.strategy)
+
+    # Check if we're using Sidekiq 8+ which requires the new API
+    if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('8.0.0')
+      Sidekiq::Web.configure do |config|
+        config.register_extension(SidekiqAdhocJob::Web, name: 'Adhoc Jobs', tab: 'adhoc_jobs', index: 'adhoc-jobs')
+      end
+    else
+      # Legacy API for Sidekiq 7.x
+      Sidekiq::Web.register(SidekiqAdhocJob::Web)
+      Sidekiq::Web.tabs['adhoc_jobs'] = 'adhoc-jobs'
+    end
 
-    Sidekiq::Web.register(SidekiqAdhocJob::Web)
-    Sidekiq::Web.tabs['adhoc_jobs'] = 'adhoc-jobs'
     Sidekiq::Web.locales << File.expand_path('sidekiq_adhoc_job/web/locales', __dir__)
 
     assets_path = File.expand_path('sidekiq_adhoc_job/web/assets', __dir__)
@@ -41,11 +52,10 @@ def self.init
                                    root: assets_path,
                                    cascade: true,
                                    header_rules: [[:all, { 'cache-control' => 'private, max-age=86400' }]]
-
-end
+  end
 
   def self.strategies
-    @_strategies ||= []
+    @strategies ||= []
   end
 
   class Configuration
@@ -94,10 +104,10 @@ def strategy
                       SidekiqAdhocJob::Strategies::Default.new(module_names)
                     else
                       strategy_klass = SidekiqAdhocJob::Strategies.const_get(StringUtil.camelize(strategy_name.to_s).to_s)
-                      raise InvalidConfigurationError, "Invalid strategy name" unless strategy_klass
+                      raise InvalidConfigurationError, 'Invalid strategy name' unless strategy_klass
+
                       strategy_klass.new(module_names)
                     end
     end
   end
-
 end