sidekiq_adhoc_job 2.2.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0eb1cd817107c67f9c597017c3fd7e0fc8e79cd783b934d3b6ebc0fb69f5224
-  data.tar.gz: deaae8c8f3de455976885dddd699fd29295cdcd0ae26a013bac38190d5d5e9a1
+  metadata.gz: 660ad86dfb526fe0eb9b473d1a86799c5f20d0f76934740e87365da5cb9bb287
+  data.tar.gz: 1237cc51e7ca8b2f52ca89e35969f153de5c97e72196c9134a6c1764e16c5565
 SHA512:
-  metadata.gz: a5955dc23c535cfe30380fb24dabfecaa95dfb8b1bdb251d9def1ddc47bd263f0dda19cca2a2dcbaa45edcf2c974d2bebd2a2fdd371e10e19d263be757478261
-  data.tar.gz: fdb6a47dc6c58d2054f6d6d21b6c10e67a9d38efe5bd76de5dca355df28125f569b6db1ddd4ca5c648faa948cfba2b8293541e1baa7685be6ec68b9984383843
+  metadata.gz: 3358428e19855f80d3f3b6ea468f10f4f634c3d15fd7d36e5843d1f2211af7d1dde8810e7b7e73799f6fecc47fb79532cc98f6aa9423837c752c8b9161a9b7a4
+  data.tar.gz: 87493129755ea165c769362b0723756155133cebcfbe53e8bfd597dfef572f23ba22313ab3946c62d347e505dcbf0d0c701f264210ab23e811c1be517a3a5f73

data/lib/sidekiq_adhoc_job/version.rb

@@ -1,3 +1,3 @@
 module SidekiqAdhocJob
-  VERSION = '2.2.0'.freeze
+  VERSION = '2.2.2'.freeze
 end

data/lib/sidekiq_adhoc_job/web/job_presenter.rb

@@ -12,7 +12,8 @@ module SidekiqAdhocJob
                   :required_kw_args,
                   :optional_kw_args,
                   :has_rest_args,
-                  :require_confirm
+                  :require_confirm,
+                  :confirm_prompt_message
 
       StringUtil ||= ::SidekiqAdhocJob::Utils::String
 
@@ -27,6 +28,7 @@ module SidekiqAdhocJob
         @optional_kw_args = args[:key] || []
         @has_rest_args = !!args[:rest]
         @require_confirm = require_confirm
+        @confirm_prompt_message = SidekiqAdhocJob.config.require_confirm_prompt_message
       end
 
       # Builds the presenter instances for the schedule hash

data/lib/sidekiq_adhoc_job/web/templates/jobs/show.html.erb

@@ -59,8 +59,14 @@
 <% if @presented_job.require_confirm %>
   <script>
     document.getElementById('adhoc-jobs-submit-form').addEventListener('submit', (event) => {
-      if (!confirm('Are you sure?'))
+      const confirmPrompt = "<%= @presented_job.confirm_prompt_message %>";
+      const input = prompt(`Please enter "${confirmPrompt}" to confirm`);
+      if (input !== confirmPrompt) {
         event.preventDefault();
+        if (input !== null) {
+          alert('Your confirmation input is incorrect, try again.');
+        }
+      }
     })
   </script>
 <% end %>

data/lib/sidekiq_adhoc_job.rb

@@ -46,22 +46,38 @@ module SidekiqAdhocJob
                   :strategy_name,
                   :require_confirm_worker_names
 
+    attr_reader :require_confirm_prompt_message
+
     def initialize
       @load_paths = []
       @module_names = []
       @strategy_name = :default
+      @require_confirm_prompt_message = 'confirm'
     end
 
     def module_names
       Array(@module_names).map(&:to_s)
     end
 
-    def require_confirm
-      @require_confirm ||= Array(@require_confirm_worker_names).map(&:to_s)
+    def require_confirm_proc
+      @require_confirm_proc ||= \
+        if @require_confirm_worker_names.respond_to?(:call)
+          @require_confirm_worker_names
+        else
+          shortlisted_workers = Array(@require_confirm_worker_names).map(&:to_s)
+
+          ->(worker_name) { shortlisted_workers.include?(worker_name) }
+        end
+    end
+
+    def require_confirm_prompt_message=(message)
+      raise 'require_confirm_prompt_message must be string' unless message.is_a? String
+
+      @require_confirm_prompt_message = message
     end
 
     def require_confirmation?(worker_name)
-      require_confirm.include?(worker_name)
+      require_confirm_proc.call(worker_name)
     end
 
     def strategy

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_adhoc_job
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Goh Khoon Hiang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2023-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry