holidays 2.2.0 → 3.0.0

data/{data → definitions}/us.yaml

@@ -2,9 +2,9 @@
 #
 # Updated: 2008-11-24.
 # Source:  http://en.wikipedia.org/wiki/Public_holidays_of_the_United_States
---- 
+---
 months:
-  0: 
+  0:
   - name: Good Friday
     regions: [us]
     function: easter(year)-2
@@ -13,7 +13,7 @@ months:
     regions: [us]
     function: easter(year)
     type: informal
-  1: 
+  1:
   - name: New Year's Day
     regions: [us]
     mday: 1
@@ -25,36 +25,36 @@ months:
   - name: Inauguration Day
     function: us_inauguration_day(year)
     regions: [us_dc]
-  2: 
+  2:
   - name: Presidents' Day
     week: 3
     regions: [us]
     wday: 1
-  3: 
+  3:
   - name: 'Cesar Chavez Day'
     regions: [us_ca]
     mday: 31
-  5: 
+  5:
   - name: Memorial Day
     week: -1
     regions: [us]
     wday: 1
-  7: 
+  7:
   - name: Independence Day
     regions: [us]
     mday: 4
     observed: to_weekday_if_weekend
-  9: 
+  9:
   - name: Labor Day
     week: 1
     regions: [us]
     wday: 1
-  10: 
+  10:
   - name: Columbus Day
     week: 2
     regions: [us]
     wday: 1
-  11: 
+  11:
   - name: Veterans Day
     regions: [us]
     mday: 11
@@ -64,10 +64,9 @@ months:
     regions: [us]
     wday: 4
   - name: Day after Thanksgiving
-    week: 4
+    function: day_after_thanksgiving(year)
     regions: [us_ca]
-    wday: 5
-  12: 
+  12:
   - name: Christmas Day
     regions: [us]
     mday: 25
@@ -78,8 +77,12 @@ methods:
     def self.us_inauguration_day(year)
       year % 4 == 1 ? 20 : nil
     end
+  day_after_thanksgiving: |
+    def self.day_after_thanksgiving(year)
+      Date.calculate_mday(year, 11, 4, 4) + 1
+    end
 tests: |
-    {Date.civil(2008,1,1) => 'New Year\'s Day', 
+    {Date.civil(2008,1,1) => 'New Year\'s Day',
      Date.civil(2008,1,21) => 'Martin Luther King, Jr. Day',
      Date.civil(2008,2,18) => 'Presidents\' Day',
      Date.civil(2008,5,26) => 'Memorial Day',
@@ -88,10 +91,12 @@ tests: |
      Date.civil(2008,10,13) => 'Columbus Day',
      Date.civil(2008,11,11) => 'Veterans Day',
      Date.civil(2008,11,27) => 'Thanksgiving',
+     Date.civil(2013,11,28) => 'Thanksgiving',
      Date.civil(2008,12,25) => 'Christmas Day'}.each do |date, name|
       assert_equal name, (Holidays.on(date, :us)[0] || {})[:name]
     end
     {Date.civil(2008, 3, 31) => 'Cesar Chavez Day',
-     Date.civil(2008, 11, 28) => 'Day after Thanksgiving'}.each do |date, name|
+     Date.civil(2008, 11, 28) => 'Day after Thanksgiving',
+     Date.civil(2013, 11, 29) => 'Day after Thanksgiving'}.each do |date, name|
      assert_equal name, (Holidays.on(date, :us, :us_ca)[0] || {})[:name]
     end

data/holidays.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://github.com/alexdunae/holidays'
   gem.description   = %q(A collection of Ruby methods to deal with statutory and other holidays. You deserve a holiday!)
   gem.summary       = %q(A collection of Ruby methods to deal with statutory and other holidays.)
-  gem.files         = `git ls-files`.split("\n") - ['.gitignore', '.travis.yml']
+  gem.files         = `git ls-files`.split("\n") - ['.gitignore', '.travis.yml', '.coveralls.yml']
   gem.test_files    = gem.files.grep(/^test/)
   gem.require_paths = ['lib']
   gem.licenses      = ['MIT']
@@ -20,4 +20,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'coveralls'
   gem.add_development_dependency 'test-unit'
+  gem.add_development_dependency 'mocha', '~>1.0'
 end

data/lib/generated_definitions/MANIFEST

