sidekiq_admin_enquerer 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54fe41c8cbbce1cf1a39e1deb135ae8aa4e1b65de4dbb49b75e851e02004a1f4
-  data.tar.gz: 9051fbd4e2b377ea71094521fdf346407c1981a59e75a3329ffabba75ef44800
+  metadata.gz: 27973558b5639feb7dd27a5849a047aaa9bf568ed4c58f9eebb07649c86c30a4
+  data.tar.gz: 9865550a3e940b4118b24597b44eb4d8df40ea77e6fabe344c8f18e5f04683a5
 SHA512:
-  metadata.gz: cbd33b5d38c04305e5353d80b0a7efaa9dab623400555181ec57539bbd5009d0612eb5484f8f8af1a548b5620a24b49867561daeea4616611ca66961f6ab4d21
-  data.tar.gz: fb8980277180a7cf69dc44a88d118b79981800367b02019229fe50a7180f4e6faa87a8e36e9574c49d162ac0e844088d5c2eccbd123b9c64ac50788c0e651e70
+  metadata.gz: 4ebe259e522245643e794e824a8cf639db239eed6533926075198b045cb20ebbab1e835bb58f246eb611340d865f630b2cac49f8a00239dd8b33260d9423c6b4
+  data.tar.gz: 1ceba7811577947af0a7cd4c5cb47659539cecddc2b9fee7fa6fa2df06bb56307d79ed41826ec11102fed08e6d38b5bb5be6a155d243aa6945344e8ab4eee118

data/CHANGELOG.md

@@ -1,5 +1,13 @@
-# Changelog
-All notable changes to this project will be documented in this file.
+## [Unreleased]
+
+## [0.2.0] - 2025-06-09
+### Changed
+- Minimum Sidekiq version (`sidekiq >= 8`);
+- Adopt admin panels to Sidekiq@8;
+
+## [0.1.2] - 2023-07-24
+### Fixed
+- Empty parameter job list during `job runing` (empty list is a `nil` value in final) leads to invocation `#values` on them;
 
 ## [0.1.1] - 2023-07-21
 ### Fixed

data/Gemfile.lock

@@ -1,102 +1,159 @@
 PATH
   remote: .
   specs:
-    sidekiq_admin_enquerer (0.1.1)
+    sidekiq_admin_enquerer (0.2.0)
+      sidekiq (>= 8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.6)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (8.0.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    armitage-rubocop (1.51.0.6)
-      rubocop (= 1.51.0)
-      rubocop-capybara (= 2.18.0)
-      rubocop-factory_bot (= 2.23.1)
-      rubocop-performance (= 1.18.0)
-      rubocop-rails (= 2.19.1)
-      rubocop-rake (= 0.6.0)
-      rubocop-rspec (= 2.22.0)
-    ast (2.4.2)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    armitage-rubocop (1.75.7.7)
+      rubocop (= 1.75.7)
+      rubocop-capybara (= 2.22.1)
+      rubocop-factory_bot (= 2.27.1)
+      rubocop-on-rbs (= 1.7.0)
+      rubocop-performance (= 1.25.0)
+      rubocop-rails (= 2.32.0)
+      rubocop-rake (= 0.7.1)
+      rubocop-rspec (= 3.6.0)
+      rubocop-rspec_rails (= 2.31.0)
+      rubocop-thread_safety (= 0.7.2)
+    ast (2.4.3)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.2)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    i18n (1.14.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
+    diff-lcs (1.6.2)
+    docile (1.4.1)
+    drb (2.2.3)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
-    method_source (1.0.0)
-    minitest (5.18.1)
-    parallel (1.23.0)
-    parser (3.2.2.3)
+    json (2.12.2)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    method_source (1.1.0)
+    minitest (5.25.5)
+    parallel (1.27.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
-    pry (0.14.2)
+    prism (1.4.0)
+    pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.7.1)
-    rack (3.0.8)
+    racc (1.8.1)
+    rack (3.1.16)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.8.1)
-    rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rake (13.3.0)
+    rbs (3.9.4)
+      logger
+    redis-client (0.24.0)
+      connection_pool
+    regexp_parser (2.10.0)
+    rspec (3.13.1)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.4)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    rubocop (1.51.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.4)
+    rubocop (1.75.7)
       json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.18.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.23.1)
