delayed_job_recurring 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8d518aa85ad86f9742ece8b2e1b16f73366534b
-  data.tar.gz: a3cb49cc1591de7641b15cf91183a302f8965023
+  metadata.gz: 31eaad03c00e4ec8246938771205511f30d29643
+  data.tar.gz: f6857219f479453925c46b76ba7fe24382029f07
 SHA512:
-  metadata.gz: 36275c6b273c10b4f68cfd38ce8c4ae0801c24c9e1330c4072ebbef9b30236562b19e3364ba265c046106803e97f549fe6d3120be5f7bd250d07473eca939bdb
-  data.tar.gz: 513b013afe5c8d4028524c637ca11d2d7a13fa9682f6521be3069c443fe6dbe28443adfc0f9a61ac1ae718f764bd1b02a5c56a101d60b2c16823b61a10bebcb0
+  metadata.gz: 917e77a0ed5c0133f1c7c425479092a0927af8d47a191a6ae736c91fe8ef83b06933f5123fe5198c5e54389c4db438c4df1ac1040acbd9ae159c4d79284f8f69
+  data.tar.gz: 567894524a9a6a03459a4d2f1b549f32958702f914f8bfb8c7109fc1865ceaee82465ccc11fce0a6517f3da44c221cdcba2147dea65931648045cf24fc7c6916

data/README.md

@@ -18,7 +18,7 @@ so we put our task classes in `app/interactors`.  You could also put them in `li
 class MyTask
   include Delayed::RecurringJob
   run_every 1.day
-  run_at DateTime.parse('2014-03-08 11:00:00 PST')
+  run_at '11:00am'
   timezone 'US/Pacific'
   def perform
     # Do some work here!
@@ -29,7 +29,7 @@ end
 And schedule it. In a rails app, you might put this in an initializer:
 
 ```ruby
-MyTask.schedule # run every day at 11am Pacific time (accounting for daylight savings)
+MyTask.schedule! # run every day at 11am Pacific time (accounting for daylight savings)
 ```
 
 ## Advanced usage
@@ -37,13 +37,19 @@ MyTask.schedule # run every day at 11am Pacific time (accounting for daylight sa
 ### Passing options to schedule
 
 ```ruby
-MyTask.schedule(run_at: DateTime.parse('2014-03-08 11:00:00 PST'))
+MyTask.schedule(run_at: '12:00')
 ```
 
 ### Running at multiples times each day
 
 ```ruby
-MyTask.schedule(run_every: 1.day, run_at: [DateTime.parse('2014-03-08 11:00:00 PST'), DateTime.parse('2014-03-08 18:00:00 PST')]
+MyTask.schedule(run_every: 1.day, run_at: ['11:00', '6:00pm']
+```
+
+### Running on specific days of the week
+
+```ruby
+MyTask.schedule(run_every: 1.week, run_at: ['sunday 8:00am', 'wednesday 8:00am'])
 ```
 
 ## Thanks!

data/lib/delayed/recurring_job.rb

@@ -23,6 +23,12 @@ module Delayed
 
     # Schedule this "repeating" job
     def schedule! options = {}
+      options = options.dup
+
+      if run_every = options.delete(:run_every)
+        options[:run_interval] = serialize_duration(run_every)
+      end
+
       @schedule_options = options.reverse_merge(@schedule_options || {}).reverse_merge(
         run_at: self.class.run_at,
         timezone: self.class.timezone,
@@ -81,7 +87,10 @@ module Delayed
     def parse_time(time, timezone)
       case time
       when String
-        get_timezone(timezone).parse(time)
+        time_with_zone = get_timezone(timezone).parse(time)
+        parts = Date._parse(time, false)
+        wday = parts.fetch(:wday, time_with_zone.wday)
+        time_with_zone + (wday - time_with_zone.wday).days
       else
         time
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_recurring
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Tony Novak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails