holidays 2.2.0 → 3.0.0

data/lib/{holidays → generated_definitions}/nl.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/nl.yaml
+  # Definitions loaded: definitions/nl.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/nl'
+  #   require 'generated_definitions/nl'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module NL # :nodoc:

data/lib/{holidays → generated_definitions}/no.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/no.yaml
+  # Definitions loaded: definitions/no.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/no'
+  #   require 'generated_definitions/no'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module NO # :nodoc:

data/lib/{holidays → generated_definitions}/north_america.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/ca.yaml, data/mx.yaml, data/us.yaml, data/north_america_informal.yaml
+  # Definitions loaded: definitions/ca.yaml, definitions/mx.yaml, definitions/us.yaml, definitions/north_america_informal.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/north_america'
+  #   require 'generated_definitions/north_america'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module NORTH_AMERICA # :nodoc:
@@ -83,7 +83,7 @@ module Holidays
             {:wday => 1, :week => 3, :name => "Día de la Revolución", :regions => [:mx]},
             {:mday => 11, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Veterans Day", :regions => [:us]},
             {:wday => 4, :week => 4, :name => "Thanksgiving", :regions => [:us]},
-            {:wday => 5, :week => 4, :name => "Day after Thanksgiving", :regions => [:us_ca]}],
+            {:function => lambda { |year| Holidays.day_after_thanksgiving(year) }, :function_id => "day_after_thanksgiving(year)", :name => "Day after Thanksgiving", :regions => [:us_ca]}],
       12 => [{:mday => 25, :name => "Christmas Day", :regions => [:ca]},
             {:mday => 26, :name => "Boxing Day", :regions => [:ca]},
             {:mday => 12, :type => :informal, :name => "Día de la Virgen de Guadalupe", :regions => [:mx]},
@@ -116,6 +116,11 @@ def self.us_inauguration_day(year)
 end
 
 
+def self.day_after_thanksgiving(year)
+  Date.calculate_mday(year, 11, 4, 4) + 1
+end
+
+
 
 end
 

data/lib/{holidays → generated_definitions}/nyse.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/nyse.yaml
+  # Definitions loaded: definitions/nyse.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/nyse'
+  #   require 'generated_definitions/nyse'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module NYSE # :nodoc:

data/lib/{holidays → generated_definitions}/nz.rb

@@ -2,18 +2,18 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/nz.yaml
+  # Definitions loaded: definitions/nz.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/nz'
+  #   require 'generated_definitions/nz'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module NZ # :nodoc:
     def self.defined_regions
-      [:nz, :nz_sl, :nz_we, :nz_ak, :nz_nl, :nz_ot, :nz_sc, :nz_hb, :nz_mb, :nz_ca, :nz_ch, :nz_wl]
+      [:nz, :nz_sl, :nz_we, :nz_ak, :nz_nl, :nz_ne, :nz_ot, :nz_ta, :nz_sc, :nz_hb, :nz_mb, :nz_ca, :nz_ch, :nz_wl]
     end
 
     def self.holidays_by_month
@@ -27,10 +27,10 @@ module Holidays
             {:mday => 22, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Wellington Anniversary Day", :regions => [:nz_we]},
             {:mday => 29, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Auckland Anniversary Day", :regions => [:nz_ak]},
             {:mday => 29, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Northland Anniversary Day", :regions => [:nz_nl]}],
-      2 => [{:mday => 1, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Nelson Anniversary Day", :regions => [:nz_ak]},
+      2 => [{:mday => 1, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Nelson Anniversary Day", :regions => [:nz_ne]},
             {:mday => 6, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "Waitangi Day", :regions => [:nz]}],
       3 => [{:mday => 23, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Otago Anniversary Day", :regions => [:nz_ot]},
-            {:wday => 1, :week => 2, :name => "Taranaki Anniversary Day", :regions => [:nz_ak]}],
+            {:wday => 1, :week => 2, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Taranaki Anniversary Day", :regions => [:nz_ta]}],
       4 => [{:mday => 25, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "ANZAC Day", :regions => [:nz]}],
       6 => [{:wday => 1, :week => 1, :name => "Queen's Birthday", :regions => [:nz]}],
       9 => [{:wday => 1, :week => 4, :name => "Dominion Day", :regions => [:nz_sc]}],

data/lib/{holidays → generated_definitions}/ph.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/ph.yaml
+  # Definitions loaded: definitions/ph.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/ph'
+  #   require 'generated_definitions/ph'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module PH # :nodoc:

data/lib/{holidays → generated_definitions}/pl.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/pl.yaml
+  # Definitions loaded: definitions/pl.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/pl'
+  #   require 'generated_definitions/pl'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module PL # :nodoc:

data/lib/{holidays → generated_definitions}/pt.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/pt.yaml
+  # Definitions loaded: definitions/pt.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/pt'
+  #   require 'generated_definitions/pt'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module PT # :nodoc:

data/lib/{holidays → generated_definitions}/ro.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/ro.yaml
+  # Definitions loaded: definitions/ro.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/ro'
+  #   require 'generated_definitions/ro'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module RO # :nodoc:

data/lib/{holidays → generated_definitions}/scandinavia.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/dk.yaml, data/is.yaml, data/no.yaml, data/se.yaml, data/fi.yaml
+  # Definitions loaded: definitions/dk.yaml, definitions/is.yaml, definitions/no.yaml, definitions/se.yaml, definitions/fi.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/scandinavia'
+  #   require 'generated_definitions/scandinavia'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module SCANDINAVIA # :nodoc:

data/lib/{holidays → generated_definitions}/se.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/se.yaml
+  # Definitions loaded: definitions/se.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/se'
+  #   require 'generated_definitions/se'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module SE # :nodoc:

data/lib/{holidays → generated_definitions}/sg.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/sg.yaml
+  # Definitions loaded: definitions/sg.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/sg'
+  #   require 'generated_definitions/sg'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module SG # :nodoc:

data/lib/{holidays → generated_definitions}/si.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/si.yaml
+  # Definitions loaded: definitions/si.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/si'
+  #   require 'generated_definitions/si'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module SI # :nodoc:

data/lib/{holidays → generated_definitions}/sk.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/sk.yaml
+  # Definitions loaded: definitions/sk.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/sk'
+  #   require 'generated_definitions/sk'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module SK # :nodoc:

data/lib/{holidays → generated_definitions}/united_nations.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/united_nations.yaml
+  # Definitions loaded: definitions/united_nations.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/united_nations'
+  #   require 'generated_definitions/united_nations'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module UNITED_NATIONS # :nodoc:

data/lib/{holidays → generated_definitions}/ups.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/ups.yaml
+  # Definitions loaded: definitions/ups.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/ups'
+  #   require 'generated_definitions/ups'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module UPS # :nodoc:
@@ -23,13 +23,18 @@ module Holidays
       7 => [{:mday => 4, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Independence Day", :regions => [:ups]}],
       9 => [{:wday => 1, :week => 1, :name => "Labor Day", :regions => [:ups]}],
       11 => [{:wday => 4, :week => 4, :name => "Thanksgiving", :regions => [:ups]},
-            {:wday => 5, :week => 4, :name => "Day After Thanksgiving", :regions => [:ups]}],
+            {:function => lambda { |year| Holidays.day_after_thanksgiving(year) }, :function_id => "day_after_thanksgiving(year)", :name => "Day After Thanksgiving", :regions => [:ups]}],
       12 => [{:mday => 25, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Christmas Day", :regions => [:ups]},
             {:mday => 31, :name => "New Year's Eve", :regions => [:ups]}]
       }
     end
   end
 
+def self.day_after_thanksgiving(year)
+  Date.calculate_mday(year, 11, 4, 4) + 1
+end
+
+
 
 end
 

data/lib/{holidays → generated_definitions}/us.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/us.yaml, data/north_america_informal.yaml
+  # Definitions loaded: definitions/us.yaml, definitions/north_america_informal.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/us'
+  #   require 'generated_definitions/us'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module US # :nodoc:
@@ -37,7 +37,7 @@ module Holidays
             {:mday => 31, :type => :informal, :name => "Halloween", :regions => [:us, :ca]}],
       11 => [{:mday => 11, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Veterans Day", :regions => [:us]},
             {:wday => 4, :week => 4, :name => "Thanksgiving", :regions => [:us]},
-            {:wday => 5, :week => 4, :name => "Day after Thanksgiving", :regions => [:us_ca]}],
+            {:function => lambda { |year| Holidays.day_after_thanksgiving(year) }, :function_id => "day_after_thanksgiving(year)", :name => "Day after Thanksgiving", :regions => [:us_ca]}],
       12 => [{:mday => 25, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Christmas Day", :regions => [:us]}],
       4 => [{:mday => 1, :type => :informal, :name => "April Fool's Day", :regions => [:us, :ca]},
             {:mday => 22, :type => :informal, :name => "Earth Day", :regions => [:us, :ca]}],
@@ -52,6 +52,11 @@ def self.us_inauguration_day(year)
 end
 
 
+def self.day_after_thanksgiving(year)
+  Date.calculate_mday(year, 11, 4, 4) + 1
+end
+
+
 
 end
 

data/lib/{holidays → generated_definitions}/ve.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/ve.yaml
+  # Definitions loaded: definitions/ve.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/ve'
+  #   require 'generated_definitions/ve'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module VE # :nodoc:

data/lib/{holidays → generated_definitions}/vi.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/vi.yaml
+  # Definitions loaded: definitions/vi.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/vi'
+  #   require 'generated_definitions/vi'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module VI # :nodoc:

data/lib/{holidays → generated_definitions}/za.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/za.yaml
+  # Definitions loaded: definitions/za.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/za'
+  #   require 'generated_definitions/za'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module ZA # :nodoc:

data/lib/holidays.rb

@@ -1,9 +1,11 @@
 # encoding: utf-8
 $:.unshift File.dirname(__FILE__)
 
-require 'digest/md5'
 require 'date'
-require 'yaml'
+require 'holidays/definition_factory'
+require 'holidays/date_calculator_factory'
+require 'holidays/option_factory'
+require 'holidays/use_case_factory'
 
 # == Region options
 # Holidays can be defined as belonging to one or more regions and sub regions.
@@ -47,712 +49,165 @@ module Holidays
   # Exception thrown when an unknown region is requested.
   class UnknownRegionError < ArgumentError; end
 
-  @@regions = []
-  @@holidays_by_month = {}
-  @@proc_cache = {}
-
-  @@cache = {}
-  @@cache_range = {}
-  class << self
-    def cache_range; @@cache_range; end
-    def cache; @@cache; end
-  end
-
   WEEKS = {:first => 1, :second => 2, :third => 3, :fourth => 4, :fifth => 5, :last => -1, :second_last => -2, :third_last => -3}
   MONTH_LENGTHS = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
   DAY_SYMBOLS = Date::DAYNAMES.collect { |n| n.downcase.intern }
-  DEFINITION_PATH = File.expand_path(File.dirname(__FILE__) + '/holidays/')
-
-  # Get all holidays on a given date.
-  #
-  # [<tt>date</tt>]     A Date object.
-  # [<tt>:options</tt>] One or more region symbols, <tt>:informal</tt> and/or <tt>:observed</tt>.
-  #
-  # Returns an array of hashes or nil. See Holidays#between for the output
-  # format.
-  #
-  # Also available via Date#holidays.
-  def self.on(date, *options)
-    self.between(date, date, options)
-  end
-
-  # Does the given work-week have any holidays?
-  #
-  # [<tt>date</tt>]   A Date object.
-  # [<tt>:options</tt>] One or more region symbols, and/or <tt>:informal</tt>. Automatically includes <tt>:observed</tt>. If you don't want this, pass <tt>:no_observed</tt>
-  #
-  # The given Date can be any day of the week.
-  # Returns true if any holidays fall on Monday - Friday of the given week.
-  def self.full_week?(date, *options)
-    days_to_monday = date.wday - 1
-    days_to_friday = 5 - date.wday
-    start_date = date - days_to_monday
-    end_date = date + days_to_friday
-    options += [:observed] unless options.include?(:no_observed)
-    options.delete(:no_observed)
-    self.between(start_date, end_date, options).empty?
-  end
 
-  # Get all holidays occuring between two dates, inclusively.
-  #
-  # Returns an array of hashes or nil.
-  #
-  # Each holiday is returned as a hash with the following fields:
-  # [<tt>start_date</tt>]  Ruby Date object.
-  # [<tt>end_date</tt>]    Ruby Date object.
-  # [<tt>options</tt>]     One or more region symbols, <tt>:informal</tt> and/or <tt>:observed</tt>.
-  #
-  # ==== Example
-  #   from = Date.civil(2008,7,1)
-  #   to   = Date.civil(2008,7,31)
-  #
-  #   Holidays.between(from, to, :ca, :us)
-  #   => [{:name => 'Canada Day', :regions => [:ca]...}
-  #       {:name => 'Independence Day'', :regions => [:us], ...}]
-  def self.between(start_date, end_date, *options)
-    # remove the timezone
-    start_date = start_date.new_offset(0) + start_date.offset if start_date.respond_to?(:new_offset)
-    end_date = end_date.new_offset(0) + end_date.offset if end_date.respond_to?(:new_offset)
+  DEFINITIONS_PATH = 'generated_definitions'
+  FULL_DEFINITIONS_PATH = File.expand_path(File.dirname(__FILE__) + "/#{DEFINITIONS_PATH}")
 
-    # get simple dates
-    start_date, end_date = get_date(start_date), get_date(end_date)
-
-    if range = @@cache_range[options]
-      if range.begin < start_date && range.end > end_date
-        return @@cache[options].select do |holiday|
-          holiday[:date] >= start_date && holiday[:date] <= end_date
-        end
+  class << self
+    # Get all holidays on a given date.
+    #
+    # [<tt>date</tt>]     A Date object.
+    # [<tt>:options</tt>] One or more region symbols, <tt>:informal</tt> and/or <tt>:observed</tt>.
+    #
+    # Returns an array of hashes or nil. See Holidays#between for the output
+    # format.
+    #
+    # Also available via Date#holidays.
+    def on(date, *options)
+      between(date, date, options)
+    end
+
+    # Does the given work-week have any holidays?
+    #
+    # [<tt>date</tt>]   A Date object.
+    # [<tt>:options</tt>] One or more region symbols, and/or <tt>:informal</tt>. Automatically includes <tt>:observed</tt>. If you don't want this, pass <tt>:no_observed</tt>
+    #
+    # The given Date can be any day of the week.
+    # Returns true if any holidays fall on Monday - Friday of the given week.
+    def full_week?(date, *options)
+      days_to_monday = date.wday - 1
+      days_to_friday = 5 - date.wday
+      start_date = date - days_to_monday
+      end_date = date + days_to_friday
+      options += [:observed] unless options.include?(:no_observed)
+      options.delete(:no_observed)
+      between(start_date, end_date, options).empty?
+    end
+
+    # Get all holidays occuring between two dates, inclusively.
+    #
+    # Returns an array of hashes or nil.
+    #
+    # Each holiday is returned as a hash with the following fields:
+    # [<tt>start_date</tt>]  Ruby Date object.
+    # [<tt>end_date</tt>]    Ruby Date object.
+    # [<tt>options</tt>]     One or more region symbols, <tt>:informal</tt> and/or <tt>:observed</tt>.
+    #
+    # ==== Example
+    #   from = Date.civil(2008,7,1)
+    #   to   = Date.civil(2008,7,31)
+    #
+    #   Holidays.between(from, to, :ca, :us)
+    #   => [{:name => 'Canada Day', :regions => [:ca]...}
+    #       {:name => 'Independence Day'', :regions => [:us], ...}]
+    def between(start_date, end_date, *options)
+      raise ArgumentError unless start_date && end_date
+
+      # remove the timezone
+      start_date = start_date.new_offset(0) + start_date.offset if start_date.respond_to?(:new_offset)
+      end_date = end_date.new_offset(0) + end_date.offset if end_date.respond_to?(:new_offset)
+
+      start_date, end_date = get_date(start_date), get_date(end_date)
+
+      if cached_holidays = DefinitionFactory.cache_repository.find(start_date, end_date, options)
+        return cached_holidays
       end
-    end
 
-    regions, observed, informal = parse_options(options)
-    holidays = []
+      regions, observed, informal = OptionFactory.parse_options.call(options)
+      date_driver_hash = UseCaseFactory.dates_driver_builder.call(start_date, end_date)
 
-    dates = {}
-    (start_date..end_date).each do |date|
-      # Always include month '0' for variable-month holidays
-      dates[date.year] = [0] unless dates[date.year]
-      # TODO: test this, maybe should push then flatten
-      dates[date.year] << date.month unless dates[date.year].include?(date.month)
+      UseCaseFactory.between.call(start_date, end_date, date_driver_hash, regions, observed, informal)
     end
 
-    dates.each do |year, months|
-      months.each do |month|
-        next unless hbm = @@holidays_by_month[month]
-
-        hbm.each do |h|
-          next unless in_region?(regions, h[:regions])
-
-          # Skip informal holidays unless they have been requested
-          next if h[:type] == :informal and not informal
-
-          if h[:function]
-            # Holiday definition requires a calculation
-            result = call_proc(h[:function], year)
-
-            # Procs may return either Date or an integer representing mday
-            if result.kind_of?(Date)
-              month = result.month
-              mday = result.mday
-            else
-              mday = result
-            end
-          else
-            # Calculate the mday
-            mday = h[:mday] || Date.calculate_mday(year, month, h[:week], h[:wday])
-          end
+    # Allows a developer to explicitly calculate and cache holidays within a given period
+    def cache_between(start_date, end_date, *options)
+      start_date, end_date = get_date(start_date), get_date(end_date)
+      cache_data = between(start_date, end_date, *options)
 
-          # Silently skip bad mdays
-          begin
-            date = Date.civil(year, month, mday)
-          rescue; next; end
-
-          # If the :observed option is set, calculate the date when the holiday
-          # is observed.
-          if observed and h[:observed]
-            date = call_proc(h[:observed], date)
-          end
-
-          if date.between?(start_date, end_date)
-            holidays << {:date => date, :name => h[:name], :regions => h[:regions]}
-          end
-
-        end
-      end
+      DefinitionFactory.cache_repository.cache_between(start_date, end_date, cache_data, options)
     end
 
-    holidays.sort{|a, b| a[:date] <=> b[:date] }
-  end
-
-  # Allows a developer to explicitly calculate and cache holidays within a given period
-  def self.cache_between(start_date, end_date, *options)
-    start_date, end_date = get_date(start_date), get_date(end_date)
-    @@cache[options]       = between(start_date, end_date, *options)
-    @@cache_range[options] = start_date..end_date
-  end
-
-  # Merge a new set of definitions into the Holidays module.
-  #
-  # This method is automatically called when including holiday definition
-  # files.
-  def self.merge_defs(regions, holidays) # :nodoc:
-    @@regions = @@regions | regions
-    @@regions.uniq!
-
-    holidays.each do |month, holiday_defs|
-      @@holidays_by_month[month] = [] unless @@holidays_by_month[month]
-      holiday_defs.each do |holiday_def|
-
-          exists = false
-          @@holidays_by_month[month].each do |ex|
-            # TODO: gross.
-            if ex[:name] == holiday_def[:name] and ex[:wday] == holiday_def[:wday] and ex[:mday] == holiday_def[:mday] and ex[:week] == holiday_def[:week] and ex[:function_id] == holiday_def[:function_id] and ex[:type] == holiday_def[:type] and ex[:observed_id] == holiday_def[:observed_id]
-              # append regions
-              ex[:regions] << holiday_def[:regions]
-
-              # Should do this once we're done
-              ex[:regions].flatten!
-              ex[:regions].uniq!
-              exists = true
-            end
-          end
-
-          @@holidays_by_month[month] << holiday_def  unless exists
-      end
+    #TODO This should not be publicly available. I need to restructure the public
+    #     API for this class to something more sensible.
+    def merge_defs(regions, holidays) # :nodoc:
+      DefinitionFactory.merger.call(regions, holidays)
     end
-  end
-
-  # Get the date of Easter Sunday in a given year.  From Easter Sunday, it is
-  # possible to calculate many traditional holidays in Western countries.
-  # Returns a Date object.
-  def self.easter(year)
-    y = year
-    a = y % 19
-    b = y / 100
-    c = y % 100
-    d = b / 4
-    e = b % 4
-    f = (b + 8) / 25
-    g = (b - f + 1) / 3
-    h = (19 * a + b - d - g + 15) % 30
-    i = c / 4
-    k = c % 4
-    l = (32 + 2 * e + 2 * i - h - k) % 7
-    m = (a + 11 * h + 22 * l) / 451
-    month = (h + l - 7 * m + 114) / 31
-    day = ((h + l - 7 * m + 114) % 31) + 1
-    Date.civil(year, month, day)
-  end
 
-  # A method to calculate the orthodox easter date, returns date in the Gregorian (western) calendar
-  # Safe until appr. 4100 AD, when one leap day will be removed.
-  # Returns a Date object.
-  def self.orthodox_easter(year)
-    y = year
-    g = y % 19
-    i = (19 * g + 15) % 30
-    j = (year + year/4 + i) % 7
-    j_month = 3 + (i - j + 40) / 44
-    j_day = i - j + 28 - 31 * (j_month / 4)
-    j_date = Date.civil(year, j_month, j_day)
-    case
-      # up until 1582, julian and gregorian easter dates were identical
-      when year <= 1582
-        offset = 0
-      # between the years 1583 and 1699 10 days are added to the julian day count
-      when (year >= 1583 and year <= 1699)
-        offset = 10
-      # after 1700, 1 day is added for each century, except if the century year is exactly divisible by 400 (in which case no days are added).
-      # Safe until 4100 AD, when one leap day will be removed.
-      when year >= 1700
-        offset = (year - 1700).divmod(100)[0] + ((year - year.divmod(100)[1]).divmod(400)[1] == 0 ? 0 : 1) - (year - year.divmod(100)[1] - 1700).divmod(400)[0] + 10
+    def easter(year)
+      DateCalculatorFactory.easter_calculator.calculate_easter_for(year)
     end
-    # add offset to the julian day
-    return Date.jd(j_date.jd + offset)
-  end
 
-  # Move date to Monday if it occurs on a Sunday.
-  # Used as a callback function.
-  def self.to_monday_if_sunday(date)
-    date += 1 if date.wday == 0
-    date
-  end
-
-  # Move date to Monday if it occurs on a Saturday on Sunday.
-  # Used as a callback function.
-  def self.to_monday_if_weekend(date)
-    date += 1 if date.wday == 0
-    date += 2 if date.wday == 6
-    date
-  end
-
-  # Move Boxing Day if it falls on a weekend, leaving room for Christmas.
-  # Used as a callback function.
-  def self.to_weekday_if_boxing_weekend(date)
-    if date.wday == 6 or date.wday == 0
-      date += 2
-    elsif date.wday == 1
-      date += 1
+    def orthodox_easter(year)
+      DateCalculatorFactory.easter_calculator.calculate_orthodox_easter_for(year)
     end
-    date
-  end
 
-  # Move date to Monday if it occurs on a Sunday or to Friday if it occurs on a
-  # Saturday.
-  # Used as a callback function.
-  def self.to_weekday_if_weekend(date)
-    date += 1 if date.wday == 0
-    date -= 1 if date.wday == 6
-    date
-  end
-
-  # Returns an array of symbols all the available holiday definitions.
-  #
-  # Optional `full_path` param is used internally for loading all the definitions.
-  def self.available(full_path = false)
-    paths = Dir.glob(DEFINITION_PATH + '/*.rb')
-    full_path ? paths : paths.collect { |path| path.match(/([a-z_-]+)\.rb/i)[1].to_sym }
-  end
-
-  # Returns an array of symbols of all the available holiday regions.
-  def self.regions
-    @@regions
-  end
-
-  # Load all available holiday definitions
-  def self.load_all
-    self.available(true).each { |path| require path }
-  end
-
-  # Parses provided holiday definition file(s) and loads them so that they are immediately available.
-  def self.load_custom(*files)
-    regions, rules_by_month, custom_methods, tests = self.parse_definition_files(files)
-    merge_defs(regions, rules_by_month)
-  end
-
-  # Parses provided holiday definition file(s) and returns strings containing the generated module and test source
-  def self.parse_definition_files_and_return_source(module_name, *files)
-    regions, rules_by_month, custom_methods, tests = self.parse_definition_files(files)
-    module_src, test_src = self.generate_definition_source(module_name, files, regions, rules_by_month, custom_methods, tests)
-
-    return module_src, test_src
-  end
-
-private
-  # Returns [(arr)regions, (bool)observed, (bool)informal]
-  def self.parse_options(*options) # :nodoc:
-    options.flatten!
-    observed = options.delete(:observed) ? true : false
-    informal = options.delete(:informal) ? true : false
-    regions = parse_regions(options)
-    return regions, observed, informal
-  end
-
-  def self.get_date(date)
-    if date.respond_to?(:to_date)
-      date.to_date
-    else
-      Date.civil(date.year, date.mon, date.mday)
+    def to_monday_if_sunday(date)
+      DateCalculatorFactory.weekend_modifier.to_monday_if_sunday(date)
     end
-  end
 
-  # Derive the containing region from a sub region wild-card or a sub region
-  # and load its definition. (Common code factored out from parse_regions)
-  def self.load_containing_region(sub_reg)
-    prefix = sub_reg.split('_').first
-    unless @@regions.include?(prefix.to_sym)
-      begin
-        require "holidays/#{prefix}"
-      rescue LoadError
-        raise UnknownRegionError, "Could not load holidays/#{prefix}"
-      end
+    def to_monday_if_weekend(date)
+      DateCalculatorFactory.weekend_modifier.to_monday_if_weekend(date)
     end
-  end
 
-  # Check regions against list of supported regions and return an array of
-  # symbols.
-  #
-  # If a wildcard region is found (e.g. <tt>:ca_</tt>) it is expanded into all
-  # of its available sub regions.
-  def self.parse_regions(regions) # :nodoc:
-    regions = [regions] unless regions.kind_of?(Array)
-    return [:any] if regions.empty?
-
-    regions = regions.collect { |r| r.to_sym }
-
-    # Found sub region wild-card
-    regions.delete_if do |r|
-      if r.to_s =~ /_$/
-        load_containing_region(r.to_s)
-        regions << @@regions.select { |dr| dr.to_s =~ Regexp.new("^#{r.to_s}") }
-        true
-      end
+    def to_weekday_if_boxing_weekend(date)
+      DateCalculatorFactory.weekend_modifier.to_weekday_if_boxing_weekend(date)
     end
 
-    regions.flatten!
-
-    require "holidays/north_america" if regions.include?(:us) # special case for north_america/US cross-linking
-
-    regions.each do |r|
-      unless r == :any or @@regions.include?(r)
-        begin
-          require "holidays/#{r.to_s}"
-        rescue LoadError => e
-          # This could be a sub region that does not have any holiday
-          # definitions of its own; try to load the containing region instead.
-          if r.to_s =~ /_/
-            load_containing_region(r.to_s)
-          else
-            raise UnknownRegionError, "Could not load holidays/#{r.to_s}"
-          end
-        end
-      end
+    def to_weekday_if_boxing_weekend_from_year(year)
+      DateCalculatorFactory.weekend_modifier.to_weekday_if_boxing_weekend_from_year(year)
     end
-    regions
-  end
 
-  # Check sub regions.
-  #
-  # When request :any, all holidays should be returned.
-  # When requesting :ca_bc, holidays in :ca or :ca_bc should be returned.
-  # When requesting :ca, holidays in :ca but not its subregions should be returned.
-  def self.in_region?(requested, available) # :nodoc:
-    return true if requested.include?(:any)
-
-    # When an underscore is encountered, derive the parent regions
-    # symbol and include both in the requested array.
-    requested = requested.collect do |r|
-      r.to_s =~ /_/ ? [r, r.to_s.gsub(/_[\w]*$/, '').to_sym] : r
+    def to_weekday_if_weekend(date)
+      DateCalculatorFactory.weekend_modifier.to_weekday_if_weekend(date)
     end
 
-    requested = requested.flatten.uniq
-
-    available.any? { |avail| requested.include?(avail) }
-  end
-
-  # Call a proc function defined in a holiday definition file.
-  #
-  # Procs are cached.
-  #
-  # ==== Benchmarks
-  #
-  # Lookup Easter Sunday, with caching, by number of iterations:
-  #
-  #       user     system      total        real
-  # 0001  0.000000   0.000000   0.000000 (  0.000000)
-  # 0010  0.000000   0.000000   0.000000 (  0.000000)
-  # 0100  0.078000   0.000000   0.078000 (  0.078000)
-  # 1000  0.641000   0.000000   0.641000 (  0.641000)
-  # 5000  3.172000   0.015000   3.187000 (  3.219000)
-  #
-  # Lookup Easter Sunday, without caching, by number of iterations:
-  #
-  #       user     system      total        real
-  # 0001  0.000000   0.000000   0.000000 (  0.000000)
-  # 0010  0.016000   0.000000   0.016000 (  0.016000)
-  # 0100  0.125000   0.000000   0.125000 (  0.125000)
-  # 1000  1.234000   0.000000   1.234000 (  1.234000)
-  # 5000  6.094000   0.031000   6.125000 (  6.141000)
-  def self.call_proc(function, year) # :nodoc:
-    proc_key = Digest::MD5.hexdigest("#{function.to_s}_#{year.to_s}")
-    @@proc_cache[proc_key] = function.call(year) unless @@proc_cache[proc_key]
-    @@proc_cache[proc_key]
-  end
-
-  def self.parse_definition_files(files)
-    raise ArgumentError, "Must have at least one file to parse" if files.empty?
-
-    all_regions = []
-    all_rules_by_month = {}
-    all_custom_methods = {}
-    all_tests = []
-
-    files.flatten!
-
-    files.each do |file|
-      definition_file = YAML.load_file(file)
-
-      regions, rules_by_month = self.parse_month_definitions(definition_file['months'])
-
-      all_regions << regions.flatten
-
-      all_rules_by_month.merge!(rules_by_month) { |month, existing, new|
-        existing << new
-        existing.flatten!
-      }
-
-      custom_methods = self.parse_method_definitions(definition_file['methods'])
-      all_custom_methods.merge!(custom_methods)
-
-      all_tests << self.parse_test_definitions(definition_file['tests'])
-    end
-
-    all_regions.flatten!.uniq!
-
-    [all_regions, all_rules_by_month, all_custom_methods, all_tests]
-  end
-
-  def self.parse_month_definitions(month_definitions)
-    regions = []
-    rules_by_month = {}
-
-    if month_definitions
-      month_definitions.each do |month, definitions|
-        rules_by_month[month] = [] unless rules_by_month[month]
-        definitions.each do |definition|
-          rule = {}
-
-          definition.each do |key, val|
-            rule[key.to_sym] = val
-          end
-
-          rule[:regions] = rule[:regions].collect { |r| r.to_sym }
-
-          regions << rule[:regions]
-
-          exists = false
-          rules_by_month[month].each do |ex|
-            if ex[:name] == rule[:name] and ex[:wday] == rule[:wday] and ex[:mday] == rule[:mday] and ex[:week] == rule[:week] and ex[:type] == rule[:type] and ex[:function] == rule[:function] and ex[:observed] == rule[:observed]
-              ex[:regions] << rule[:regions].flatten
-              exists = true
-            end
-          end
-
-          unless exists
-            rules_by_month[month] << rule
-          end
-        end
-      end
-    end
-
-    [regions, rules_by_month]
-  end
-
-  def self.parse_method_definitions(methods)
-    custom_methods = {}
-
-    if methods
-      methods.each do |name, code|
-        custom_methods[name] = code
-      end
-    end
-
-    custom_methods
-  end
-
-  def self.parse_test_definitions(tests)
-    test_strings = []
-
-    if tests
-      test_strings << tests
-    end
-
-    test_strings
-  end
-
-  def self.generate_definition_source(module_name, files, regions, rules_by_month, custom_methods, tests)
-    month_strings = self.generate_month_definition_strings(rules_by_month)
-
-    # Build the custom methods string
-    custom_method_string = ''
-    custom_methods.each do |key, code|
-      custom_method_string << code + "\n\n"
+    def calculate_day_of_month(year, month, day, wday)
+      DateCalculatorFactory.day_of_month_calculator.call(year, month, day, wday)
     end
 
-    module_src = self.generate_module_src(module_name, files, regions, month_strings, custom_method_string)
-    test_src = self.generate_test_src(module_name, files, tests)
-
-    return module_src, test_src || ''
-  end
-
-  def self.generate_month_definition_strings(rules_by_month)
-    month_strings = []
-
-    rules_by_month.each do |month, rules|
-      month_string = "      #{month.to_s} => ["
-      rule_strings = []
-      rules.each do |rule|
-        string = '{'
-        if rule[:mday]
-          string << ":mday => #{rule[:mday]}, "
-        elsif rule[:function]
-          string << ":function => lambda { |year| Holidays.#{rule[:function]} }, "
-          string << ":function_id => \"#{rule[:function].to_s}\", "
-        else
-          string << ":wday => #{rule[:wday]}, :week => #{rule[:week]}, "
-        end
-
-        if rule[:observed]
-          string << ":observed => lambda { |date| Holidays.#{rule[:observed]}(date) }, "
-          string << ":observed_id => \"#{rule[:observed].to_s}\", "
-        end
-
-        if rule[:type]
-          string << ":type => :#{rule[:type]}, "
-        end
-
-        # shouldn't allow the same region twice
-        string << ":name => \"#{rule[:name]}\", :regions => [:" + rule[:regions].uniq.join(', :') + "]}"
-        rule_strings << string
-      end
-      month_string << rule_strings.join(",\n            ") + "]"
-      month_strings << month_string
+    # Returns an array of symbols all the available holiday definitions.
+    #
+    # Optional `full_path` param is used internally for loading all the definitions.
+    def available(full_path = false)
+      paths = Dir.glob(FULL_DEFINITIONS_PATH + '/*.rb')
+      full_path ? paths : paths.collect { |path| path.match(/([a-z_-]+)\.rb/i)[1].to_sym }
     end
 
-    return month_strings
-  end
-
-  def self.generate_module_src(module_name, files, regions, month_strings, custom_methods)
-    module_src = ""
-
-    module_src =<<-EOM
-# encoding: utf-8
-module Holidays
-  # This file is generated by the Ruby Holidays gem.
-  #
-  # Definitions loaded: #{files.join(', ')}
-  #
-  # To use the definitions in this file, load it right after you load the
-  # Holiday gem:
-  #
-  #   require 'holidays'
-  #   require 'holidays/#{module_name.to_s.downcase}'
-  #
-  # All the definitions are available at https://github.com/alexdunae/holidays
-  module #{module_name.to_s.upcase} # :nodoc:
-    def self.defined_regions
-      [:#{regions.join(', :')}]
+    # Returns an array of symbols of all the available holiday regions.
+    def regions
+      DefinitionFactory.regions_repository.all
     end
 
-    def self.holidays_by_month
-      {
-        #{month_strings.join(",\n")}
-      }
+    # Load all available holiday definitions
+    def load_all
+      available(true).each { |path| require path }
     end
-  end
-
-#{custom_methods}
-end
-
-Holidays.merge_defs(Holidays::#{module_name.to_s.upcase}.defined_regions, Holidays::#{module_name.to_s.upcase}.holidays_by_month)
-  EOM
-
-    return module_src
-  end
-
-  def self.generate_test_src(module_name, files, tests)
-    unless tests.empty?
-      test_src = ""
-
-      test_src =<<-EndOfTests
-# encoding: utf-8
-require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
-
-# This file is generated by the Ruby Holiday gem.
-#
-# Definitions loaded: #{files.join(', ')}
-class #{module_name.to_s.capitalize}DefinitionTests < Test::Unit::TestCase  # :nodoc:
 
-  def test_#{module_name.to_s.downcase}
-#{tests.join("\n\n")}
-  end
-end
-      EndOfTests
+    # Parses provided holiday definition file(s) and loads them so that they are immediately available.
+    def load_custom(*files)
+      regions, rules_by_month, custom_methods, tests = DefinitionFactory.file_parser.parse_definition_files(files)
+      merge_defs(regions, rules_by_month)
     end
 
-    return test_src
-  end
-end
-
-# === Extending Ruby's Date class with the Holidays gem
-# The Holidays gem automatically extends Ruby's Date class and gives you access
-# to three new methods: holiday?, #holidays and #calculate_mday.
-#
-# ==== Examples
-# Lookup Canada Day in the <tt>:ca</tt> region
-#   Date.civil(2008,7,1).holiday?(:ca)
-#   => true
-#
-# Lookup Canada Day in the <tt>:fr</tt> region
-#   Date.civil(2008,7,1).holiday?(:fr)
-#   => false
-#
-# Lookup holidays on North America in January 1.
-#   Date.civil(2008,1,1).holidays(:ca, :mx, :us, :informal, :observed)
-#   => [{:name => 'New Year\'s Day'...}]
-class Date
-  include Holidays
-
-  # Get holidays on the current date.
-  #
-  # Returns an array of hashes or nil. See Holidays#between for options
-  # and the output format.
-  #
-  #   Date.civil('2008-01-01').holidays(:ca_)
-  #   => [{:name => 'New Year\'s Day',...}]
-  #
-  # Also available via Holidays#on.
-  def holidays(*options)
-    Holidays.on(self, options)
-  end
-
-  # Check if the current date is a holiday.
-  #
-  # Returns true or false.
-  #
-  #   Date.civil('2008-01-01').holiday?(:ca)
-  #   => true
-  def holiday?(*options)
-    holidays = self.holidays(options)
-    holidays && !holidays.empty?
-  end
-
-  # Calculate day of the month based on the week number and the day of the
-  # week.
-  #
-  # ==== Parameters
-  # [<tt>year</tt>]  Integer.
-  # [<tt>month</tt>] Integer from 1-12.
-  # [<tt>week</tt>]  One of <tt>:first</tt>, <tt>:second</tt>, <tt>:third</tt>,
-  #                  <tt>:fourth</tt>, <tt>:fifth</tt> or <tt>:last</tt>.
-  # [<tt>wday</tt>]  Day of the week as an integer from 0 (Sunday) to 6
-  #                  (Saturday) or as a symbol (e.g. <tt>:monday</tt>).
-  #
-  # Returns an integer.
-  #
-  # ===== Examples
-  # First Monday of January, 2008:
-  #   Date.calculate_mday(2008, 1, :first, :monday)
-  #   => 7
-  #
-  # Third Thursday of December, 2008:
-  #   Date.calculate_mday(2008, 12, :third, :thursday)
-  #   => 18
-  #
-  # Last Monday of January, 2008:
-  #   Date.calculate_mday(2008, 1, :last, 1)
-  #   => 28
-  #--
-  # see http://www.irt.org/articles/js050/index.htm
-  def self.calculate_mday(year, month, week, wday)
-    raise ArgumentError, "Week parameter must be one of Holidays::WEEKS (provided #{week})." unless WEEKS.include?(week) or WEEKS.has_value?(week)
+    # Parses provided holiday definition file(s) and returns strings containing the generated module and test source
+    def parse_definition_files_and_return_source(module_name, *files)
+      regions, rules_by_month, custom_methods, tests = DefinitionFactory.file_parser.parse_definition_files(files)
+      module_src, test_src = DefinitionFactory.source_generator.generate_definition_source(module_name, files, regions, rules_by_month, custom_methods, tests)
 
-    unless wday.kind_of?(Numeric) and wday.between?(0,6) or DAY_SYMBOLS.index(wday)
-      raise ArgumentError, "Wday parameter must be an integer between 0 and 6 or one of Date::DAY_SYMBOLS."
+      return module_src, test_src, regions
     end
 
-    week = WEEKS[week] if week.kind_of?(Symbol)
-    wday = DAY_SYMBOLS.index(wday) if wday.kind_of?(Symbol)
+    private
 
-    # :first, :second, :third, :fourth or :fifth
-    if week > 0
-      return ((week - 1) * 7) + 1 + ((wday - Date.civil(year, month,(week-1)*7 + 1).wday) % 7)
+    def get_date(date)
+      if date.respond_to?(:to_date)
+        date.to_date
+      else
+        Date.civil(date.year, date.mon, date.mday)
+      end
     end
-
-    days = MONTH_LENGTHS[month-1]
-
-    days = 29 if month == 2 and Date.leap?(year)
-
-    return days - ((Date.civil(year, month, days).wday - wday + 7) % 7) - (7 * (week.abs - 1))
   end
 end