dynamodb-sidekiq-scheduler 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69eeed67230490a8eadbce9bbb18336e24332756f270f1a7df5b203b23876095
-  data.tar.gz: 5694659a15a3f59b86e43089d9330c2e249d20670fb9c4d07d41d11c21670b2e
+  metadata.gz: 850847bb7177c4748340edd60fd4a6eb6b47d7f70b3c481d88c96639e8c29990
+  data.tar.gz: cbcc19f0d2c94f5e6bb3ba084831ba866a21d1f0ef6fd1ea56d40e4f19b912c9
 SHA512:
-  metadata.gz: a87ef258b8a40ad07ad9ba4fc911dda0736e4a75ae3c5722e03264169367ef5c67468b6365f5a79e4d06ca5d57a99fddbc69fdbe5f6f6f9871ad2a1ef52b86e3
-  data.tar.gz: 1ef25e68c5a7bdd4c530f44a56fb5940a8410337902410ef1bc7ed4777eae4a027ec5f93df2677ea87e6a463beb4eb99f8ec512748d96658125c601d1e3fce81
+  metadata.gz: fa192c72ce6480bf8d3b98cb2df6e5ab1d3af0d0f2f4ddb6b7a1c06b14b598b715174674395063220c6ed99f433787ea120076353a84caa26ee4f0f23be31618
+  data.tar.gz: 6ac9f8c8f9d0c029d7a09ea4febd8384f84ed8678833f7af838030686f03904bf8e66a12803555aedb4a8a6de4675ac122dd3922d3e78cef4747a7e09756cda3

data/lib/sidekiq-scheduler/version.rb

@@ -1,3 +1,3 @@
 module SidekiqScheduler
-  VERSION = "0.2"
+  VERSION = "0.3"
 end

data/lib/sidekiq-scheduler/web.rb

@@ -46,7 +46,7 @@ module SidekiqScheduler
 
         dynamo_clas_name = ENV.fetch('SIDEKIQ_SCHEDUER_DYNAMOID_CLASS', 'ScheduleRule')
         klass = dynamo_clas_name.constantize
-        sr = klass.where(job_name: params[:name]).first
+        sr = klass.where(name: params[:name]).first
         if sr.present?
           sr.destroy
         else
@@ -60,29 +60,26 @@ module SidekiqScheduler
         @title = 'Recurring Job Update'
         @form_action = "#{root_path}recurring-jobs/#{ERB::Util.url_encode(params[:name])}/update"
         @existing_rule = true
-        @presented_job = JobPresenter.new(params[:name], Sidekiq.get_schedule(params[:name]))
+        @name = params[:name]
+        @config = Sidekiq.get_schedule(params[:name])
         erb File.read(File.join(VIEW_PATH, 'recurring_job.erb'))
       end
 
       app.post '/recurring-jobs/new' do
         @title = 'New Recurring Job'
-        @presented_job = JobPresenter.new('', {})
         @existing_rule = false
         @form_action = "#{root_path}recurring-jobs/create"
+        @name = ''
+        dynamo_clas_name = ENV.fetch('SIDEKIQ_SCHEDUER_DYNAMOID_CLASS', 'ScheduleRule')
+        klass = dynamo_clas_name.constantize
+        @config = klass.sample_config
         erb File.read(File.join(VIEW_PATH, 'recurring_job.erb'))
       end
 
       app.post '/recurring-jobs/:name/update' do
         dynamo_clas_name = ENV.fetch('SIDEKIQ_SCHEDUER_DYNAMOID_CLASS', 'ScheduleRule')
         klass = dynamo_clas_name.constantize
-        config = params.slice(*%w[worker_class description cron queue args]).transform_values(&:presence)
-        sr = klass.where(job_name: params[:name]).first
-        if sr.present?
-          config.each { |k, v| sr.send "#{k}=", v}
-          sr.save!
-        else
-          klass.create config.merge(job_name: params[:name])
-        end
+        klass.update_or_create name: params[:name], config: JSON.parse(params[:config])
 
         Sidekiq.reload_schedule!
         redirect "#{root_path}recurring-jobs"
@@ -91,9 +88,7 @@ module SidekiqScheduler
       app.post '/recurring-jobs/create' do
         dynamo_clas_name = ENV.fetch('SIDEKIQ_SCHEDUER_DYNAMOID_CLASS', 'ScheduleRule')
         klass = dynamo_clas_name.constantize
-        config = params.slice(*%w[job_name worker_class description cron queue args])
-                       .transform_values(&:presence)
-        klass.create config
+        klass.update_or_create name: params[:name], config: JSON.parse(params[:config])
 
         Sidekiq.reload_schedule!
         redirect "#{root_path}recurring-jobs"

data/web/views/recurring_job.erb

@@ -2,24 +2,16 @@
 
 <form action="<%= @form_action %>"
       method="post" class="recurring-job" style="background-color:white;">
-    <%= csrf_tag %>
-    <div style="padding: 20px;">
-        <label for="job_name">Job name:</label><br>
-        <input <%= @existing_rule ? 'disabled' : 'required' %> required name='job_name' type="text"
-               value="<%= @presented_job.name %>" style='width:50%;'/><br>
-        <label for="worker_class" style="padding-top: 10px;">Worker Class:</label><br>
-        <input name='worker_class' required type="text" value="<%= @presented_job['class'] %>" style='width:50%'/><br>
-        <label for="description" style="padding-top: 10px;">Description:</label><br>
-        <input name='description' type="text" value="<%= @presented_job['description'] %>" style='width:50%'/><br>
-        <label for="cron" style="padding-top: 10px;">Cron Rule:</label><br>
-        <input name='cron' type="text" value="<%= @presented_job['cron'] %>" style='width:50%'/><br>
-        <label for="queue" style="padding-top: 10px;">Queue:</label><br>
-        <input name='queue' type="text" value="<%= @presented_job['queue'] %>" style='width:50%'/><br>
-        <label for="args" style="padding-top: 10px;">Args:</label><br>
-        <input name='args' type="text" value="<%= @presented_job['args'] %>" style='width:50%'/><br><br>
+  <%= csrf_tag %>
+  <div style="padding: 20px;">
+    <label for="name">Name:</label><br>
+    <input <%= @existing_rule ? 'disabled' : 'required' %> required name='name' type="text"
+           value="<%= @name %>" style='width:50%;'/><br>
+    <label for="args" style="padding-top: 10px;">Configuration:</label><br>
+    <textarea name='config' style='width:50%'><%= @config.to_json.html_safe %></textarea><br><br>
 
-        <a href="<%= root_path %>recurring-jobs" class="btn btn-warn btn-xs"><%= t('cancel') %></a>
-        <input type="submit" class="btn btn-warn btn-xs" value="<%= @existing_rule ? t('update') : t('create') %>"/><br>
-        <a></a>
-    </div>
+    <a href="<%= root_path %>recurring-jobs" class="btn btn-warn btn-xs"><%= t('cancel') %></a>
+    <input type="submit" class="btn btn-warn btn-xs" value="<%= @existing_rule ? t('update') : t('create') %>"/><br>
+    <a></a>
+  </div>
 </form>

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: dynamodb-sidekiq-scheduler
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Morton Jonuschat
 - Moove-it
 - Marcelo Lauxen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-16 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -234,7 +234,7 @@ homepage: https://sidekiq-scheduler.github.io/sidekiq-scheduler/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Light weight job scheduling extension for Sidekiq
 test_files: []