sidekiq_adhoc_job 0.2.1 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c21a2663558c918e59402c9180737fdc70f7520003413770eecaa73cabf86db8
-  data.tar.gz: f0eb1fd9b4c6e9d7b7fd52eaa157bd468bc02585438413c27b42a933097b5ca9
+  metadata.gz: 66953581bfb24c498a01eaaf26fabdd822e39195179b9e3624b8eb4fd2dab287
+  data.tar.gz: 67dedc0f7f9e1d6e053f5df711c16c489e3c9e1b3996da84243e164dc224ddf5
 SHA512:
-  metadata.gz: cc04bca685843cdc4f68758fbef688bfaaca75ab64deaaece3cb3e082dd54c028230753e1c8d7d2b8001089584c8b6a4fb578fbb2582f22fd604c0a30b492bb9
-  data.tar.gz: 5c3bb8282be7d70ff5a5937b41e7be4db4d4ab4568b302030aef2da554ede3a89e8d9b45afafbd5820b4bc68fc22b75bebb7ffbce183c9c8c773878c5bbb8fa0
+  metadata.gz: bbc917b706c381e9a49d29cdd46d30efc4840d4f52a6dc4506dd05b567df8a5f86f7ba17dd09d2765931131d1bec008cf28cbd6be1bce17ecf5a7780e35c3d75
+  data.tar.gz: 371a29635a981a812fb5dd31412d656d85e2723a158dedad143610eccdc382ba5f1f3c53312ce2d4b1a229b1e49ace6f33c027aa467779b223475adc01a59980

data/lib/sidekiq_adhoc_job.rb

@@ -16,6 +16,7 @@ module SidekiqAdhocJob
   module Strategies
     autoload :Default, 'sidekiq_adhoc_job/strategies/default'
     autoload :ActiveJob, 'sidekiq_adhoc_job/strategies/active_job'
+    autoload :RailsApplicationJob, 'sidekiq_adhoc_job/strategies/rails_application_job'
   end
 
   def self.configure

data/lib/sidekiq_adhoc_job/services/schedule_adhoc_job.rb

@@ -25,7 +25,9 @@ module SidekiqAdhocJob
                 :allowed_params, :worker_params
 
     def parse_params
-      @worker_params = allowed_params.map { |key| StringUtil.parse(request_params[key], symbolize: true) }
+      @worker_params = allowed_params
+        .reject { |key| request_params[key].empty? }
+        .map { |key| StringUtil.parse(request_params[key], symbolize: true) }
       if !!request_params[:rest_args] && !request_params[:rest_args].empty?
         @worker_params << StringUtil.parse_json(request_params[:rest_args].strip, symbolize: true)
       end

data/lib/sidekiq_adhoc_job/strategies/rails_application_job.rb

@@ -0,0 +1,19 @@
+module SidekiqAdhocJob
+  module Strategies
+    class RailsApplicationJob
+      include SidekiqAdhocJob::Strategy
+
+      def worker_class?(klass)
+        klass.superclass&.name == 'ApplicationJob'
+      end
+
+      def get_queue_name(klass_name)
+        klass_name.queue_name
+      end
+
+      def perform_async(klass, *params)
+        klass.perform_later(*params)
+      end
+    end
+  end
+end

data/lib/sidekiq_adhoc_job/version.rb

@@ -1,3 +1,3 @@
 module SidekiqAdhocJob
-  VERSION = '0.2.1'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/lib/sidekiq_adhoc_job/web/job_presenter.rb

@@ -4,7 +4,7 @@ module SidekiqAdhocJob
     class JobPresenter
       include Sidekiq::WebHelpers
 
-      attr_reader :name, :path_name, :queue, :has_rest_args, :args
+      attr_reader :name, :path_name, :queue, :required_args, :optional_args, :has_rest_args
 
       StringUtil ||= ::SidekiqAdhocJob::Utils::String
 
@@ -16,7 +16,6 @@ module SidekiqAdhocJob
         @required_args = args[:req] || []
         @optional_args = args[:opt] || []
         @has_rest_args = !!args[:rest]
-        @args = @required_args + @optional_args
       end
 
       # Builds the presenter instances for the schedule hash

data/lib/sidekiq_adhoc_job/web/locales/en.yml

