sidekiq_schedulable 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1064f6cde72a8cf64dc6d6b8ca33772fd07e82b2
-  data.tar.gz: 353880a557b65213b9638853962aa5cca164f59a
+  metadata.gz: 450f7fd85c24f474868daf002b797b7779dc0860
+  data.tar.gz: fa64a185b2d32374abdbd46f73dc1f71cfe776b4
 SHA512:
-  metadata.gz: 9cef8200ad866b2e733ca179af8055ae3d3813c29c54c3d62431af7eccd6da041bdc1bc5a9069f0029dafd230c74b9eae98c21e2c3b67ff1a5ef78a78433a401
-  data.tar.gz: e7c691de4d29031ffa8c210fb6d05b4a61716c3832b32bbfbb9b1f1c0f76729270de2ab266e5619fcc2dd85632f673ff4e27e60ee1e756ff46d07ee2d81f4d51
+  metadata.gz: 339ab0b0321e86fdc72048af80bddca34bc19c3d02c70920768882f89c9cd2635e3b0ba13c230e051283593098b18f1c01fcfdac3da294d20f83f3fa913f199b
+  data.tar.gz: 1f17dc0ae9ab4b856280d0557c070988e3bf4c15e37f81951177fd74d950b5cca220dfa0dde05b99404b1376a50b01af8d1b00b26e84742e87b3ee81719cff04

data/README.md

@@ -21,3 +21,19 @@ class MyJob
   end
 end
 ```
+
+Using the last run time:
+
+```ruby
+class MyJob
+  include Sidekiq::Worker
+  include Sidekiq::Schedulable
+
+  sidekiq_options retry: false, queue: 'my_scheduled_jobs_queue'
+  sidekiq_schedule '*/5 * * * * *', last_run: true
+
+  def perform(last_run)
+    RunReport.between(Time.at(last_run), Time.now)
+  end
+end
+```

data/lib/sidekiq/schedulable.rb

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

data/lib/sidekiq_schedulable/schedule.rb

@@ -3,10 +3,12 @@ require 'parse-cron'
 module SidekiqSchedulable
   module Schedule
     def self.enqueue(schedule, last_run = nil)
+      return unless schedule[:cron]
+
       worker = schedule[:worker]
-      time = next_time(schedule[:at])
+      time = next_time(schedule[:cron])
       if schedule[:options][:last_run]
-        last_time = last_run || last_time(schedule[:at])
+        last_time = last_run || last_time(schedule[:cron])
         worker.perform_at(time, last_time.to_f)
       else
         worker.perform_at(time)

data/lib/sidekiq_schedulable/startup.rb

@@ -2,10 +2,6 @@ require 'sidekiq_schedulable/schedule'
 
 module SidekiqSchedulable
   class Startup
-    def self.schedule!(schedules, current_jobs)
-      new(schedules, current_jobs).schedule!
-    end
-
     def initialize(schedules, current_jobs)
       @schedules = schedules
       @current_jobs = current_jobs

data/lib/sidekiq_schedulable/version.rb

@@ -1,3 +1,3 @@
 module SidekiqSchedulable
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/sidekiq_schedulable_spec.rb

@@ -36,12 +36,12 @@ describe SidekiqSchedulable do
     {
       'TestWorker' => {
         worker: TestWorker,
-        at: '*/10 * * * * *',
+        cron: '*/10 * * * * *',
         options: {}
       },
       'AnotherWorker' => {
         worker: AnotherWorker,
-        at: '0 12 * * * *',
+        cron: '0 12 * * * *',
         options: { last_run: true }
       }
     }
@@ -58,7 +58,7 @@ describe SidekiqSchedulable do
   it "adds the schedule to the schedules" do
     schedule = SidekiqSchedulable.schedules['TestWorker']
 
-    expect(schedule[:at]).to eq('*/10 * * * * *')
+    expect(schedule[:cron]).to eq('*/10 * * * * *')
     expect(schedule[:worker]).to eq(TestWorker)
     expect(schedule[:options]).to eq({})
   end
@@ -119,7 +119,7 @@ describe SidekiqSchedulable do
         true
       end
 
-      expect(item['schedule']).to be_nil
+      expect(item['scheduled']).to be_nil
     end
   end
 
@@ -131,7 +131,7 @@ describe SidekiqSchedulable do
     end
 
     it "enqueues a job for the given worker on an empty queue" do
-      SidekiqSchedulable::Startup.schedule!(schedules, current_jobs)
+      SidekiqSchedulable::Startup.new(schedules, current_jobs).schedule!
 
       expect(TestWorker.jobs.size).to eq(1)
       expect(TestWorker.jobs.first['at']).to eq(next_ten_minutes.to_f)
@@ -140,7 +140,7 @@ describe SidekiqSchedulable do
     it "adds the last_run argument based on the schedule" do
       last_run = midnight - 60 * 60 * 12
 
-      SidekiqSchedulable::Startup.schedule!(schedules, current_jobs)
+      SidekiqSchedulable::Startup.new(schedules, current_jobs).schedule!
 
       expect(AnotherWorker.jobs.size).to eq(1)
       expect(AnotherWorker.jobs.first['args']).to eq([last_run.to_f])
@@ -148,10 +148,18 @@ describe SidekiqSchedulable do
     end
 
     it "does not enqueue a duplicate job for the given worker" do
-      SidekiqSchedulable::Startup.schedule!(schedules, current_jobs)
-      SidekiqSchedulable::Startup.schedule!(schedules, current_jobs)
+      SidekiqSchedulable::Startup.new(schedules, current_jobs).schedule!
+      SidekiqSchedulable::Startup.new(schedules, current_jobs).schedule!
 
       expect(TestWorker.jobs.size).to eq(1)
     end
+
+    it "does not enqueue a job with no schedule" do
+      schedules['TestWorker'][:cron] = nil
+
+      SidekiqSchedulable::Startup.new(schedules, current_jobs).schedule!
+
+      expect(TestWorker.jobs.size).to eq(0)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_schedulable
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kevin Buchanan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq