workpattern 0.2.0 → 0.3.0

data/.gitignore

@@ -1,2 +1,3 @@
 doc
 pkg
+.yardoc

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-19mode

data/CHANGELOG

@@ -1,3 +1,11 @@
+## Workpattern v0.3.0 (Jul 19, 2012)  ##
+
+* incomplete tests for week (#2) * Barrie Callender *
+* getting wrong time when hour had exactly the right number of minutes (#9) * Barrie Callender *
+* jruby-19mode failed with SystemStackError: stack level too deep  (#8) * Barrie Callender *
+* midnight flag should override hour and minutes  (#7) * Barrie Callender *
+* available minutes not calculating correctly for a time of 00:01 (#6) * Barrie Callender *
+
 ## Workpattern v0.2.0 (May 31, 2012)  ##
 
 *   Rewritten from scratch effectively first version * Barrie Callender *

data/Gemfile.lock

@@ -0,0 +1,16 @@
+PATH
+  remote: .
+  specs:
+    workpattern (0.3.0.beta)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    rake (0.9.2.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake (~> 0.9.2)
+  workpattern!

data/README.md

@@ -1,3 +1,5 @@
+# Workpattern [![Build Status](https://secure.travis-ci.org/callenb/workpattern.png)](https://secure.travis-ci.org/callenb/workpattern.png)
+
 ## What?
 
 Simple addition and subtraction of minutes on dates taking account of real-life working and resting periods.

data/lib/workpattern/day.rb

@@ -124,7 +124,7 @@ module Workpattern
     # Returns the total number of minutes between and including two minutes.
     # 
     def minutes(start_hour,start_min,finish_hour,finish_min)
-      return 0 if (start_hour==finish_hour && start_hour==0 && start_min==finish_min && start_min==0)
+      
       if (start_hour > finish_hour) || ((finish_hour==start_hour) && (start_min > finish_min))
         start_hour,start_min,finish_hour,finish_min=finish_hour,finish_min,start_hour,finish_min 
       end
@@ -219,14 +219,15 @@ module Workpattern
     # for the start of the following
     #
     def add(time,duration)
-      available_minutes=minutes(time.hour,time.min,@hours-1,59)
+      available_minutes=minutes(time.hour,time.min,@hours-1,59)   
       if ((duration-available_minutes)>0) # not enough minutes left in the day      
+
         result_date= time.next_day - (HOUR*time.hour) - (MINUTE*time.min)
         duration = duration - available_minutes      
       else
         total=@values[time.hour].minutes(time.min,59)
-        if (total==duration) # this hour satisfies
-          result_date=time + HOUR - (MINUTE*time.min)
+        if (total==duration) # this hour satisfies              
+          result_date=time - (MINUTE*time.min) + (MINUTE*@values[time.hour].last) + MINUTE                   
           duration = 0
         else  
           result_date = time

data/lib/workpattern/version.rb

@@ -1,3 +1,3 @@
 module Workpattern
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end  

data/lib/workpattern/week.rb

@@ -1,14 +1,30 @@
 module Workpattern
   
-  # Represents working and resting times of each day in a week from one date to another.
-  # The two dates could be the same day or they could be several weeks or years apart.
+  # @author Barrie Callender
+  # @!attribute values
+  #   @return [Array] each day of the week
+  # @!attribute days
+  #   @return [Fixnum] number of days in the week
+  # @!attribute start
+  #   @return [DateTime] first date in the range
+  # @!attribute finish
+  #   @return [DateTime] last date in the range
+  # @!attribute week_total
+  #   @return [Fixnum] total number of minutes in a week
+  # @!attribute total
+  #   @return [Fixnum] total number of minutes in the range
+  #  
+  # Represents working and resting periods for each day in a week for a specified date range.
   #
   class Week
     
     attr_accessor :values, :days, :start, :finish, :week_total, :total
-    
-    # :call-seq: new(start,finish,type) => Week
-    #  
+
+    # Initialises an instance of class Week
+    # @param [DateTime] start first date in the range
+    # @param [DateTime] finish last date in the range
+    # @param [Fixnum] type working (1) or resting (0)
+    # @return [Week] newly initialised Week object    
     #
     def initialize(start,finish,type=1)
       hours_in_days_in_week=[24,24,24,24,24,24,24]
@@ -20,6 +36,9 @@ module Workpattern
       set_attributes
     end
     
+    # Duplicates the current Week object
+    # @return [Week] a duplicated instance of the current Week object
+    #
     def duplicate()
       duplicate_week=Week.new(@start,@finish)
       duplicate_values=Array.new(@values.size)
@@ -36,27 +55,48 @@ module Workpattern
       return duplicate_week
     end
     
+    # Recalculates the attributes that defines a Week object.
+    # This was made public for #duplicate to work
+    #
     def refresh
       set_attributes
     end
     
+    # Changes the date range.
+    # This method calls #refresh to update the attributes.
+    #
     def adjust(start,finish)
       @start=DateTime.new(start.year,start.month,start.day)
       @finish=DateTime.new(finish.year,finish.month,finish.day)
       refresh
     end
     
+    # Sets a range of minutes in a week to be working or resting.  The parameters supplied
+    # to this method determine exactly what should be changed
+    # @param [Hash] days identifies the days to be included in the range
+    # @param [DateTime] from_time where the time portion is used to specify the first minute to be set
+    # @param [DateTime] to_time where the time portion is used to specify the last minute to be set
+    # @param [Fixnum] type where a 1 sets it to working and a 0 to resting
     def workpattern(days,from_time,to_time,type)
       DAYNAMES[days].each {|day| @values[day].workpattern(from_time,to_time,type)}  
       refresh
     end
     
+    # Calculates a new date by adding or subtracting a duration in minutes.
+    # @param [DateTime] start original date
+    # @param [Fixnum] duration minutes to add or subtract
+    # @param [Boolean] midnight flag used for subtraction that indicates the start date is midnight
+    #
     def calc(start,duration, midnight=false)
-      return start,duration if duration==0
+      return start,duration,false if duration==0
       return add(start,duration) if duration > 0
+      return subtract(@start,duration, midnight) if (@total==0) && (duration <0)
       return subtract(start,duration, midnight) if duration <0  
     end
     
+    # Comparison — Returns an integer (-1, 0, or +1) if week is less than, equal to, or greater than other_week
+    # @param [Week] other_week object to compare to
+    # @return [Integer] -1,0 or +1 if week is less than, equal to or greater than other_week
     def <=>(obj)
       if @start < obj.start
         return -1
@@ -67,16 +107,19 @@ module Workpattern
       end      
     end
     
-    # :call-seq: working?(start) => Boolean
-    # Returns true if the given minute is working and false if it isn't
+    # Returns true if the supplied DateTime is working and false if resting
+    # @param [DateTime] start DateTime to be tested
+    # @return [Boolean] true if the minute is working otherwise false if it is a resting minute
     #
     def working?(start)
       @values[start.wday].working?(start)
     end    
 
-    
-    # :call-seq: diff(start,finish) => Duration, Date
-    # Returns the difference in minutes between two times.
+    # Returns the difference in minutes between two DateTime values.
+    # @param [DateTime] start starting DateTime
+    # @param [DateTime] finish ending DateTime
+    # @return [Fixnum] number of minutes
+    # @return [DateTime] start date for rest of calculation.  The calculation is complete when this is the same as the finish date
     #
     def diff(start,finish)
       start,finish=finish,start if ((start <=> finish))==1
@@ -94,6 +137,8 @@ module Workpattern
     
     private
     
+    # Recalculates all the attributes for a Week object
+    #
     def set_attributes
       @total=0
       @week_total=0
@@ -113,6 +158,11 @@ module Workpattern
       end
     end
     
+    # Calculates the total number of minutes between two dates
+    # @param [DateTime] start is the first date in the range
+    # @param [DateTime] finish is the last date in the range
+    # @return [Fixnum] total number of minutes between supplied dates
+    #
     def total_hours(start,finish)
       total=0
       start.upto(finish) {|day|
@@ -121,10 +171,18 @@ module Workpattern
       return total
     end
     
+    # Adds a duration in minutes to a date
+    # @param [DateTime] start original date
+    # @param [Fixnum] duration minutes to add
+    # @param [Boolean] midnight flag used for subtraction that indicates the start date is midnight
+    # @return [DateTime] the calculated date
+    # @return [Fixnum] the number of minutes still to be added
+    # @return [Boolean] Always false, this is the flag used for subtraction
+    #
     def add(start,duration)
       # aim to calculate to the end of the day
-      start,duration = @values[start.wday].calc(start,duration)
-      return start,duration if (duration==0) || (start.jd > @finish.jd) 
+      start,duration = @values[start.wday].calc(start,duration)   
+      return start,duration,false if (duration==0) || (start.jd > @finish.jd) 
       # aim to calculate to the end of the next week day that is the same as @finish
       while((duration!=0) && (start.wday!=@finish.next_day.wday) && (start.jd <= @finish.jd))
         if (duration>@values[start.wday].total)
@@ -138,17 +196,17 @@ module Workpattern
         end
       end
       
-      return start,duration if (duration==0) || (start.jd > @finish.jd) 
+      return start,duration,false if (duration==0) || (start.jd > @finish.jd) 
       
-      #while duration accomodates full weeks
+      # while duration accomodates full weeks
       while ((duration!=0) && (duration>=@week_total) && ((start.jd+6) <= @finish.jd))
         duration=duration - @week_total
         start=start+7
       end
 
-      return start,duration if (duration==0) || (start.jd > @finish.jd) 
+      return start,duration,false if (duration==0) || (start.jd > @finish.jd) 
 
-      #while duration accomodates full days
+      # while duration accomodates full days
       while ((duration!=0) && (start.jd<= @finish.jd))
         if (duration>@values[start.wday].total)
           duration = duration - @values[start.wday].total
@@ -157,10 +215,18 @@ module Workpattern
           start,duration = @values[start.wday].calc(start,duration)
         end
       end    
-      return start, duration 
+      return start, duration, false 
       
     end
-
+    
+    # Subtracts a duration in minutes from a date
+    # @param [DateTime] start original date
+    # @param [Fixnum] duration minutes to subtract - always a negative
+    # @param [Boolean] midnight flag indicates the start date is midnight when true
+    # @return [DateTime] the calculated date
+    # @return [Fixnum] the number of minutes still to be subtracted
+    # @return [Boolean] When set to true indicates the time is midnight on the given date
+    #
     def subtract(start,duration,midnight=false)
       
       # Handle subtraction from start of day
@@ -218,12 +284,25 @@ module Workpattern
       
     end
     
+    # Supports calculating from midnight by updating the given duration depending on whether the
+    # last minute in the day is resting or working.  It then sets the time to this minute.
+    # @param [DateTime] start is the date whose midnight is to be used as the start date
+    # @param [Fixnum] duration is the number of minutes to subtract
+    # @return [DateTime] the date with a time of 23:59
+    # @return [Fixnum] the duration adjusted according to whether 23:59 is resting or not
+    #
     def minute_b4_midnight(start,duration)
+      start -= start.hour * HOUR
+      start -= start.min * MINUTE
       duration += @values[start.wday].minutes(23,59,23,59)
       start = start.next_day - MINUTE
       return start,duration
     end  
     
+    # Calculates the date and time after the last working minute of the current date
+    # @param [DateTime] start is the current date
+    # @return [DateTime] the new date
+    #
     def after_last_work(start)
       if @values[start.wday].last_hour.nil?
         return start.next_day
@@ -234,6 +313,13 @@ module Workpattern
       end  
     end
     
+    # Calculates the difference between two dates that exist in this Week object.
+    # @param [DateTime] start first date 
+    # @param [DateTime] finish last date
+    # @param [DateTime] finish_on the range to be used in this Week object.  
+    # @return [DateTime] new date for rest of calculation otherwise same as finish if completed calculation
+    # @return [Fixnum] total number of minutes calculated thus far.
+    #
     def diff_detail(start,finish,finish_on)
       duration, start=@values[start.wday].diff(start,finish)
       #rest of week to finish day

data/test/test_day.rb

@@ -184,6 +184,7 @@ class TestDay < Test::Unit::TestCase #:nodoc:
     # y   ,m ,d ,h ,n ,dur ,yr  ,mr,dr,hr,nr,rem ,midnight,midnightr    
     tests=[
      [2000,1 ,1 ,0 ,0 ,-3  ,1999,12,31,0 ,0 ,-3  ,false   ,true],
+     [2000,1 ,1 ,0 ,1 ,-2  ,1999,12,31,0 ,0 ,-1  ,false   ,true], #Issue 6 - available minutes not calculating correctly for a time of 00:01
      [2000,1 ,1 ,23,59,0   ,2000,1 ,1 ,23,59,0   ,false   ,false],
      [2000,1 ,1 ,23,59,-1  ,2000,1 ,1 ,23,58,0   ,false   ,false],
      [2000,1 ,1 ,23,59,-2  ,2000,1 ,1 ,23,57,0   ,false   ,false],
@@ -197,7 +198,7 @@ class TestDay < Test::Unit::TestCase #:nodoc:
      [2000,1 ,1 ,0 ,0 ,-2  ,2000,1 ,1 ,23,58,0   ,true    ,false],
      [2000,1 ,1 ,0 ,0 ,-33 ,2000,1 ,1 ,23,27,0   ,true    ,false],
      [2000,1 ,1 ,0 ,0 ,-60 ,2000,1 ,1 ,23,0 ,0   ,true    ,false],
-     [2000,1 ,1 ,0 ,0 ,-931,2000,1 ,1 ,8 ,29,0   ,true    ,false]
+     [2000,1 ,1 ,0 ,0 ,-931,2000,1 ,1 ,8 ,29,0   ,true    ,false]     
     ]
     clue="subtract minutes in a working day"
     calc_test(day,tests,clue)

data/test/test_week.rb

@@ -66,49 +66,153 @@ class TestWeek < Test::Unit::TestCase #:nodoc:
     start=DateTime.new(2000,1,1,0,0)
     finish=DateTime.new(2005,12,31,8,59)
     working_week=week(start,finish,1)
-    result_date, result_duration= working_week.calc(start,0)
-    assert_equal start,result_date, "#{start} + #{0}"
-    result_date,result_duration=working_week.calc(finish,0)
-    assert_equal finish,result_date, "#{finish} + #{0}"
-    result_date,result_duration=working_week.calc(finish,10)
-    assert_equal DateTime.new(2005,12,31,9,9),result_date, "#{finish} + #{10}"
+      
+    [# yyyy,mm,dd,hh,mn,durtn,ryyyy,rmm,rdd,rhh,rmn,rdurtn
+     [ 2000, 1, 1, 0, 0,    0, 2000,  1,  1,  0,  0,     0],
+     [ 2005,12,31, 8,59,   10, 2005, 12, 31,  9,  9,     0],
+     [ 2005,12,31,23,59,    1, 2006,  1,  1,  0,  0,     0],
+     [ 2005,12,31,23,59,    2, 2006,  1,  1,  0,  0,     1],
+     [ 2005,11,30,23,59,    2, 2005, 12,  1,  0,  1,     0]
+    ].each {|yyyy,mm,dd,hh,mn,durtn,ryyyy,rmm,rdd,rhh,rmn,rdurtn|
+      start=DateTime.new(yyyy,mm,dd,hh,mn)
+      result_date, result_duration= working_week.calc(start,durtn)
+      assert_equal DateTime.new(ryyyy,rmm,rdd,rhh,rmn), result_date, "result_date for working_week.calc(#{start},#{durtn})"
+      assert_equal rdurtn, result_duration,"result_duration for working_week.calc(#{start},#{durtn})"
+    }
   end
   
   must 'add minutes in a resting week' do
-    assert true
+    start=DateTime.new(2000,1,1,0,0)
+    finish=DateTime.new(2005,12,31,8,59)
+    resting_week=week(start,finish,0)
+      
+    [# yyyy,mm,dd,hh,mn,durtn,midnight,ryyyy,rmm,rdd,rhh,rmn,rdurtn,rmidnight
+     [ 2000, 1, 1, 0, 0,    0,   false, 2000,  1,  1,  0,  0,     0,   false],
+     [ 2005,12,31, 8,59,   10,   false, 2006,  1,  1,  0,  0,    10,   false],
+     [ 2005,12,31,23,59,    1,   false, 2006,  1,  1,  0,  0,     1,   false],
+     [ 2005,12,31,23,59,    2,   false, 2006,  1,  1,  0,  0,     2,   false],
+     [ 2005,11,30,23,59,    2,   false, 2006,  1,  1,  0,  0,     2,   false],
+     [ 2000, 1, 1, 0, 0,    0,    true, 2000,  1,  1,  0,  0,     0,   false],
+     [ 2005,12,31, 8,59,   10,    true, 2006,  1,  1,  0,  0,    10,   false],
+     [ 2005,12,31,23,59,    1,    true, 2006,  1,  1,  0,  0,     1,   false],
+     [ 2005,12,31,23,59,    2,    true, 2006,  1,  1,  0,  0,     2,   false],
+     [ 2005,11,30,23,59,    2,    true, 2006,  1,  1,  0,  0,     2,   false]     
+    ].each {|yyyy,mm,dd,hh,mn,durtn,midnight,ryyyy,rmm,rdd,rhh,rmn,rdurtn,rmidnight|
+      start=DateTime.new(yyyy,mm,dd,hh,mn)
+      result_date, result_duration,result_midnight= resting_week.calc(start,durtn,midnight)
+      assert_equal DateTime.new(ryyyy,rmm,rdd,rhh,rmn), result_date, "result_date for resting_week.calc(#{start},#{durtn},#{midnight})"
+      assert_equal rdurtn, result_duration,"result_duration for resting_week.calc(#{start},#{durtn},#{midnight})"
+      assert_equal rmidnight, result_midnight,"result_midnight for resting_week.calc(#{start},#{durtn},#{midnight})"      
+    }
   end
   
   must 'add minutes in a patterned week' do
-    assert true
+    start=DateTime.new(2000,1,1,0,0) #saturday
+    finish=DateTime.new(2005,12,31,8,59) #saturday
+    working_week=week(start,finish,0)
+    working_week.workpattern(:sun,clock(9,0),clock(9,13),1) 
+    
+    working_week.workpattern(:weekday,clock(9,0),clock(11,59),1)
+    working_week.workpattern(:weekday,clock(13,0),clock(17,59),1)
+    
+    working_week.workpattern(:mon,clock(0,0),clock(23,59),0) 
+    working_week.workpattern(:mon,clock(9,0),clock(9,13),1)
+    working_week.workpattern(:mon,clock(10,1),clock(10,1),1)        
+    
+    
+    [# yyyy,mm,dd,hh,mn,durtn,midnight,ryyyy,rmm,rdd,rhh,rmn,rdurtn,rmidnight
+     [ 2000, 1, 1, 0, 0,    0,   false, 2000,  1,  1,  0,  0,     0,   false],
+     [ 2000, 1, 1, 0, 0,    1,   false, 2000,  1,  2,  9,  1,     0,   false],
+     [ 2000, 1, 2, 9, 0,   14,   false, 2000,  1,  2,  9,  14,     0,   false], #Issue #9 - getting wrong time when hour had exactly the right number of minutes
+     [ 2000, 1, 2, 9, 0,   15,   false, 2000,  1,  3,  9,  1,     0,   false],
+     [ 2000, 1, 2, 9, 0,   29,   false, 2000,  1,  3,  10,  2,     0,   false],     
+     [ 2000, 1, 2, 9, 0, 1950,   false, 2000,  1,  9,   9,  1,     0,   false],
+     [ 2005,12,25, 9, 0, 1950,   false, 2006,  1,  1,   0,  0,     1,   false],
+     [ 2005,12,25, 9, 0, 1949,   false, 2005, 12, 30,  18,  0,     0,   false]#,          
+    ].each {|yyyy,mm,dd,hh,mn,durtn,midnight,ryyyy,rmm,rdd,rhh,rmn,rdurtn,rmidnight|
+      start=DateTime.new(yyyy,mm,dd,hh,mn)   
+      result_date, result_duration,result_midnight= working_week.calc(start,durtn,midnight)
+      assert_equal DateTime.new(ryyyy,rmm,rdd,rhh,rmn), result_date, "result_date for working_week.calc(#{start},#{durtn},#{midnight})"
+      assert_equal rdurtn, result_duration,"result_duration for working_week.calc(#{start},#{durtn},#{midnight})"
+      assert_equal rmidnight, result_midnight,"result_midnight for working_week.calc(#{start},#{durtn},#{midnight})"      
+    }
   end
   
   must 'subtract minutes in a working week' do
     start=DateTime.new(2000,1,1,0,0)
     finish=DateTime.new(2005,12,31,8,59)
     working_week=week(start,finish,1)
-    result_date, result_duration= working_week.calc(start,0)
-    assert_equal start,result_date, "#{start} + #{0}"
-    result_date,result_duration=working_week.calc(finish,0)
-    assert_equal finish,result_date, "#{finish} + #{0}"
-    result_date,result_duration=working_week.calc(finish,-10)
-    assert_equal DateTime.new(2005,12,31,8,49),result_date, "#{finish} - #{10}"
-    result_date,result_duration=working_week.calc(DateTime.new(2005,12,31,0,0),-10)
-    assert_equal DateTime.new(2005,12,30,23,50),result_date, "#{DateTime.new(2005,12,31,0,0)} - #{10}"
+    [# yyyy,mm,dd,hh,mn,durtn,midnight,ryyyy,rmm,rdd,rhh,rmn,rdurtn,rmidnight
+     [ 2000, 1, 1, 0, 0,    0,   false, 2000,  1,  1,  0,  0,     0,   false],
+     [ 2005,12,31, 0, 0,  -10,   false, 2005, 12, 30, 23, 50,     0,   false],
+     [ 2005,12,31, 0, 0,   -1,   false, 2005, 12, 30, 23, 59,     0,   false],
+     [ 2005,12,31, 0, 1,   -2,   false, 2005, 12, 30, 23, 59,     0,   false], #Issue 6 - available minutes not calculating correctly for a time of 00:01
+     [ 2000, 1, 1, 0, 1,   -2,   false, 1999, 12, 31,  0,  0,     -1,   true], #Issue 6 - available minutes not calculating correctly for a time of 00:01
+     [ 2000, 1, 1, 0, 0,    0,    true, 2000,  1,  1,  0,  0,     0,   false],
+     [ 2005,12,31, 0, 0,  -10,    true, 2005, 12, 31, 23, 50,     0,   false],
+     [ 2005,12,31, 0, 0,   -1,    true, 2005, 12, 31, 23, 59,     0,   false],
+     [ 2005,12,31, 0, 1,   -2,    true, 2005, 12, 31, 23, 58,     0,   false],#Issue 7 - midnight flag should override hour and minutes     
+     [ 2000, 1, 1, 0, 1,   -2,    true, 2000,  1,  1, 23, 58,     0,   false] #Issue 7 - midnight flag should override hour and minutes     
+    ].each {|yyyy,mm,dd,hh,mn,durtn,midnight,ryyyy,rmm,rdd,rhh,rmn,rdurtn,rmidnight|
+      start=DateTime.new(yyyy,mm,dd,hh,mn)
+      result_date, result_duration,result_midnight= working_week.calc(start,durtn,midnight)
+      assert_equal DateTime.new(ryyyy,rmm,rdd,rhh,rmn), result_date, "result_date for working_week.calc(#{start},#{durtn},#{midnight})"
+      assert_equal rdurtn, result_duration,"result_duration for working_week.calc(#{start},#{durtn},#{midnight})"
+      assert_equal rmidnight, result_midnight,"result_midnight for working_week.calc(#{start},#{durtn},#{midnight})"      
+    }
   end
   
   must 'subtract minutes in a resting week' do
-    assert true
+    start=DateTime.new(2000,1,1,0,0)
+    finish=DateTime.new(2005,12,31,8,59)
+    resting_week=week(start,finish,0)
+    [# yyyy,mm,dd,hh,mn,durtn,midnight,ryyyy,rmm,rdd,rhh,rmn,rdurtn,rmidnight
+     [ 2000, 1, 1, 0, 0,    0,   false, 2000,  1,  1,  0,  0,     0,    false],
+     [ 2005,12,31, 0, 0,  -10,   false, 1999, 12, 31,  0,  0,   -10,     true],
+     [ 2005,12,31, 0, 0,   -1,   false, 1999, 12, 31,  0,  0,    -1,     true],
+     [ 2005,12,31, 0, 1,   -2,   false, 1999, 12, 31,  0,  0,    -2,     true],
+     [ 2000, 1, 1, 0, 1,   -2,   false, 1999, 12, 31,  0,  0,    -2,     true]
+    ].each {|yyyy,mm,dd,hh,mn,durtn,midnight,ryyyy,rmm,rdd,rhh,rmn,rdurtn,rmidnight|
+      start=DateTime.new(yyyy,mm,dd,hh,mn)
+      result_date, result_duration, result_midnight= resting_week.calc(start,durtn,midnight)
+      assert_equal DateTime.new(ryyyy,rmm,rdd,rhh,rmn), result_date, "result_date for resting_week.calc(#{start},#{durtn},#{midnight})"
+      assert_equal rdurtn, result_duration,"result_duration for resting_week.calc(#{start},#{durtn},#{midnight})"
+      assert_equal rmidnight, result_midnight,"result_midnight for resting_week.calc(#{start},#{durtn},#{midnight})"      
+    }
   end
   
   must 'subtract minutes in a patterned week' do
-    assert true
+    start=DateTime.new(2000,1,1,0,0) #saturday
+    finish=DateTime.new(2005,12,31,8,59) #saturday
+    working_week=week(start,finish,0)
+    working_week.workpattern(:sun,clock(9,0),clock(9,13),1) 
+    
+    working_week.workpattern(:weekday,clock(9,0),clock(11,59),1)
+    working_week.workpattern(:weekday,clock(13,0),clock(17,59),1)
+    
+    working_week.workpattern(:mon,clock(0,0),clock(23,59),0) 
+    working_week.workpattern(:mon,clock(9,0),clock(9,13),1)
+    working_week.workpattern(:mon,clock(10,1),clock(10,1),1)        
+    
+    
+    [# yyyy,mm,dd,hh,mn,durtn,midnight,ryyyy,rmm,rdd,rhh,rmn,rdurtn,rmidnight
+     [ 2000, 1, 1, 0, 0,    0,   false, 2000,  1,  1,  0,  0,     0,   false],
+     [ 2000, 1, 1, 0, 0,   -1,   false, 1999, 12, 31,  0,  0,     -1,   true],
+     [ 2000, 1, 2, 9, 0,   14,   false, 2000,  1,  2,  9,  14,     0,   false], 
+     [ 2000, 1, 2, 9, 0,   15,   false, 2000,  1,  3,  9,  1,     0,   false],
+     [ 2000, 1, 2, 9, 0,   29,   false, 2000,  1,  3,  10,  2,     0,   false],     
+     [ 2000, 1, 2, 9, 0, 1950,   false, 2000,  1,  9,   9,  1,     0,   false],
+     [ 2005,12,25, 9, 0, 1950,   false, 2006,  1,  1,   0,  0,     1,   false],
+     [ 2005,12,25, 9, 0, 1949,   false, 2005, 12, 30,  18,  0,     0,   false]#,          
+    ].each {|yyyy,mm,dd,hh,mn,durtn,midnight,ryyyy,rmm,rdd,rhh,rmn,rdurtn,rmidnight|
+      start=DateTime.new(yyyy,mm,dd,hh,mn)   
+      result_date, result_duration,result_midnight= working_week.calc(start,durtn,midnight)
+      assert_equal DateTime.new(ryyyy,rmm,rdd,rhh,rmn), result_date, "result_date for working_week.calc(#{start},#{durtn},#{midnight})"
+      assert_equal rdurtn, result_duration,"result_duration for working_week.calc(#{start},#{durtn},#{midnight})"
+      assert_equal rmidnight, result_midnight,"result_midnight for working_week.calc(#{start},#{durtn},#{midnight})"      
+    }
   end
   
-  
-  must 'create complex patterns' do
-    assert true
-  end
-
   must "calculate difference between dates in working week" do
     start=DateTime.new(2012,10,1)
     finish=DateTime.new(2012,10,7)
@@ -178,13 +282,15 @@ class TestWeek < Test::Unit::TestCase #:nodoc:
   end
 
   must "calculate difference between dates in pattern week" do
-    
-    day = Workpattern::Day.new(1)
+    start=DateTime.new(2000,1,1)
+    finish=DateTime.new(2012,12,31)
+    week=week(start,finish,1)
+    return
     [[0,0,8,59],
      [12,0,12,59],
      [17,0,22,59]
     ].each {|start_hour,start_min,finish_hour,finish_min|
-      day.workpattern(clock(start_hour, start_min),
+      week.workpattern(clock(start_hour, start_min),
                       clock(finish_hour, finish_min),
                       0)
     }

data/workpattern.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
   # s.add_runtime_dependency "rest-client"
+  s.add_development_dependency('rake', ['~> 0.9.2'])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: workpattern
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000Z
-dependencies: []
+date: 2012-07-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 description: Workpattern performs date calculations that take into account working
   and resting periods.
 email:
@@ -20,8 +36,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - config/website.yml
@@ -65,8 +83,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: workpattern
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: temporal calculations
 test_files: []
+has_rdoc: