chronic_cron 0.2.28 → 0.2.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18ca6b9986162d123d81aaa8dbe1da0dd7d0eb5f
-  data.tar.gz: a0dfb41b5ce09016b721dc86240dc179b2620fcb
+  metadata.gz: 0726ffc63935eadf82e49459e993bf8b1eda96eb
+  data.tar.gz: c22145d48434cc7c048561ee1f34efcff3eb7724
 SHA512:
-  metadata.gz: 793e7397772cafeee53ace1978cae1eeb3b315247fa14b4d8291fb3b398648c6148a65b8b4579985a351fa18dbea5455fc46516d8b8a89e9e368e5c29fd94279
-  data.tar.gz: 809a78a5b889d2506bc897133d7dc66d17441dada9dbaed57d14e76a176630468fe011d866984a3ab5176afdda5a976b42216b96ffebb28ef7673c0d9ba0ae69
+  metadata.gz: 0e0563354945b408a5996c84af4e5777d32a7d2b395d39f0b8db7627a16b1d81bc7b0f7673b64765e87068ece1628c54a13a655d27190966d4ec4007ca81a681
+  data.tar.gz: 4403940917553f50065674d72849f07330e0e162d8db88a5c83ce660cce3ae3490a0a981eb2f3d9dd5bb71ca357ef08e84120bbe08bcc7bc81b51b1277bbb075

data/lib/chronic_cron.rb

@@ -8,8 +8,6 @@ require 'cron_format'
 require 'timetoday'
 
 
-WEEK = DAY * 7
-
 class ChronicCron
   include AppRoutes
   
@@ -24,8 +22,7 @@ class ChronicCron
     expressions(@params)
 
     expression = find_expression(s.sub(/^(?:on|at|from|starting)\s+/,''))
-
-    @cf = CronFormat.new(expression, now)    
+    @cf = CronFormat.new(expression, now)
     @to_expression = @cf.to_expression
 
   end
@@ -238,33 +235,25 @@ class ChronicCron
     # e.g. first thursday of each month at 7:30pm
     nday = '(\w+(?:st|rd|nd))\s+' + weekday + '\s+'
     get /#{nday}(?:of\s+)?(?:the|each|every)\s+month(?:\s+at\s+([^\s]+))?/i do
-                                                  |nth_week, day_of_week, time|
+                                              |nth_week, day_of_week, raw_time|
 
       month = @now.month
 
       h = {
-            /first|1st/       => 0, 
-            /second|2nd/      => 1, 
-            /third|3rd/       => 2, 
-            /fourth|4th|last/ => 3
+            /first|1st/       => '1-7', 
+            /second|2nd/      => '8-14', 
+            /third|3rd/       => '15-21', 
+            /fourth|4th|last/ => '22-28'
       }
 
-      _, nweek = h.find{|k,_| nth_week[k]}
+      _, day_range = h.find{|k,_| nth_week[k]}
+      a = %w(sunday monday tuesday wednesday thursday friday saturday)
+      wday = a.index(a.grep(/#{day_of_week}/).first)
 
-      def make_date(day_of_week, month, time, nweek)
+      raw_time ||= '6:00am'
+      minute, hour = Chronic.parse(raw_time).to_a[1,2]
 
-        Chronic.parse([day_of_week,month,time].join(' '), :now => @now) \
-          + WEEK * nweek
-      end
-      
-      months = Date::MONTHNAMES
-      t = make_date day_of_week, months[month], time, nweek
-
-      if t < @now
-        t = make_date(day_of_week, months.rotate[month], time, nweek)
-      end
-
-      "%s %s %s %s * %s" % t.to_a.values_at(1,2,3,4,5)
+      "%s %s %s * %s" % [minute, hour, day_range, wday]
     end 
 
     # e.g. 04-Aug@12:34

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronic_cron
 version: !ruby/object:Gem::Version
-  version: 0.2.28
+  version: 0.2.29
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   aYYwh4InyS/QZr4LG0nh0TuYVP5vwm1cCSlLlo4dlv7bl7Q4y815j70z8O4oUrT8
   5oSIzmlVDEDmwAibYqdf+aHqmum1mkYW
   -----END CERTIFICATE-----
-date: 2014-01-11 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: app-routes