sidekiq-belt 2.0.1 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc3e263b41945c7d61098a4a7a4c7eca2cde322f3b945123e606bab80d1208dc
-  data.tar.gz: bab878cdfcae648031fffc925dab94debddabcd32d0a618fa4da8be6f0fed000
+  metadata.gz: 7dec0e6d4e3842e7f5ce45c84049764adbfe7f0051c5fa477624359b06f67322
+  data.tar.gz: 588a98f3e5292907b5cabb98ef2f42804917e71662e79bb17cc10bb7b5408445
 SHA512:
-  metadata.gz: a00367b260974c366b9d9e1ac6ae7e1b10a1e3b125195199dbe601b77de1e40b2a7f87e8c830c0ad389f21667845d7cd9778d2f2d3259b48104fd689462216d6
-  data.tar.gz: 9a231dc67e020d8a6e8e7497c7dda5ac4218cb8ced146b24a04212b3fafa832aeeeb2d0ad8e1d16b20f0a116e3df463ccfb2b1a9e45efabf7f97083c0e65322d
+  metadata.gz: 973105fbafe85ab4d03c27f46e54dbbbfad9c0d51a7e21662c10283dc2252a7de1ff42a0e38fe265ec244ed87a6fcfa3eea0362b4751a550aaa1c1d735c40fbb
+  data.tar.gz: ca82931ae4c4300d72ce65c9976ff115bfcc242ad8a6f587d774786256a8a96b89630a1272bbb835237e83195695b17ffca35164e8dd64d77c47e5baa865e3ac

data/CHANGELOG.md

@@ -1,4 +1,11 @@
 ## [Unreleased]
+
+## [2.0.4] - 2025-06-01
+- Adapt to original Periodic pause and enqueue
+
+## [2.0.2] - 2025-03-23
+- Dynamic args on Jobs Run
+
 ## [2.0.1] - 2025-03-11
 - Fix Support to Sidekiq-ent and Sidekiq-pro v8
 

data/README.md

@@ -113,6 +113,16 @@ Sidekiq::Belt.configure do |config|
 
   config.run_jobs << { class: "CWorker", args: ["a"], group: "Etc" }
   config.run_jobs << { class: "DWorker", args: ["a"], group: "Etc" }