@@ -0,0 +1,56 @@
+==== Regional definitions
+The following definition files are included in this installation:
+
+* generated_definitions/REGIONS
+* generated_definitions/ar
+* generated_definitions/at
+* generated_definitions/au
+* generated_definitions/be
+* generated_definitions/br
+* generated_definitions/ca
+* generated_definitions/ch
+* generated_definitions/cl
+* generated_definitions/cr
+* generated_definitions/cz
+* generated_definitions/de
+* generated_definitions/dk
+* generated_definitions/ecb_target
+* generated_definitions/el
+* generated_definitions/es
+* generated_definitions/europe
+* generated_definitions/fed_ex
+* generated_definitions/federal_reserve
+* generated_definitions/fi
+* generated_definitions/fr
+* generated_definitions/gb
+* generated_definitions/hr
+* generated_definitions/hu
+* generated_definitions/ie
+* generated_definitions/is
+* generated_definitions/it
+* generated_definitions/jp
+* generated_definitions/li
+* generated_definitions/lt
+* generated_definitions/ma
+* generated_definitions/mx
+* generated_definitions/nerc
+* generated_definitions/nl
+* generated_definitions/no
+* generated_definitions/north_america
+* generated_definitions/nyse
+* generated_definitions/nz
+* generated_definitions/ph
+* generated_definitions/pl
+* generated_definitions/pt
+* generated_definitions/ro
+* generated_definitions/scandinavia
+* generated_definitions/se
+* generated_definitions/sg
+* generated_definitions/si
+* generated_definitions/sk
+* generated_definitions/united_nations
+* generated_definitions/ups
+* generated_definitions/us
+* generated_definitions/ve
+* generated_definitions/vi
+* generated_definitions/za

data/lib/generated_definitions/REGIONS.rb

@@ -0,0 +1,4 @@
+# encoding: utf-8
+module Holidays
+  REGIONS = [:ar, :at, :au, :au_nsw, :au_vic, :au_qld, :au_nt, :au_act, :au_sa, :au_tas_south, :au_wa, :au_tas, :au_qld_cairns, :au_qld_brisbane, :au_tas_north, :au_vic_melbourne, :be, :br, :ca, :ca_qc, :ca_ab, :ca_on, :ca_sk, :ca_mb, :ca_ns, :ca_pe, :ca_bc, :ca_nf, :ca_nt, :ca_nu, :ca_nb, :ca_yk, :us, :ch_zh, :ch_be, :ch_lu, :ch_ur, :ch_sz, :ch_ow, :ch_nw, :ch_gl, :ch_zg, :ch_fr, :ch_so, :ch_bs, :ch_bl, :ch_sh, :ch_ar, :ch_ai, :ch_sg, :ch_gr, :ch_ag, :ch_tg, :ch_ti, :ch_vd, :ch_ne, :ch_ge, :ch_ju, :ch_vs, :ch, :cl, :cr, :cz, :dk, :de, :de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_st, :de_by_aux, :de_bb, :de_mv, :de_sn, :de_th, :ecb_target, :el, :es_pv, :es_na, :es_an, :es_ib, :es_cm, :es_mu, :es_m, :es_ar, :es_cl, :es_cn, :es_lo, :es_ga, :es_ce, :es_o, :es_ex, :es, :es_ct, :es_v, :es_vc, :federal_reserve, :fedex, :fi, :fr, :gb, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :gb_sct, :gb_con, :je, :gb_jsy, :gg, :gb_gsy, :im, :gb_iom, :hr, :hu, :ie, :is, :it, :li, :lt, :ma, :mx, :mx_pue, :us, :ca, :nerc, :nl, :no, :nyse, :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, :ph, :pl, :pt, :ro, :se, :us, :us_dc, :us_ca, :ca, :united_nations, :ups, :za, :ca, :ca_qc, :ca_ab, :ca_on, :ca_sk, :ca_mb, :ca_ns, :ca_pe, :ca_bc, :ca_nf, :ca_nt, :ca_nu, :ca_nb, :ca_yk, :mx, :mx_pue, :us, :us_dc, :us_ca, :dk, :is, :no, :se, :fi, :at, :be, :ch_zh, :ch_be, :ch_lu, :ch_ur, :ch_sz, :ch_ow, :ch_nw, :ch_gl, :ch_zg, :ch_fr, :ch_so, :ch_bs, :ch_bl, :ch_sh, :ch_ar, :ch_ai, :ch_sg, :ch_gr, :ch_ag, :ch_tg, :ch_ti, :ch_vd, :ch_ne, :ch_ge, :ch_ju, :ch_vs, :ch, :cz, :dk, :de, :de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_st, :de_by_aux, :de_bb, :de_mv, :de_sn, :de_th, :el, :es_pv, :es_na, :es_an, :es_ib, :es_cm, :es_mu, :es_m, :es_ar, :es_cl, :es_cn, :es_lo, :es_ga, :es_ce, :es_o, :es_ex, :es, :es_ct, :es_v, :es_vc, :fr, :gb, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :gb_sct, :gb_con, :je, :gb_jsy, :gg, :gb_gsy, :im, :gb_iom, :hr, :hu, :ie, :is, :it, :li, :lt, :nl, :no, :pl, :pt, :ro, :sk, :si, :jp, :ve, :vi, :sk, :si, :sg]
+end

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

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

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

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

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

