sidekiq-cron 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcc4ae725097b1fc4a42a3c8f0b211f10dd1a046
-  data.tar.gz: 50589e96e308bd347d29e917ee8d7c31b00d3782
+  metadata.gz: 873586d3842f9498012e042967394936f59ff000
+  data.tar.gz: 455f2a83bca498a0b0b6d37c4a9dd359170a6f28
 SHA512:
-  metadata.gz: 46b8ae7aa71d31dd693f0a3cf5035ed5f06bbf174da2a742de270c3c9d9d2fc6428b4bc26ca4d71a0028254e4a0b0f1228483906d544f5c92a9f40b0cc3a3eef
-  data.tar.gz: 1819f9a1eec1a60c0f1348df9a28747eedab16e4673e10dbfccd3ae62a5b82911f11a6f90dbc1962d664021579f4b723b8d6b97c028bbc9d471af495ead82a6f
+  metadata.gz: 6eba0a3a0270f83abb155ac4683d03aa06f30e8d801c0b242e627dc29cd04d646f1e7d91c5a45da9b1197e8dd968d09e88fa4df3161cc216e3d097e7a319c036
+  data.tar.gz: 7776ad92e891399343e16020e2fb7136e472614fdc7a9503910e48bffe5e1a442456cf1785bd885d1c808a24d77f8e28ea058bc6a299b51eb0f486f7b98d4f15

data/Changes.md

@@ -1,3 +1,9 @@
+v 0.4.0
+-------
+
+- enable to work with sidekiq >= 4.0.0
+- fix readme
+
 v 0.3.1
 -------
 

data/README.md

@@ -17,8 +17,8 @@ Works with ActiveJob (Rails 4.2+)
 Requirements
 -----------------
 
-- Redis 2.4 or greater is required.
-- Sidekiq 4 or grater is required (for Sidekiq <4 use version sidekiq-cron 0.3.1)
+- Redis 2.8 or greater is required. (Redis 3.0.3 or greater is recommended for large scale use)
+- Sidekiq 4 or greater is required (for Sidekiq < 4 use version sidekiq-cron 0.3.1)
 
 Change Log
 ----------
@@ -32,7 +32,7 @@ Installation
 
 or add to your `Gemfile`
 
-    gem "sidekiq-cron", "~> 0.3.0"
+    gem "sidekiq-cron", "~> 0.4.0"
 
 
 Getting Started

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/sidekiq/cron/job.rb

@@ -16,7 +16,10 @@ module Sidekiq
       def should_enque? time
         enqueue = false
         enqueue = Sidekiq.redis do |conn|
-          status == "enabled" && not_enqueued_after?(time) && conn.zadd(job_enqueued_key, time.to_f.to_s, formated_last_time(time))
+          status == "enabled" &&
+            not_past_scheduled_time?(time) &&
+            not_enqueued_after?(time) &&
+            conn.zadd(job_enqueued_key, formated_enqueue_time(time), formated_last_time(time))
         end
         enqueue
       end
@@ -433,6 +436,10 @@ module Sidekiq
         Rufus::Scheduler::CronLine.new(@cron).previous_time(now)
       end
 
+      def formated_enqueue_time now = Time.now
+        last_time(now).getutc.to_f.to_s
+      end
+
       def formated_last_time now = Time.now
         last_time(now).getutc.iso8601
       end
@@ -480,6 +487,12 @@ module Sidekiq
         end
       end
 
+      def not_past_scheduled_time?(current_time)
+        last_cron_time = Rufus::Scheduler::CronLine.new(@cron).previous_time(current_time)
+        return false if (current_time - last_cron_time) > 60
+        true
+      end
+
       # Redis key for set of all cron jobs
       def self.jobs_key
         "cron_jobs"

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 0.4.0 ruby lib
+# stub: sidekiq-cron 0.4.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "sidekiq-cron"
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   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-11-17"
+  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.extra_rdoc_files = [

data/test/unit/job_test.rb

@@ -132,6 +132,25 @@ describe "Cron Job" do
     end
   end
 
+  describe 'formatted time' do
+    before do
+      @args = {
+        name: "Test",
+        cron: "* * * * *"
+      }
+      @job = Sidekiq::Cron::Job.new(@args)
+      @time = Time.new(2015, 1, 2, 3, 4, 5, '+01:00')
+    end
+
+    it 'returns formatted_last_time' do
+      assert_equal '2015-01-02T02:04:00Z', @job.formated_last_time(@time)
+    end
+
+    it 'returns formated_enqueue_time' do
+      assert_equal '1420164240.0', @job.formated_enqueue_time(@time)
+    end
+  end
+
   describe "new with different class inputs" do
     it "be initialized by 'klass' and Class" do
       job = Sidekiq::Cron::Job.new('klass' => CronTestClass)
@@ -794,6 +813,11 @@ describe "Cron Job" do
       refute Sidekiq::Cron::Job.new(@args).should_enque? @time + 235
     end
 
+    it "should not enqueue jobs that are past" do
+      assert Sidekiq::Cron::Job.new(@args.merge(cron: "*/1 * * * *")).should_enque? @time
+      refute Sidekiq::Cron::Job.new(@args.merge(cron: "0 1,13 * * *")).should_enque? @time
+    end
+
     it "remove old enque times + should be enqeued" do
       job = Sidekiq::Cron::Job.new(@args)
       assert_nil job.last_enqueue_time

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cron
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ondrej Bartas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq