sidekiq-cron 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c90d24def3eade7024094a7566884c40f1cd8ae6
-  data.tar.gz: e8b4b9db953ef8044064c680faff48cc315fd5e4
+  metadata.gz: 8adf66042c715b918d56ac413f033f713fb0cfb0
+  data.tar.gz: 44d64bdf7d9e1329510fece42e186c35776ed85d
 SHA512:
-  metadata.gz: 39e8b2497e40539f2f3d94c415a8dc6f4b7f1b852a3876fed743eb2c63b5c2defb1c24404d076cdb837d619125820a9eb60d374831886a81d57a056f649edf8f
-  data.tar.gz: 1ebaa7c1b9bd7fd950a7e30bfae464ebfc2ff064ab97010f6bc0efa74fd00bd297f91254ba4329b0aa2139d97f985acaa73749efc1cd14e74190d5312fdd2c6e
+  metadata.gz: 1e0b4a1f7cd40f4e4db9d15ebc37cebb2afbf1249b8107be50557e72f93f8100da2c85bb1349a8125de0ba529b77c17c17ca7ff077883118c9cb655f33f5f4e9
+  data.tar.gz: 3487319de6f4626be8704a91f5767ba24505e88385b06b9df43b6818451dcc90e8246c110c1084d290e9fbfabe8d44831b8949f4277c80c1393287639f7714e4

data/README.md

