dynamodb-sidekiq-scheduler 0.0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41f36be732670f63a04e4433e7409238af7b88d906ca8eab82bdd2df2c4f12cc
-  data.tar.gz: 59a18452ec604d55fc61d634c5b0e93d5929f2086221205d7947a2a336af1296
+  metadata.gz: 69eeed67230490a8eadbce9bbb18336e24332756f270f1a7df5b203b23876095
+  data.tar.gz: 5694659a15a3f59b86e43089d9330c2e249d20670fb9c4d07d41d11c21670b2e
 SHA512:
-  metadata.gz: 3e6b963abf528bfd3f0d935b6efc09e56e0f28b165514a477e2dd78b6804d9ccf7e52ba58f6bc5590613677832b02e8475053a08b2eea8038068c2331ad72fea
-  data.tar.gz: eff22625d062361600412dab4985f662c7fdad8b49b1c0a978d930013f1106c975315bd3378a48b3b58efd6011d21493aa6d6bbac1c9c382fcd9764ec854dfc3
+  metadata.gz: a87ef258b8a40ad07ad9ba4fc911dda0736e4a75ae3c5722e03264169367ef5c67468b6365f5a79e4d06ca5d57a99fddbc69fdbe5f6f6f9871ad2a1ef52b86e3
+  data.tar.gz: 1ef25e68c5a7bdd4c530f44a56fb5940a8410337902410ef1bc7ed4777eae4a027ec5f93df2677ea87e6a463beb4eb99f8ec512748d96658125c601d1e3fce81

data/lib/sidekiq-scheduler/version.rb

@@ -1,3 +1,3 @@
 module SidekiqScheduler
-  VERSION = '0.0.1'
+  VERSION = "0.2"
 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(name: params[:name]).first
+        sr = klass.where(job_name: params[:name]).first
         if sr.present?
           sr.destroy
         else
@@ -60,24 +60,29 @@ module SidekiqScheduler
         @title = 'Recurring Job Update'
         @form_action = "#{root_path}recurring-jobs/#{ERB::Util.url_encode(params[:name])}/update"
         @existing_rule = true
-        @name = params[:name]
-        @config = Sidekiq.get_schedule(params[:name])
+        @presented_job = JobPresenter.new(params[:name], 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 = ''
-        @config = { queue: 'default', enabled: false }
         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
-        klass.update_or_create name: params[:name], config: JSON.parse(params[:config])
+        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
 
         Sidekiq.reload_schedule!
         redirect "#{root_path}recurring-jobs"
@@ -86,7 +91,9 @@ module SidekiqScheduler
       app.post '/recurring-jobs/create' do
         dynamo_clas_name = ENV.fetch('SIDEKIQ_SCHEDUER_DYNAMOID_CLASS', 'ScheduleRule')
         klass = dynamo_clas_name.constantize
-        klass.update_or_create name: params[:name], config: JSON.parse(params[:config])
+        config = params.slice(*%w[job_name worker_class description cron queue args])
+                       .transform_values(&:presence)
+        klass.create config
 
         Sidekiq.reload_schedule!
         redirect "#{root_path}recurring-jobs"

data/web/views/recurring_job.erb

@@ -2,16 +2,24 @@
 
 <form action="<%= @form_action %>"
       method="post" class="recurring-job" style="background-color:white;">
-  <%= 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>
-    <span class="help-block" style='width:50%;'>Example:<br>{"cron":"0 9 * * * America/New_York","class":"NameSpace::WorkerName","args":["arg1","arg2"],"description":"something","queue":"default","enabled":true}</span><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>
+    <%= 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>
+
+        <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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamodb-sidekiq-scheduler
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: '0.2'
 platform: ruby
 authors:
 - Morton Jonuschat
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-22 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -242,15 +242,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Light weight job scheduling extension for Sidekiq