workpattern 0.3.2 → 0.3.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YWVlYjQ0YTY1NzVhMzRjN2QzZWZkNzZjZTBmOTM4ODAyNjFmZDFiYw==
-  data.tar.gz: !binary |-
-    NjBhMzUyNWZkYWYzMzk3ZmIyN2ZlNTM1ZjcwMGQ5YjZjM2QwYzFlNA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NDllNzljYmEyMzBiMjY3ZDIwYWNhMWE0YWQwNWUxNTMxZGQ3ZDQzNTdmNGU2
-    YWI1OGYwNDZiOTU2NWViZWZmYjRkZmQzY2I5NDg1ODhmNjhjOGUyYjUwMDFh
-    MzllYTIwNGQ3ODY4NTMxNWNmZTk1MDEwNjU2ZTlmNjliNjU2M2Y=
-  data.tar.gz: !binary |-
-    ZjgwZmM2ZTU1YjE0MzhkYTVkYzU2MTU0YmRhOWZkYzIyZDdhNzZmNmY0MWI3
-    OWNkN2MwNmMzOWIxYjg1ODE5MDM3MzFhYWIzMTJjOTMwMjMwMzlkMWViZWU0
-    MTMzYWFmMzRiZWEzMzA1NmE3YTllMTBhMmJlMzA3ZmJkYWQ0YTg=
+SHA1:
+  metadata.gz: 1bf0371cc0f47c34f3ab9e7e740975077e3edbf6
+  data.tar.gz: bbd957d3fb41cedd503146cc8bb870e34c023994
+SHA512:
+  metadata.gz: fc1f35fbb2e5a1cf1f0cdb357da3348343041f47b034d139f470590949116fb78e889c80798241f627f05a90259f6c99ea3c390969e6806d68756888faa992b8
+  data.tar.gz: 5f7cea5e6f7869a0da1a6cd9cdb92d9836867567514709b0a1792b6438976705d0c500c5584c9f21714475b1ef6082a9aed8ae95a8c3da4ae07b9f60188b499c

data/.travis.yml

@@ -2,4 +2,4 @@ language: ruby
 rvm:
   - 1.9.3
   - jruby-19mode # JRuby in 1.9 mode
-  - rbx-19mode
+  - 2.0.0

data/CHANGELOG