-      rubocop (~> 1.33)
-    rubocop-performance (1.18.0)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.19.1)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.45.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-capybara (2.22.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-factory_bot (2.27.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-on-rbs (1.7.0)
+      lint_roller (~> 1.1)
+      rbs (~> 3.5)
+      rubocop (>= 1.72.1, < 2.0)
+      zlib
+    rubocop-performance (1.25.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rails (2.32.0)
       activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
-    rubocop-rake (0.6.0)
-      rubocop (~> 1.0)
-    rubocop-rspec (2.22.0)
-      rubocop (~> 1.33)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
+    rubocop-rspec (3.6.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rspec_rails (2.31.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+      rubocop-rspec (~> 3.5)
+    rubocop-thread_safety (0.7.2)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
     ruby-progressbar (1.13.0)
+    securerandom (0.4.1)
+    sidekiq (8.0.4)
+      connection_pool (>= 2.5.0)
+      json (>= 2.9.0)
+      logger (>= 1.6.2)
+      rack (>= 3.1.0)
+      redis-client (>= 0.23.2)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.3)
+    zlib (3.2.1)
 
 PLATFORMS
   arm64-darwin-22
+  arm64-darwin-24
+  x86_64-darwin-22
+  x86_64-linux
 
 DEPENDENCIES
   armitage-rubocop (~> 1.51)
@@ -108,4 +165,4 @@ DEPENDENCIES
   simplecov (~> 0.22)
 
 BUNDLED WITH
-   2.4.13
+   2.6.9

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2023 Rustam Ibragimov
+Copyright (c) 2023-2024 Rustam Ibragimov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/sidekiq_admin_enquerer/pages/job.erb

@@ -1,34 +1,39 @@
-<h3>Enqueue Job</h3>
+<% style_tag "enquerer/stylesheets-enquerer/enquerer.css" %>
 
 <!-- TODO: add interactive tabs (for each performing method) -->
-<!-- NOTE: sidekiq's UI has no jquery and bootstrap-js integrations -->
-
-<% @job.methods.each do |job_method| %>
-  <div class="form-group"><%= job_method.name %></div>
-  <form method="post" action="<%= side_enq__enqueue_job_path %>">
-    <%= csrf_tag if respond_to?(:csrf_tag) %>
-    <input class="form-control" name="perform_method" value="<%= job_method.name %>" readonly />
-    <input class="form-control" name="job_name" value="<%= @job.name %>" readonly />
-    <% job_method.params.each do |job_param| %>
+
+<section>
+  <h3>Enqueue Job</h3>
+
+  <% @job.methods.each do |job_method| %>
+    <div class="form-group"><%= job_method.name %></div>
+    <form method="post" action="<%= side_enq__enqueue_job_path %>">
+      <%= csrf_tag if respond_to?(:csrf_tag) %>
+
+      <input class="form-control" name="perform_method" value="<%= job_method.name %>" readonly />
+      <input class="form-control" name="job_name" value="<%= @job.name %>" readonly />
+
+      <% job_method.params.each do |job_param| %>
+        <div class="form-group">
+          <label for="<%= job_method.name %>[<%= job_param.name %>]">
+            <b><%= side_enq__param_requirement(job_param) %></b>: <%= job_param.name %>
+          </label>
+          <input class="form-control" name="<%= job_method.name %>[<%= job_param.name %>]" />
+        </div>
+      <% end %>
+
       <div class="form-group">
-        <label for="<%= job_method.name %>[<%= job_param.name %>]">
-          <b><%= side_enq__param_requirement(job_param) %></b>: <%= job_param.name %>
-        </label>
-        <input class="form-control" name="<%= job_method.name %>[<%= job_param.name %>]" />
+        <input type="submit" class="btn btn-danger" name="submit" value="enqueue" />
       </div>
-    <% end %>
-
-    <div class="form-group">
-      <input type="submit" class="btn btn-danger" name="submit" value="enqueue" />
-    </div>
 
-    <div class="form-group">
-      <label for="enqueue_in">Schedule</label>
-      <input class="form-control" name="enqueue_in" placeholder="in seconds" />
-    </div>
+      <div class="form-group">
+        <label for="enqueue_in">Schedule</label>
+        <input class="form-control" name="enqueue_in" placeholder="in seconds" />
+      </div>
 
-    <input type="submit" class="btn btn-danger" name="submit" value="schedule" />
-  </form>
+      <input type="submit" class="btn btn-danger" name="submit" value="schedule" />
+    </form>
 
-  <hr />
-<% end %>
+    <hr />
+  <% end %>
+</section>

data/lib/sidekiq_admin_enquerer/version.rb

@@ -5,5 +5,6 @@ module SidekiqAdminEnquerer
   #
   # @api public
   # @since 0.0.0
-  VERSION = '0.1.1'
+  # @version 0.1.2
+  VERSION = '0.2.0'
 end

data/lib/sidekiq_admin_enquerer/web_app/app_control.rb

@@ -28,7 +28,7 @@ module SidekiqAdminEnquerer::WebApp
       # @api private
       # @since 0.1.0
       def run_job(job_run_params)
-        job_name = job_run_params[:job_name]
+        job_name = job_run_params['job_name']
         job_klass = SidekiqAdminEnquerer.find_job(job_name)
         SidekiqAdminEnquerer.run_job(job_klass, job_run_params)
       end

data/lib/sidekiq_admin_enquerer/web_app.rb

@@ -33,12 +33,12 @@ module SidekiqAdminEnquerer::WebApp
       end
 
       app.get('/enquerer/:job_name') do
-        @job = AppControl.find_job(params[:job_name])
+        @job = AppControl.find_job(route_params(:job_name))
         render(:erb, TEMPLATES[:job])
       end
 
       app.post('/enquerer') do
-        AppControl.run_job(params)
+        AppControl.run_job(request.params)
         redirect File.join(root_path, 'enquerer')
       end
     end

data/lib/sidekiq_admin_enquerer.rb

@@ -48,11 +48,12 @@ module SidekiqAdminEnquerer
     #
     # @api private
     # @since 0.1.0
+    # @version 0.1.2
     # rubocop:disable Metrics/AbcSize
     def run_job(job, params)
       # TODO: rework with attribute analysis
       job_perform_method = params['perform_method']
-      job_params = params[job_perform_method]
+      job_params = params[job_perform_method] || {} # NOTE: {} means that no parameters were passed
       job.respond_to?(:sidekiq_options) ? job.sidekiq_options['queue'].to_s : 'default'
 
       if params['submit'] == 'enqueue'
@@ -81,8 +82,16 @@ module SidekiqAdminEnquerer
     # @since 0.1.0
     def load
       if defined?(Sidekiq::Web)
-        Sidekiq::Web.register(SidekiqAdminEnquerer::WebApp)
-        Sidekiq::Web.tabs['Enquerer'] = 'enquerer'
+        Sidekiq::Web.configure do |config|
+          config.register(
+            SidekiqAdminEnquerer::WebApp,
+            name: 'enquerer',
+            tab: ['Enquerer'],
+            index: ['enquerer'],
+            root_dir: File.expand_path('../web', File.dirname(__FILE__)),
+            asset_paths: ['stylesheets-enquerer']
+          )
+        end
       end
     end
   end

data/sidekiq_admin_enquerer.gemspec

@@ -27,6 +27,8 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'sidekiq', '>= 8'
+
   spec.add_development_dependency 'bundler',          '~> 2.4'
   spec.add_development_dependency 'rake',             '~> 13.0'
   spec.add_development_dependency 'rspec',            '~> 3.12'

data/web/assets/enquerer/stylesheets-enquerer/enquerer.css

@@ -0,0 +1,10 @@
+.form-group {
+  margin-bottom: 10px;
+}
+
+.form-group .form-control {
+  width: 100%;
+  height: 34px;
+  padding: 6px 12px;
+  display: block;
+}

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_admin_enquerer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Rustam Ibragimov
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-21 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: sidekiq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -124,6 +137,7 @@ files:
 - lib/sidekiq_admin_enquerer/web_app/job_wrapper.rb
 - lib/sidekiq_admin_enquerer/web_app/web_helpers.rb
 - sidekiq_admin_enquerer.gemspec
+- web/assets/enquerer/stylesheets-enquerer/enquerer.css
 homepage: https://github.com/0exp/sidekiq_admin_enquerer
 licenses:
 - MIT
@@ -131,7 +145,6 @@ metadata:
   homepage_uri: https://github.com/0exp/sidekiq_admin_enquerer
   source_code_uri: https://github.com/0exp/sidekiq_admin_enquerer
   changelog_uri: https://github.com/0exp/sidekiq_admin_enquerer/blob/master/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -146,8 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Sidekiq Admin Enquerer.
 test_files: []