sidekiq-cron 1.0.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6e4efebfa16f1bedd09081f160e3db3d778e0b9
-  data.tar.gz: b23fe76d331791eabd457cd85f797181bf086712
+  metadata.gz: cb2f152cb3faf85dbc089e10820fd48d7c23f6ad
+  data.tar.gz: 4ced419b5c9ddaeb43a6ebd62221cdbd95eb2c91
 SHA512:
-  metadata.gz: 3286595909fbc0c05504fb38b12f79544b020a627454701adc8e7b10fd7afc7a27cf27a3edf062b3840eca9e4ebc4964149bc9742e6d1bd85d0177cdea6fe18b
-  data.tar.gz: 337457599316fcdec08c10d29fab8b7d130584c345c97f3e4ad2bc93a2c7f2a240689776be8da24d380057ec23481995f0eff456e3789e68a3cc979012f817bf
+  metadata.gz: d882bd7a34f478fc9ea3eb591c6ffe01df2b360ba501ef2df13aa3d7631f77a97a393bc5a391ec682810766dbfe8790bb8a42ed29fc69a666623753103c4c994
+  data.tar.gz: 4bbdf927f3830a9a62e2bf622bf34492555e0a8051f303a0a712eda46a818a5dfd78b5de913e137e39b91f046a05247ae2a133cabe1573fa1b4f21307f721b24

data/.travis.yml

@@ -1,9 +1,10 @@
 language: ruby
 rvm:
-  - 2.5.0
-  - 2.4.3
-  - 2.3.6
-  - 2.2.9
+  - 2.6
+  - 2.5
+  - 2.4
+  - 2.3
+  - 2.2
 services:
   - redis-server
 branches:
@@ -15,7 +16,3 @@ notifications:
       - ondrej@bartas.cz
 env:
   travis: 'yes'
-matrix:
-  allow_failures:
-    - rvm: jruby-19mode
-    - rvm: rbx-19mode

data/Changes.md

@@ -1,3 +1,21 @@
+v 1.2.0
+-------
+
+- updated readme
+- fix problem with Sidekiq::Launcher and requiring it when not needed
+- better patching of Sidekiq::Launcher
+- fixed Dockerfile
+
+v 1.1.0
+-------
+
+- updated readme
+- fix unit tests - changed argument error when getting invalid cron format
+- when fallbacking old job enqueued time use `Time.parse` šwithout format (so ruby can decide best method to parse it)
+- add option `date_as_argument` which will add to your job arguments on last place `Time.now.to_f` when it was eneuqued
+- add option `description` which will allow you to add notes to your jobs so in web view you can see it
+- fixed translations
+
 v 1.0.4
 -------
 

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.3.1
+FROM ruby:2.4
 MAINTAINER Joao Serra <joaopfserra@gmail.com>
 
 RUN apt-get update && \

data/README.md

@@ -19,6 +19,11 @@ Works with ActiveJob (Rails 4.2+)
 
 You don't need Sidekiq PRO, you can use this gem with plain __Sidekiq__.
 
+Upgrade from <0.6x to 1.0.x
+---------------------------
+
+Please be aware that sidekiq-cron < 1.0 was relying on rufus-scheduler < 3.5. Using those older sidekiq-cron with rufus-scheduler >= 3.5 ends up with jobs failing on creation. Sidekiq-cron 1.0 includes a patch that switches from rufus-scheduler to rufus-scheduler's core dependency, fugit.
+
 Requirements
 -----------------
 
@@ -37,7 +42,7 @@ Installation
 
 or add to your `Gemfile`
 
-    gem "sidekiq-cron", "~> 0.6.3"
+    gem "sidekiq-cron", "~> 1.1"
 
 
 Getting Started
@@ -56,9 +61,11 @@ _Job properties_:
  #OPTIONAL
  'queue' => 'name of queue',
  'args'  => '[Array or Hash] of arguments which will be passed to perform method',
+ 'date_as_argument' => true, # add the time of execution as last argument of the perform method
  'active_job' => true,  # enqueue job through rails 4.2+ active job interface
  'queue_name_prefix' => 'prefix', # rails 4.2+ active job queue with prefix