@@ -1,6 +1,7 @@
-Sidekiq-Cron [![Gem Version](https://badge.fury.io/rb/sidekiq-cron.png)](http://badge.fury.io/rb/sidekiq-cron) [![Build Status](https://travis-ci.org/ondrejbartas/sidekiq-cron.png?branch=master)](https://travis-ci.org/ondrejbartas/sidekiq-cron) [![Coverage Status](https://coveralls.io/repos/ondrejbartas/sidekiq-cron/badge.png?branch=master)](https://coveralls.io/r/ondrejbartas/sidekiq-cron?branch=master)
+Sidekiq-Cron [![Gem Version](https://badge.fury.io/rb/sidekiq-cron.svg)](http://badge.fury.io/rb/sidekiq-cron) [![Build Status](https://travis-ci.org/ondrejbartas/sidekiq-cron.svg?branch=master)](https://travis-ci.org/ondrejbartas/sidekiq-cron) [![Coverage Status](https://coveralls.io/repos/ondrejbartas/sidekiq-cron/badge.svg?branch=master)](https://coveralls.io/r/ondrejbartas/sidekiq-cron?branch=master)
 ================================================================================================================================================================================================================================================================================================================================================================================================================================================
 
+[![Join the chat at https://gitter.im/ondrejbartas/sidekiq-cron](https://badges.gitter.im/ondrejbartas/sidekiq-cron.svg)](https://gitter.im/ondrejbartas/sidekiq-cron?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 A scheduling add-on for [Sidekiq](http://sidekiq.org).
 
@@ -52,7 +53,8 @@ _Job properties_:
  'queue' => 'name of queue',
  'args'  => '[Array or Hash] of arguments which will be passed to 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_prefix' => 'prefix', # rails 4.2+ active job queue with prefix
+ 'queue_name_delimiter' => '.'  # rails 4.2+ active job queue with custom delimiter
 }
 ```
 

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/lib/sidekiq/cron/job.rb

@@ -72,10 +72,18 @@ module Sidekiq
       # active job has different structure how it is loading data from sidekiq
       # queue, it createaswrapper arround job
       def active_job_message
+        if !"#{@active_job_queue_name_delimiter}".empty?
+          queue_name_delimiter = @active_job_queue_name_delimiter
+        elsif defined?(ActiveJob::Base) && defined?(ActiveJob::Base.queue_name_delimiter) && !ActiveJob::Base.queue_name_delimiter.empty?
+          queue_name_delimiter = ActiveJob::Base.queue_name_delimiter
+        else
+          queue_name_delimiter = '_'
+        end
+
         if !"#{@active_job_queue_name_prefix}".empty?
-          queue_name = "#{@active_job_queue_name_prefix}_#{@queue}"
+          queue_name = "#{@active_job_queue_name_prefix}#{queue_name_delimiter}#{@queue}"
         elsif defined?(ActiveJob::Base) && defined?(ActiveJob::Base.queue_name_prefix) && !"#{ActiveJob::Base.queue_name_prefix}".empty?
-          queue_name = "#{ActiveJob::Base.queue_name_prefix}_#{@queue}"
+          queue_name = "#{ActiveJob::Base.queue_name_prefix}#{queue_name_delimiter}#{@queue}"
         else
           queue_name = @queue
         end
@@ -159,17 +167,19 @@ module Sidekiq
 
       # get all cron jobs
       def self.all
-        out = []
+        job_hashes = nil
         Sidekiq.redis do |conn|
-          out = conn.smembers(jobs_key).collect do |key|
-            if conn.exists key
-              Job.new conn.hgetall(key)
-            else
-              nil
+          set_members = conn.smembers(jobs_key)
+          job_hashes = conn.pipelined do
+            set_members.each do |key|
+              conn.hgetall(key)
             end
           end
         end
-        out.select{|j| !j.nil? }
+        job_hashes.compact.reject(&:empty?).collect do |h|
+          # no need to fetch missing args from redis since we just got this hash from there
+          Sidekiq::Cron::Job.new(h.merge(fetch_missing_args: false))
+        end
       end
 
       def self.count
@@ -211,10 +221,12 @@ module Sidekiq
       end
 
       attr_accessor :name, :cron, :description, :klass, :args, :message
-      attr_reader   :last_enqueue_time
+      attr_reader   :last_enqueue_time, :fetch_missing_args
 
       def initialize input_args = {}
         args = input_args.stringify_keys
+        @fetch_missing_args = args.delete('fetch_missing_args')
+        @fetch_missing_args = true if @fetch_missing_args.nil?
 
         @name = args["name"]
         @cron = args["cron"]
@@ -238,6 +250,7 @@ module Sidekiq
 
         @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"]
+        @active_job_queue_name_delimiter = args["queue_name_delimiter"]
 
         if args["message"]
           @message = args["message"]
@@ -302,9 +315,10 @@ module Sidekiq
 
       def status_from_redis
         out = "enabled"
-        if exists?
+        if fetch_missing_args
           Sidekiq.redis do |conn|
-            out = conn.hget redis_key, "status"
+            status = conn.hget redis_key, "status"
+            out = status if status
           end
         end
         out
@@ -312,7 +326,7 @@ module Sidekiq
 
       def last_enqueue_time_from_redis
         out = nil
-        if exists?
+        if fetch_missing_args
           Sidekiq.redis do |conn|
             out = Time.parse(conn.hget(redis_key, "last_enqueue_time")) rescue nil
           end
@@ -332,6 +346,7 @@ module Sidekiq
           status: @status,
           active_job: @active_job,
           queue_name_prefix: @active_job_queue_name_prefix,
+          queue_name_delimiter: @active_job_queue_name_delimiter,
           last_enqueue_time: @last_enqueue_time,
         }
       end
@@ -399,7 +414,7 @@ module Sidekiq
 
           #add information about last time! - don't enque right after scheduler poller starts!
           time = Time.now
-          conn.zadd(job_enqueued_key, time.to_f.to_s, formated_last_time(time).to_s)
+          conn.zadd(job_enqueued_key, time.to_f.to_s, formated_last_time(time).to_s) unless conn.exists(job_enqueued_key)
         end
         logger.info { "Cron Jobs - add job with name: #{@name}" }
       end

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

@@ -3,6 +3,7 @@ de:
   Cron: Cron
   CronJobs: Cronjobs
   EnqueueNow: In Warteschlange
+  'Cron string': Cron
   AreYouSureDeleteCronJob: Sind Sie sicher, dass sie den Cronjob %{job} löschen wollen?
   NoCronJobsFound: "Keine Cronjobs gefunden"
   Enable: Aktivieren

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

@@ -3,9 +3,10 @@ en:
   Cron: Cron
   CronJobs: Cron Jobs
   EnqueueNow: Enqueue Now
+  'Cron string': Cron
   AreYouSureDeleteCronJob: Are you sure you want to delete the %{job} cron job?
   NoCronJobsFound: "No cron jobs found"
-  Enable: Enabled
+  Enable: Enable
   Disable: Disable
   'Last enque': Last enqueued
   disabled: disabled

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

@@ -0,0 +1,14 @@
+ru:
+  Job: Задача
+  Cron: Cron
+  CronJobs: Периодические задачи
+  Name: Название
+  'Cron string': Периодичность (синтаксис Cron)
+  EnqueueNow: Запустить
+  AreYouSureDeleteCronJob: Вы действительно хотите удалить задачу «%{job}»?
+  NoCronJobsFound: "Не найдено периодических задач"
+  Enable: Включить
+  Disable: Отключить
+  'Last enque': Последний запуск
+  disabled: отключено
+  enabled: включено

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

@@ -9,7 +9,7 @@
     <thead>
       <th><%= t('Status') %></th>
       <th><%= t('Name') %></th>
-      <th><%= t('Cron') %></th>
+      <th><%= t('Cron string') %></th>
       <th><%= t('Last enque') %></th>
       <th width="180"><%= t('Actions')%></th>
     </thead>

data/sidekiq-cron.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: sidekiq-cron 0.4.2 ruby lib
+# stub: sidekiq-cron 0.4.3 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "sidekiq-cron"
-  s.version = "0.4.2"
+  s.name = "sidekiq-cron".freeze
+  s.version = "0.4.3"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Ondrej Bartas"]
-  s.date = "2015-12-20"
-  s.description = "Enables to set jobs to be run in specified time (using CRON notation)"
-  s.email = "ondrej@bartas.cz"
+  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 = "2016-08-18"
+  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 = [
     "LICENSE.txt",
     "README.md"
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/sidekiq/cron/launcher.rb",
     "lib/sidekiq/cron/locales/de.yml",
     "lib/sidekiq/cron/locales/en.yml",
+    "lib/sidekiq/cron/locales/ru.yml",
     "lib/sidekiq/cron/poller.rb",
     "lib/sidekiq/cron/views/cron.erb",
     "lib/sidekiq/cron/views/cron.slim",
@@ -44,71 +45,71 @@ Gem::Specification.new do |s|
     "test/test_helper.rb",
     "test/unit/job_test.rb",
     "test/unit/poller_test.rb",
-    "test/unit/web_extesion_test.rb"
+    "test/unit/web_extension_test.rb"
   ]
-  s.homepage = "http://github.com/ondrejbartas/sidekiq-cron"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.5"
-  s.summary = "Sidekiq Cron helps to add repeated scheduled jobs"
+  s.homepage = "http://github.com/ondrejbartas/sidekiq-cron".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.6.6".freeze
+  s.summary = "Sidekiq Cron helps to add repeated scheduled jobs".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sidekiq>, [">= 4.0.0"])
-      s.add_runtime_dependency(%q<rufus-scheduler>, [">= 2.0.24"])
-      s.add_runtime_dependency(%q<redis-namespace>, [">= 1.5.2"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<shoulda-context>, [">= 0"])
-      s.add_development_dependency(%q<rack>, [">= 0"])
-      s.add_development_dependency(%q<rack-test>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_development_dependency(%q<minitest>, [">= 0"])
-      s.add_development_dependency(%q<test-unit>, [">= 0"])
-      s.add_development_dependency(%q<sdoc>, [">= 0"])
-      s.add_development_dependency(%q<slim>, [">= 0"])
-      s.add_development_dependency(%q<sinatra>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
-      s.add_development_dependency(%q<coveralls>, [">= 0"])
-      s.add_development_dependency(%q<shotgun>, [">= 0"])
+      s.add_runtime_dependency(%q<sidekiq>.freeze, [">= 4.0.0"])
+      s.add_runtime_dependency(%q<rufus-scheduler>.freeze, [">= 2.0.24"])
+      s.add_runtime_dependency(%q<redis-namespace>.freeze, [">= 1.5.2"])
+      s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
+      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
+      s.add_development_dependency(%q<shoulda-context>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rack>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rack-test>.freeze, [">= 0"])
+      s.add_development_dependency(%q<jeweler>.freeze, ["~> 1.8.3"])
+      s.add_development_dependency(%q<minitest>.freeze, [">= 0"])
+      s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
+      s.add_development_dependency(%q<sdoc>.freeze, [">= 0"])
+      s.add_development_dependency(%q<slim>.freeze, [">= 0"])
+      s.add_development_dependency(%q<sinatra>.freeze, [">= 0"])
+      s.add_development_dependency(%q<mocha>.freeze, [">= 0"])
+      s.add_development_dependency(%q<coveralls>.freeze, [">= 0"])
+      s.add_development_dependency(%q<shotgun>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<sidekiq>, [">= 4.0.0"])
-      s.add_dependency(%q<rufus-scheduler>, [">= 2.0.24"])
-      s.add_dependency(%q<redis-namespace>, [">= 1.5.2"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<shoulda-context>, [">= 0"])
-      s.add_dependency(%q<rack>, [">= 0"])
-      s.add_dependency(%q<rack-test>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_dependency(%q<minitest>, [">= 0"])
-      s.add_dependency(%q<test-unit>, [">= 0"])
-      s.add_dependency(%q<sdoc>, [">= 0"])
-      s.add_dependency(%q<slim>, [">= 0"])
-      s.add_dependency(%q<sinatra>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
-      s.add_dependency(%q<coveralls>, [">= 0"])
-      s.add_dependency(%q<shotgun>, [">= 0"])
+      s.add_dependency(%q<sidekiq>.freeze, [">= 4.0.0"])
+      s.add_dependency(%q<rufus-scheduler>.freeze, [">= 2.0.24"])
+      s.add_dependency(%q<redis-namespace>.freeze, [">= 1.5.2"])
+      s.add_dependency(%q<bundler>.freeze, [">= 0"])
+      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
+      s.add_dependency(%q<shoulda-context>.freeze, [">= 0"])
+      s.add_dependency(%q<rack>.freeze, [">= 0"])
+      s.add_dependency(%q<rack-test>.freeze, [">= 0"])
+      s.add_dependency(%q<jeweler>.freeze, ["~> 1.8.3"])
+      s.add_dependency(%q<minitest>.freeze, [">= 0"])
+      s.add_dependency(%q<test-unit>.freeze, [">= 0"])
+      s.add_dependency(%q<sdoc>.freeze, [">= 0"])
+      s.add_dependency(%q<slim>.freeze, [">= 0"])
+      s.add_dependency(%q<sinatra>.freeze, [">= 0"])
+      s.add_dependency(%q<mocha>.freeze, [">= 0"])
+      s.add_dependency(%q<coveralls>.freeze, [">= 0"])
+      s.add_dependency(%q<shotgun>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<sidekiq>, [">= 4.0.0"])
-    s.add_dependency(%q<rufus-scheduler>, [">= 2.0.24"])
-    s.add_dependency(%q<redis-namespace>, [">= 1.5.2"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<shoulda-context>, [">= 0"])
-    s.add_dependency(%q<rack>, [">= 0"])
-    s.add_dependency(%q<rack-test>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-    s.add_dependency(%q<minitest>, [">= 0"])
-    s.add_dependency(%q<test-unit>, [">= 0"])
-    s.add_dependency(%q<sdoc>, [">= 0"])
-    s.add_dependency(%q<slim>, [">= 0"])
-    s.add_dependency(%q<sinatra>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
-    s.add_dependency(%q<coveralls>, [">= 0"])
-    s.add_dependency(%q<shotgun>, [">= 0"])
+    s.add_dependency(%q<sidekiq>.freeze, [">= 4.0.0"])
+    s.add_dependency(%q<rufus-scheduler>.freeze, [">= 2.0.24"])
+    s.add_dependency(%q<redis-namespace>.freeze, [">= 1.5.2"])
+    s.add_dependency(%q<bundler>.freeze, [">= 0"])
+    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
+    s.add_dependency(%q<shoulda-context>.freeze, [">= 0"])
+    s.add_dependency(%q<rack>.freeze, [">= 0"])
+    s.add_dependency(%q<rack-test>.freeze, [">= 0"])
+    s.add_dependency(%q<jeweler>.freeze, ["~> 1.8.3"])
+    s.add_dependency(%q<minitest>.freeze, [">= 0"])
+    s.add_dependency(%q<test-unit>.freeze, [">= 0"])
+    s.add_dependency(%q<sdoc>.freeze, [">= 0"])
+    s.add_dependency(%q<slim>.freeze, [">= 0"])
+    s.add_dependency(%q<sinatra>.freeze, [">= 0"])
+    s.add_dependency(%q<mocha>.freeze, [">= 0"])
+    s.add_dependency(%q<coveralls>.freeze, [">= 0"])
+    s.add_dependency(%q<shotgun>.freeze, [">= 0"])
   end
 end
 

data/test/test_helper.rb

@@ -22,6 +22,8 @@ require 'shoulda-context'
 require "rack/test"
 require "mocha/setup"
 
+ENV['RACK_ENV'] = 'test'
+
 #SIDEKIQ Require - need to have sidekiq running!
 require 'sidekiq'
 require 'sidekiq/util'

data/test/unit/job_test.rb

@@ -835,6 +835,16 @@ describe "Cron Job" do
       refute Sidekiq::Cron::Job.new(@args.merge(cron: "0 1,13 * * *")).should_enque? @time
     end
 
+    it 'doesnt skip enqueuing if job is resaved near next enqueue time' do
+      job = Sidekiq::Cron::Job.new(@args)
+      assert job.test_and_enque_for_time!(@time), "should enqueue"
+
+      future_now = @time + 1 * 60 * 60
+      Time.stubs(:now).returns(future_now) # save uses Time.now
+      job.save
+      assert Sidekiq::Cron::Job.new(@args).test_and_enque_for_time!(future_now + 30), "should enqueue"
+    end
+
     it "remove old enque times + should be enqeued" do
       job = Sidekiq::Cron::Job.new(@args)
       assert_nil job.last_enqueue_time
@@ -843,7 +853,7 @@ describe "Cron Job" do
 
       refute Sidekiq::Cron::Job.new(@args).test_and_enque_for_time!(@time), "should not enqueue"
       Sidekiq.redis do |conn|
-        assert_equal conn.zcard(Sidekiq::Cron::Job.new(@args).send(:job_enqueued_key)), 2, "Should have two enqueued job (first was in save, second in enque)"
+        assert_equal conn.zcard(Sidekiq::Cron::Job.new(@args).send(:job_enqueued_key)), 1, "Should have one enqueued job"
       end
       assert_equal Sidekiq::Queue.all.first.size, 1, "Sidekiq queue 1 job in queue"
 
@@ -852,7 +862,7 @@ describe "Cron Job" do
       refute Sidekiq::Cron::Job.new(@args).test_and_enque_for_time! @time + 1 * 60 * 60
 
       Sidekiq.redis do |conn|
-        assert_equal conn.zcard(Sidekiq::Cron::Job.new(@args).send(:job_enqueued_key)), 3, "Should have two enqueued job + one from start"
+        assert_equal conn.zcard(Sidekiq::Cron::Job.new(@args).send(:job_enqueued_key)), 2, "Should have two enqueued job"
       end
       assert_equal Sidekiq::Queue.all.first.size, 2, "Sidekiq queue 2 jobs in queue"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cron
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Ondrej Bartas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-20 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -272,6 +272,7 @@ files:
 - lib/sidekiq/cron/launcher.rb
 - lib/sidekiq/cron/locales/de.yml
 - lib/sidekiq/cron/locales/en.yml
+- lib/sidekiq/cron/locales/ru.yml
 - lib/sidekiq/cron/poller.rb
 - lib/sidekiq/cron/views/cron.erb
 - lib/sidekiq/cron/views/cron.slim
@@ -281,7 +282,7 @@ files:
 - test/test_helper.rb
 - test/unit/job_test.rb
 - test/unit/poller_test.rb
-- test/unit/web_extesion_test.rb
+- test/unit/web_extension_test.rb
 homepage: http://github.com/ondrejbartas/sidekiq-cron
 licenses:
 - MIT
@@ -302,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Sidekiq Cron helps to add repeated scheduled jobs