vrinek-periodicity 0.2 → 0.2.1

data/History.txt

@@ -1,4 +1,16 @@
-=== 0.1 2009-08-06
+=== 0.2.1 -- 2009-08-06
 
-* 1 major enhancement:
-  * Initial release
+* <b>[FEATURE]</b> Now supports <tt>at('5:20')</tt> kind of precision
+
+=== 0.2 -- 2009-08-06
+
+* <b>[FEATURE]</b> Can use _overnight_ limits (e.g. from 22:00 to 02:00)
+* Removed some duplicate code
+
+=== 0.1.1 -- 2009-08-06
+
+* Can use <tt>.every(:other)</tt> which means <tt>.every(2)</tt>
+
+=== 0.1 -- 2009-08-06
+
+* Initial release

data/README.rdoc

@@ -14,8 +14,8 @@ means: every 2 hours at :20 from 10:00 to 15:00 (10:20, 12:20, 14:20)
   period.next_run # returns the next calculated time as a Time object
   
   Period.new.every(:half).hour # every 30 minutes
-  Period.every.week # every week
-  Period.every(5).seconds # every 5 seconds
+  Period.new.every.week # every week
+  Period.new.every(5).seconds # every 5 seconds
 
 == REQUIREMENTS:
 
@@ -28,4 +28,4 @@ means: every 2 hours at :20 from 10:00 to 15:00 (10:20, 12:20, 14:20)
 
 == TODO:
 
-* add <em>sub-sub-time</em> precision to at(time) (e.g. '5:30')
+* add something like "every minute from 20:00 to 21:00 and from 02:00 to 03:00"

data/lib/periodicity.rb

@@ -5,5 +5,5 @@ require 'activesupport'
 require 'periodicity/period'
 
 module Periodicity
-  VERSION = '0.2'
+  VERSION = '0.2.1'
 end

data/lib/periodicity/period.rb

@@ -108,9 +108,15 @@ class Period
 =begin rdoc
   Sets a specific "sub-time" for the next_run:
     every(2).hours.at(15) # means "every 2 hours at the first quarter of each" e.g. 12:15, 14:15, 16:15
-  
-  NOTE: when using at and from, to limits together the limits *always* calculate at 0 "sub-time":
+    
+  Specific time within a day is also supported:
+    every(3).days.at('5:30') # means "every 3 days at 05:30"
+    
+  <b>NOTE 1:</b> when using at and from, to limits together the limits *always* calculate at 0 "sub-time":
     every(2).hours.at(15).from(12).to(16) # will return 12:15, 14:15 but not 16:15 because the to limit ends at 16:00
+    
+  <b>NOTE 2:</b> when using minute precision (5:30) but instead of every.day the interval is in another period, the minutes will be discarded.
+    every.hour.at('5:30') # means "every hour at :05" (e.g. 12:05, 13:05, 14:05)
 =end
   def at(time)
     unless time.is_a?(Integer)
@@ -118,7 +124,8 @@ class Period
       when /^\d+:00$/
         time[/^\d+/].to_i
       when /^\d+:\d{2}$/
-        raise 'Precise timing like "20:15" is not yet supported'
+        @min_at = time.split(/:/)[1].to_i
+        time.split(/:/)[0].to_i
       when /^(noon|afternoon|midnight|morning)$/
         DAY_PERIODS[time.to_s]
       else
@@ -175,7 +182,13 @@ class Period
   end
   
   def calc_precision(scope = nil)
-    @at = 0 if scope
+    if scope
+      @at = if @min_at and scope == 1.hour
+        @min_at
+      else
+        0
+      end
+    end
 
     if down = downtime(scope || @scope)
       unless now(down) == @at

data/spec/periodicity_spec.rb

@@ -36,7 +36,14 @@ describe Period do
     period.every.day.at('5:00').next_run.should == "Aug 06 05:00:00 2009".to_time
     period.every.day.at('05:00').next_run.should == "Aug 06 05:00:00 2009".to_time
     
-    lambda {period.every.day.at('05:30').next_run}.should raise_error # not yet implemented
+    (n = period.every.day.at('05:30').next_run).should == "Aug 06 05:30:00 2009".to_time
+    (n = Period.new(n).every.day.at('05:30').next_run).should == "Aug 07 05:30:00 2009".to_time
+    (n = Period.new(n).every.day.at('05:30').next_run).should == "Aug 08 05:30:00 2009".to_time
+    
+    (n = period.every(2).days.from(12).to(17).at('05:30').next_run).should == "Aug 12 05:30:00 2009".to_time
+    (n = Period.new(n).every(2).days.from(12).to(17).at('05:30').next_run).should == "Aug 14 05:30:00 2009".to_time
+    (n = Period.new(n).every(2).days.from(12).to(17).at('05:30').next_run).should == "Aug 16 05:30:00 2009".to_time
+    (n = Period.new(n).every(2).days.from(12).to(17).at('05:30').next_run).should == "Sep 12 05:30:00 2009".to_time
   end
   
   it "should return correct time with precision" do
@@ -131,12 +138,9 @@ describe Period do
     (n = Period.new(n).every.every(5).minutes.at(30).from(40).to(10).next_run).should == "Aug 05 15:50:30 2009".to_time
   end
   
-  it "should avoid some pitfalls" do
+  it "should avoid some obvious pitfalls" do
     Period.new("Aug 05 14:41:23 2009".to_time).every.hour.at(40).next_run.should == "Aug 05 15:40:00 2009".to_time
     Period.new("Aug 05 14:39:23 2009".to_time).every.hour.at(40).next_run.should == "Aug 05 15:40:00 2009".to_time
-    
-    # lambda {period.from(5).to(1)}.should raise_error
-    # lambda {period.to(1).from(5)}.should raise_error
   end
   
   def period

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vrinek-periodicity
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: 0.2.1
 platform: ruby
 authors: 
 - Kostas Karachalios