workpattern 0.5.0 → 0.6.0

data/workpattern.gemspec

@@ -1,27 +1,39 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "workpattern/version"
 
-Gem::Specification.new do |s|
-  s.name        = "workpattern"
-  s.version     = Workpattern::VERSION
-  s.authors     = ["Barrie Callender"]
-  s.email       = ["barrie@callenb.org"]
-  s.homepage    = "http://github.com/callenb/workpattern"
-  s.summary     = %q{Calculates dates and durations whilst taking into account working and non-working periods down to a minute}
-  s.description = %q{Calculates dates and durations whilst taking into account working and non-working times down to a minute.  Business working time with holidays are a breeze.}
-  s.license     = 'MIT'
+require_relative "lib/workpattern/version"
 
-  s.required_ruby_version = ">= 1.9.3"
+Gem::Specification.new do |spec|
+  spec.name          = "workpattern"
+  spec.version       = Workpattern::VERSION
+  spec.authors       = ["Barrie Callender"]
+  spec.email         = ["barrie@callenb.org"]
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  spec.summary       = "Calculates dates and durations whilst taking into account working and non-working periods down to a minute"
+  spec.description   = "Calculates dates and durations whilst taking into account working and non-working times down to a minute.  Business working time with holidays are a breeze."
+  spec.homepage      = "http://workpattern.org"
+  spec.license       = "MIT"  
+  spec.required_ruby_version = Gem::Requirement.new(">= 1.9.3")
 
