parse-cron 0.0.1 → 0.1.0

data/lib/cron_parser.rb

@@ -15,9 +15,12 @@ class CronParser
     end
 
     def to_time
-      Time.utc(@year, @month, @day, @hour, @min, 0)
+      Time.local(@year, @month, @day, @hour, @min, 0)
+    end
+
+    def inspect
+      [year, month, day, hour, min].inspect
     end
-    alias :inspect :to_time
   end
 
   SYMBOLS = {
@@ -52,17 +55,17 @@ class CronParser
   def next(now = Time.now)
     t = InternalTime.new(now)
 
-    unless time_specs[:month].include?(t.month)
+    unless time_specs[:month][0].include?(t.month)
       nudge_month(t)
       t.day = 0
     end
 
-    unless t.day == 0 || interpolate_weekdays(t.year, t.month).include?(t.day)
+    unless t.day == 0 || interpolate_weekdays(t.year, t.month)[0].include?(t.day)
       nudge_date(t)
       t.hour = -1
     end
 
-    unless time_specs[:hour].include?(t.hour)
+    unless time_specs[:hour][0].include?(t.hour)
       nudge_hour(t)
       t.min = -1
     end
@@ -72,9 +75,34 @@ class CronParser
     t.to_time
   end
 
+  # returns the last occurence before the given date
+  def last(now = Time.now)
+    t = InternalTime.new(now)
+
+    unless time_specs[:month][0].include?(t.month)
+      nudge_month(t, :last)
+      t.day = 32
+    end
+
+    if t.day == 32 || !interpolate_weekdays(t.year, t.month)[0].include?(t.day)
+      nudge_date(t, :last)
+      t.hour = 24
+    end
+
+    unless time_specs[:hour][0].include?(t.hour)
+      nudge_hour(t, :last)
+      t.min = 60
+    end
+
+    # always nudge the minute
+    nudge_minute(t, :last)
+    t.to_time
+  end
+
+
   SUBELEMENT_REGEX = %r{^(\d+)(-(\d+)(/(\d+))?)?$}
   def parse_element(elem, allowed_range)
-    elem.split(',').map do |subel|
+    values = elem.split(',').map do |subel|
       if subel =~ /^\*/
         step = subel.length > 1 ? subel[2..-1].to_i : 1
         stepped_range(allowed_range, step)
@@ -92,6 +120,8 @@ class CronParser
         end
       end
     end.flatten.sort
+
+    [Set.new(values), values]
   end
 
 
@@ -99,9 +129,14 @@ class CronParser
 
   # returns a list of days which do both match time_spec[:dom] and time_spec[:dow]
   def interpolate_weekdays(year, month)
+    @_interpolate_weekdays_cache ||= {}
+    @_interpolate_weekdays_cache["#{year}-#{month}"] ||= interpolate_weekdays_without_cache(year, month)
+  end
+
+  def interpolate_weekdays_without_cache(year, month)
     t = Date.new(year, month, 1)
-    valid_mday = time_specs[:dom]
-    valid_wday = time_specs[:dow]
+    valid_mday = time_specs[:dom][0]
+    valid_wday = time_specs[:dow][0]
 
     result = []
     while t.month == month
@@ -109,39 +144,50 @@ class CronParser
       t = t.succ
     end
 
-    result
+    [Set.new(result), result]
   end
 
-  def nudge_year(t)
-    t.year = t.year + 1
+  def nudge_year(t, dir = :next)
+    t.year = t.year + (dir == :next ? 1 : -1)
   end
 
-  def nudge_month(t)
-    spec = time_specs[:month]
-    next_value = find_best_next(t.month, spec)
-    t.month = next_value || spec.first
-    next_value.nil? ?  nudge_year(t) : t
+  def nudge_month(t, dir = :next)
+    spec = time_specs[:month][1]
+    next_value = find_best_next(t.month, spec, dir)
+    t.month = next_value || (dir == :next ? spec.first : spec.last)
+
+    nudge_year(t, dir) if next_value.nil?
+
+    # we changed the month, so its likely that the date is incorrect now
+    t.day = interpolate_weekdays(t.year, t.month)[1].last if dir == :last
   end
 
-  def nudge_date(t)
-    spec = interpolate_weekdays(t.year, t.month)
-    next_value = find_best_next(t.day, spec)
-    t.day = next_value || spec.first
-    next_value.nil? ?  nudge_month(t) : t
+  def date_valid?(t, dir = :next)
+    interpolate_weekdays(t.year, t.month)[0].include?(t.day)
   end
 
-  def nudge_hour(t)
-    spec = time_specs[:hour]
-    next_value = find_best_next(t.hour, spec)
-    t.hour = next_value || spec.first
-    next_value.nil? ?  nudge_date(t) : t
+  def nudge_date(t, dir = :next, can_nudge_month = true)
+    spec = interpolate_weekdays(t.year, t.month)[1]
+    next_value = find_best_next(t.day, spec, dir)
+    t.day = next_value || (dir == :next ? spec.first : spec.last)
+
+    nudge_month(t, dir) if next_value.nil? && can_nudge_month
+  end
+
+  def nudge_hour(t, dir = :next)
+    spec = time_specs[:hour][1]
+    next_value = find_best_next(t.hour, spec, dir)
+    t.hour = next_value || (dir == :next ? spec.first : spec.last)
+
+    nudge_date(t, dir) if next_value.nil?
   end
 
-  def nudge_minute(t)
-    spec = time_specs[:minute]
-    next_value = find_best_next(t.min, spec)
-    t.min = next_value || spec.first
-    next_value.nil? ?  nudge_hour(t) : t
+  def nudge_minute(t, dir = :next)
+    spec = time_specs[:minute][1]
+    next_value = find_best_next(t.min, spec, dir)
+    t.min = next_value || (dir == :next ? spec.first : spec.last)
+
+    nudge_hour(t, dir) if next_value.nil?
   end
 
   def time_specs
@@ -178,7 +224,11 @@ class CronParser
 
   # returns the smallest element from allowed which is greater than current
   # returns nil if no matching value was found
-  def find_best_next(current, allowed)
-    allowed.sort.find { |val| val > current }
+  def find_best_next(current, allowed, dir)
+    if dir == :next
+      allowed.sort.find { |val| val > current }
+    else
+      allowed.sort.reverse.find { |val| val < current }
+    end
   end
 end

data/lib/parse-cron/version.rb

@@ -1,5 +1,5 @@
 module Parse
   module Cron
-    VERSION = "0.0.1"
+    VERSION = "0.1.0"
   end
 end

data/parse-cron.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Michael Siebert"]
   s.email       = ["siebertm85@googlemail.com"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/siebertm/parse-cron"
   s.summary     = %q{Parses cron expressions and calculates the next occurence}
   s.description = %q{Parses cron expressions and calculates the next occurence}
 

data/spec/cron_parser_spec.rb

@@ -1,6 +1,12 @@
 require "time"
 require "./spec/spec_helper"
 require "cron_parser"
+require "time"
+
+def parse_date(str)
+  dt = DateTime.strptime(str, "%Y-%m-%d %H:%M")
+  Time.local(dt.year, dt.month, dt.day, dt.hour, dt.min, 0)
+end
 
 describe "CronParser#parse_element" do
   [
@@ -20,23 +26,23 @@ end
 
 describe "CronParser#next" do
   [
-    ["* * * * *",       "2011-08-15T12:00",  "2011-08-15T12:01"],
-    ["* * * * *",       "2011-08-15T02:25",  "2011-08-15T02:26"],
-    ["* * * * *",       "2011-08-15T02:59",  "2011-08-15T03:00"],
-    ["*/15 * * * *",    "2011-08-15T02:02",  "2011-08-15T02:15"],
-    ["*/15,25 * * * *", "2011-08-15T02:15",  "2011-08-15T02:25"],
-    ["30 3,6,9 * * *",  "2011-08-15T02:15",  "2011-08-15T03:30"],
-    ["30 9 * * *",      "2011-08-15T10:15",  "2011-08-16T09:30"],
-    ["30 9 * * *",      "2011-08-31T10:15",  "2011-09-01T09:30"],
-    ["30 9 * * *",      "2011-09-30T10:15",  "2011-10-01T09:30"],
-    ["0 9 * * *",       "2011-12-31T10:15",  "2012-01-01T09:00"],
-    ["* * 12 * *",      "2010-04-15T10:15",  "2010-05-12T00:00"],
-    ["* * * * 1,3",     "2010-04-15T10:15",  "2010-04-19T00:00"],
-    ["0 0 1 1 *",       "2010-04-15T10:15",  "2011-01-01T00:00"],
+    ["* * * * *",       "2011-08-15 12:00",  "2011-08-15 12:01"],
+    ["* * * * *",       "2011-08-15 02:25",  "2011-08-15 02:26"],
+    ["* * * * *",       "2011-08-15 02:59",  "2011-08-15 03:00"],
+    ["*/15 * * * *",    "2011-08-15 02:02",  "2011-08-15 02:15"],
+    ["*/15,25 * * * *", "2011-08-15 02:15",  "2011-08-15 02:25"],
+    ["30 3,6,9 * * *",  "2011-08-15 02:15",  "2011-08-15 03:30"],
+    ["30 9 * * *",      "2011-08-15 10:15",  "2011-08-16 09:30"],
+    ["30 9 * * *",      "2011-08-31 10:15",  "2011-09-01 09:30"],
+    ["30 9 * * *",      "2011-09-30 10:15",  "2011-10-01 09:30"],
+    ["0 9 * * *",       "2011-12-31 10:15",  "2012-01-01 09:00"],
+    ["* * 12 * *",      "2010-04-15 10:15",  "2010-05-12 00:00"],
+    ["* * * * 1,3",     "2010-04-15 10:15",  "2010-04-19 00:00"],
+    ["0 0 1 1 *",       "2010-04-15 10:15",  "2011-01-01 00:00"],
   ].each do |line, now, expected_next|
     it "should return #{expected_next} for '#{line}' when now is #{now}" do
-      now = Time.xmlschema(now + ":00+00:00")
-      expected_next = Time.xmlschema(expected_next + ":00+00:00")
+      now = parse_date(now)
+      expected_next = parse_date(expected_next)
 
       parser = CronParser.new(line)
 
@@ -44,3 +50,31 @@ describe "CronParser#next" do
     end
   end
 end
+
+describe "CronParser#last" do
+  [
+    ["* * * * *",       "2011-08-15 12:00",  "2011-08-15 11:59"],
+    ["* * * * *",       "2011-08-15 02:25",  "2011-08-15 02:24"],
+    ["* * * * *",       "2011-08-15 03:00",  "2011-08-15 02:59"],
+    ["*/15 * * * *",    "2011-08-15 02:02",  "2011-08-15 02:00"],
+    ["*/15,45 * * * *", "2011-08-15 02:55",  "2011-08-15 02:45"],
+    ["*/15,25 * * * *", "2011-08-15 02:35",  "2011-08-15 02:30"],
+    ["30 3,6,9 * * *",  "2011-08-15 02:15",  "2011-08-14 09:30"],
+    ["30 9 * * *",      "2011-08-15 10:15",  "2011-08-15 09:30"],
+    ["30 9 * * *",      "2011-09-01 08:15",  "2011-08-31 09:30"],
+    ["30 9 * * *",      "2011-10-01 08:15",  "2011-09-30 09:30"],
+    ["0 9 * * *",       "2012-01-01 00:15",  "2011-12-31 09:00"],
+    ["* * 12 * *",      "2010-04-15 10:15",  "2010-04-12 23:59"],
+    ["* * * * 1,3",     "2010-04-15 10:15",  "2010-04-14 23:59"],
+    ["0 0 1 1 *",       "2010-04-15 10:15",  "2010-01-01 00:00"],
+  ].each do |line, now, expected_next|
+    it "should return #{expected_next} for '#{line}' when now is #{now}" do
+      now = parse_date(now)
+      expected_next = parse_date(expected_next)
+
+      parser = CronParser.new(line)
+
+      parser.last(now).should == expected_next
+    end
+  end
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: parse-cron
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors: 
 - Michael Siebert
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-17 00:00:00 +02:00
-default_executable: 
+date: 2011-08-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -26,11 +20,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
         version: 2.6.0
   type: :development
   version_requirements: *id001
@@ -54,8 +43,7 @@ files:
 - parse-cron.gemspec
 - spec/cron_parser_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
-homepage: ""
+homepage: https://github.com/siebertm/parse-cron
 licenses: []
 
 post_install_message: 
@@ -68,23 +56,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: parse-cron
-rubygems_version: 1.4.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Parses cron expressions and calculates the next occurence