@@ -1,6 +1,18 @@
+## Workpattern v0.3.4 (Sep 23, 2013)  ##
+
+* Failed to subtract 1 minute from end of resting hour (#12) * Barrie Callender *
+* Failed to add minutes starting from a resting period in a patterned hour (#13) * Barrie Callender *
+* Failed to subtract the exact amount of minutes from a patterned hour (#14) * Barrie Callender *
+
+
+## Workpattern v0.3.3 (Aug 21, 2013)  ##
+
+* The two tests no longer fail with Ruby 2.0 (#11) * Barrie Callender *
+
+
 ## Workpattern v0.3.2 (Mar 14, 2013)  ##
 
-* Changed methods on Hour module so as to not clash with Rails (#10) * Barrie Callender * 
+* Changed methods on Hour module so as to not clash with Rails (#10) * Barrie Callender *
 * Applied DRY principle to workpattern method in Workpattern class * Barrie Callender *
 * Removed file from emacs backup * Barrie Callender *
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    workpattern (0.3.2)
+    workpattern (0.3.3)
 
 GEM
   remote: http://rubygems.org/

data/lib/workpattern/hour.rb

@@ -20,7 +20,7 @@ module Workpattern
     # @param [Integer] finish minute at end of range
     # @param [Integer] type defines whether working (1) or resting (0)
     #
-    def wp_workpattern(start,finish,type)
+    def wp_workpattern(start,finish,type=1)
       return wp_working(start,finish) if type==1
       return wp_resting(start,finish) if type==0
     end
@@ -60,7 +60,6 @@ module Workpattern
     # @return [Integer] number of minutes from <tt>start</tt> to <tt>finish</tt> inclusive
     #
     def wp_minutes(start,finish)
-      start,finish=finish,start if start > finish
       return (self & wp_mask(start,finish)).to_s(2).count('1')
     end
     
@@ -73,14 +72,9 @@ module Workpattern
     # @return [DateTime,Integer,Boolean] The <tt>DateTime</tt> calculated along with remaining minutes and a flag indicating if starting point is next hour
     #
     def wp_calc(time,duration,next_hour=false)
-    
-      if (duration<0)
-        return wp_subtract(time,duration, next_hour)  
-      elsif (duration>0)
-        return wp_add(time,duration)                
-      else
-        return time,duration
-      end 
+      return wp_subtract(time,duration, next_hour) if duration < 0
+      return wp_add(time,duration) if duration > 0
+      return time,duration 
     end
     
     # Returns the number of minutes between two minutes
@@ -133,16 +127,13 @@ module Workpattern
       start = time.min
       available_minutes=wp_minutes(start,59)
 
-      if ((duration-available_minutes)>=0)
+      if not_enough_minutes duration, available_minutes
         result_date = time + HOUR - (MINUTE*start)
         result_remainder = duration-available_minutes
-      elsif ((duration-available_minutes)==0)
-        result_date = time - (MINUTE*start) + last + 1 
-        result_remainder = 0
-      elsif (wp_minutes(start,start+duration-1)==duration)
+      elsif exact_amount_of_minutes(start,duration)
         result_date = time + (MINUTE*duration)
         result_remainder = 0
-      else
+      else # more than enough minutes
         step = start + duration
         duration-=wp_minutes(start,step)
         until (duration==0)
@@ -150,7 +141,7 @@ module Workpattern
           duration-=wp_minutes(step,step)
         end
         step+=1
-        result_date = time + (MINUTE*step)
+        result_date = time - (MINUTE*time.min) + (MINUTE*step)
         result_remainder = 0
       end  
       return result_date, result_remainder  
@@ -169,17 +160,18 @@ module Workpattern
           time=time+(MINUTE*59)
           return wp_calc(time,duration)
         end  
+        return time, duration if wp_total==0
       else  
         start=time.min  
         available_minutes=0
         available_minutes = wp_minutes(0,start-1) if start > 0
       end
       
-      if ((duration + available_minutes)<=0)
+      if not_enough_minutes duration,available_minutes
         result_date = time - (MINUTE*start)
         result_remainder = duration+available_minutes
-      elsif (wp_minutes(start+duration,start-1)==duration.abs)
-        result_date = time + (MINUTE*duration)
+      elsif duration.abs==available_minutes
+        result_date = time - (MINUTE*(start-wp_first))
         result_remainder = 0
       else     
         step = start + duration
@@ -194,6 +186,18 @@ module Workpattern
       return result_date, result_remainder  
       
     end
+
+    private
+ 
+    def not_enough_minutes(duration,available_minutes)
+      return true if (duration.abs-available_minutes)>0
+      return false
+    end
+
+    def exact_amount_of_minutes(start,duration)
+      return true if wp_minutes(start,start+duration-1)==duration
+      false
+    end
   end
 end
 

data/lib/workpattern/version.rb

@@ -1,5 +1,5 @@
 module Workpattern
   # Version Number for Workpattern gem
   # @since 0.0.1
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end  

data/test/test_clock.rb

@@ -1,11 +1,11 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
-class TestClock < Test::Unit::TestCase #:nodoc:
+class TestClock < MiniTest::Unit::TestCase #:nodoc:
 
   def setup
   end
   
-  must "create midnight default"  do
+  def test_must_create_midnight_default
     clock=Workpattern::Clock.new()
     
     assert_equal 0, clock.minutes, "total default minutes"
@@ -17,7 +17,7 @@ class TestClock < Test::Unit::TestCase #:nodoc:
     assert_equal 0, time.min, "minute in the day must be zero"
   end
   
-  must "account for out of range values" do
+  def test_must_account_for_out_of_range_values
     clock=Workpattern::Clock.new(27,80)
     
     assert_equal 1700, clock.minutes, "total minutes"

data/test/test_day.rb

@@ -1,234 +1,353 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
-class TestDay < Test::Unit::TestCase #:nodoc:
+class TestDay < MiniTest::Unit::TestCase #:nodoc:
 
   def setup
+    @working_day = Workpattern::Day.new(1)
+    @resting_day = Workpattern::Day.new(0)
+    @pattern_day = Workpattern::Day.new(1)
+    @pattern_day.workpattern(clock(0,0),clock(8,33),0)
+    @pattern_day.workpattern(clock(12,0),clock(12,21),0)
+    @pattern_day.workpattern(clock(12,30),clock(12,59),0)
+    @pattern_day.workpattern(clock(17,0),clock(22,59),0)
   end
   
-  must "create a working day" do
-  
-    working_day = Workpattern::Day.new(1)
-    assert_equal 1440, working_day.total,"24 hour working total minutes"
+  def test_must_create_a_working_day
+    assert_equal 1440, @working_day.total,"24 hour working total minutes"
   end
     
-  must "ceate a resting day" do
-
-    resting_day = Workpattern::Day.new(0)
-    assert_equal 0, resting_day.total,"24 hour resting total minutes"
+  def test_must_ceate_a_resting_day
+    assert_equal 0, @resting_day.total,"24 hour resting total minutes"
   end
   
-  must "set patterns correctly" do
-
-    times=Array.new()
-    [[0,0,8,59],
-     [12,0,12,59],
-     [17,0,22,59]
-    ].each {|start_hour,start_min,finish_hour,finish_min|
-      times<<[clock(start_hour,start_min),clock(finish_hour,finish_min)]
+  def test_must_set_patterns_correctly
+    mins=[0,0,0,0,0,0,0,0,26,60,60,60,8,60,60,60,60,0,0,0,0,0,0,60]
+    mins.each_index {|index|
+      assert_equal mins[index],@pattern_day.values[index].wp_total,"#{index} hour should be #{mins[index]} minutes"
     }
-    
-    [[24,480,clock(9,0),clock(23,59)]
-    ].each{|hours_in_day,total,first_time,last_time|
-      working_day=Workpattern::Day.new(1)
-      times.each{|start_time,finish_time| 
-        working_day.workpattern(start_time,finish_time,0)
-      } 
-      assert_equal total,working_day.total, "#{hours_in_day} hour total working minutes"
-      assert_equal first_time.hour, working_day.first_hour, "#{hours_in_day} hour first hour of the day"
-      assert_equal first_time.min, working_day.first_min, "#{hours_in_day} hour first minute of the day"
-      assert_equal last_time.hour, working_day.last_hour, "#{hours_in_day} hour last hour of the day"
-      assert_equal last_time.min, working_day.last_min, "#{hours_in_day} hour last minute of the day"
+    assert_equal 514, @pattern_day.total, "total working minutes"
+    assert_equal 8, @pattern_day.first_hour, "first hour of the day"
+    assert_equal 34, @pattern_day.first_min, "first minute of the day"
+    assert_equal 23, @pattern_day.last_hour, "last hour of the day"
+    assert_equal 59, @pattern_day.last_min, "last minute of the day"
+  end
+
+  def test_must_duplicate_a_working_day
+    dup_day = @working_day.duplicate
+    assert_equal 1440, dup_day.total
+    assert_equal 0, dup_day.first_hour
+    assert_equal 0, dup_day.first_min
+    assert_equal 23, dup_day.last_hour
+    assert_equal 59, dup_day.last_min
+    hour=Workpattern::WORKING_HOUR
+    dup_day.values.each {|item|
+      assert_equal hour, item
     }
   end
-  
-  must "duplicate all of day" do
-    day=Workpattern::Day.new(1)
-    new_day = day.duplicate
-    assert_equal 1440, new_day.total,"24 hour duplicate working total minutes"
-    # y    m ,d ,h ,n ,dur ,yr  ,mr,dr,hr,nr,rem ,midnight, midnightr
-    tests=[
-     [2000,1 ,1 ,0 , 0,3   ,2000,1 ,1 ,0 ,3 ,0   ,false   ,false],
-     [2000,1 ,1 ,23,59,0   ,2000,1 ,1 ,23,59,0   ,false   ,false],
-     [2000,1 ,1 ,23,59,1   ,2000,1 ,2 ,0 ,0 ,0   ,false   ,false],
-     [2000,1 ,1 ,23,59,2   ,2000,1 ,2 ,0 ,0 ,1   ,false   ,false],
-     [2000,1 ,1 ,9 ,10,33  ,2000,1 ,1 ,9 ,43,0   ,false   ,false],
-     [2000,1 ,1 ,9 ,10,60  ,2000,1 ,1 ,10,10,0   ,false   ,false],
-     [2000,1 ,1 ,9 , 0,931 ,2000,1 ,2 ,0 ,0 ,31  ,false   ,false]
-    ]
-    clue="duplicate working pattern"
-    calc_test(new_day,tests,clue)
-    
-    day = Workpattern::Day.new(0)
-    new_day=day.duplicate
-    assert_equal 0, new_day.total,"24 hour resting total minutes"
-    # y    m ,d ,h ,n ,dur ,yr  ,mr,dr,hr,nr,rem ,midnight, midnightr
-    tests=[
-     [2000,1,1,0,0,3,2000,1,2,0,0,3,false,false],
-     [2000,1,1,23,59,0,2000,1,1,23,59,0,false,false],
-     [2000,1,1,23,59,1,2000,1,2,0,0,1,false,false],
-     [2000,1,1,23,59,2,2000,1,2,0,0,2,false,false],
-     [2000,1,1,9,10,33,2000,1,2,0,0,33,false,false],
-     [2000,1,1,9,10,60,2000,1,2,0,0,60,false,false],
-     [2000,1,1,9,0,931,2000,1,2,0,0,931,false,false]
-    ]
-    clue="duplicate resting pattern"
-    calc_test(new_day,tests,clue)
-    
-    
-    times=Array.new()
-    [[0,0,8,59],
-     [12,0,12,59],
-     [17,0,22,59]
-    ].each {|start_hour,start_min,finish_hour,finish_min|
-      times<<[Workpattern::Clock.new(start_hour,start_min),Workpattern::Clock.new(finish_hour,finish_min)]
+
+  def test_must_duplicate_a_resting_day
+    dup_day = @resting_day.duplicate
+    assert_equal 0, dup_day.total
+    assert_nil dup_day.first_hour
+    assert_nil dup_day.first_min
+    assert_nil dup_day.last_hour
+    assert_nil dup_day.last_min
+    hour=Workpattern::RESTING_HOUR
+    dup_day.values.each {|item|
+      assert_equal hour, item
     }
-    
-    [[24,480,clock(9,0),clock(23,59)]
-    ].each{|hours_in_day,total,first_time,last_time|
-      day=Workpattern::Day.new(1)
-      times.each{|start_time,finish_time| 
-        day.workpattern(start_time,finish_time,0)
-      } 
-      new_day=day.duplicate
-      
-      assert_equal total,new_day.total, "#{hours_in_day} hour total working minutes"
-      assert_equal first_time.hour, new_day.first_hour, "#{hours_in_day} hour first hour of the day"
-      assert_equal first_time.min, new_day.first_min, "#{hours_in_day} hour first minute of the day"
-      assert_equal last_time.hour, new_day.last_hour, "#{hours_in_day} hour last hour of the day"
-      assert_equal last_time.min, new_day.last_min, "#{hours_in_day} hour last minute of the day"
-      
-      new_day.workpattern(clock(13,0),clock(13,0),0)
-      
-      assert_equal total,day.total, "#{hours_in_day} hour total original working minutes"
-      
-      assert_equal total-1,new_day.total, "#{hours_in_day} hour total new working minutes"
-      
+  end
+
+  def test_must_duplicate_a_patterned_day
+    dup_day = @pattern_day.duplicate
+
+    mins=[0,0,0,0,0,0,0,0,26,60,60,60,8,60,60,60,60,0,0,0,0,0,0,60]
+    mins.each_index {|index|
+      assert_equal mins[index],dup_day.values[index].wp_total,"#{index} hour should be #{mins[index]} minutes"
     }
-    
+
+    assert_equal 514, dup_day.total, "total working minutes"
+    assert_equal 8, dup_day.first_hour, "first hour of the day"
+    assert_equal 34, dup_day.first_min, "first minute of the day"
+    assert_equal 23, dup_day.last_hour, "last hour of the day"
+    assert_equal 59, dup_day.last_min, "last minute of the day"
+
   end
-  
-  must 'add minutes in a working day' do
-  
-    day = Workpattern::Day.new(1)
-    # y    m ,d ,h ,n ,dur ,yr  ,mr,dr,hr,nr,rem ,midnight, midnightr
-    tests=[
-     [2000,1,1,0,0,3,2000,1,1,0,3,0,false,false],
-     [2000,1,1,0,0,0,2000,1,1,0,0,0,false,false],
-     [2000,1,1,0,59,0,2000,1,1,0,59,0,false,false],
-     [2000,1,1,0,11,3,2000,1,1,0,14,0,false,false],
-     [2000,1,1,0,0,60,2000,1,1,1,0,0,false,false],
-     [2000,1,1,0,0,61,2000,1,1,1,1,0,false,false],
-     [2000,1,1,0,30,60,2000,1,1,1,30,0,false,false],
-     [2000,12,31,23,59,1,2001,1,1,0,0,0,false,false],
-     [2000,1,1,9,10,33,2000,1,1,9,43,0,false,false],
-     [2000,1,1,9,10,60,2000,1,1,10,10,0,false,false],
-     [2000,1,1,9,0,931,2000,1,2,0,0,31,false,false]
-    ]
-    clue = "add minutes in a working day"
-    calc_test(day,tests,clue)
-    
+
+  def test_must_add_more_than_available_minutes_to_a_working_day
+    start_date=DateTime.new(2013,1,1,8,15)
+    result, remainder=@working_day.calc(start_date,946)
+    assert_equal DateTime.new(2013,1,2,0,0), result
+    assert_equal 1,remainder
   end
-  
-  must 'add minutes in a resting day' do
 
-    day = Workpattern::Day.new(0)
-    # y    m ,d ,h ,n ,dur ,yr  ,mr,dr,hr,nr,rem ,midnight, midnightr
-    tests=[
-     [2000,1,1,0,0,3,2000,1,2,0,0,3,false,false],
-     [2000,1,1,23,59,0,2000,1,1,23,59,0,false,false],
-     [2000,1,1,23,59,1,2000,1,2,0,0,1,false,false],
-     [2000,1,1,23,59,2,2000,1,2,0,0,2,false,false],
-     [2000,1,1,9,10,33,2000,1,2,0,0,33,false,false],
-     [2000,1,1,9,10,60,2000,1,2,0,0,60,false,false],
-     [2000,1,1,9,0,931,2000,1,2,0,0,931,false,false]
-    ]
-    clue="add minutes in a resting day"
-    calc_test(day,tests,clue)
+  def test_must_add_less_than_available_minutes_to_a_working_day
+    start_date=DateTime.new(2013,1,1,8,15)
+    result, remainder=@working_day.calc(start_date,944)
+    assert_equal DateTime.new(2013,1,1,23,59), result
+    assert_equal 0,remainder
+  end
+
+  def test_must_add_exactly_the_available_minutes_to_a_working_day
+    start_date=DateTime.new(2013,1,1,8,15)
+    result, remainder=@working_day.calc(start_date,945)
+    assert_equal DateTime.new(2013,1,2,0,0), result
+    assert_equal 0,remainder
+  end
+
+  def test_must_add_zero_minutes_to_a_working_day
+    start_date=DateTime.new(2013,1,1,8,15)
+    result, remainder=@working_day.calc(start_date,0)
+    assert_equal start_date, result
+    assert_equal 0,remainder
+  end
+
+  def test_must_add_1_minute_to_0_in_working_day
+    start_date=DateTime.new(2013,1,1,0,0)
+    result, remainder=@working_day.calc(start_date,1)
+    assert_equal DateTime.new(2013,1,1,0,1), result
+    assert_equal 0,remainder
+  end
+
+  def test_must_add_1_hour_to_0_in_working_day
+    start_date=DateTime.new(2013,1,1,0,0)
+    result, remainder=@working_day.calc(start_date,60)
+    assert_equal DateTime.new(2013,1,1,1,0), result
+    assert_equal 0,remainder
   end
   
-  must 'add minutes in a patterned day' do
+  def test_must_add_1_hour_1_minute_to_0_in_working_day
+    start_date=DateTime.new(2013,1,1,0,0)
+    result, remainder=@working_day.calc(start_date,61)
+    assert_equal DateTime.new(2013,1,1,1,1), result
+    assert_equal 0,remainder
+  end
+
+  def test_must_add_1_day_to_0_in_working_day
+    start_date=DateTime.new(2013,1,1,0,0)
+    result, remainder=@working_day.calc(start_date,1440)
+    assert_equal DateTime.new(2013,1,2,0,0), result
+    assert_equal 0,remainder
+  end
  
-    day = Workpattern::Day.new(1)
-    [[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),
-                      clock(finish_hour, finish_min),
-                      0)
-    }
-    assert_equal 480, day.total, "minutes in patterned day should be 480"
-    # y    m ,d ,h ,n ,dur ,yr  ,mr,dr,hr,nr,rem ,midnight, midnightr
-    tests=[
-     [2000,1,1,0,0,3,2000,1,1,9,3,0,false,false],
-     [2000,1,1,0,0,0,2000,1,1,0,0,0,false,false],
-     [2000,1,1,0,59,0,2000,1,1,0,59,0,false,false],
-     [2000,1,1,0,11,3,2000,1,1,9,3,0,false,false],
-     [2000,1,1,0,0,60,2000,1,1,10,0,0,false,false],
-     [2000,1,1,0,0,61,2000,1,1,10,1,0,false,false],
-     [2000,1,1,9,30,60,2000,1,1,10,30,0,false,false],
-     [2000,12,31,22,59,1,2000,12,31,23,1,0,false,false],
-     [2000,1,1,9,10,33,2000,1,1,9,43,0,false,false],
-     [2000,1,1,9,10,60,2000,1,1,10,10,0,false,false],
-     [2000,1,1,9,0,931,2000,1,2,0,0,451,false,false],
-     [2000,1,1,12,0,1,2000,1,1,13,1,0,false,false],
-     [2000,1,1,12,59,1,2000,1,1,13,1,0,false,false]
-    ]
-    clue = "add minutes in a patterned day"
-    calc_test(day,tests,clue)  
+  def test_must_add_1_day_1_minute_to_0_in_working_day
+    start_date=DateTime.new(2013,1,1,0,0)
+    result, remainder=@working_day.calc(start_date,1441)
+    assert_equal DateTime.new(2013,1,2,0,0), result
+    assert_equal 1,remainder
+  end
+
+  def test_must_add_more_than_available_minutes_to_a_resting_day
+    start_date=DateTime.new(2013,1,1,8,15)
+    result, remainder=@resting_day.calc(start_date,946)
+    assert_equal DateTime.new(2013,1,2,0,0), result
+    assert_equal 946,remainder
+  end
+
+  def test_must_add_less_than_available_minutes_to_a_resting_day
+    start_date=DateTime.new(2013,1,1,8,15)
+    result, remainder=@resting_day.calc(start_date,944)
+    assert_equal DateTime.new(2013,1,2,0,0), result
+    assert_equal 944,remainder
+  end
+
+  def test_must_add_exactly_the_available_minutes_to_a_resting_day
+    start_date=DateTime.new(2013,1,1,8,15)
+    result, remainder=@resting_day.calc(start_date,945)
+    assert_equal DateTime.new(2013,1,2,0,0), result
+    assert_equal 945,remainder
+  end
+
+  def test_must_add_zero_minutes_to_a_resting_day
+    start_date=DateTime.new(2013,1,1,8,15)
+    result, remainder=@resting_day.calc(start_date,0)
+    assert_equal start_date, result
+    assert_equal 0,remainder
+  end
+
+  def test_must_add_1_minute_to_0_in_resting_day
+    start_date=DateTime.new(2013,1,1,0,0)
+    result, remainder=@resting_day.calc(start_date,1)
+    assert_equal DateTime.new(2013,1,2,0,0), result
+    assert_equal 1,remainder
+  end
+
+  def test_must_add_1_hour_to_0_in_resting_day
+    start_date=DateTime.new(2013,1,1,0,0)
+    result, remainder=@resting_day.calc(start_date,60)
+    assert_equal DateTime.new(2013,1,2,0,0), result
+    assert_equal 60,remainder
   end
   
-  must 'subtract minutes in a working day' do
+  def test_must_add_1_hour_1_minute_to_0_in_resting_day
+    start_date=DateTime.new(2013,1,1,0,0)
+    result, remainder=@resting_day.calc(start_date,61)
+    assert_equal DateTime.new(2013,1,2,0,0), result
+    assert_equal 61,remainder
+  end
 
-    day = Workpattern::Day.new(1)
-    # 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],
-     [2000,1 ,1 ,9 ,10,-33 ,2000,1 ,1 ,8 ,37,0   ,false   ,false],
-     [2000,1 ,1 ,9 ,10,-60 ,2000,1 ,1 ,8 ,10,0   ,false   ,false],
-     [2000,1 ,1 ,9 ,4 ,-3  ,2000,1 ,1 ,9 ,1 ,0   ,false   ,false],
-     [2000,1 ,1 ,9 ,0 ,-931,1999,12,31,0 ,0 ,-391,false   ,true],
-     [2000,1 ,1 ,0 ,0 ,-3  ,2000,1 ,1 ,23,57,0   ,true    ,false],
-     [2000,1 ,1 ,23,59,0   ,2000,1 ,1 ,23,59,0   ,true    ,false],
-     [2000,1 ,1 ,23,59,-1  ,2000,1 ,1 ,23,58,0   ,true    ,false],
-     [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]     
-    ]
-    clue="subtract minutes in a working day"
-    calc_test(day,tests,clue)
+  def test_must_add_1_day_to_0_in_resting_day
+    start_date=DateTime.new(2013,1,1,0,0)
+    result, remainder=@resting_day.calc(start_date,1440)
+    assert_equal DateTime.new(2013,1,2,0,0), result
+    assert_equal 1440,remainder
+  end
+ 
+  def test_must_add_1_day_1_minute_to_0_in_resting_day
+    start_date=DateTime.new(2013,1,1,0,0)
+    result, remainder=@resting_day.calc(start_date,1441)
+    assert_equal DateTime.new(2013,1,2,0,0), result
+    assert_equal 1441,remainder
+  end
+
+  def test_must_add_more_than_available_minutes_to_a_pattern_day
+    start_date=DateTime.new(2013,1,1,8,15)
+    result, remainder=@pattern_day.calc(start_date,515)
+    assert_equal DateTime.new(2013,1,2,0,0), result
+    assert_equal 1,remainder
+  end
+
+  def test_must_add_less_than_available_minutes_to_a_pattern_day
+    start_date=DateTime.new(2013,1,1,8,15)
+    result, remainder=@pattern_day.calc(start_date,513)
+    assert_equal DateTime.new(2013,1,1,23,59), result
+    assert_equal 0,remainder
+  end
+
+  def test_must_add_exactly_the_available_minutes_to_a_pattern_day
+    start_date=DateTime.new(2013,1,1,8,15)
+    result, remainder=@pattern_day.calc(start_date,514)
+    assert_equal DateTime.new(2013,1,2,0,0), result
+    assert_equal 0,remainder
+  end
+
+  def test_must_add_zero_minutes_to_a_pattern_day
+    start_date=DateTime.new(2013,1,1,8,15)
+    result, remainder=@pattern_day.calc(start_date,0)
+    assert_equal start_date, result
+    assert_equal 0,remainder
+  end
+
+  def test_must_add_1_minute_to_0_in_pattern_day
+    start_date=DateTime.new(2013,1,1,0,0)
+    result, remainder=@pattern_day.calc(start_date,1)
+    assert_equal DateTime.new(2013,1,1,8,35), result
+    assert_equal 0,remainder
+  end
+
+  def test_must_add_1_hour_to_0_in_pattern_day
+    start_date=DateTime.new(2013,1,1,0,0)
+    result, remainder=@pattern_day.calc(start_date,60)
+    assert_equal DateTime.new(2013,1,1,9,34), result
+    assert_equal 0,remainder
   end
   
-  must 'subtract minutes in a resting day' do
-    
-    day = Workpattern::Day.new(0)
-    # 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 ,23,59,0   ,2000,1 ,1 ,23,59,0   ,false   ,false],
-     [2000,1 ,1 ,23,59,-1  ,1999,12,31,0 ,0 ,-1  ,false   ,true],
-     [2000,1 ,1 ,23,59,-2  ,1999,12,31,0 ,0 ,-2  ,false   ,true],
-     [2000,1 ,1 ,9 ,10,-33 ,1999,12,31,0 ,0 ,-33 ,false   ,true],
-     [2000,1 ,1 ,9 ,10,-60 ,1999,12,31,0 ,0 ,-60 ,false   ,true],
-     [2000,1 ,1 ,9 ,0 ,-931,1999,12,31,0 ,0 ,-931,false   ,true],
-     [2000,1 ,1 ,0 ,0 ,-3  ,1999,12,31,0 ,0 ,-3  ,true   ,true],
-     [2000,1 ,1 ,23,59,0   ,2000,1 ,1 ,23,59,0   ,true   ,false],
-     [2000,1 ,1 ,23,59,-1  ,1999,12,31,0 ,0 ,-1  ,true   ,true],
-     [2000,1 ,1 ,23,59,-2  ,1999,12,31,0 ,0 ,-2  ,true   ,true],
-     [2000,1 ,1 ,9 ,10,-33 ,1999,12,31,0 ,0 ,-33 ,true   ,true],
-     [2000,1 ,1 ,9 ,10,-60 ,1999,12,31,0 ,0 ,-60 ,true   ,true],
-     [2000,1 ,1 ,9 ,0 ,-931,1999,12,31,0 ,0 ,-931,true   ,true]
-    ]
-    clue="subtract minutes in a resting day"
-    calc_test(day,tests,clue)  
+  def test_must_add_1_hour_1_minute_to_0_in_pattern_day
+    start_date=DateTime.new(2013,1,1,0,0)
+    result, remainder=@pattern_day.calc(start_date,61)
+    assert_equal DateTime.new(2013,1,1,9,35), result
+    assert_equal 0,remainder
+  end
+
+  def test_must_add_1_day_to_0_in_pattern_day
+    start_date=DateTime.new(2013,1,1,0,0)
+    result, remainder=@pattern_day.calc(start_date,1440)
+    assert_equal DateTime.new(2013,1,2,0,0), result
+    assert_equal 926,remainder
+  end
+ 
+  def test_must_add_1_day_1_minute_to_0_in_pattern_day
+    start_date=DateTime.new(2013,1,1,0,0)
+    result, remainder=@pattern_day.calc(start_date,1441)
+    assert_equal DateTime.new(2013,1,2,0,0), result
+    assert_equal 927,remainder
   end
+
+  def test_must_subtract_more_than_available_minutes_in_working_day
+    start_date=DateTime.new(2013,1,1,12,23)
+    result, remainder, midnight=@working_day.calc(start_date,-744)
+    assert_equal DateTime.new(2012,12,31,0,0), result
+    assert_equal -1,remainder
+    assert midnight
+  end  
+
+  def test_must_subtract_less_than_available_minutes_in_working_day
+    start_date=DateTime.new(2013,1,1,12,23)
+    result, remainder, midnight=@working_day.calc(start_date,-742)
+    assert_equal DateTime.new(2013,1,1,0,1), result
+    assert_equal 0,remainder
+    refute midnight
+  end  
+
+  def test_must_subtract_available_minutes_in_working_day
+    start_date=DateTime.new(2013,1,1,12,23)
+    result, remainder, midnight=@working_day.calc(start_date,-743)
+    assert_equal DateTime.new(2013,1,1,0,0), result
+    assert_equal 0,remainder
+    refute midnight
+  end  
+
+  def test_must_subtract_1_minute_from_start_of_working_day
+    start_date=DateTime.new(2013,1,1,0,0)
+    result, remainder, midnight=@working_day.calc(start_date,-1)
+    assert_equal DateTime.new(2012,12,31,0,0), result
+    assert_equal -1,remainder
+    assert midnight
+  end  
+
+  def test_must_subtract_1_minute_from_start_of_next_working_day
+    start_date=DateTime.new(2013,1,1,0,0)
+    result, remainder, midnight=@working_day.calc(start_date,-1,true)
+    assert_equal DateTime.new(2013,1,1,23,59), result
+    assert_equal 0,remainder
+    refute midnight
+  end  
+
+  def test_must_subtract_1_day_from_start_of_next_working_day
+    start_date=DateTime.new(2013,1,1,0,0)
+    result, remainder, midnight=@working_day.calc(start_date,-1440,true)
+    assert_equal DateTime.new(2013,1,1,0,0), result
+    assert_equal 0,remainder
+    refute midnight
+  end  
+
+  def test_must_subtract_1_from_zero_minutes_from_resting_day
+    start_date=DateTime.new(2013,1,1,0,0)
+    result, remainder, midnight=@resting_day.calc(start_date,-1,true)
+    assert_equal DateTime.new(2012,12,31,0,0), result
+    assert_equal -1,remainder
+    assert midnight
+  end
+
+  def test_must_subtract_1_from_resting_day
+    start_date=DateTime.new(2013,1,1,4,13)
+    result, remainder, midnight=@resting_day.calc(start_date,-1,true)
+    assert_equal DateTime.new(2012,12,31,0,0), result
+    assert_equal -1,remainder
+    assert midnight
+  end
+
+  def test_must_subtract_1_from_zero_minutes_from_resting_day
+    start_date=DateTime.new(2013,1,1,0,0)
+    result, remainder, midnight=@resting_day.calc(start_date,-1,false)
+    assert_equal DateTime.new(2012,12,31,0,0), result
+    assert_equal -1,remainder
+    assert midnight
+  end
+
+  def test_must_subtract_1_from_somewhere_in_resting_day
+    start_date=DateTime.new(2013,1,1,4,13)
+    result, remainder, midnight=@resting_day.calc(start_date,-1,false)
+    assert_equal DateTime.new(2012,12,31,0,0), result
+    assert_equal -1,remainder
+    assert midnight
+  end
+
+############################################################################  
+############################################################################  
+############################################################################  
   
-  must 'subtract minutes in a patterned day' do
+  def test_must_subtract_minutes_in_a_patterned_day
   
     day = Workpattern::Day.new(1)
     [[0,0,8,59],
@@ -274,7 +393,7 @@ class TestDay < Test::Unit::TestCase #:nodoc:
   end
    
   
-  must "calculate difference between times in working day" do
+  def test_must_calculate_difference_between_times_in_working_day
     day = Workpattern::Day.new(1)
     
     [
@@ -305,7 +424,7 @@ class TestDay < Test::Unit::TestCase #:nodoc:
     }
   end
 
-  must "calculate difference between times in resting day" do
+  def test_must_calculate_difference_between_times_in_resting_day
   day = Workpattern::Day.new(0)
   
     [
@@ -336,7 +455,7 @@ class TestDay < Test::Unit::TestCase #:nodoc:
      }
   end
 
-  must "calculate difference between times in pattern day" do
+  def test_must_calculate_difference_between_times_in_pattern_day
 
     day = Workpattern::Day.new(1)
     [[0,0,8,59],