chronic_cron 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7eca0fbc233b9d687bf7f2be8ba7edac29a6c73
-  data.tar.gz: 9f875ee4c9e740b4c56cf28e8501a5fb19b07a72
+  metadata.gz: 1d923a211da99f3c97e20188b27547bffd239467
+  data.tar.gz: 74b111c8aeeba371677cc54806af63c0896a78a8
 SHA512:
-  metadata.gz: 020d2e96a70aebec08df379bcebbcc02ed2d919e5a364b6cc62dbcf0175b0a47487171982381794356c7acbf7f7e6941d5bbe31c33e1b083bfcf7fca6357d681
-  data.tar.gz: 8ea8d2079b3dde28c46875fa5dcd7bd5a25e1d683e8921b4f281ef646c2a43747a45051284ab85a6909bce7dbaa5f2879e316737005b1d48655d6cde125aad53
+  metadata.gz: 13a8e75a0cd3174b0090d8e7d4f365af11e5fd5f3c2f9eeb36040b9e474d8d6245876dd527b98a81ad5834c9fc14fd80506be621357907fc0cfa6d9d1dc64733
+  data.tar.gz: a358625d1db39f639deff268abf935607462c822a5379adf201e51f6d3607efd0284d1d3d82f4dfd7e8f19cfd93422d0424933b1408bbdd747d36e9a2011c7e5

data/lib/chronic_cron.rb

@@ -3,17 +3,14 @@
 # file: chronic_cron.rb
 
 require 'app-routes'
+require 'chronic'
 require 'cron_format'
 
 
 class ChronicCron
   include AppRoutes
   
-  attr_reader :to_expression
-  
-  def self.parse(s, now=Time.now)    
-    CronFormat.new(s, now).to_time
-  end
+  attr_reader :to_expression  
   
   def initialize(s, now=Time.now)
     @now = now
@@ -21,6 +18,12 @@ class ChronicCron
     @params = {}
     expressions(@params)
     @to_expression = find_expression s
+    
+    if @to_expression.nil? then
+      t = Chronic.parse('tomorrow')
+      @to_expression = "%s %s %s %s * %s" % t.to_a.values_at(1,2,3,4,5)
+    end
+    
     @cf = CronFormat.new(@to_expression, now)    
   end
   
@@ -31,8 +34,10 @@ class ChronicCron
 
   def expressions(params) 
 
-    get /10:15am every day/ do 
-      '15 10 * * *'
+    r = '[0-9\*,\?\/\-]+'
+    # e.g. 00 5 15 * *
+    get /(#{r}\s+#{r}\s+#{r}\s#{r}\s#{r})(\s#{r})?/ do
+      "%s%s" % params[:captures]
     end
 
     # e.g. 10:15am every day

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronic_cron
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   aYYwh4InyS/QZr4LG0nh0TuYVP5vwm1cCSlLlo4dlv7bl7Q4y815j70z8O4oUrT8
   5oSIzmlVDEDmwAibYqdf+aHqmum1mkYW
   -----END CERTIFICATE-----
-date: 2013-07-07 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: app-routes
@@ -59,6 +59,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: 
 executables: []