+
+  config.run_jobs << { class: "EWorker", args: [
+      { dynamic: 'text', title: 'Observation' },
+      { dynamic: 'integer', title: 'Number of test' },
+      'fixed value A',
+      { dynamic: 'boolean', title: 'Boolean data' },
+      { dynamic: 'enum', title: 'Enum data', options: ['option1', 'option2', 'option3'], default: 'option2' },
+      'fixed value B'
+    ], group: "Etc" }
+  config.run_jobs << { class: "FWorker", args: ["a"], group: "Etc" }
 end
 ```
 

data/lib/sidekiq/belt/community/run_job.rb

@@ -20,11 +20,32 @@ module Sidekiq
           jobs
         end
 
-        def self.run_job(job_id)
+        def self.dynamic_type?(arg, type)
+          return false unless arg.is_a?(Hash)
+
+          arg[:dynamic].to_s == type
+        end
+
+        def self.run_job(job_id, extra_args = {})
           job = Sidekiq::Belt.config.run_jobs[job_id.to_i]
           job.transform_keys(&:to_sym)
 
-          Module.const_get(job[:class]).perform_async(*job.fetch(:args, []))
+          args = job.fetch(:args, [])
+
+          new_args = []
+          args.each_with_index do |arg, i|
+            if dynamic_type?(arg, "text") || dynamic_type?(arg, "enum")
+              new_args[i] = extra_args.shift
+            elsif dynamic_type?(arg, "integer")
+              new_args[i] = extra_args.shift.to_i
+            elsif dynamic_type?(arg, "boolean")
+              new_args[i] = extra_args.shift == "true"
+            else
+              new_args << arg
+            end
+          end
+
+          Module.const_get(job[:class]).perform_async(*new_args)
         end
 
         module SidekiqRunJob
@@ -36,7 +57,9 @@ module Sidekiq
             end
 
             app.post("/run_jobs/:rjid/run") do
-              Sidekiq::Belt::Community::RunJob.run_job(route_params(:rjid).to_i)
+              args = url_params("args")
+
+              Sidekiq::Belt::Community::RunJob.run_job(route_params(:rjid).to_i, args)
 
               return redirect "#{root_path}run_jobs"
             end

data/lib/sidekiq/belt/community/views/run_jobs.erb

@@ -14,10 +14,35 @@
       <% jobs.each do |job| %>
         <tr>
           <td><%= job[:class] %></td>
-          <td><%= job[:args].inspect %></td>
-          <td style='width: 100px'>
-            <form action="<%= root_path %>run_jobs/<%= job[:id] %>/run" method="post">
+          <td colspan="2">
+            <form action="<%= root_path %>run_jobs/<%= job[:id] %>/run" class="force-run-form" method="post">
+              <%= '[' %>
+              <% (job[:args] || []).each_with_index do |arg, i| %>
+                <% if Sidekiq::Belt::Community::RunJob.dynamic_type?(arg, 'text') %>
+                  <input type="text" class="form-control" name="args[]" title="<%= arg[:title] %>" required='true' placeholder="<%= arg[:title] %>" value="<%= arg[:default] %>"  />
+                <% elsif Sidekiq::Belt::Community::RunJob.dynamic_type?(arg, 'integer') %>
+                 <input type="number" class="form-control" name="args[]" title="<%= arg[:title] %>" required='true' placeholder="<%= arg[:title] %>" value="<%= arg[:default] %>" />
+                <% elsif Sidekiq::Belt::Community::RunJob.dynamic_type?(arg, 'boolean') %>
+                  <select class="form-control" name="args[]" required='true' title="<%= arg[:title] %>" placeholder="<%= arg[:title] %>">
+                    <option value="true" <%= arg[:default] == 'true' ? 'selected' : '' %>>true</option>
+                    <option value="false" <%= arg[:default] == 'false' ? 'selected' : '' %>>false</option>
+                  </select>
+                <% elsif Sidekiq::Belt::Community::RunJob.dynamic_type?(arg, 'enum') %>
+                  <select class="form-control" name="args[]" required='true' title="<%= arg[:title] %>" placeholder="<%= arg[:title] %>">
+                    <% arg[:options].each do |option| %>
+                      <option value="<%= option %>" <%= arg[:default].to_s == option.to_s ? 'selected' : '' %>><%= option %></option>
+                    <% end %>
+                  </select>
+                <% else %>
+                  <input type="hidden" name="args[]" value="<%= arg %>" />
+                  <%= arg.inspect %>
+                <% end %>
+                <%= ',' if i < (job[:args] || []).size - 1 %>
+              <% end %>
+              <%= ']' %>
+
               <%= csrf_tag %>
+
               <input class="btn btn-danger" type="submit" name="run" value="<%= t('Run') %>"
                 data-confirm="Run the job <%= job[:klass] %>? <%= t('AreYouSure') %>" />
             </form>

data/lib/sidekiq/belt/ent/periodic_pause.rb

@@ -6,33 +6,13 @@ module Sidekiq
   module Belt
     module Ent
       module PeriodicPause
-        def paused?
-          Sidekiq.redis { |r| r.hget("PeriodicPaused", @lid.to_s) }.to_s == "p"
-        end
-
-        def pause!
-          Sidekiq.redis { |r| r.hset("PeriodicPaused", @lid.to_s, "p") }
-        end
-
-        def unpause!
-          Sidekiq.redis { |r| r.hdel("PeriodicPaused", @lid.to_s) }
-        end
-
         module SidekiqLoopsPeriodicPause
           PAUSE_BUTTON = <<~ERB
-            <form action="<%= root_path %>loops/<%= loup.lid %>/pause" method="post">
-              <%= csrf_tag %>
-              <input class="btn btn-danger btn-pause" type="submit" name="pause" value="<%= t('Pause') %>"
-                data-confirm="Pause the job <%= loup.klass %>? <%= t('AreYouSure') %>" />
-            </form>
+            name="pause" data-confirm="Pause the job <%= loup.klass %>? <%= t('AreYouSure') %>"
           ERB
 
           UNPAUSE_BUTTON = <<~ERB
-            <form action="<%= root_path %>loops/<%= loup.lid %>/unpause" method="post">
-              <%= csrf_tag %>
-              <input class="btn btn-danger btn-unpause" type="submit" name="pause" value="<%= t('Unpause') %>"
-                data-confirm="Unpause the job <%= loup.klass %>? <%= t('AreYouSure') %>" />
-            </form>
+            name="unpause" data-confirm="Unpause the job <%= loup.klass %>? <%= t('AreYouSure') %>"
           ERB
 
           def self.registered(app)
@@ -49,52 +29,19 @@ module Sidekiq
                   }
                 </style>")
 
-              # Add the top of the table
-              content.gsub!("</th>\n    </tr>", "</th><th><%= t('Pause/Unpause') %></th></th>\n    </tr>")
-
-              # Add the run button
-              content.gsub!(
-                "</td>\n      </tr>\n    <% end %>",
-                "</td>\n<td>" \
-                "<% if (loup.paused?) %>#{UNPAUSE_BUTTON}<% else %>#{PAUSE_BUTTON}<% end %>" \
-                "</td>\n      </tr>\n    <% end %>"
-              )
-            end
-
-            app.post("/loops/:lid/pause") do
-              Sidekiq::Periodic::Loop.new(route_params(:lid)).pause!
-
-              return redirect "#{root_path}loops"
-            end
-
-            app.post("/loops/:lid/unpause") do
-              Sidekiq::Periodic::Loop.new(route_params(:lid)).unpause!
-
-              return redirect "#{root_path}loops"
+              content.gsub!("name=\"pause\"", PAUSE_BUTTON)
+              content.gsub!("name=\"unpause\"", UNPAUSE_BUTTON)
             end
           end
         end
 
-        module PauseServer
-          def enqueue_job(cycle, ts)
-            cycle.paused? ? logger.info("Job #{cycle.klass} is paused by Periodic Pause") : super
-          end
-        end
-
         def self.use!
           require("sidekiq-ent/web")
-          require("sidekiq-ent/periodic")
-          require("sidekiq-ent/periodic/manager")
-          require("sidekiq-ent/periodic/static_loop")
 
           Sidekiq::Web.configure do |cfg|
             cfg.register(Sidekiq::Belt::Ent::PeriodicPause::SidekiqLoopsPeriodicPause, name: "periodic_pause",
                                                                                        tab: nil, index: nil)
           end
-
-          Sidekiq::Periodic::Loop.prepend(Sidekiq::Belt::Ent::PeriodicPause)
-          Sidekiq::Periodic::StaticLoop.prepend(Sidekiq::Belt::Ent::PeriodicPause)
-          Sidekiq::Periodic::Manager.prepend(Sidekiq::Belt::Ent::PeriodicPause::PauseServer)
         end
       end
     end

data/lib/sidekiq/belt/ent/periodic_run.rb

@@ -18,11 +18,7 @@ module Sidekiq
 
         module SidekiqLoopsPeriodicRun
           FORCE_RUN_BUTTON = <<~ERB
-            <form action="<%= root_path %>loops/<%= loup.lid %>/run" method="post">
-              <%= csrf_tag %>
-              <input class="btn btn-danger" type="submit" name="run" value="<%= t('Run now') %>"
-                data-confirm="Run the job <%= loup.klass %>? <%= t('AreYouSure') %>" />
-            </form>
+            name="enqueue" data-confirm="Enqueue the job <%= loup.klass %>? <%= t('AreYouSure') %>"
           ERB
 
           FORCE_RUN_SINGLE_PAGE = <<~ERB
@@ -41,14 +37,7 @@ module Sidekiq
 
           def self.registered(app)
             app.replace_content("/loops") do |content|
-              # Add the top of the table
-              content.gsub!("</th>\n    </tr>", "</th><th><%= t('Force Run') %></th></th>\n    </tr>")
-
-              # Add the run button
-              content.gsub!(
-                "</td>\n      </tr>\n    <% end %>",
-                "</td>\n<td>#{FORCE_RUN_BUTTON}</td>\n      </tr>\n    <% end %>"
-              )
+              content.gsub!("name=\"enqueue\"", FORCE_RUN_BUTTON)
             end
 
             app.replace_content("/loops/:lid") do |content|

data/lib/sidekiq/belt/pro/failed_batch_remove.rb

@@ -17,10 +17,10 @@ module Sidekiq
 
           def self.registered(app)
             app.replace_content("/batches") do |content|
-              content.gsub!("</th>\n      <%", "</th><th><%= t('Delete') %></th>\n      <%")
+              content.gsub!("</th>\n    <%", "</th><th><%= t('Delete') %></th>\n      <%")
 
               content.gsub!(
-                "</td>\n        </tr>\n      <% end %>",
+                "</td>\n      </tr>\n    <% end %>",
                 "</td>\n<td>#{REMOVE_BUTTON}</td>\n        </tr>\n      <% end %>"
               )
             end

data/lib/sidekiq/belt/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Belt
-    VERSION = "2.0.1"
+    VERSION = "2.0.4"
   end
 end

data/lib/sidekiq/web_action_helper.rb

@@ -10,11 +10,7 @@ module Sidekiq
         replace_views = Sidekiq::Config::DEFAULTS[:replace_views] || {}
 
         replace_views.each do |key, content_blocks|
-          router = if Sidekiq::VERSION.to_i >= 8
-                     Sidekiq::Web::Route.new(self.class.sidekiq_request_method, key, true)
-                   else
-                     WebRoute.new(self.class.sidekiq_request_method, key, true)
-                   end
+          router = Sidekiq::Web::Route.new(self.class.sidekiq_request_method, key, true)
 
           next if router.match(self.class.sidekiq_request_method, self.class.sidekiq_path_info).nil?
 
@@ -56,9 +52,5 @@ module Sidekiq
     end
   end
 
-  if defined?(Sidekiq::Web::Action)
-    Sidekiq::Web::Action.prepend(Sidekiq::WebActionHelper)
-  else
-    Sidekiq::WebAction.prepend(Sidekiq::WebActionHelper)
-  end
+  Sidekiq::Web::Action.prepend(Sidekiq::WebActionHelper)
 end

data/lib/sidekiq/web_router_helper.rb

@@ -13,9 +13,5 @@ module Sidekiq
     end
   end
 
-  if defined?(Sidekiq::Web::Router)
-    Sidekiq::Web::Router.prepend(Sidekiq::WebRouterHelper)
-  else
-    Sidekiq::WebRouter.prepend(Sidekiq::WebRouterHelper)
-  end
+  Sidekiq::Web::Router.prepend(Sidekiq::WebRouterHelper)
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-belt
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.4
 platform: ruby
 authors:
 - Danilo Jeremias da Silva
 bindir: exe
 cert_chain: []
-date: 2025-03-12 00:00:00.000000000 Z
+date: 2025-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.3.8
+        version: 8.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.3.8
+        version: 8.0.1
 description: This Ruby gem enhances the capabilities of Sidekiq, Sidekiq Pro, and
   Sidekiq Enterprise by adding essential utilities.
 email: