sidekiq_schedulable 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b63956db669f074615f6bcf3b1ba88572005eded
-  data.tar.gz: a3416899d49afcb426bf8286f0730ef5ce307167
+  metadata.gz: 33c2701432b5817f7d743b3da80a87085a6c2e3f
+  data.tar.gz: 8855bbb6c15a477b9f13b0154ea2fed624a75804
 SHA512:
-  metadata.gz: 849c6f5ea0aaabbca8f3b22835f83517ba9cef3f11beac749bc97a4344efac9143fa129785f775e78fdd514211ffd4519578898e9518e637de7568b1cc399a4c
-  data.tar.gz: 5e4fea3129c64b92cda1b5641fea9c1eb451e0c97d9c3902060a7833fb578d960e6bcad5e822dbfaebf8fa123652f8759936af0c0f70b22c7071f2c6db7dc447
+  metadata.gz: 9851d19fc215bf77b2653980ef1a72bc93fc728bf6cdadf018c8b5aeebf310af0477d7cab6fbd8776c42cd344cc4049fe590ba385e77becd0b5fa1de30c0314f
+  data.tar.gz: c9135baadd95a6998d6a2ed71d096630599632d5b6dc43cdc4fa8d310bf90fb0e13760e047e4ce0452235e4a8ff2c3e7c4212b16a94f715c3c9c14065f243728

data/lib/sidekiq/schedulable.rb

@@ -8,7 +8,7 @@ module Sidekiq
       def sidekiq_schedule(schedule, options = {})
         SidekiqSchedulable.schedules[self.to_s] = {
           worker: self,
-          cron: schedule,
+          crons: Array(schedule),
           options: options
         }
       end

data/lib/sidekiq_schedulable/schedule.rb

@@ -3,15 +3,17 @@ require 'parse-cron'
 module SidekiqSchedulable
   module Schedule
     def self.enqueue(schedule, last_run = nil)
-      return unless schedule[:cron]
+      return if schedule[:crons].empty?
 
       worker = schedule[:worker]
-      time = next_time(schedule[:cron])
-      if schedule[:options][:last_run]
-        last_time = last_run || last_time(schedule[:cron])
-        worker.perform_at(time, last_time.to_f)
-      else
-        worker.perform_at(time)
+      schedule[:crons].each do |cron|
+        time = next_time(cron)
+        if schedule[:options][:last_run]
+          last_time = last_run || last_time(cron)
+          worker.perform_at(time, last_time.to_f)
+        else
+          worker.perform_at(time)
+        end
       end
     end
 

data/lib/sidekiq_schedulable/version.rb

@@ -1,3 +1,3 @@
 module SidekiqSchedulable
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/sidekiq_schedulable_spec.rb

@@ -29,20 +29,39 @@ describe SidekiqSchedulable do
     end
   end
 
+  class MultipleSchedulesWorker
+    include Sidekiq::Worker
+    include Sidekiq::Schedulable
+
+    sidekiq_schedule ['0 */2 * * * *', '0 */3 * * * *', '0 */5 * * * *']
+
+    def perform
+      :nothing
+    end
+  end
+
   let(:midnight) { Time.new(2015, 10, 1, 0, 0, 0) }
   let(:next_ten_minutes) { midnight + 10 * 60 }
+  let(:next_five_minutes) { midnight + 5 * 60 }
+  let(:next_three_minutes) { midnight + 3 * 60 }
+  let(:next_two_minutes) { midnight + 2 * 60 }
 
   let(:schedules) {
     {
       'TestWorker' => {
         worker: TestWorker,
-        cron: '*/10 * * * * *',
+        crons: ['*/10 * * * * *'],
         options: {}
       },
       'AnotherWorker' => {
         worker: AnotherWorker,
-        cron: '0 12 * * * *',
+        crons: ['0 12 * * * *'],
         options: { last_run: true }
+      },
+      'MultipleSchedulesWorker' => {
+        worker: MultipleSchedulesWorker,
+        crons: ['*/2 * * * * *', '*/3 * * * * *', '*/5 * * * * *'],
+        options: {}
       }
     }
   }
@@ -58,7 +77,7 @@ describe SidekiqSchedulable do
   it "adds the schedule to the schedules" do
     schedule = SidekiqSchedulable.schedules['TestWorker']
 
-    expect(schedule[:cron]).to eq('*/10 * * * * *')
+    expect(schedule[:crons]).to eq(['*/10 * * * * *'])
     expect(schedule[:worker]).to eq(TestWorker)
     expect(schedule[:options]).to eq({})
   end
@@ -155,11 +174,18 @@ describe SidekiqSchedulable do
     end
 
     it "does not enqueue a job with no schedule" do
-      schedules['TestWorker'][:cron] = nil
+      schedules['TestWorker'][:crons] = []
 
       SidekiqSchedulable::Startup.new(schedules, current_jobs).schedule!
 
       expect(TestWorker.jobs.size).to eq(0)
     end
+
+    it "creates multiple jobs for multiple schedules" do
+      SidekiqSchedulable::Startup.new(schedules, current_jobs).schedule!
+
+      expect(MultipleSchedulesWorker.jobs.size).to eq(3)
+      expect([next_two_minutes.to_f, next_three_minutes.to_f, next_five_minutes.to_f]).to eq(MultipleSchedulesWorker.jobs.map{ |j| j['at'] })
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_schedulable
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kevin Buchanan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-29 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Scheduled Sidekiq jobs