- 'queue_name_delimiter' => '.'  # rails 4.2+ active job queue with custom delimiter
+ 'queue_name_delimiter' => '.',  # rails 4.2+ active job queue with custom delimiter
+ 'description' => 'A sentence describing what work this job performs.'  # Optional
 }
 ```
 

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.2.0

data/docker-compose.yml

@@ -18,4 +18,6 @@ services:
     - redis:redis.test
     depends_on:
     - common
-    command: dockerize -wait tcp://redis.test:6379 -timeout 60s rake test
+    command: dockerize -wait tcp://redis.test:6379 -timeout 60s bundle exec rake test
+    volumes:
+    - .:/sidekiq-cron

data/lib/sidekiq/cron/job.rb

@@ -13,7 +13,6 @@ module Sidekiq
       #how long we would like to store informations about previous enqueues
       REMEMBER_THRESHOLD = 24 * 60 * 60
       LAST_ENQUEUE_TIME_FORMAT = '%Y-%m-%d %H:%M:%S %z'
-      LAST_ENQUEUE_TIME_FORMAT_OLD = '%Y-%m-%d %H:%M:%S'
 
       #crucial part of whole enquing job
       def should_enque? time
@@ -57,21 +56,23 @@ module Sidekiq
               nil
             end
 
-        if klass_const
-          if defined?(ActiveJob::Base) && klass_const < ActiveJob::Base
-            enqueue_active_job(klass_const)
-          else
-            enqueue_sidekiq_worker(klass_const)
-          end
-        else
-          if @active_job
-            Sidekiq::Client.push(active_job_message)
+        jid =
+          if klass_const
+            if defined?(ActiveJob::Base) && klass_const < ActiveJob::Base
+              enqueue_active_job(klass_const).try :provider_job_id
+            else
+              enqueue_sidekiq_worker(klass_const)
+            end
           else
-            Sidekiq::Client.push(sidekiq_worker_message)
+            if @active_job
+              Sidekiq::Client.push(active_job_message)
+            else
+              Sidekiq::Client.push(sidekiq_worker_message)
+            end
           end
-        end
 
         save_last_enqueue_time
+        add_jid_history jid
         logger.debug { "enqueued #{@name}: #{@message}" }
       end
 
@@ -83,14 +84,10 @@ module Sidekiq
 
       def enqueue_active_job(klass_const)
         klass_const.set(queue: @queue).perform_later(*@args)
-
-        true
       end
 
       def enqueue_sidekiq_worker(klass_const)
         klass_const.set(queue: queue_name_with_prefix).perform_async(*@args)
-
-        true
       end
 
       # siodekiq worker message
@@ -283,6 +280,7 @@ module Sidekiq
 
         #get right arguments for job
         @args = args["args"].nil? ? [] : parse_args( args["args"] )
+        @args += [Time.now.to_f] if args["date_as_argument"]
 
         @active_job = args["active_job"] == true || ("#{args["active_job"]}" =~ (/^(true|t|yes|y|1)$/i)) == 0 || false
         @active_job_queue_name_prefix = args["queue_name_prefix"]
@@ -350,6 +348,12 @@ module Sidekiq
         !enabled?
       end
 
+      def pretty_message
+        JSON.pretty_generate Sidekiq.load_json(message)
+      rescue JSON::ParserError
+        message
+      end
+
       def status_from_redis
         out = "enabled"
         if fetch_missing_args
@@ -371,6 +375,18 @@ module Sidekiq
         out
       end
 
+      def jid_history_from_redis
+        out =
+          Sidekiq.redis do |conn|
+            conn.lrange(jid_history_key, 0, -1) rescue nil
+          end
+
+        # returns nil if out nil
+        out && out.map do |jid_history_raw|
+          Sidekiq.load_json jid_history_raw
+        end
+      end
+
       #export job data to hash
       def to_hash
         {
@@ -457,6 +473,20 @@ module Sidekiq
         end
       end
 
+      def add_jid_history(jid)
+        jid_history = {
+          jid: jid,
+          enqueued: @last_enqueue_time
+        }
+        @history_size ||= (Sidekiq.options[:cron_history_size] || 10).to_i - 1
+        Sidekiq.redis do |conn|
+          conn.lpush jid_history_key,
+                     Sidekiq.dump_json(jid_history)
+          # keep only last 10 entries in a fifo manner
+          conn.ltrim jid_history_key, 0, @history_size
+        end
+      end
+
       # remove job from cron jobs by name
       # input:
       #   first arg: name (string) - name of job (must be same - case sensitive)
@@ -468,6 +498,9 @@ module Sidekiq
           #delete runned timestamps
           conn.del job_enqueued_key
 
+          # delete jid_history
+          conn.del jid_history_key
+
           #delete main job
           conn.del redis_key
         end
@@ -554,7 +587,7 @@ module Sidekiq
       def parse_enqueue_time(timestamp)
         DateTime.strptime(timestamp, LAST_ENQUEUE_TIME_FORMAT).to_time.utc
       rescue ArgumentError
-        DateTime.strptime(timestamp, LAST_ENQUEUE_TIME_FORMAT_OLD).to_time.utc
+        DateTime.parse(timestamp).to_time.utc
       end
 
       def not_past_scheduled_time?(current_time)
@@ -586,12 +619,20 @@ module Sidekiq
         "cron_job:#{name}:enqueued"
       end
 
+      def self.jid_history_key name
+        "cron_job:#{name}:jid_history"
+      end
+
       # Redis key for storing one cron job run times
       # (when poller added job to queue)
       def job_enqueued_key
         self.class.job_enqueued_key @name
       end
 
+      def jid_history_key
+        self.class.jid_history_key @name
+      end
+
       # Give Hash
       # returns array for using it for redis.hmset
       def hash_to_redis hash

data/lib/sidekiq/cron/launcher.rb

@@ -1,6 +1,3 @@
-# require  Sidekiq original launcher
-require 'sidekiq/launcher'
-
 # require cron poller
 require 'sidekiq/cron/poller'
 
@@ -10,44 +7,41 @@ require 'sidekiq/cron/poller'
 # we are creating new cron poller instance and
 # adding start and stop commands to launcher
 module Sidekiq
-  class Launcher
-    # Add cron poller to launcher
-    attr_reader :cron_poller
-
-    # remember old initialize
-    alias_method :old_initialize, :initialize
-
-    # add cron poller and execute normal initialize of Sidekiq launcher
-    def initialize(options)
-      @cron_poller = Sidekiq::Cron::Poller.new
-      old_initialize options
-    end
-
-    # remember old run
-    alias_method :old_run, :run
-
-    # execute normal run of launcher and run cron poller
-    def run
-      old_run
-      cron_poller.start
-    end
-
-    # remember old quiet
-    alias_method :old_quiet, :quiet
-
-    # execute normal quiet of launcher and quiet cron poller
-    def quiet
-      cron_poller.terminate
-      old_quiet
+  module Cron
+    module Launcher
+      # Add cron poller to launcher
+      attr_reader :cron_poller
+
+      # add cron poller and execute normal initialize of Sidekiq launcher
+      def initialize(options)
+        @cron_poller = Sidekiq::Cron::Poller.new
+        super(options)
+      end
+
+      # execute normal run of launcher and run cron poller
+      def run
+        super
+        cron_poller.start
+      end
+
+      # execute normal quiet of launcher and quiet cron poller
+      def quiet
+        cron_poller.terminate
+        super
+      end
+
+      # execute normal stop of launcher and stop cron poller
+      def stop
+        cron_poller.terminate
+        super
+      end
     end
+  end
+end
 
-    # remember old stop
-    alias_method :old_stop, :stop
+Sidekiq.configure_server do
+  # require  Sidekiq original launcher
+  require 'sidekiq/launcher'
 
-    # execute normal stop of launcher and stop cron poller
-    def stop
-      cron_poller.terminate
-      old_stop
-    end
-  end
+  ::Sidekiq::Launcher.prepend(Sidekiq::Cron::Launcher)
 end

data/lib/sidekiq/cron/locales/de.yml

@@ -8,6 +8,6 @@ de:
   NoCronJobsWereFound: Keine Cronjobs gefunden
   Enable: Aktivieren
   Disable: Deaktivieren
-  'Last enque': Eingereiht
+  'Last enqueued': Eingereiht
   disabled: deaktiviert
   enabled: aktiviert

data/lib/sidekiq/cron/locales/en.yml

@@ -13,6 +13,8 @@ en:
   NoCronJobsWereFound: No cron jobs were found
   Enable: Enable
   Disable: Disable
-  'Last enque': Last enqueued
+  'Last enqueued': Last enqueued
   disabled: disabled
   enabled: enabled
+  NoHistoryWereFound: No history were found
+  Description: Description

data/lib/sidekiq/cron/locales/ja.yml

@@ -13,6 +13,6 @@ ja:
   NoCronJobsWereFound: Cronジョブが見つかりませんでした
   Enable: 有効にする
   Disable: 無効にする
-  'Last enque': 最後のキュー
+  'Last enqueued': 最後のキュー
   disabled: 無効
   enabled: 有効

data/lib/sidekiq/cron/locales/ru.yml

@@ -9,6 +9,6 @@ ru:
   NoCronJobsWereFound: Не найдено периодических задач
   Enable: Включить
   Disable: Отключить
-  'Last enque': Последний запуск
+  'Last enqueued': Последний запуск
   disabled: отключено
   enabled: включено

data/lib/sidekiq/cron/locales/zh-CN.yml

@@ -13,7 +13,7 @@ zh-CN:
   NoCronJobsWereFound: 没有定时任务
   Enable: 启用
   Disable: 禁用
-  'Last enque': 放入队列时间
+  'Last enqueued': 放入队列时间
   disabled: 已禁用
   enabled: 已启用
 

data/lib/sidekiq/cron/poller.rb

@@ -17,8 +17,8 @@ module Sidekiq
       rescue => ex
         # Most likely a problem with redis networking.
         # Punt and try again at the next interval
-        logger.error ex.message
-        logger.error ex.backtrace.first
+        Sidekiq.logger.error ex.message
+        Sidekiq.logger.error ex.backtrace.first
         handle_exception(ex) if respond_to?(:handle_exception)
       end
 
@@ -28,8 +28,8 @@ module Sidekiq
         job.test_and_enque_for_time! time if job && job.valid?
       rescue => ex
         # problem somewhere in one job
-        logger.error "CRON JOB: #{ex.message}"
-        logger.error "CRON JOB: #{ex.backtrace.first}"
+        Sidekiq.logger.error "CRON JOB: #{ex.message}"
+        Sidekiq.logger.error "CRON JOB: #{ex.backtrace.first}"
         handle_exception(ex) if respond_to?(:handle_exception)
       end
 

data/lib/sidekiq/cron/views/cron.erb

@@ -31,7 +31,7 @@
       <th><%= t('Status') %></th>
       <th><%= t('Name') %></th>
       <th><%= t('Cron string') %></th>
-      <th><%= t('Last enque') %></th>
+      <th><%= t('Last enqueued') %></th>
       <th width="180"><%= t('Actions')%></th>
     </thead>
 
@@ -41,7 +41,9 @@
         <tr>
           <td style="<%= style %>"><%= t job.status %></td>
           <td style="<%= style %>">
-            <b><%= job.name %></b>
+            <a href="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>">
+              <b><%= job.name %></b>
+            </a>
             <hr style="margin:3px;border:0;">
             <small>
             <% if job.message and job.message.to_s.size > 100 %>

data/lib/sidekiq/cron/views/cron.slim

@@ -24,7 +24,7 @@ header.row
       th = t('Status')
       th = t('Name')
       th = t('Cron')
-      th = t('Last enque')
+      th = t('Last enqueued')
       th width="180px"
         = t('Actions')
 
@@ -34,7 +34,8 @@ header.row
       tr
         td[style="#{style}"]= job.status
         td[style="#{style}"]
-          b job.name
+          a href="#{root_path}cron/#{CGI.escape(job.name).gsub('+', '%20')}"
+            b = job.name
           hr style="margin:3px;border:0;"
           small
             - if job.message and job.message.to_s.size > 100

data/lib/sidekiq/cron/views/cron_show.erb

@@ -0,0 +1,88 @@
+<header class="row">
+  <div class="span col-sm-5 pull-left">
+    <h3>
+      <%= "#{t('Cron')} #{t('Job')}" %>
+      <small><%= @job.name %></small>
+    </h3>
+  </div>
+  <div class="span col-sm-7 pull-right" style="margin-top: 20px; margin-bottom: 10px;">
+    <% cron_job_path = "#{root_path}cron/#{CGI.escape(@job.name).gsub('+', '%20')}" %>
+    <form action="<%= cron_job_path %>/enque?redirect=<%= cron_job_path %>" class="pull-right" method="post">
+      <%= csrf_tag if respond_to?(:csrf_tag) %>
+      <input class="btn btn-small pull-left" name="enque" type="submit" value="<%= t('EnqueueNow') %>" />
+    </form>
+    <% if @job.status == 'enabled' %>
+      <form action="<%= cron_job_path %>/disable?redirect=<%= cron_job_path %>" class="pull-right" method="post">
+        <%= csrf_tag if respond_to?(:csrf_tag) %>
+        <input class="btn btn-small pull-left" name="disable" type="submit" value="<%= t('Disable') %>" />
+      </form>
+    <% else %>
+      <form action="<%= cron_job_path %>/enable?redirect=<%= cron_job_path %>" class="pull-right" method="post">
+        <%= csrf_tag if respond_to?(:csrf_tag) %>
+        <input class="btn btn-small pull-left" name="enable" type="submit" value="<%= t('Enable') %>" />
+      </form>
+      <form action="<%= cron_job_path %>/delete" class="pull-right" method="post">
+        <%= csrf_tag if respond_to?(:csrf_tag) %>
+        <input class="btn btn-danger btn-small" data-confirm="<%= t('AreYouSureDeleteCronJob', :job => @job.name) %>" name="delete" type="submit" value="<%= t('Delete') %>" />
+      </form>
+    <% end %>
+  </div>
+</header>
+
+<table class="table table-bordered table-striped">
+  <tbody>
+  <tr>
+    <th><%= t 'Status' %></th>
+    <td><%= @job.status %></td>
+  </tr>
+  <tr>
+    <th><%= t 'Name' %></th>
+    <td><%= @job.name %></td>
+  </tr>
+  <tr>
+    <th><%= t 'Description' %></th>
+    <td><%= @job.description %></td>
+  </tr>
+  <tr>
+    <th><%= t 'Message' %></th>
+    <td><pre><%= @job.pretty_message %></pre></td>
+  </tr>
+  <tr>
+    <th><%= t 'Cron' %></th>
+    <td><%= @job.cron.gsub(" ", "&nbsp;") %></td>
+  </tr>
+  <tr>
+    <th><%= t 'Last enqueued' %></th>
+    <td><%= @job.last_enqueue_time ? relative_time(@job.last_enqueue_time) : "-" %></td>
+  </tr>
+  </tbody>
+</table>
+
+<header class="row">
+  <div class="col-sm-12">
+    <h4>
+      <%= t 'History' %>
+    </h4>
+  </div>
+</header>
+
+<% if @job.jid_history_from_redis.size > 0 %>
+  <table class="table table-hover table-bordered table-striped">
+    <thead>
+    <tr>
+      <th><%= t 'Enqueued' %></th>
+      <th><%= t 'JID' %></th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @job.jid_history_from_redis.each do |jid_history| %>
+      <tr>
+        <td><%= jid_history['enqueued'] %></td>
+        <td><%= jid_history['jid'] %></td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class='alert alert-success'><%= t 'NoHistoryWereFound' %></div>
+<% end %>

data/lib/sidekiq/cron/views/cron_show.slim

@@ -0,0 +1,61 @@
+header.row
+  .span.col-sm-5.pull-left
+    h3
+      = "#{t('Cron')} #{t('Job')}"
+      small= @job.name
+  .span.col-sm-7.pull-right style=("margin-top: 20px; margin-bottom: 10px;")
+    - cron_job_path = "#{root_path}cron/#{CGI.escape(@job.name).gsub('+', '%20')}"
+    form.pull-right action="#{cron_job_path}/enque?redirect=#{cron_job_path}" method="post"
+      = csrf_tag if respond_to?(:csrf_tag)
+      input.btn.btn-small.pull-left name="enque" type="submit" value="#{t('EnqueueNow')}"
+    - if @job.status == 'enabled'
+      form.pull-right action="#{cron_job_path}/disable?redirect=#{cron_job_path}" method="post"
+        = csrf_tag if respond_to?(:csrf_tag)
+        input.btn.btn-small.pull-left name="disable" type="submit" value="#{t('Disable')}"
+    - else
+      form.pull-right action="#{cron_job_path}/enable?redirect=#{cron_job_path}" method="post"
+        = csrf_tag if respond_to?(:csrf_tag)
+        input.btn.btn-small.pull-left name="enable" type="submit" value="#{t('Enable')}"
+      form.pull-right action="#{cron_job_path}/delete" method="post"
+        = csrf_tag if respond_to?(:csrf_tag)
+        input.btn.btn-danger.btn-small data-confirm="#{t('AreYouSureDeleteCronJob' job =@job.name)}" name="delete" type="submit" value="#{t('Delete')}" /
+
+table.table.table-bordered.table-striped
+  tbody
+    tr
+      th= t 'Status'
+      td= @job.status
+    tr
+      th= t 'Name'
+      td= @job.name
+    tr
+      th= t 'Description'
+      td= @job.description
+    tr
+      th= t 'Message'
+      td
+        pre= @job.pretty_message
+    tr
+      th= t 'Cron'
+      td= @job.cron.gsub(" ", " ")
+    tr
+      th= t 'Last enqueued'
+      td= @job.last_enqueue_time ? relative_time(@job.last_enqueue_time) : "-"
+
+header.row
+  .col-sm-12
+    h4= t 'History'
+
+- if @job.jid_history_from_redis.size > 0
+  table.table.table-hover.table-bordered.table-striped
+    thead
+      tr
+        th= t 'Enqueued'
+        th= t 'JID'
+    tbody
+      - @job.jid_history_from_redis.each do |jid_history|
+        tr
+          td= jid_history['enqueued']
+          td= jid_history['jid']
+- else
+  .alert.alert-success= t 'NoHistoryWereFound'

data/lib/sidekiq/cron/web_extension.rb

@@ -20,6 +20,23 @@ module Sidekiq
           end
         end
 
+        # display job detail + jid history
+        app.get '/cron/:name' do
+          view_path = File.join(File.expand_path("..", __FILE__), "views")
+
+          @job = Sidekiq::Cron::Job.find(route_params[:name])
+          if @job
+            #if Slim renderer exists and sidekiq has layout.slim in views
+            if defined?(Slim) && File.exists?(File.join(settings.views,"layout.slim"))
+              render(:slim, File.read(File.join(view_path, "cron_show.slim")))
+            else
+              render(:erb, File.read(File.join(view_path, "cron_show.erb")))
+            end
+          else
+            redirect "#{root_path}cron"
+          end
+        end
+
         #enque cron job
         app.post '/cron/:name/enque' do
           if route_params[:name] === '__all__'
@@ -27,7 +44,7 @@ module Sidekiq
           elsif job = Sidekiq::Cron::Job.find(route_params[:name])
             job.enque!
           end
-          redirect "#{root_path}cron"
+          redirect params['redirect'] || "#{root_path}cron"
         end
 
         #delete schedule
@@ -47,7 +64,7 @@ module Sidekiq
           elsif job = Sidekiq::Cron::Job.find(route_params[:name])
             job.enable!
           end
-          redirect "#{root_path}cron"
+          redirect params['redirect'] || "#{root_path}cron"
         end
 
         #disable job
@@ -57,7 +74,7 @@ module Sidekiq
           elsif job = Sidekiq::Cron::Job.find(route_params[:name])
             job.disable!
           end
-          redirect "#{root_path}cron"
+          redirect params['redirect'] || "#{root_path}cron"
         end
 
       end

data/sidekiq-cron.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: sidekiq-cron 1.0.4 ruby lib
+# stub: sidekiq-cron 1.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "sidekiq-cron".freeze
-  s.version = "1.0.4"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Ondrej Bartas".freeze]
-  s.date = "2018-08-15"
+  s.date = "2020-04-03"
   s.description = "Enables to set jobs to be run in specified time (using CRON notation)".freeze
   s.email = "ondrej@bartas.cz".freeze
   s.extra_rdoc_files = [
@@ -44,6 +44,8 @@ Gem::Specification.new do |s|
     "lib/sidekiq/cron/support.rb",
     "lib/sidekiq/cron/views/cron.erb",
     "lib/sidekiq/cron/views/cron.slim",
+    "lib/sidekiq/cron/views/cron_show.erb",
+    "lib/sidekiq/cron/views/cron_show.slim",
     "lib/sidekiq/cron/web.rb",
     "lib/sidekiq/cron/web_extension.rb",
     "sidekiq-cron.gemspec",
@@ -55,7 +57,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/ondrejbartas/sidekiq-cron".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.5.2.1".freeze
+  s.rubygems_version = "2.5.2.3".freeze
   s.summary = "Sidekiq Cron helps to add repeated scheduled jobs".freeze
 
   if s.respond_to? :specification_version then

data/test/integration/performance_test.rb

@@ -6,9 +6,7 @@ describe 'Performance Poller' do
   X = 10000
   before do
     Sidekiq.redis = REDIS
-    Sidekiq.redis do |conn|
-      conn.flushdb
-    end
+    Redis.current.flushdb
 
     #clear all previous saved data from redis
     Sidekiq.redis do |conn|
@@ -33,7 +31,7 @@ describe 'Performance Poller' do
     Time.stubs(:now).returns(enqueued_time)
   end
 
-  it 'should enqueue 10000 jobs in less than 30s' do
+  it 'should enqueue 10000 jobs in less than 40s' do
     Sidekiq.redis do |conn|
       assert_equal 0, conn.llen("queue:default"), 'Queue should be empty'
     end
@@ -47,6 +45,6 @@ describe 'Performance Poller' do
     end
 
     puts "Performance test finished in #{bench.real}"
-    assert_operator bench.real, :<, 30
+    assert_operator bench.real, :<, 40
   end
 end

data/test/test_helper.rb

@@ -20,7 +20,7 @@ Coveralls.wear!
 require "minitest/autorun"
 require 'shoulda-context'
 require "rack/test"
-require "mocha/setup"
+require 'mocha/minitest'
 
 ENV['RACK_ENV'] = 'test'
 
@@ -66,6 +66,13 @@ end
 
 module ActiveJob
   class Base
+    attr_accessor *%i[job_class provider_job_id queue_name arguments]
+
+    def initialize
+      yield self if block_given?
+      self.provider_job_id ||= SecureRandom.hex(12)
+    end
+
     def self.queue_name_prefix
       @queue_name_prefix
     end
@@ -80,12 +87,16 @@ module ActiveJob
       self
     end
 
+    def try(method, *args, &block)
+      send method, *args, &block if respond_to? method
+    end
+
     def self.perform_later(*args)
-      {
-        "job_class"  => self.class.name,
-        "queue_name" => @queue,
-        "args"  => [*args],
-      }
+      new do |instance|
+        instance.job_class = self.class.name
+        instance.queue_name = @queue
+        instance.arguments = [*args]
+      end
     end
   end
 end

data/test/unit/job_test.rb

@@ -223,6 +223,34 @@ describe "Cron Job" do
                                  "class"=>"CronTestClassWithQueue",
                                  "args"=>[]}
     end
+
+    it "be initialized with 'class' and date_as_argument" do
+      job = Sidekiq::Cron::Job.new('class' => 'CronTestClassWithQueue', "date_as_argument" => true)
+
+      job_message = job.message
+      job_args    = job_message.delete("args")
+      assert_equal job_message, {"retry"=>false,
+                                 "queue"=>:super,
+                                 "backtrace"=>true,
+                                 "class"=>"CronTestClassWithQueue"}
+      assert job_args[-1].is_a?(Float)
+      assert job_args[-1].between?(Time.now.to_f - 1, Time.now.to_f)
+    end
+
+    it "be initialized with 'class', 2 arguments and date_as_argument" do
+      job = Sidekiq::Cron::Job.new('class' => 'CronTestClassWithQueue', "date_as_argument" => true, "args"=> ["arg1", :arg2])
+
+      job_message = job.message
+      job_args    = job_message.delete("args")
+      assert_equal job_message, {"retry"=>false,
+                                 "queue"=>:super,
+                                 "backtrace"=>true,
+                                 "class"=>"CronTestClassWithQueue"}
+      assert job_args[-1].is_a?(Float)
+      assert job_args[-1].between?(Time.now.to_f - 1, Time.now.to_f)
+      assert_equal job_args[0..-2], ["arg1", :arg2]
+    end
+
   end
 
   describe "cron test" do
@@ -381,7 +409,7 @@ describe "Cron Job" do
 
       it 'pushes to queue active jobs message' do
         @job.expects(:enqueue_active_job)
-            .returns(true)
+            .returns(ActiveJobCronTestClass.new)
         @job.enque!
       end
     end
@@ -399,7 +427,7 @@ describe "Cron Job" do
 
       it 'pushes to queue active jobs message with queue_name_prefix' do
         @job.expects(:enqueue_active_job)
-            .returns(true)
+            .returns(ActiveJobCronTestClass.new)
         @job.enque!
       end
     end
@@ -907,7 +935,8 @@ describe "Cron Job" do
         @jobs_hash['name_of_job']['cron'] = "bad cron"
         out = Sidekiq::Cron::Job.load_from_hash @jobs_hash
         assert_equal 1, out.size, "should have 1 error"
-        assert_equal ({"name_of_job"=>["'cron' -> \"bad cron\" -> ArgumentError: not a cron string \"bad cron\""]}), out
+        assert_includes out['name_of_job'].first, "bad cron"
+        assert_includes out['name_of_job'].first, "ArgumentError:"
         assert_equal 1, Sidekiq::Cron::Job.all.size, "Should have only 1 job after load"
       end
 

data/test/unit/poller_test.rb

@@ -5,9 +5,7 @@ require './test/test_helper'
 describe 'Cron Poller' do
   before do
     Sidekiq.redis = REDIS
-    Sidekiq.redis do |conn|
-      conn.flushdb
-    end
+    Redis.current.flushdb
 
     #clear all previous saved data from redis
     Sidekiq.redis do |conn|

data/test/unit/web_extension_test.rb

@@ -9,7 +9,7 @@ describe 'Cron web' do
 
   before do
     Sidekiq.redis = REDIS
-    Sidekiq.redis {|c| c.flushdb }
+    Redis.current.flushdb
 
     #clear all previous saved data from redis
     Sidekiq.redis do |conn|
@@ -66,6 +66,25 @@ describe 'Cron web' do
       @cron_job_name = "TesQueueNameOfCronJob"
     end
 
+    it 'shows history of a cron job' do
+      @job.enque!
+      get "/cron/#{@name}"
+
+      jid =
+        Sidekiq.redis do |conn|
+          history = conn.lrange Sidekiq::Cron::Job.jid_history_key(@name), 0, -1
+          Sidekiq.load_json(history.last)['jid']
+        end
+
+      assert last_response.body.include?(jid)
+    end
+
+    it 'redirects to cron path when name not found' do
+      get '/cron/some-fake-name'
+
+      assert_match %r{\/cron\z}, last_response['Location']
+    end
+
     it "disable and enable all cron jobs" do
       post "/cron/__all__/disable"
       assert_equal Sidekiq::Cron::Job.find(@name).status, "disabled"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cron
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Ondrej Bartas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2020-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -309,6 +309,8 @@ files:
 - lib/sidekiq/cron/support.rb
 - lib/sidekiq/cron/views/cron.erb
 - lib/sidekiq/cron/views/cron.slim
+- lib/sidekiq/cron/views/cron_show.erb
+- lib/sidekiq/cron/views/cron_show.slim
 - lib/sidekiq/cron/web.rb
 - lib/sidekiq/cron/web_extension.rb
 - sidekiq-cron.gemspec
@@ -337,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Sidekiq Cron helps to add repeated scheduled jobs