-  # specify any dependencies here; for example:
-  s.add_runtime_dependency 'tzinfo'
-  s.add_development_dependency('rake', ['~> 0.9.2'])
-  s.add_development_dependency('minitest', ['~> 5.4.3'])
-end
+  spec.metadata["homepage_url"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/callenb/workpattern"
+  spec.metadata["changelog_uri"] = "https://workpattern.org/2021/02/25/changelog.html"
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
+  end
+  spec.require_paths = ["lib"]
 
+  # Uncomment to register a new dependency of your gem
+  # spec.add_dependency "example-gem", "~> 1.0"
+
+  # For more information and examples about making a new gem, checkout our
+  # guide at: https://bundler.io/guides/creating_gem.html
+  spec.add_runtime_dependency 'tzinfo'
+  spec.add_runtime_dependency 'sorted_set' if RUBY_VERSION >= "2.4"
+  spec.test_files            = `git ls-files -- {test,spec,features}/*`.split("\n")
+  spec.require_paths         = ["lib"]
+  
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workpattern
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Barrie Callender
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2021-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -25,33 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: sorted_set
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.3
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.3
+        version: '0'
 description: Calculates dates and durations whilst taking into account working and
   non-working times down to a minute.  Business working time with holidays are a breeze.
 email:
@@ -62,30 +48,33 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
-- CHANGELOG
+- CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
+- LICENSE.txt
 - README.md
 - Rakefile
 - lib/workpattern.rb
 - lib/workpattern/clock.rb
-- lib/workpattern/utility/base.rb
+- lib/workpattern/constants.rb
+- lib/workpattern/day.rb
 - lib/workpattern/version.rb
 - lib/workpattern/week.rb
+- lib/workpattern/week_pattern.rb
 - lib/workpattern/workpattern.rb
 - script/console
 - script/destroy
 - script/generate
 - script/txt2html
-- test/test_clock.rb
-- test/test_helper.rb
-- test/test_week.rb
-- test/test_workpattern.rb
-- test/test_workpattern_module.rb
 - workpattern.gemspec
-homepage: http://github.com/callenb/workpattern
+homepage: http://workpattern.org
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_url: http://workpattern.org
+  source_code_uri: https://github.com/callenb/workpattern
+  changelog_uri: https://workpattern.org/2021/02/25/changelog.html
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -101,8 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Calculates dates and durations whilst taking into account working and non-working

data/lib/workpattern/utility/base.rb

@@ -1,27 +0,0 @@
-module Workpattern
-  # Mixins expected to be used in more than one class
-  #
-  # @since 0.2.0
-  #
-  # @private
-  module Base
-    # Holds local timezone info
-    @@tz = nil
-
-    # Converts a date like object into utc
-    #
-    def to_utc(date)
-      date.to_time.utc
-    end
-    # Converts a date like object into local time
-    #
-    def to_local(date)
-      date.to_time.getgm
-    end
-
-    # Retrieves the local timezone
-    def timezone
-      @@tz || @@tz = TZInfo::Timezone.get(Time.now.zone)
-    end
-  end
-end

data/test/test_clock.rb

@@ -1,29 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestClock < MiniTest::Test #:nodoc:
-  def setup
-  end
-
-  def test_must_create_midnight_default
-    clock = Workpattern::Clock.new
-
-    assert_equal 0, clock.minutes, 'total default minutes'
-    assert_equal 0, clock.hour, 'default hour is zero'
-    assert_equal 0, clock.min, 'default minute is zero'
-    time = clock.time
-    assert time.is_a?(DateTime), 'must return a DateTime object'
-    assert_equal 0, time.hour, 'hour in the day must be zero'
-    assert_equal 0, time.min, 'minute in the day must be zero'
-  end
-
-  def test_must_account_for_out_of_range_values
-    clock = Workpattern::Clock.new(27, 80)
-
-    assert_equal 1700, clock.minutes, 'total minutes'
-    assert_equal 4, clock.hour, 'hour is 4'
-    assert_equal 20, clock.min, 'minute is 20'
-    time = clock.time
-    assert time.is_a?(DateTime), 'must return a DateTime object'
-    assert_equal DateTime.new(1963, 6, 10, 4, 20), time
-  end
-end

data/test/test_helper.rb

@@ -1,2 +0,0 @@
-require 'minitest/autorun'
-require File.dirname(__FILE__) + '/../lib/workpattern.rb'

data/test/test_week.rb

@@ -1,532 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestWeek < MiniTest::Test #:nodoc:
-  include Workpattern::Base
-  def setup
-    start = Time.gm(2000, 1, 3)
-    finish = Time.gm(2000, 1, 9)
-
-    @w_week = Workpattern::Week.new(start, finish, 1)
-
-    @r_week = Workpattern::Week.new(start, finish, 0)
-
-    @p_week = Workpattern::Week.new(start, finish, 1)
-    @p_week.workpattern(:weekend, Workpattern.clock(0, 0),
-                        Workpattern.clock(23, 59), 0)
-    @p_week.workpattern(:weekday, Workpattern.clock(0, 0),
-                        Workpattern.clock(8, 59), 0)
-    @p_week.workpattern(:weekday, Workpattern.clock(12, 30),
-                        Workpattern.clock(13, 0), 0)
-    @p_week.workpattern(:weekday, Workpattern.clock(17, 0),
-                        Workpattern.clock(23, 59), 0)
-  end
-
-  def test_must_create_a_w_week
-    start = Time.gm(2000, 1, 1, 11, 3)
-    finish = Time.gm(2005, 12, 31, 16, 41)
-    w_week = week(start, finish, 1)
-    assert_equal Time.gm(start.year, start.month, start.day),
-                 w_week.start
-    assert_equal Time.gm(finish.year, finish.month, finish.day),
-                 w_week.finish
-    assert_equal 3_156_480, w_week.total # 2192 days
-  end
-
-  def test_create_w_week_of_3_concecutive_days
-    start = Time.gm(2000, 1, 2, 11, 3) # Sunday
-    finish = Time.gm(2000, 1, 4, 16, 41) # Tuesday
-    w_week = week(start, finish, 1)
-    assert_equal Time.gm(start.year, start.month,
-                         start.day), w_week.start
-    assert_equal Time.gm(finish.year, finish.month, finish.day),
-                 w_week.finish
-    assert_equal 1_440 * 3, w_week.total # 3 days
-  end
-
-  def test_create_working_week_friday_to_sunday
-    start = Time.gm(2000, 1, 7, 11, 3) # Friday
-    finish = Time.gm(2000, 1, 9, 16, 41) # Sunday
-    w_week = week(start, finish, 1)
-    assert_equal Time.gm(start.year, start.month, start.day),
-                 w_week.start
-    assert_equal Time.gm(finish.year, finish.month, finish.day),
-                 w_week.finish
-    assert_equal 1_440 * 3, w_week.total # 3 days
-  end
-
-  def test_create_working_week_thursday_to_sunday
-    start = Time.gm(2000, 1, 6, 11, 3) # Thursday
-    finish = Time.gm(2000, 1, 8, 16, 41) # Sunday
-    w_week = week(start, finish, 1)
-    assert_equal Time.gm(start.year, start.month, start.day),
-                 w_week.start
-    assert_equal Time.gm(finish.year, finish.month, finish.day),
-                 w_week.finish
-    assert_equal 1_440 * 3, w_week.total # 3 days
-  end
-
-  def test_must_create_a_resting_week
-    start = Time.gm(2000, 1, 1, 11, 3)
-    finish = Time.gm(2005, 12, 31, 16, 41)
-    resting_week = week(start, finish, 0)
-    assert_equal Time.gm(start.year, start.month, start.day),
-                 resting_week.start
-    assert_equal Time.gm(finish.year, finish.month, finish.day),
-                 resting_week.finish
-    assert_equal 0, resting_week.total # 2192
-    assert_equal 0, resting_week.week_total
-  end
-
-  def test_must_duplicate_all_of_a_week
-    start = Time.gm(2000, 1, 1, 11, 3)
-    finish = Time.gm(2005, 12, 31, 16, 41)
-    week = week(start, finish, 1)
-    new_week = week.duplicate
-    assert_equal Time.gm(start.year, start.month, start.day),
-                 new_week.start
-    assert_equal Time.gm(finish.year, finish.month, finish.day),
-                 new_week.finish
-    assert_equal 3_156_480, new_week.total # 2192
-    week.workpattern(:weekend, Workpattern.clock(0, 0),
-                     Workpattern.clock(23, 59), 0)
-    assert_equal 3_156_480, new_week.total # 2192
-  end
-
-  def test_must_set_week_pattern_correctly
-    start = Time.gm(2000, 1, 3)
-    finish = Time.gm(2000, 1, 9)
-
-    pattern_week = Workpattern::Week.new(start, finish, 1)
-    assert_equal start, pattern_week.start
-    assert_equal finish, pattern_week.finish
-    assert_equal 10_080, pattern_week.week_total
-    pattern_week.workpattern(:weekend, Workpattern.clock(0, 0),
-                             Workpattern.clock(23, 59), 0)
-    assert_equal 7_200, pattern_week.week_total
-    pattern_week.workpattern(:weekday, Workpattern.clock(0, 0),
-                             Workpattern.clock(8, 59), 0)
-    assert_equal 4_500, pattern_week.week_total
-    pattern_week.workpattern(:weekday, Workpattern.clock(12, 30),
-                             Workpattern.clock(13, 0), 0)
-    assert_equal 4_345, pattern_week.week_total
-    pattern_week.workpattern(:weekday, Workpattern.clock(17, 0),
-                             Workpattern.clock(23, 59), 0)
-    assert_equal 2_245, pattern_week.week_total
-  end
-
-  def test_must_set_patterns_correctly
-    start = Time.gm(2000, 1, 1, 0, 0)
-    finish = Time.gm(2005, 12, 31, 8, 59)
-    w_week = week(start, finish, 1)
-    assert_equal 10_080, w_week.week_total
-    w_week.workpattern(:all, start, finish, 0)
-    assert_equal 6_300, w_week.week_total
-    w_week.workpattern(:sun, start, finish, 1)
-    assert_equal 6_840, w_week.week_total
-    w_week.workpattern(:mon, start, finish, 1)
-    assert_equal 7_380, w_week.week_total
-    w_week.workpattern(:all, clock(18, 0), clock(18, 19), 0)
-    assert_equal 7_240, w_week.week_total
-    w_week.workpattern(:all, clock(0, 0), clock(23, 59), 0)
-    assert_equal 0, w_week.week_total
-    w_week.workpattern(:all, clock(0, 0), clock(0, 0), 1)
-    assert_equal 7, w_week.week_total
-    w_week.workpattern(:all, clock(23, 59), clock(23, 59), 1)
-    assert_equal 14, w_week.week_total
-    w_week.workpattern(:all, clock(0, 0), clock(23, 59), 1)
-    assert_equal 10_080, w_week.week_total
-    w_week.workpattern(:weekend, clock(0, 0), clock(23, 59), 0)
-    assert_equal 7_200, w_week.week_total
-  end
-
-  def test_must_add_minutes_in_a_w_week_result_in_same_day
-    r_date, r_duration, m_flag = @w_week.calc(Time.gm(2000, 1, 3, 7, 31),
-                                              29)
-    assert_equal Time.gm(2000, 1, 3, 8, 0), r_date
-    refute m_flag
-    assert_equal 0, r_duration
-  end
-
-  def test_must_add_minutes_in_a_w_week_result_in_next_day
-    r_date, r_dur, m_flag = @w_week.calc(Time.gm(2000, 1, 3, 7, 31), 990)
-    assert_equal Time.gm(2000, 1, 4, 0, 1), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_add_minutes_in_a_w_week_result_in_later_day
-    r_date, r_dur, m_flag = @w_week.calc(Time.gm(2000, 1, 3, 7, 31), 2430)
-    assert_equal Time.gm(2000, 1, 5, 0, 1), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_add_minutes_in_a_w_week_result_in_start_next_day
-    r_date, r_dur, m_flag = @w_week.calc(Time.gm(2000, 1, 3, 7, 31), 989)
-    assert_equal Time.gm(2000, 1, 4, 0, 0), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_add_0_minutes_in_a_w_week
-    r_date, r_dur, m_flag = @w_week.calc(Time.gm(2000, 1, 3, 7, 31), 0)
-    assert_equal Time.gm(2000, 1, 3, 7, 31), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_add_too_many_minutes_in_a_w_week
-    r_date, r_dur, m_flag = @w_week.calc(Time.gm(2000, 1, 3, 7, 31), 9630)
-    assert_equal Time.gm(2000, 1, 10, 0, 0), r_date
-    refute m_flag
-    assert_equal 1, r_dur
-  end
-
-  def test_must_add_minutes_in_a_resting_week
-    r_date, r_dur, m_flag = @r_week.calc(Time.gm(2000, 1, 3, 7, 31), 29)
-    assert_equal Time.gm(2000, 1, 10, 0, 0), r_date
-    refute m_flag
-    assert_equal 29, r_dur
-  end
-
-  def test_must_add_minutes_from_start_of_resting_week
-    r_date, r_dur, m_flag = @r_week.calc(Time.gm(2000, 1, 3, 0, 0), 990)
-    assert_equal Time.gm(2000, 1, 10, 0, 0), r_date
-    refute m_flag
-    assert_equal 990, r_dur
-  end
-
-  def test_must_add_minutes_to_last_minute_of_a_resting_week
-    r_date, r_dur, m_flag = @r_week.calc(Time.gm(2000, 1, 9, 23, 59), 2430)
-    assert_equal Time.gm(2000, 1, 10, 0, 0), r_date
-    refute m_flag
-    assert_equal 2_430, r_dur
-  end
-
-  def test_must_add_zero_minutes_in_a_resting_week
-    r_date, r_dur, m_flag = @r_week.calc(Time.gm(2000, 1, 3, 7, 31), 0)
-    assert_equal Time.gm(2000, 1, 3, 7, 31), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_add_minutes_from_working_in_a_pattern_week_result_in_same_day
-    r_date, r_dur, m_flag = @p_week.calc(Time.gm(2000, 1, 3, 10, 11), 110)
-    assert_equal Time.gm(2000, 1, 3, 12, 1), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_add_minutes_from_resting_in_a_pattern_week_result_in_same_day
-    r_date, r_dur, m_flag = @p_week.calc(Time.gm(2000, 1, 3, 12, 45), 126)
-    assert_equal Time.gm(2000, 1, 3, 15, 7), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_add_minutes_from_working_in_a_pattern_week_result_in_next_day
-    r_date, r_dur, m_flag = @p_week.calc(Time.gm(2000, 1, 3, 10, 11), 379)
-    assert_equal Time.gm(2000, 1, 4, 9, 1), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_add_minutes_from_resting_in_a_pattern_week_result_in_next_day
-    r_date, r_dur, m_flag = @p_week.calc(Time.gm(2000, 1, 3, 12, 45), 240)
-    assert_equal Time.gm(2000, 1, 4, 9, 1), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_add_minutes_from_working_in_a_pattern_week_result_in_later_day
-    r_date, r_dur, m_flag = @p_week.calc(Time.gm(2000, 1, 3, 10, 11), 828)
-    assert_equal Time.gm(2000, 1, 5, 9, 1), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_add_minutes_from_resting_in_a_w_week_result_in_later_day
-    r_date, r_dur, m_flag = @p_week.calc(Time.gm(2000, 1, 3, 12, 45), 689)
-    assert_equal Time.gm(2000, 1, 5, 9, 1), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_add_0_minutes_from_working_in_a_resting_week
-    r_date, r_dur, m_flag = @p_week.calc(Time.gm(2000, 1, 3, 10, 11), 0)
-    assert_equal Time.gm(2000, 1, 3, 10, 11), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_add_0_minutes_from_resting_in_a_resting_week
-    r_date, r_dur, m_flag = @p_week.calc(Time.gm(2000, 1, 3, 12, 45), 0)
-    assert_equal Time.gm(2000, 1, 3, 12, 45), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_add_too_many_minutes_in_a_pattern__week
-    r_date, r_dur, m_flag = @p_week.calc(Time.gm(2000, 1, 3, 10, 11), 2175)
-    assert_equal Time.gm(2000, 1, 10, 0, 0), r_date
-    refute m_flag
-    assert_equal 1, r_dur
-  end
-
-  def test_must_subtract_minutes_in_a_w_week_result_in_same_day
-    r_date, r_dur, m_flag = @w_week.calc(Time.gm(2000, 1, 8, 7, 31), -29)
-    assert_equal Time.gm(2000, 1, 8, 7, 2), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_subtract_minutes_in_a_w_week_result_in_previous_day
-    r_date, r_dur, m_flag = @w_week.calc(Time.gm(2000, 1, 8, 7, 31), -452)
-    assert_equal Time.gm(2000, 1, 7, 23, 59), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_subtract_minutes_in_a_w_week_result_in_earlier_day
-    r_date, r_dur, m_flag = @w_week.calc(Time.gm(2000, 1, 8, 7, 31), -1892)
-    assert_equal Time.gm(2000, 1, 6, 23, 59), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_subtract_minutes_in_a_w_week_result_at_start_of_day
-    r_date, r_dur, m_flag = @w_week.calc(Time.gm(2000, 1, 8, 7, 31), -451)
-    assert_equal Time.gm(2000, 1, 8, 0, 0), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_subtract_minutes_in_a_w_week_result_at_start_of_previous_day
-    r_date, r_dur, m_flag = @w_week.calc(Time.gm(2000, 1, 8, 7, 31), -1891)
-    assert_equal Time.gm(2000, 1, 7, 0, 0), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_subtract_too_many_minutes_from_a_w_week
-    r_date, r_dur, m_flag = @w_week.calc(Time.gm(2000, 1, 8, 7, 31), -7652)
-    assert_equal Time.gm(2000, 1, 2, 0, 0), r_date
-    assert m_flag
-    assert_equal -1, r_dur
-  end
-
-  def test_must_subtract_1_minute_from_start_of_next_day_after_w_week
-    r_date, r_dur, m_flag = @w_week.calc(Time.gm(2000, 1, 9, 0, 0), -1, true)
-    assert_equal Time.gm(2000, 1, 9, 23, 59), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_subtract_2_minutes_from_start_of_next_day_after_w_week
-    r_date, r_dur, m_flag = @w_week.calc(Time.gm(2000, 1, 9, 0, 0), -2, true)
-    assert_equal Time.gm(2000, 1, 9, 23, 58), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_subtract_minutes_from_last_day_in_a_resting_week
-    r_date, r_dur, m_flag = @r_week.calc(Time.gm(2000, 1, 10, 7, 31), -29)
-    assert_equal Time.gm(2000, 1, 2, 0, 0), r_date
-    assert m_flag
-    assert_equal -29, r_dur
-  end
-
-  def test_must_subtract_minutes_from_middle_day_in_a_resting_week
-    r_date, r_dur, m_flag = @r_week.calc(Time.gm(2000, 1, 8, 7, 31), -452)
-    assert_equal Time.gm(2000, 1, 2, 0, 0), r_date
-    assert m_flag
-    assert_equal -452, r_dur
-  end
-
-  def test_must_subtract_minutes_from_start_of_resting_week
-    r_date, r_dur, m_flag = @r_week.calc(Time.gm(2000, 1, 3, 0, 0), -1892)
-    assert_equal Time.gm(2000, 1, 2, 0, 0), r_date
-    assert m_flag
-    assert_equal -1_892, r_dur
-  end
-
-  def test_must_subtract_minutes_from_start_of_next_day_after_resting_week
-    r_date, r_dur, m_flag = @r_week.calc(Time.gm(2000, 1, 9, 0, 0), -1, true)
-    assert_equal Time.gm(2000, 1, 2, 0, 0), r_date
-    assert m_flag
-    assert_equal -1, r_dur
-  end
-
-  def test_must_subtract_minutes_from_resting_day_in_a_pattern_week
-    r_date, r_dur, m_flag = @p_week.calc(Time.gm(2000, 1, 8, 13, 29), -29)
-    assert_equal Time.gm(2000, 1, 7, 16, 31), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_subtract_minutes_from_working_day_in_a_pattern_week
-    r_date, r_dur, m_flag = @p_week.calc(Time.gm(2000, 1, 7, 13, 29), -29)
-    assert_equal Time.gm(2000, 1, 7, 12, 29), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_subtract_minutes_in_a_pattern_week_result_in_previous_day
-    r_date, r_dur, m_flag = @p_week.calc(Time.gm(2000, 1, 7, 9, 1), -2)
-    assert_equal Time.gm(2000, 1, 6, 16, 59), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_subtract_minutes_in_a_pattern_week_result_in_earlier_day
-    r_date, r_dur, m_flag = @p_week.calc(Time.gm(2000, 1, 7, 13, 29), -240)
-    assert_equal Time.gm(2000, 1, 6, 16, 58), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_subtract_minutes_in_a_pattern_week_result_at_start_of_day
-    r_date, r_dur, m_flag = @p_week.calc(Time.gm(2000, 1, 7, 13, 29), -238)
-    assert_equal Time.gm(2000, 1, 7, 9, 0), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_subtract_minutes_in_a_pattern_week_result_at_start_of_prev_day
-    r_date, r_dur, m_flag = @p_week.calc(Time.gm(2000, 1, 7, 13, 29), -687)
-    assert_equal Time.gm(2000, 1, 6, 9, 0), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_subtract_too_many_minutes_from_a_pattern_week
-    r_date, r_dur, m_flag = @p_week.calc(Time.gm(2000, 1, 7, 9, 0), -1797)
-    assert_equal Time.gm(2000, 1, 2, 0, 0), r_date
-    assert m_flag
-    assert_equal -1, r_dur
-  end
-
-  def test_must_subtract_1_minute_from_start_of_next_day_after_pattern_week
-    r_date, r_dur, m_flag = @p_week.calc(Time.gm(2000, 1, 9, 0, 0), -1, true)
-    assert_equal Time.gm(2000, 1, 7, 16, 59), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def test_must_subtract_2_minutes_from_start_of_next_day_after_pattern_week
-    r_date, r_dur, m_flag = @p_week.calc(Time.gm(2000, 1, 9, 0, 0), -2, true)
-    assert_equal Time.gm(2000, 1, 7, 16, 58), r_date
-    refute m_flag
-    assert_equal 0, r_dur
-  end
-
-  def must_diff_day_week_day_in_patterned_week
-    start = Time.gm(2013, 9, 23, 0, 0)
-    finish = Time.gm(2013, 10, 20, 23, 59)
-    w_week = week(start, finish, 1)
-    w_week.workpattern :all, Workpattern.clock(0, 0),
-                       Workpattern.clock(8, 59), 0
-    w_week.workpattern :all, Workpattern.clock(12, 0),
-                       Workpattern.clock(12, 59), 0
-    w_week.workpattern :all, Workpattern.clock(18, 0),
-                       Workpattern.clock(23, 59), 0
-    s_date = Time.gm(2013, 10, 3, 16, 0)
-    f_date = Time.gm(2013, 10, 15, 12, 30)
-    duration, start = w_week.diff(s_date, f_date)
-
-    assert_equal 5_640, duration
-    assert_equal Time.gm(2013, 10, 15, 12, 30), start
-  end
-
-  def test_must_calculate_difference_between_dates_in_w_week
-    late_date = Time.gm(2000, 1, 6, 9, 32)
-    early_date = Time.gm(2000, 1, 6, 8, 20)
-    result_dur, r_date = @w_week.diff(early_date, late_date)
-    assert_equal 72, result_dur
-    assert_equal late_date, r_date
-  end
-
-  def test_must_calculate_difference_between_dates_in_resting_week
-    late_date = Time.gm(2000, 1, 6, 9, 32)
-    early_date = Time.gm(2000, 1, 6, 8, 20)
-    result_dur, r_date = @r_week.diff(early_date, late_date)
-    assert_equal 0, result_dur
-    assert_equal late_date, r_date
-  end
-
-  def test_must_calculate_difference_between_dates_in_pattern_week
-    late_date = Time.gm(2000, 1, 6, 13, 1)
-    early_date = Time.gm(2000, 1, 6, 12, 29)
-    result_dur, r_date = @p_week.diff(early_date, late_date)
-    assert_equal 1, result_dur
-    assert_equal late_date, r_date
-  end
-
-  def test_must_diff_from_last_day_of_patterned_week
-    # #issue 15
-    start = Time.gm(2013, 9, 23, 0, 0)
-    finish = Time.gm(2013, 9, 26, 23, 59)
-    w_week = week(start, finish, 1)
-    w_week.workpattern :all, Workpattern.clock(0, 0),
-                       Workpattern.clock(8, 59), 0
-    w_week.workpattern :all, Workpattern.clock(12, 0),
-                       Workpattern.clock(12, 59), 0
-    w_week.workpattern :all, Workpattern.clock(18, 0),
-                       Workpattern.clock(23, 59), 0
-
-    s_date = Time.gm(2013, 9, 26, 17, 0)
-    f_date = Time.gm(2013, 9, 27, 10, 0)
-    duration, start = w_week.diff(s_date, f_date)
-
-    assert_equal 60, duration
-    assert_equal Time.gm(2013, 9, 27, 0, 0), start
-  end
-
-  def test_must_diff_long_distances_beyond_end_of_patterned_week
-    start = Time.gm(2013, 9, 23, 0, 0)
-    finish = Time.gm(2013, 10, 20, 23, 59)
-    w_week = week(start, finish, 1)
-    w_week.workpattern :all, Workpattern.clock(0, 0),
-                       Workpattern.clock(8, 59), 0
-    w_week.workpattern :all, Workpattern.clock(12, 0),
-                       Workpattern.clock(12, 59), 0
-    w_week.workpattern :all, Workpattern.clock(18, 0),
-                       Workpattern.clock(23, 59), 0
-
-    s_date = Time.gm(2013, 9, 26, 17, 0)
-    f_date = Time.gm(2018, 9, 27, 10, 0)
-    duration, start = w_week.diff(s_date, f_date)
-
-    assert_equal 11_580, duration
-    assert_equal Time.gm(2013, 10, 21, 0, 0), start
-  end
-
-  def test_must_diff_long_distances_within_patterned_week
-    start = Time.gm(2013, 9, 23, 0, 0)
-    finish = Time.gm(2013, 10, 20, 23, 59)
-    w_week = week(start, finish, 1)
-    w_week.workpattern :all, Workpattern.clock(0, 0),
-                       Workpattern.clock(8, 59), 0
-    w_week.workpattern :all, Workpattern.clock(12, 0),
-                       Workpattern.clock(12, 59), 0
-    w_week.workpattern :all, Workpattern.clock(18, 0),
-                       Workpattern.clock(23, 59), 0
-
-    s_date = Time.gm(2013, 9, 26, 17, 0)
-    f_date = Time.gm(2013, 10, 15, 10, 0)
-    duration, start = w_week.diff(s_date, f_date)
-
-    assert_equal 8_760, duration
-    assert_equal Time.gm(2013, 10, 15, 10, 0), start
-  end
-
-  private
-
-  def week(start, finish, type)
-    Workpattern::Week.new(start, finish, type)
-  end
-
-  def clock(hour, min)
-    Workpattern.clock(hour, min)
-  end
-end