chronic_cron 0.2.25 → 0.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e335ae83907530c6cc8e7eca961a30f198e31930
-  data.tar.gz: 8f7e0d5c02400248e880347a665a3e2a80d3d0b6
+  metadata.gz: 66daab1a72dc3f45d8d1df42be0c6b78d874b662
+  data.tar.gz: e2a927a2a7a829653c26681d1b5521d3c2076be0
 SHA512:
-  metadata.gz: 90aef594831f7d5e0fc0862f4b595ae83af8e95f975bfad15eeb1563d5215bf98d9b618bdbe6d7c097a38f41698fa42a4bfbe5da23abd317e497659a7bed7e91
-  data.tar.gz: d6972999a422ecc934446f1a4e7c6227bfba2ebf217ecf90ff33e42b7462f0218dba88cd1ae75980a6ef82e1f24ceeb7a62b04a3506bb7ce27be86a21c0612c8
+  metadata.gz: 6ff659dd0c467a203da283097413e54c55ba595e71e768b52b24af92fccfab6edca0a20f03444095c77f39cae3ac923171dc5e7ecd0d3b40f6d1d290962e41dc
+  data.tar.gz: 64c9cf0cbbc65948522004745f32b54ba465f818c65284e8845f09291e8b669a0acca4153c8200adcd4f05a4b85c133f0f9b92cdd070de41d7752b5c1d149dd6

data/lib/chronic_cron.rb

@@ -82,14 +82,14 @@ class ChronicCron
 
     # e.g. 10:15am every day
     get /(\d{1,2}):(\d{1,2})([ap]m)?\s+#{daily}/ do |raw_hrs, mins, meridiem|
-      hrs = meridiem == 'pm' ? raw_hrs.to_i + 12 : raw_hrs
+      hrs = in24hrs(raw_hrs, meridiem)
       "%s %s * * *" % [mins.to_i, hrs]
     end
 
     # e.g. at 7:30am  Monday to Friday
     get /(\d{1,2}):(\d{1,2})([ap]m)?\s+(\w+) to (\w+)/ do 
                                   |raw_hrs, mins, meridiem, wday1, wday2|
-      hrs = meridiem == 'pm' ? raw_hrs.to_i + 12 : raw_hrs
+      hrs = in24hrs(raw_hrs, meridiem)
       "%s %s * * %s-%s" % [mins.to_i, hrs , wday1, wday2]
     end      
     
@@ -112,14 +112,14 @@ class ChronicCron
     # e.g. at 10:30pm on every Monday
     get /(\d{1,2}):(\d{1,2})([ap]m)?\s+(?:on )?every #{weekday}/i do 
                                               |raw_hrs, mins, meridiem, wday|                                              
-      hrs = meridiem == 'pm' ? raw_hrs.to_i + 12 : raw_hrs
+      hrs = in24hrs(raw_hrs, meridiem)
       "%s %s * * %s" % [mins, hrs , wday]
     end
     
     # e.g. at 10pm on every Monday
     get /(\d{1,2})([ap]m)?\s+(?:on )?every #{weekday}/i do 
                                               |raw_hrs, meridiem, wday|
-      hrs = meridiem == 'pm' ? raw_hrs.to_i + 12 : raw_hrs
+      hrs = in24hrs(raw_hrs, meridiem)
       "0 %s * * %s" % [hrs , wday]
     end    
     
@@ -149,14 +149,14 @@ class ChronicCron
     # e.g. every tuesday at 4pm
     get /every\s+#{weekday}\s+at\s+(\d{1,2})([ap]m)/i do
                                               |wday, raw_hrs, meridiem, |
-      hrs = meridiem == 'pm' ? raw_hrs.to_i + 12 : raw_hrs
+      hrs = in24hrs(raw_hrs, meridiem)
       "0 %s * * %s" % [hrs , wday]
     end
 
     # e.g. every tuesday at 4:40pm
     get /every\s+#{weekday}\s+at\s+(\d{1,2}):(\d{1,2})([ap]m)/i do
                                             |wday, raw_hrs, mins, meridiem, |
-      hrs = meridiem == 'pm' ? raw_hrs.to_i + 12 : raw_hrs
+      hrs = in24hrs(raw_hrs, meridiem)
       "%s %s * * %s" % [mins, hrs , wday]
     end    
     
@@ -186,7 +186,7 @@ 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]+))?/ do
+    get /#{nday}(?:of\s+)?(?:the|each|every)\s+month(?:\s+at\s+([^\s]+))?/i do
                                                   |nth_week, day_of_week, time|
 
       month = @now.month
@@ -221,6 +221,15 @@ class ChronicCron
       
       t = Chronic.parse(params[:input], :now => @now)
       "%s %s %s %s * %s" % t.to_a.values_at(1,2,3,4,5)
+    end
+
+    def in24hrs(raw_hrs, meridiem)
+
+      hrs = if meridiem == 'pm' then
+        raw_hrs.to_i + 12
+      else
+        raw_hrs.to_i == 12 ? 0 : raw_hrs
+      end
     end    
   end
   

metadata

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