holidays 5.3.0 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30377dc9e9355e6b5b752a770530f5ad512673b6
-  data.tar.gz: 7426948bcbcbe2c9f3c86eccb80a7291717b742f
+  metadata.gz: 0448bba1a51b6146ce38c33adaf245f93c7fc4a3
+  data.tar.gz: bb063b9cb860cbbac1acbeae2efb76914c74d659
 SHA512:
-  metadata.gz: ca4ca5bd5ba71eafdedc24a72d47d8c8804c96757e78a95159c2ac2325fb5f9322763b992fdd1db701d67ebe49be598d73abaf7c27d9deff993dab0dbb124ea4
-  data.tar.gz: 050b4d862d71ac3dc95e074e354cdbd49d614127cbeaa1070e52082d553b9159fcdfdc4625af7643104a8240a15edc1341ccd21f9d2ffa78b4f9f2369935cb18
+  metadata.gz: 8d0d7e506d4f0ca0d3ed87790b253739d06b3ef47c4ca1f543af10fdfca3b55f3c131c402ec0254fa6c450e6866db44ec8e1717f220e6fda853daf49d0f6a20c
+  data.tar.gz: c22cedcfaf1a970ebae94891b0040cdf835db1f4fc76ca76b5fec460b0d998b9c9ddcdad3bb8ca2f7d4af68967ca8aff065095f8b5e25ae6c3df9113cd5bcbf0

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Ruby Holidays Gem CHANGELOG
 
+## 5.4.0
+
+* Add support for ruby 2.4.0 (added it to the required tests in Travis CI)
+* Fix issue [#250](https://github.com/holidays/holidays/issues/250), which was that subregions were 'lost' if there was more than one underscore in it (thanks to https://github.com/chinito)
+* Fix caching when using Date extensions (thanks to https://github.com/alexgerstein)
+* Remove unused weekend date calculator method (thanks to https://github.com/ttwo32)
+* Use FULL_DEFINITIONS_PATH when loading definitions to avoid NameErrors when iterating whole LOAD_PATH (thanks to https://github.com/burke)
+* Point to latest version (1.3.0) of definitions, which includes:
+  * Add Tunisian (tn) holidays (thanks to https://github.com/achr3f)
+  * Corrects various Australian holidays
+  * Update certain German regions for accuracy
+  * Change 'yk' to 'yt'
+
 ## 5.3.0
 
 * Fix `ca` province/territory codes for 'Newfoundland and Labrador' and 'Yukon' (thanks to https://github.com/slucaskim)
@@ -12,10 +25,10 @@
 ## 5.2.0
 
 * Point to latest (v1.2.0 of definitions)
-** updates `jp` defs to fix 'Foundation Day' name
-** Fix `ca` defs for observed holidays
-** Update `au` defs to have Christmas and Boxing Day for all of Australia instead of just individual territories
-** Update `ie` defs to consolidate St Stephen's Day to use common method instead of custom method
+  * updates `jp` defs to fix 'Foundation Day' name
+  * Fix `ca` defs for observed holidays
+  * Update `au` defs to have Christmas and Boxing Day for all of Australia instead of just individual territories
+  * Update `ie` defs to consolidate St Stephen's Day to use common method instead of custom method
 
 ## 5.1.0
 

data/CONTRIBUTING.md

@@ -15,12 +15,12 @@ or, if you forgot to do so, run `make update_defs` so that all of the submodule
 
 Our definitions are written in YAML. They are housed in a [separate repository](https://github.com/holidays/definitions) so
 that they can be used by tools written in other languages. You can find a complete guide to our format in the
-[definitions SYNTAX guide](https://github.com/holidays/definitions/SYNTAX.md).
+[definitions SYNTAX guide](https://github.com/holidays/definitions/blob/master/SYNTAX.md).
 
 In this ruby project we take the YAML definitions and generate final ruby classes that are loaded at runtime for fast
 calculations.
 
-Once you have a good idea on what you want to change, please see the [contributing guide](https://github.com/holidays/definitions/CONTRIBUTING.md) in the `definitions` repository.
+Once you have a good idea on what you want to change, please see the [contributing guide](https://github.com/holidays/definitions/blob/master/CONTRIBUTING.md) in the `definitions` repository.
 
 *NOTICE* - this whole submodule-definitions-thing is brand-new. If you are confused or run into issues please open an issue.
 The maintainers will respond immediately to help you out. :)

data/lib/generated_definitions/MANIFEST

@@ -56,6 +56,7 @@ The following definition files are included in this installation:
 * generated_definitions/sg
 * generated_definitions/si
 * generated_definitions/sk
+* generated_definitions/tn
 * generated_definitions/united_nations
 * generated_definitions/ups
 * generated_definitions/us

data/lib/generated_definitions/REGIONS.rb

@@ -1,4 +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_fr, :be_nl, :br, :bg_en, :bg_bg, :ca, :ca_qc, :ca_ab, :ca_sk, :ca_on, :ca_bc, :ca_mb, :ca_ns, :ca_pe, :ca_nl, :ca_nt, :ca_nu, :ca_nb, :ca_yt, :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_sn_aux, :de_th_aux, :de_sn, :de_st, :de_by_aux, :de_bb, :de_mv, :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, :hk, :hu, :ie, :is, :it, :kr, :li, :lt, :ma, :mx, :mx_pue, :us, :ca, :nerc, :nl, :lu, :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, :pe, :ph, :pl, :pt, :ro, :se, :us, :us_dc, :us_ca, :ca, :united_nations, :ups, :za, :ca, :ca_qc, :ca_ab, :ca_sk, :ca_on, :ca_bc, :ca_mb, :ca_ns, :ca_pe, :ca_nl, :ca_nt, :ca_nu, :ca_nb, :ca_yt, :mx, :mx_pue, :us, :us_dc, :us_ca, :dk, :is, :no, :se, :fi, :at, :be_fr, :be_nl, :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_sn_aux, :de_th_aux, :de_sn, :de_st, :de_by_aux, :de_bb, :de_mv, :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, :bg_en, :bg_bg, :jp, :ve, :vi, :sk, :si, :sg, :my]
+  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_fr, :be_nl, :br, :bg_en, :bg_bg, :ca, :ca_qc, :ca_ab, :ca_sk, :ca_on, :ca_bc, :ca_mb, :ca_ns, :ca_pe, :ca_nl, :ca_nt, :ca_nu, :ca_nb, :ca_yt, :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_sn_sorbian, :de_th_eichsfeld, :de_sn, :de_st, :de_by_augsburg, :de_bb, :de_mv, :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, :hk, :hu, :ie, :is, :it, :kr, :li, :lt, :ma, :mx, :mx_pue, :us, :ca, :nerc, :nl, :lu, :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, :pe, :ph, :pl, :pt, :ro, :se, :tn, :us, :us_dc, :us_ca, :ca, :united_nations, :ups, :za, :ca, :ca_qc, :ca_ab, :ca_sk, :ca_on, :ca_bc, :ca_mb, :ca_ns, :ca_pe, :ca_nl, :ca_nt, :ca_nu, :ca_nb, :ca_yt, :mx, :mx_pue, :us, :us_dc, :us_ca, :dk, :is, :no, :se, :fi, :at, :be_fr, :be_nl, :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_sn_sorbian, :de_th_eichsfeld, :de_sn, :de_st, :de_by_augsburg, :de_bb, :de_mv, :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, :bg_en, :bg_bg, :jp, :ve, :vi, :sk, :si, :sg, :my]
 end

data/lib/generated_definitions/au.rb

@@ -51,12 +51,11 @@ module Holidays
       11 => [{:function => "g20_day_2014_only(year)", :function_arguments => [: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_melbourne]}],
-      12 => [{:mday => 25, :observed => "to_tuesday_if_sunday_or_monday_if_saturday(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:au, :au_qld, :au_nsw, :au_act, :au_tas, :au_wa]},
-            {:mday => 25, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:au_sa]},
-            {:function => "xmas_to_weekday_if_weekend(year)", :function_arguments => [:year], :name => "Christmas Day", :regions => [:au_vic, :au_nt]},
-            {:mday => 26, :observed => "to_tuesday_if_sunday_or_monday_if_saturday(date)", :observed_arguments => [:date], :name => "Boxing Day", :regions => [:au, :au_nsw, :au_vic, :au_qld, :au_act, :au_wa]},
+      12 => [{:mday => 25, :observed => "to_tuesday_if_sunday_or_monday_if_saturday(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:au_qld, :au_nsw, :au_act, :au_tas, :au_wa, :au_vic, :au_nt]},
+            {:mday => 26, :observed => "to_tuesday_if_sunday_or_monday_if_saturday(date)", :observed_arguments => [:date], :name => "Boxing Day", :regions => [:au_nsw, :au_vic, :au_qld, :au_act, :au_wa]},
+            {:function => "to_weekday_if_boxing_weekend_from_year(year)", :function_arguments => [:year], :name => "Boxing Day", :regions => [:au_tas, :au_nt]},
             {:function => "to_weekday_if_boxing_weekend_from_year_or_to_tuesday_if_monday(year)", :function_arguments => [:year], :name => "Boxing Day", :regions => [:au_sa]},
-            {:function => "to_weekday_if_boxing_weekend_from_year(year)", :function_arguments => [:year], :name => "Boxing Day", :regions => [:au_tas, :au_nt]}]
+            {:mday => 25, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:au_sa]}]
       }
     end
 
@@ -67,7 +66,9 @@ case year
 when 2015
   Date.civil(2015, 10, 2)
 when 2016
-  Date.civil(2017, 9, 30)
+  Date.civil(2016, 9, 30)
+when 2017
+  Date.civil(2017, 9, 29)
 end
 },
 

data/lib/generated_definitions/de.rb

@@ -13,7 +13,7 @@ module Holidays
   # All the definitions are available at https://github.com/holidays/holidays
   module DE # :nodoc:
     def self.defined_regions
-      [:de, :de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn_aux, :de_th_aux, :de_sn, :de_st, :de_by_aux, :de_bb, :de_mv, :de_th]
+      [:de, :de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn_sorbian, :de_th_eichsfeld, :de_sn, :de_st, :de_by_augsburg, :de_bb, :de_mv, :de_th]
     end
 
     def self.holidays_by_month
@@ -24,7 +24,7 @@ module Holidays
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 39, :name => "Christi Himmelfahrt", :regions => [:de]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 49, :type => :informal, :name => "Pfingstsonntag", :regions => [:de]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :name => "Pfingstmontag", :regions => [:de]},
-            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 60, :name => "Fronleichnam", :regions => [:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn_aux, :de_th_aux]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 60, :name => "Fronleichnam", :regions => [:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn_sorbian, :de_th_eichsfeld]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -52, :type => :informal, :name => "Weiberfastnacht", :regions => [:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -48, :type => :informal, :name => "Rosenmontag", :regions => [:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -46, :type => :informal, :name => "Aschermittwoch", :regions => [:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn]}],
@@ -32,7 +32,7 @@ module Holidays
             {: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]},
-            {:mday => 8, :name => "Friedensfest", :regions => [:de_by_aux]}],
+            {:mday => 8, :name => "Friedensfest", :regions => [:de_by_augsburg]}],
       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]},
             {:mday => 31, :type => :informal, :name => "Reformationstag", :regions => [:de_bw]},

data/lib/generated_definitions/europe.rb

@@ -13,7 +13,7 @@ module Holidays
   # All the definitions are available at https://github.com/holidays/holidays
   module EUROPE # :nodoc:
     def self.defined_regions
-      [:at, :be_fr, :be_nl, :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_sn_aux, :de_th_aux, :de_sn, :de_st, :de_by_aux, :de_bb, :de_mv, :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, :bg_en, :bg_bg]
+      [:at, :be_fr, :be_nl, :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_sn_sorbian, :de_th_eichsfeld, :de_sn, :de_st, :de_by_augsburg, :de_bb, :de_mv, :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, :bg_en, :bg_bg]
     end
 
     def self.holidays_by_month
@@ -57,7 +57,7 @@ module Holidays
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 39, :name => "Christi Himmelfahrt", :regions => [:de]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 49, :type => :informal, :name => "Pfingstsonntag", :regions => [:de]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :name => "Pfingstmontag", :regions => [:de]},
-            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 60, :name => "Fronleichnam", :regions => [:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn_aux, :de_th_aux]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 60, :name => "Fronleichnam", :regions => [:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn_sorbian, :de_th_eichsfeld]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -52, :type => :informal, :name => "Weiberfastnacht", :regions => [:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -48, :type => :informal, :name => "Rosenmontag", :regions => [:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -46, :type => :informal, :name => "Aschermittwoch", :regions => [:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn]},
@@ -249,7 +249,7 @@ module Holidays
             {:mday => 1, :name => "Bundesfeiertag", :regions => [:ch]},
             {:mday => 15, :name => "Mariä Himmelfahrt", :regions => [:ch_lu, :ch_ur, :ch_sz, :ch_ow, :ch_nw, :ch_zg, :ch_fr, :ch_so, :ch_ai, :ch_ag, :ch_ti, :ch_vs, :ch_ju]},
             {:mday => 15, :name => "Mariä Himmelfahrt", :regions => [:de_by, :de_sl]},
-            {:mday => 8, :name => "Friedensfest", :regions => [:de_by_aux]},
+            {:mday => 8, :name => "Friedensfest", :regions => [:de_by_augsburg]},
             {:mday => 15, :name => "Κοίμηση της Θεοτόκου", :regions => [:el]},
             {:mday => 15, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Asunción", :regions => [:es]},
             {:mday => 15, :name => "Assomption", :regions => [:fr]},

data/lib/generated_definitions/ph.rb

@@ -23,13 +23,13 @@ module Holidays
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -1, :name => "Holy Saturday", :regions => [:ph]},
             {:function => "easter(year)", :function_arguments => [:year], :name => "Easter Sunday", :regions => [:ph]}],
       1 => [{:mday => 1, :name => "New Year’s Day", :regions => [:ph]}],
-      2 => [{:mday => 25, :name => "People Power Anniversary", :regions => [:ph]}],
+      2 => [{:mday => 25, :type => :informal, :name => "People Power Anniversary", :regions => [:ph]}],
       4 => [{:mday => 9, :name => "The Day of Valor", :regions => [:ph]}],
       5 => [{:mday => 1, :name => "Labor Day", :regions => [:ph]}],
       6 => [{:mday => 12, :name => "Independence Day", :regions => [:ph]}],
       8 => [{:mday => 21, :name => "Ninoy Aquino Day", :regions => [:ph]},
             {:function => "ph_heroes_day(year)", :function_arguments => [:year], :name => "National Heroes Day", :regions => [:ph]}],
-      11 => [{:mday => 1, :name => "All Saints Day", :regions => [:ph]},
+      11 => [{:mday => 1, :type => :informal, :name => "All Saints Day", :regions => [:ph]},
             {:mday => 30, :name => "Bonifacio Day", :regions => [:ph]}],
       12 => [{:mday => 25, :name => "Christmas Day", :regions => [:ph]},
             {:mday => 30, :name => "Rizal Day", :regions => [:ph]},

data/lib/generated_definitions/tn.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+module Holidays
+  # This file is generated by the Ruby Holidays gem.
+  #
+  # Definitions loaded: definitions/tn.yaml
+  #
+  # To use the definitions in this file, load it right after you load the
+  # Holiday gem:
+  #
+  #   require 'holidays'
+  #   require 'generated_definitions/tn'
+  #
+  # All the definitions are available at https://github.com/holidays/holidays
+  module TN # :nodoc:
+    def self.defined_regions
+      [:tn]
+    end
+
+    def self.holidays_by_month
+      {
+              1 => [{:mday => 1, :name => "Jour de l'an", :regions => [:tn]},
+            {:mday => 14, :name => "Fête de la Révolution et de la Jeunesse", :regions => [:tn]}],
+      3 => [{:mday => 20, :name => "Fête de l'Indépendance", :regions => [:tn]}],
+      4 => [{:mday => 9, :name => "Journée des Martyrs", :regions => [:tn]}],
+      5 => [{:mday => 1, :name => "Fête du travail", :regions => [:tn]}],
+      7 => [{:mday => 25, :name => "Fête de la République", :regions => [:tn]}],
+      8 => [{:mday => 13, :name => "Fête de la Femme et de la Famille", :regions => [:tn]}],
+      10 => [{:mday => 15, :name => "Fête de l'Évacuation", :regions => [:tn]}]
+      }
+    end
+
+    def self.custom_methods
+      {
+        
+      }
+    end
+  end
+end

data/lib/holidays/core_extensions/date.rb

@@ -15,7 +15,7 @@ module Holidays
       #
       # Also available via Holidays#on.
       def holidays(*options)
-        Holidays.on(self, options)
+        Holidays.on(self, *options)
       end
 
       # Check if the current date is a holiday.
@@ -25,7 +25,7 @@ module Holidays
       #   Date.civil('2008-01-01').holiday?(:ca)
       #   => true
       def holiday?(*options)
-        holidays = self.holidays(options)
+        holidays = self.holidays(*options)
         holidays && !holidays.empty?
       end
 

data/lib/holidays/date_calculator/weekend_modifier.rb

@@ -17,13 +17,6 @@ module Holidays
         to_next_weekday(date)
       end
 
-      # if Christmas falls on a Sunday, move it to the next Tuesday (Boxing Day will go on Monday)
-      # if Christmas falls on a Saturday, move it to the next Monday (Boxing Day will be Sunday and potentially Tuesday)
-      # used as a callback function, if xmas is not observed on the 25th
-      def xmas_to_weekday_if_weekend(year)
-        to_tuesday_if_sunday_or_monday_if_saturday(Date.civil(year, 12, 25))
-      end
-
       # Move Boxing Day if it falls on a weekend, leaving room for Christmas.
       # Used as a callback function.
       def to_weekday_if_boxing_weekend(date)

data/lib/holidays/finder/context/parse_options.rb

@@ -92,7 +92,7 @@ module Holidays
         def load_definition_data(region)
           # Lazy loading of definition files. We verify the region doesn't
           # contain malicious stuff in the initial validation.
-          region_definition_file = "#{DEFINITIONS_PATH}/#{region}"
+          region_definition_file = "#{FULL_DEFINITIONS_PATH}/#{region}"
           require region_definition_file
 
           target_region_module = Module.const_get("Holidays").const_get(region.upcase)

data/lib/holidays/finder/rules/in_region.rb

@@ -9,7 +9,15 @@ module Holidays
             # When an underscore is encountered, derive the parent regions
             # symbol and check for both.
             requested = requested.collect do |r|
-              r.to_s =~ /_/ ? [r, r.to_s.gsub(/_[\w]*$/, '').to_sym] : r
+              if r.to_s =~ /_/
+                chunks = r.to_s.split('_')
+                
+                chunks.length.downto(1).map do |num|
+                  chunks[0..-num].join('_').to_sym
+                end
+              else
+                r
+              end
             end
 
             requested = requested.flatten.uniq

data/lib/holidays/load_all_definitions.rb

@@ -19,7 +19,6 @@ module Holidays
           "to_weekday_if_weekend(date)" => weekend_modifier.method(:to_weekday_if_weekend).to_proc,
           "calculate_day_of_month(year, month, day, wday)" => day_of_month_calculator.method(:call).to_proc,
           "to_weekday_if_boxing_weekend_from_year_or_to_tuesday_if_monday(year)" => weekend_modifier.method(:to_weekday_if_boxing_weekend_from_year_or_to_tuesday_if_monday).to_proc,
-          "xmas_to_weekday_if_weekend(year)" => weekend_modifier.method(:xmas_to_weekday_if_weekend).to_proc,
           "to_tuesday_if_sunday_or_monday_if_saturday(date)" => weekend_modifier.method(:to_tuesday_if_sunday_or_monday_if_saturday).to_proc,
         }
 

data/lib/holidays/version.rb

@@ -1,3 +1,3 @@
 module Holidays
-  VERSION = '5.3.0'
+  VERSION = '5.4.0'
 end

data/test/defs/test_defs_au.rb

@@ -75,7 +75,8 @@ assert_equal 'Melbourne Cup Day', Holidays.on(Date.civil(2014,11,4), :au_vic_mel
 assert_equal 'Melbourne Cup Day', Holidays.on(Date.civil(2015,11,3), :au_vic_melbourne)[0][:name]
 
 assert_equal 'Friday before the AFL Grand Final', Date.civil(2015,10,2).holidays(:au_vic)[0][:name]
-assert_equal 'Friday before the AFL Grand Final', Date.civil(2016,9, 30).holidays(:au_vic)[0][:name]
+assert_equal 'Friday before the AFL Grand Final', Date.civil(2016,9,30).holidays(:au_vic)[0][:name]
+assert_equal 'Friday before the AFL Grand Final', Date.civil(2017,9,29).holidays(:au_vic)[0][:name]
 
 assert_equal "May Public Holiday", Date.civil(2005, 5, 16).holidays(:au_sa)[0][:name]
 assert_equal [], Date.civil(2014, 5, 19).holidays(:au_sa)
@@ -92,14 +93,15 @@ assert_equal [], Date.civil(2015, 4, 27).holidays(:au_qld, :observed)
 assert_equal "ANZAC Day", Date.civil(2015, 4, 27).holidays(:au_wa, :observed)[0][:name]
 
 # BOXING DAY - QLD observes weekend and monday
-assert_equal "Boxing Day", Date.civil(2015, 12, 26).holidays(:au)[0][:name]
-assert_equal "Boxing Day", Date.civil(2015, 12, 28).holidays(:au, :observed)[0][:name]
 assert_equal "Boxing Day", Date.civil(2015, 12, 26).holidays(:au_qld)[0][:name]
 assert_equal "Boxing Day", Date.civil(2015, 12, 28).holidays(:au_qld, :observed)[0][:name]
 
 # BOXING DAY - SA gets monday only. same for TAS and NT.
+assert_nil Date.civil(2015, 12, 26).holidays(:au_sa)[0]
 assert_equal "Boxing Day", Date.civil(2015, 12, 28).holidays(:au_sa)[0][:name]
+assert_nil Date.civil(2015, 12, 26).holidays(:au_tas)[0]
 assert_equal "Boxing Day", Date.civil(2015, 12, 28).holidays(:au_tas)[0][:name]
+assert_nil Date.civil(2015, 12, 26).holidays(:au_nt)[0]
 assert_equal "Boxing Day", Date.civil(2015, 12, 28).holidays(:au_nt)[0][:name]
 
 assert_equal 'G20 Day', Holidays.on(Date.civil(2014,11,14), :au_qld_brisbane)[0][:name]
@@ -112,8 +114,6 @@ assert_equal 'Royal Hobart Regatta', Holidays.on(Date.civil(2015, 2, 9), :au_tas
 assert_equal 'Royal Hobart Regatta', Holidays.on(Date.civil(2016, 2, 8), :au_tas_south)[0][:name]
 
 # CHRISTMAS DAY - ACT, NSW, QLD, Tas, WA observe on 27th (and 25th) if 25th is a Sunday
-assert_equal "Christmas Day", Date.civil(2016, 12, 25).holidays(:au)[0][:name]
-assert_equal "Christmas Day", Date.civil(2016, 12, 27).holidays(:au, :observed)[0][:name]
 assert_equal "Christmas Day", Date.civil(2016, 12, 25).holidays(:au_qld)[0][:name]
 assert_equal "Christmas Day", Date.civil(2016, 12, 27).holidays(:au_qld, :observed)[0][:name]
 assert_equal "Christmas Day", Date.civil(2016, 12, 25).holidays(:au_nsw)[0][:name]
@@ -130,11 +130,19 @@ assert_equal "Christmas Day", Date.civil(2016, 12, 25).holidays(:au_sa)[0][:name
 assert_equal "Christmas Day", Date.civil(2016, 12, 26).holidays(:au_sa, :observed)[0][:name]
 assert_equal "Boxing Day", Date.civil(2016, 12, 27).holidays(:au_sa)[0][:name]
 
-# CHRISTMAS DAY - Victoria and NT don't observe 25th if weekend - xmas is on the 27th
+# CHRISTMAS DAY - Victoria and NT now observe both 25th and 27th if weekend
+assert_equal "Christmas Day", Date.civil(2016, 12, 25).holidays(:au_vic)[0][:name]
+assert_equal "Christmas Day", Date.civil(2016, 12, 25).holidays(:au_nt)[0][:name]
 assert_equal "Boxing Day", Date.civil(2016, 12, 26).holidays(:au_vic)[0][:name]
 assert_equal "Boxing Day", Date.civil(2016, 12, 26).holidays(:au_nt)[0][:name]
-assert_equal "Christmas Day", Date.civil(2016, 12, 27).holidays(:au_vic)[0][:name]
-assert_equal "Christmas Day", Date.civil(2016, 12, 27).holidays(:au_nt)[0][:name]
-
+assert_equal "Christmas Day", Date.civil(2016, 12, 27).holidays(:au_vic, :observed)[0][:name]
+assert_equal "Christmas Day", Date.civil(2016, 12, 27).holidays(:au_nt, :observed)[0][:name]
+
+# NEW YEAR'S DAY - observed on both 1st and 2nd of Jan for 2017
+regions = [:au_qld, :au_nsw, :au_act, :au_vic, :au_tas, :au_sa, :au_wa, :au_nt]
+regions.each do |r|
+  assert_equal "New Year's Day", Date.civil(2017, 1, 1).holidays(r)[0][:name]
+  assert_equal "New Year's Day", Date.civil(2017, 1, 2).holidays(r, :observed)[0][:name]
+end
   end
 end

data/test/defs/test_defs_de.rb

@@ -27,7 +27,7 @@ end
   assert_equal 'Heilige Drei Könige', Holidays.on(Date.civil(2009,1,6), r)[0][:name]
 end
 
-[:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_].each do |r|
+[:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn_sorbian, :de_th_eichsfeld, :de_].each do |r|
   assert_equal 'Fronleichnam', Holidays.on(Date.civil(2009,6,11), r)[0][:name]
 end
 
@@ -53,7 +53,7 @@ assert_equal [], Holidays.on(Date.civil(2018,10,31), :de), "Reformationstag is n
   assert_equal 'Allerheiligen', Holidays.on(Date.civil(2009,11,1), r)[0][:name]
 end
 
-[:de_by_aux].each do |r|
+[:de_by_augsburg].each do |r|
   assert_equal 'Friedensfest', Holidays.on(Date.civil(2015,8,8),r)[0][:name]
 end
 

data/test/defs/test_defs_europe.rb

@@ -140,7 +140,7 @@ end
   assert_equal 'Heilige Drei Könige', Holidays.on(Date.civil(2009,1,6), r)[0][:name]
 end
 
-[:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_].each do |r|
+[:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn_sorbian, :de_th_eichsfeld, :de_].each do |r|
   assert_equal 'Fronleichnam', Holidays.on(Date.civil(2009,6,11), r)[0][:name]
 end
 
@@ -166,7 +166,7 @@ assert_equal [], Holidays.on(Date.civil(2018,10,31), :de), "Reformationstag is n
   assert_equal 'Allerheiligen', Holidays.on(Date.civil(2009,11,1), r)[0][:name]
 end
 
-[:de_by_aux].each do |r|
+[:de_by_augsburg].each do |r|
   assert_equal 'Friedensfest', Holidays.on(Date.civil(2015,8,8),r)[0][:name]
 end
 

data/test/defs/test_defs_ph.rb

@@ -7,14 +7,12 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class PhDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_ph
-{Date.civil(2015,2,25) => 'People Power Anniversary',
- Date.civil(2015,4,3) => 'Good Friday',
+{Date.civil(2015,4,3) => 'Good Friday',
  Date.civil(2015,4,9) => 'The Day of Valor',
  Date.civil(2015,5,1) => 'Labor Day',
  Date.civil(2015,6,12) => 'Independence Day',
  Date.civil(2015,8,21) => 'Ninoy Aquino Day',
  Date.civil(2015,8,31) => 'National Heroes Day',
- Date.civil(2015,11,1) => 'All Saints Day',
  Date.civil(2015,11,30) => 'Bonifacio Day',
  Date.civil(2015,12,25) => 'Christmas Day',
  Date.civil(2015,12,30) => 'Rizal Day'}.each do |date, name|

data/test/defs/test_defs_tn.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
+
+# This file is generated by the Ruby Holiday gem.
+#
+# Definitions loaded: definitions/tn.yaml
+class TnDefinitionTests < Test::Unit::TestCase  # :nodoc:
+
+  def test_tn
+{Date.civil(2016,1,1)   => "Jour de l'an",
+ Date.civil(2016,1,14)  => "Fête de la Révolution et de la Jeunesse",
+ Date.civil(2016,3,20)  => "Fête de l'Indépendance",
+ Date.civil(2016,4,9)   => "Journée des Martyrs",
+ Date.civil(2016,5,1)   => "Fête du travail",
+ Date.civil(2016,7,25)  => "Fête de la République",
+ Date.civil(2016,8,13)  => "Fête de la Femme et de la Famille",
+ Date.civil(2016,10,15) => "Fête de l'Évacuation" }.each do |date, name|
+  assert_equal name, (Holidays.on(date, :tn)[0] || {})[:name]
+end
+
+  end
+end

data/test/holidays/finder/rules/test_in_region.rb

@@ -19,6 +19,10 @@ class FinderRulesInRegionTests < Test::Unit::TestCase
   def test_returns_true_if_subregion_matches_parent
     assert_equal(true, @subject.call([:test_sub], @available))
   end
+  
+  def test_returns_true_if_subregion_matches_grandparent
+    assert_equal(true, @subject.call([:test_sub_sub], @available))
+  end
 
   def test_returns_true_if_subregion_is_in_available
     assert_equal(true, @subject.call([:test_sub], [:test, :test_sub]))

data/test/integration/test_available_regions.rb

@@ -18,6 +18,6 @@ class AvailableRegionsTests < Test::Unit::TestCase
   # This test might fail if we add new regions. Since this is an integration test
   # I am fine with that!
   def test_available_regions_returns_correct_number_of_regions
-    assert_equal 294, Holidays.available_regions.count
+    assert_equal 295, Holidays.available_regions.count
   end
 end

data/test/integration/test_holidays.rb

@@ -155,17 +155,23 @@ class HolidaysTests < Test::Unit::TestCase
     holidays = Holidays.year_holidays([:ca_on], Date.civil(2016, 1, 1))
     assert_equal 11, holidays.length
 
-    # Should return all 7 holidays for 2016 in Australia
+    # Should return all 5 holidays for 2016 in Australia
     holidays = Holidays.year_holidays([:au], Date.civil(2016, 1, 1))
-    assert_equal 7, holidays.length
+    assert_equal 5, holidays.length
   end
 
   def test_year_holidays_without_specified_year
     # Gets holidays for current year from today's date
-    holidays = Holidays.year_holidays([:ca_on])
+    holidays = Holidays.year_holidays([:de])
     assert_equal holidays.first[:date].year, Date.today.year
   end
 
+  def test_year_holidays_empty
+    # if remain holidays is nothing , method will return empty.
+    holidays = Holidays.year_holidays([:ca_on], Date.civil(2016, 12, 27))
+    assert_empty holidays
+  end
+
   def test_year_holidays_feb_29_on_non_leap_year
     assert_raises ArgumentError do
       Holidays.year_holidays([:ca_on], Date.civil(2015, 2, 29))
@@ -264,26 +270,29 @@ class HolidaysTests < Test::Unit::TestCase
   end
 
   def test_caching
-    start_date = Date.civil(2008, 3, 21)
-    end_date = Date.civil(2008, 3, 25)
-    cache_data = Holidays.between(start_date, end_date, :ca, :informal)
-    options = [:ca, :informal]
+    good_friday = Date.civil(2008, 3, 21)
+    easter_monday = Date.civil(2008, 3, 24)
+    cache_end_date = Date.civil(2008, 3, 25)
 
-    Holidays.cache_between(Date.civil(2008,3,21), Date.civil(2008,3,25), :ca, :informal)
+    Holidays.cache_between(good_friday, cache_end_date, :ca, :informal)
 
-    # Test that correct results are returned outside the cache range, and with no caching
-    assert_equal 1, Holidays.on(Date.civil(2035,1,1), :ca, :informal).length
-    assert_equal 1, Holidays.on(Date.civil(2035,1,1), :us).length
+    # Test that correct results are returned outside the
+    # cache range, and with no caching
+    assert_equal 1, Holidays.on(Date.civil(2035, 1, 1), :ca, :informal).length
+    assert_equal 1, Holidays.on(Date.civil(2035, 1, 1), :us).length
 
-    Holidays::Factory::Finder.expects(:between).never # Make sure cache is hit for two next call
+    # Make sure cache is hit for all successive calls
+    Holidays::Factory::Finder.expects(:between).never
 
     # Test that cache has been set and it returns the same as before
-    assert_equal 1, Holidays.on(Date.civil(2008, 3, 21), :ca, :informal).length
-    assert_equal 1, Holidays.on(Date.civil(2008, 3, 24), :ca, :informal).length
+    assert_equal 1, Holidays.on(good_friday, :ca, :informal).length
+    assert_equal 1, Holidays.on(easter_monday, :ca, :informal).length
+    assert_equal 1, easter_monday.holidays(:ca, :informal).length
+    assert_equal true, easter_monday.holiday?(:ca, :informal)
   end
 
   def test_load_all
     Holidays.load_all
-    assert_equal 294, Holidays.available_regions.count
+    assert_equal 295, Holidays.available_regions.count
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holidays
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.4.0
 platform: ruby
 authors:
 - Alex Dunae
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-27 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -172,6 +172,7 @@ files:
 - lib/generated_definitions/sg.rb
 - lib/generated_definitions/si.rb
 - lib/generated_definitions/sk.rb
+- lib/generated_definitions/tn.rb
 - lib/generated_definitions/united_nations.rb
 - lib/generated_definitions/ups.rb
 - lib/generated_definitions/us.rb
@@ -272,6 +273,7 @@ files:
 - test/defs/test_defs_sg.rb
 - test/defs/test_defs_si.rb
 - test/defs/test_defs_sk.rb
+- test/defs/test_defs_tn.rb
 - test/defs/test_defs_united_nations.rb
 - test/defs/test_defs_ups.rb
 - test/defs/test_defs_us.rb
@@ -402,6 +404,7 @@ test_files:
 - test/defs/test_defs_sg.rb
 - test/defs/test_defs_si.rb
 - test/defs/test_defs_sk.rb
+- test/defs/test_defs_tn.rb
 - test/defs/test_defs_united_nations.rb
 - test/defs/test_defs_ups.rb
 - test/defs/test_defs_us.rb