kronparser 0.0.3 → 0.0.4

data/README.md

@@ -26,8 +26,10 @@ Usage
 require 'kronparser'
 require 'time'
 
-KronParser.parser("* * * * *").next(Time.parse("Fri Oct 26 11:27:44 +0900 2012"))
+KronParser.parse("* * * * *").next(Time.parse("Fri Oct 26 11:27:44 +0900 2012"))
 # => Fri Oct 26 11:28:00 +0900 2012
+KronParser.parse("40 * * * *").next(Time.parse("Fri Oct 26 11:27:44 +0900 2012"))
+# => Fri Oct 26 10:40:00 +0900 2012
 ```
 
  * Example2
@@ -35,7 +37,7 @@ KronParser.parser("* * * * *").next(Time.parse("Fri Oct 26 11:27:44 +0900 2012")
 ```
 require 'kronparser'
 
-KronParser.parser("* * * * *").next
+KronParser.parse("* * * * *").next
 # => Fri Oct 26 11:28:00 +0900 2012
 # Default value is Time.now
 ```

data/lib/kronparser.rb

@@ -13,7 +13,7 @@ class KronParser
 
   MONTH_LAST_DATE = {
     1 => 31,
-    2 => 29,
+    2 => 28,
     3 => 31,
     4 => 30,
     5 => 31,
@@ -61,7 +61,7 @@ class KronParser
                                                 time.send(time_item) + forward,
                                                 :mon => time.mon,
                                                 :year => time.year)
-      if (forward == 1) || (time_data[time_item] != time.send(time_item))
+      if (forward != 0) || (time_data[time_item] != time.send(time_item))
         idx.times do |i|
           time_data[time_items[i]] = first_elem(time_items[i], :mon => time.mon, :year => time.year)
         end
@@ -86,8 +86,39 @@ class KronParser
     return Time.local(time_data[:year], time_data[:mon], time_data[:day], time_data[:hour], time_data[:min])
   end
 
-  def last(time = TIme.now)
-    Time.now
+  def prev(time = TIme.now)
+    return nil unless @is_time_exist
+
+    back = 0
+    time_items = [:min, :hour, :day, :mon]
+    time_data = {}
+    time_items.each_with_index do |time_item, idx|
+      time_data[time_item], back = prev_elem(time_item,
+                                             time.send(time_item) - back,
+                                             :mon => time.mon,
+                                             :year => time.year)
+      if (back != 0) || (time_data[time_item] != time.send(time_item))
+        idx.times do |i|
+          time_data[time_items[i]] = last_elem(time_items[i], :mon => time.mon, :year => time.year)
+        end
+      end
+    end
+    time_data[:year] = time.year - back
+
+    date = nil
+    while date.nil?
+      date = Date.new(time_data[:year], time_data[:mon], time_data[:day]) rescue nil
+      next if date
+
+      time_data[:min] = last_elem(:min)
+      time_data[:hour] = last_elem(:hour)
+
+      time_data[:day], back = prev_elem(:day, time_data[:day] - 1, time_data)
+      time_data[:mon], back = prev_elem(:mon, time_data[:mon] - back)
+      time_data[:year] -= back
+    end
+
+    return Time.local(time_data[:year], time_data[:mon], time_data[:day], time_data[:hour], time_data[:min])
   end
 
   private
@@ -95,7 +126,7 @@ class KronParser
   def time_exist? 
     return true if @day_type != :day
     @data[:mon].each do |mon|
-      last_date = MONTH_LAST_DATE[mon]
+      last_date = MONTH_LAST_DATE[mon] + (mon == 2 ? 1 : 0)
       return true if last_date == 31
       return true if @data[:day].find { |x| x <= last_date }
     end
@@ -122,6 +153,26 @@ class KronParser
     end
   end
 
+  def last_elem(type, options = {})
+    if (type != :day) || (@day_type == :day)
+      return @data[type].last
+    end
+
+    value = nil
+    last_mon, back = prev_elem(:mon, options[:mon] - 1)
+    date = Date.new(options[:year] - back, last_mon, MONTH_LAST_DATE[last_mon])
+    date = date.next if date.leap?
+    last_wday = @data[:wday].reverse.find { |x| x <= date.wday }
+    value = date.day + (last_wday ? (last_wday - date.wday) : (-7 - date.wday + @data[:wday].last))
+
+    case @day_type
+    when :wday
+      return value
+    when :each
+      return [value, @data[type].last].max
+    end
+  end
+
   def next_elem(type, value, options = {})
     next_value = forward = nil
 
@@ -150,7 +201,36 @@ class KronParser
       return *(((forward > wday_forward) || ((forward == wday_forward) && (next_value > next_wday_value))) ? [next_wday_value, wday_forward] : [next_value, forward])
     end
   end
-  
+ 
+  def prev_elem(type, value, options = {})
+    last_value = back = nil
+
+    if (type != :day) || (@day_type != :wday)
+      last_value = @data[type].reverse.find { |x| x <= value }
+      back = last_value.nil? ? 1 : 0
+      last_value = last_elem(type, options) unless last_value
+
+      return last_value, back if (type != :day) || (@day_type == :day)
+    end
+
+    wday_back = 1
+    last_wday_value = nil
+    date = Date.new(options[:year], options[:mon], value) rescue nil
+    if date
+      last_wday = @data[:wday].reverse.find { |x| x <= date.wday }
+      last_wday_value = value + (last_wday ? (last_wday - date.wday) : (-7 - date.wday + @data[:wday].last))
+      wday_back = 0 if last_wday_value > 0
+    end
+    last_wday_value = last_elem(type, options) if wday_back == 1
+
+    case @day_type
+    when :wday
+      return last_wday_value, wday_back
+    when :each
+      return *(((back > wday_back) || ((back == wday_back) && (last_value < last_wday_value))) ? [last_wday_value, wday_back] : [last_value, back])
+    end
+  end
+
   def parse_elem(format, range)
     case format
     when /,/

data/lib/kronparser/version.rb

@@ -1,3 +1,3 @@
 class KronParser
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/kronparser_spec.rb

@@ -136,6 +136,93 @@ describe KronParser do
     end
   end
 
+  it "could get prev time" do
+    test_data = [
+      ["1 * * * *",     :prev, "2011/12/21 12:31:52", "2011/12/21 12:01:00"],
+      ["* 1 * * *",     :prev, "2011/12/21 12:31:52", "2011/12/21 01:59:00"],
+      ["* * 1 * *",     :prev, "2011/12/21 12:31:52", "2011/12/01 23:59:00"],
+      ["* * * 1 *",     :prev, "2011/12/21 12:31:52", "2011/01/31 23:59:00"],
+      ["* * * * 1",     :prev, "2011/12/21 12:31:52", "2011/12/19 23:59:00"],
+      ["* * * * *",     :prev, "2011/12/21 12:31:52", "2011/12/21 12:31:00"],
+
+      ["5,30 * * * *",  :prev, "2011/12/21 12:01:52", "2011/12/21 11:30:00"],
+      ["5,30 * * * *",  :prev, "2011/12/21 12:04:52", "2011/12/21 11:30:00"],
+      ["5,30 * * * *",  :prev, "2011/12/21 12:05:52", "2011/12/21 12:05:00"],
+      ["5,30 * * * *",  :prev, "2011/12/21 12:06:52", "2011/12/21 12:05:00"],
+      ["5,30 * * * *",  :prev, "2011/12/21 12:29:52", "2011/12/21 12:05:00"],
+      ["5,30 * * * *",  :prev, "2011/12/21 12:30:52", "2011/12/21 12:30:00"],
+      ["5,30 * * * *",  :prev, "2011/12/21 12:31:52", "2011/12/21 12:30:00"],
+      ["5,30 * * * *",  :prev, "2011/12/21 12:40:52", "2011/12/21 12:30:00"],
+
+      ["5,30 * * * *",  :prev, "2011/12/21 12:50:52", "2011/12/21 12:30:00"],
+      ["5,30 * * * *",  :prev, "2011/12/21 12:01:52", "2011/12/21 11:30:00"],
+      ["5,30 * * * *",  :prev, "2011/12/21 00:01:52", "2011/12/20 23:30:00"],
+      ["5,30 * * * *",  :prev, "2011/12/01 00:01:52", "2011/11/30 23:30:00"],
+      ["5,30 * * * *",  :prev, "2011/01/01 00:01:52", "2010/12/31 23:30:00"],
+
+      ["5,30 * * * *",  :prev, "2012/01/01 00:01:52", "2011/12/31 23:30:00"],
+      ["5,30 * * * *",  :prev, "2012/02/01 00:01:52", "2012/01/31 23:30:00"],
+      ["5,30 * * * *",  :prev, "2012/03/01 00:01:52", "2012/02/29 23:30:00"],
+      ["5,30 * * * *",  :prev, "2012/04/01 00:01:52", "2012/03/31 23:30:00"],
+      ["5,30 * * * *",  :prev, "2012/05/01 00:01:52", "2012/04/30 23:30:00"],
+      ["5,30 * * * *",  :prev, "2012/06/01 00:01:52", "2012/05/31 23:30:00"],
+      ["5,30 * * * *",  :prev, "2012/07/01 00:01:52", "2012/06/30 23:30:00"],
+      ["5,30 * * * *",  :prev, "2012/08/01 00:01:52", "2012/07/31 23:30:00"],
+      ["5,30 * * * *",  :prev, "2012/09/01 00:01:52", "2012/08/31 23:30:00"],
+      ["5,30 * * * *",  :prev, "2012/10/01 00:01:52", "2012/09/30 23:30:00"],
+      ["5,30 * * * *",  :prev, "2012/11/01 00:01:52", "2012/10/31 23:30:00"],
+      ["5,30 * * * *",  :prev, "2012/12/01 00:01:52", "2012/11/30 23:30:00"],
+      ["5,30 * * * *",  :prev, "2013/01/01 00:01:52", "2012/12/31 23:30:00"],
+      ["5,30 * * * *",  :prev, "2011/03/01 00:01:52", "2011/02/28 23:30:00"],
+
+      ["* 5 * * *",  :prev, "2011/03/02 10:10:52", "2011/03/02 05:59:00"],
+      ["* 5 * * *",  :prev, "2011/03/02 05:59:00", "2011/03/02 05:59:00"],
+      ["* 5 * * *",  :prev, "2011/03/02 05:00:00", "2011/03/02 05:00:00"],
+      ["* 5 * * *",  :prev, "2011/03/02 04:59:00", "2011/03/01 05:59:00"],
+      ["* 5 * * *",  :prev, "2011/03/01 04:59:00", "2011/02/28 05:59:00"],
+      ["* 5 * * *",  :prev, "2011/01/01 04:59:00", "2010/12/31 05:59:00"],
+
+      ["* * 5 * *",  :prev, "2011/01/31 04:59:00", "2011/01/05 23:59:00"],
+      ["* * 5 * *",  :prev, "2011/02/04 23:59:00", "2011/01/05 23:59:00"],
+      ["* * 5 * *",  :prev, "2011/01/04 23:59:00", "2010/12/05 23:59:00"],
+
+      ["* * * 5 *",  :prev, "2011/05/23 04:59:34", "2011/05/23 04:59:00"],
+      ["* * * 5 *",  :prev, "2011/10/01 04:59:00", "2011/05/31 23:59:00"],
+      ["* * * 5 *",  :prev, "2011/04/30 23:59:59", "2010/05/31 23:59:00"],
+      
+      ["* * * * 5",     :prev, "2011/04/30 23:59:59", "2011/04/29 23:59:00"],
+      ["* * * * 5",     :prev, "2011/04/28 23:59:59", "2011/04/22 23:59:00"],
+      ["* * * * 5",     :prev, "2011/03/03 23:59:59", "2011/02/25 23:59:00"],
+      ["* * * * 5",     :prev, "2011/01/06 23:59:59", "2010/12/31 23:59:00"],
+      ["* * * * 3,5",   :prev, "2011/04/30 23:59:59", "2011/04/29 23:59:00"],
+      ["* * * * 3,5",   :prev, "2011/04/29 12:12:59", "2011/04/29 12:12:00"],
+      ["* * * * 3,5",   :prev, "2011/04/28 23:59:59", "2011/04/27 23:59:00"],
+      ["* * * * 3,5",   :prev, "2011/04/27 12:12:59", "2011/04/27 12:12:00"],
+      ["* * * * 3,5",   :prev, "2011/04/26 23:59:59", "2011/04/22 23:59:00"],
+
+      ["* * 2 * 5",     :prev, "2011/02/05 23:59:59", "2011/02/04 23:59:00"],
+      ["* * 2 * 5",     :prev, "2011/02/04 23:59:59", "2011/02/04 23:59:00"],
+      ["* * 2 * 5",     :prev, "2011/02/03 23:59:59", "2011/02/02 23:59:00"],
+      ["* * 2 * 5",     :prev, "2011/02/02 23:59:59", "2011/02/02 23:59:00"],
+      ["* * 2 * 5",     :prev, "2011/02/01 23:59:59", "2011/01/28 23:59:00"],
+      ["* * 2 * 5",     :prev, "2011/01/01 23:59:59", "2010/12/31 23:59:00"],
+
+      ["* * 27 * 5",     :prev, "2011/02/28 23:59:59", "2011/02/27 23:59:00"],
+      ["* * 27 * 5",     :prev, "2011/02/27 23:59:59", "2011/02/27 23:59:00"],
+      ["* * 27 * 5",     :prev, "2011/02/26 23:59:59", "2011/02/25 23:59:00"],
+      ["* * 27 * 5",     :prev, "2011/02/25 23:59:59", "2011/02/25 23:59:00"],
+      ["* * 27 * 5",     :prev, "2011/03/02 23:59:59", "2011/02/27 23:59:00"],
+      ["* * 30 * 1",     :prev, "2011/01/01 23:59:59", "2010/12/30 23:59:00"],
+
+      ["* * 29 2 *",     :prev, "2011/05/01 23:59:59", "2008/02/29 23:59:00"],
+    ]
+
+    test_data.each do |cron_time_format, target_method, now_date, get_date|
+      result_date = KronParser.parse(cron_time_format).send(target_method, Time.parse(now_date))
+      result_date.should == Time.parse(get_date)
+    end
+  end
+
   it "could get nil if next time is not exist" do
     data = [
       ["* * 31 1 *",        :next, "2012/01/31 23:59:59", "2013/01/31 00:00:00"],
@@ -168,6 +255,17 @@ describe KronParser do
     end
   end
 
+  it "could get nil if prev time is not exist" do
+    data = [
+      ["* * 31 2 *",        :prev, "2012/01/31 23:59:59", nil],
+    ]
+
+    data.each do |cron_time_format, target_method, now_date, get_date|
+      result_date = KronParser.parse(cron_time_format).send(target_method, Time.parse(now_date))
+      result_date.should == (get_date ? Time.parse(get_date) : nil)
+    end
+  end
+
   it "should raise ArgmentError when value is out of range" do
     data = [
       ["-1 * * * *",  false],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kronparser
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-27 00:00:00.000000000 Z
+date: 2012-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70325128253200 !ruby/object:Gem::Requirement
+  requirement: &70314147481600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70325128253200
+  version_requirements: *70314147481600
 description: datermine next scheduled crontab run
 email:
 - ''