@@ -1,7 +1,8 @@
 en:
   adhoc_jobs: Adhoc Jobs
   adhoc_jobs_actions: Actions
-  adhoc_jobs_arguments: Required Arguments
+  adhoc_jobs_required_arguments: Required Arguments
+  adhoc_jobs_optional_arguments: Optional Arguments
   adhoc_jobs_go_back: Go Back
   adhoc_jobs_has_rest_arguments: Has Rest Arguments
   adhoc_jobs_name: Job Name

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

@@ -6,7 +6,8 @@
       <tr>
         <th><%= t('adhoc_jobs_name') %></th>
         <th><%= t('adhoc_jobs_queue') %></th>
-        <th><%= t('adhoc_jobs_arguments') %></th>
+        <th><%= t('adhoc_jobs_required_arguments') %></th>
+        <th><%= t('adhoc_jobs_optional_arguments') %></th>
         <th><%= t('adhoc_jobs_has_rest_arguments') %></th>
         <th><%= t('adhoc_jobs_actions') %></th>
       </tr>
@@ -17,7 +18,8 @@
         <tr>
           <td><%= job.name %></td>
           <td><%= job.queue %></td>
-          <td><%= job.args.join(', ') %></td>
+          <td><%= job.required_args.join(', ') %></td>
+          <td><%= job.optional_args.join(', ') %></td>
           <td><%= job.has_rest_args %></td>
           <td class="text-center">
             <a class="btn btn-warn btn-xs" href="<%= root_path %>adhoc-jobs/<%= URI.escape(job.path_name) %>">

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

@@ -4,10 +4,10 @@
 
 <form method="POST" action="<%= root_path %>adhoc-jobs/<%= URI.escape(@presented_job.path_name) %>/schedule">
   <input type="hidden" name="authenticity_token" value="<%= @csrf_token %>" />
-  <% if @presented_job.args.empty? && !@presented_job.has_rest_args %>
+  <% if @presented_job.required_args.empty? && @presented_job.optional_args.empty? && !@presented_job.has_rest_args %>
     <p>No job arguments</p>
   <% else %>
-    <% @presented_job.args.each do |arg| %>
+    <% @presented_job.required_args.each do |arg| %>
       <div class="form-group row">
         <label class="col-sm-2 col-form-label" for="<%= arg %>">*<%= arg %>:</label>
         <div class="col-sm-4">
@@ -15,11 +15,19 @@
         </div>
       </div>
     <% end %>
+    <% @presented_job.optional_args.each do |arg| %>
+      <div class="form-group row">
+        <label class="col-sm-2 col-form-label" for="<%= arg %>"><%= arg %>:</label>
+        <div class="col-sm-4">
+          <input class="form-control" type="text" name="<%= arg %>" id="<%= arg %>"/>
+        </div>
+      </div>
+    <% end %>
     <% if @presented_job.has_rest_args %>
       <div class="form-group row">
-        <label class="col-sm-2 col-form-label" for="rest_args">*Rest arguments (please provide a json string representing the arguments):</label>
+        <label class="col-sm-2 col-form-label" for="rest_args">Rest arguments (please provide a json string representing the arguments):</label>
         <div class="col-sm-4">
-          <input class="form-control" type="text" name="rest_args" id="rest_args" required/>
+          <input class="form-control" type="text" name="rest_args" id="rest_args"/>
         </div>
       </div>
     <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_adhoc_job
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.1
 platform: ruby
 authors:
 - Goh Khoon Hiang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.26.0
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.2.7
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.2.7
+        version: '7'
 description: Trigger jobs adhoc from Sidekiq web admin
 email:
 - gohkhoonhiang@gmail.com
@@ -119,6 +119,7 @@ files:
 - lib/sidekiq_adhoc_job/services/schedule_adhoc_job.rb
 - lib/sidekiq_adhoc_job/strategies/active_job.rb
 - lib/sidekiq_adhoc_job/strategies/default.rb
+- lib/sidekiq_adhoc_job/strategies/rails_application_job.rb
 - lib/sidekiq_adhoc_job/strategy.rb
 - lib/sidekiq_adhoc_job/utils/class_inspector.rb
 - lib/sidekiq_adhoc_job/utils/string.rb
@@ -144,17 +145,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Trigger jobs adhoc from Sidekiq web admin