@@ -2,24 +2,24 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/au.yaml
+  # Definitions loaded: definitions/au.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/au'
+  #   require 'generated_definitions/au'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module AU # :nodoc:
     def self.defined_regions
-      [:au, :au_nsw, :au_vic, :au_qld, :au_nt, :au_act, :au_sa, :au_qld_brisbane, :au_qld_cairns, :au_tas_south, :au_wa, :au_tas, :au_tas_north]
+      [:au, :au_nsw, :au_vic, :au_qld, :au_nt, :au_act, :au_sa, :au_tas_south, :au_wa, :au_tas, :au_qld_cairns, :au_qld_brisbane, :au_tas_north, :au_vic_melbourne]
     end
 
     def self.holidays_by_month
       {
               0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:au]},
-            {:function => lambda { |year| Holidays.easter(year)-1 }, :function_id => "easter(year)-1", :name => "Easter Saturday", :regions => [:au_nsw, :au_vic, :au_qld, :au_nt, :au_act, :au_sa, :au_qld_brisbane, :au_qld_cairns]},
+            {:function => lambda { |year| Holidays.easter(year)-1 }, :function_id => "easter(year)-1", :name => "Easter Saturday", :regions => [:au_nsw, :au_vic, :au_qld, :au_nt, :au_act, :au_sa]},
             {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Easter Sunday", :regions => [:au_nsw, :au_vic]},
             {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Easter Monday", :regions => [:au]}],
       1 => [{:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "New Year's Day", :regions => [:au]},
@@ -42,19 +42,28 @@ module Holidays
       8 => [{:wday => 3, :week => -3, :name => "Ekka", :regions => [:au_qld_brisbane]}],
       9 => [{:wday => 1, :week => -1, :name => "Queen's Birthday", :regions => [:au_wa]},
             {:wday => 1, :week => -1, :name => "Family & Community Day", :regions => [:au_act]}],
-      10 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_act, :au_nsw, :au_sa]},
+      10 => [{:function => lambda { |year| Holidays.afl_grand_final(year) }, :function_id => "afl_grand_final(year)", :name => "Friday before the AFL Grand Final", :regions => [:au_vic]},
+            {:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_act, :au_nsw, :au_sa]},
             {:function => lambda { |year| Holidays.qld_labour_day_october(year) }, :function_id => "qld_labour_day_october(year)", :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "Labour Day", :regions => [:au_qld]},
             {:function => lambda { |year| Holidays.qld_queens_bday_october(year) }, :function_id => "qld_queens_bday_october(year)", :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "Queen's Birthday", :regions => [:au_qld]},
             {:function => lambda { |year| Holidays.hobart_show_day(year) }, :function_id => "hobart_show_day(year)", :name => "Royal Hobart Show", :regions => [:au_tas_south]}],
       11 => [{:function => lambda { |year| Holidays.g20_day_2014_only(year) }, :function_id => "g20_day_2014_only(year)", :name => "G20 Day", :regions => [:au_qld_brisbane]},
             {:wday => 1, :week => 1, :name => "Recreation Day", :regions => [:au_tas_north]},
-            {:wday => 2, :week => 1, :name => "Melbourne Cup Day", :regions => [:au_vic]}],
+            {:wday => 2, :week => 1, :name => "Melbourne Cup Day", :regions => [:au_vic_melbourne]}],
       12 => [{:mday => 25, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "Christmas Day", :regions => [:au]},
-            {:mday => 26, :observed => lambda { |date| Holidays.to_weekday_if_boxing_weekend(date) }, :observed_id => "to_weekday_if_boxing_weekend", :name => "Boxing Day", :regions => [:au]}]
+            {:mday => 26, :observed => lambda { |date| Holidays.to_weekday_if_boxing_weekend(date) }, :observed_id => "to_weekday_if_boxing_weekend", :name => "Boxing Day", :regions => [:au_nsw, :au_vic, :au_qld, :au_act, :au_wa]},
+            {:function => lambda { |year| Holidays.to_weekday_if_boxing_weekend_from_year(year) }, :function_id => "to_weekday_if_boxing_weekend_from_year(year)", :name => "Boxing Day", :regions => [:au_sa, :au_tas, :au_nt]}]
       }
     end
   end
 
+def self.afl_grand_final(year)
+  if year == 2015
+    Date.civil(2015, 10, 2)
+  end
+end    
+
+
 # http://www.justice.qld.gov.au/fair-and-safe-work/industrial-relations/public-holidays/dates
 # celebrated twice in 2012
 def self.qld_queens_bday_october(year)
@@ -65,14 +74,14 @@ end
 # http://www.justice.qld.gov.au/fair-and-safe-work/industrial-relations/public-holidays/dates
 # changed from may to october after 2012
 def self.qld_labour_day_may(year)
-  year <= 2012 ? Date.calculate_mday(year, 5, 1, 1) : nil
+  year <= 2012 ? Holidays.calculate_day_of_month(year, 5, 1, 1) : nil
 end
 
 
 # http://www.justice.qld.gov.au/fair-and-safe-work/industrial-relations/public-holidays/dates
 # changed from may to october after 2012
 def self.qld_labour_day_october(year)
-  year <= 2012 ? nil : Date.calculate_mday(year, 10, 1, 1)
+  year <= 2012 ? nil : Holidays.calculate_day_of_month(year, 10, 1, 1)
 end
 
 
@@ -86,7 +95,7 @@ end
 # http://worksafe.tas.gov.au/__data/assets/pdf_file/0008/287036/Public_Holidays_2014.pdf
 # The Thursday before the fourth Saturday in October. 
 def self.hobart_show_day(year)
-  fourth_sat_in_oct = Date.civil(year, 10, Date.calculate_mday(year, 10, 4, :saturday))
+  fourth_sat_in_oct = Date.civil(year, 10, Holidays.calculate_day_of_month(year, 10, 4, :saturday))
   fourth_sat_in_oct - 2 # the thursday before
 end
 

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

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

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

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

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

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/ca.yaml, data/north_america_informal.yaml
+  # Definitions loaded: definitions/ca.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/ca'
+  #   require 'generated_definitions/ca'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module CA # :nodoc:

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

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

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

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

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

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

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

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

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

@@ -2,18 +2,18 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/de.yaml
+  # Definitions loaded: definitions/de.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/de'
+  #   require 'generated_definitions/de'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module DE # :nodoc:
     def self.defined_regions
-      [:de, :de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_st, :de_bb, :de_mv, :de_sn, :de_th]
+      [:de, :de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_st, :de_by_aux, :de_bb, :de_mv, :de_sn, :de_th]
     end
 
     def self.holidays_by_month
@@ -26,7 +26,8 @@ module Holidays
       1 => [{:mday => 1, :name => "Neujahrstag", :regions => [:de]},
             {:mday => 6, :name => "Heilige Drei Könige", :regions => [:de_bw, :de_by, :de_st]}],
       5 => [{:mday => 1, :name => "Tag der Arbeit", :regions => [:de]}],
-      8 => [{:mday => 15, :name => "Mariä Himmelfahrt", :regions => [:de_by, :de_sl]}],
+      8 => [{:mday => 15, :name => "Mariä Himmelfahrt", :regions => [:de_by, :de_sl]},
+            {:mday => 8, :name => "Friedensfest", :regions => [:de_by_aux]}],
       10 => [{:mday => 3, :name => "Tag der Deutschen Einheit", :regions => [:de]},
             {:mday => 31, :name => "Reformationstag", :regions => [:de_bb, :de_mv, :de_sn, :de_st, :de_th]}],
       11 => [{:mday => 1, :name => "Allerheiligen", :regions => [:de_bw, :de_by, :de_nw, :de_rp, :de_sl]},