holidays 6.6.1 → 7.0.0

data/lib/generated_definitions/es.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -3, :name => "Jueves Santo", :regions => [: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]},
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -3, :name => "Jueves Santo", :regions => [: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]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Viernes Santo", :regions => [:es]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Lunes de Pascua", :regions => [:es_pv, :es_ct, :es_na, :es_v, :es_vc]}],
       1 => [{:mday => 1, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Año Nuevo", :regions => [:es]},
@@ -47,7 +47,7 @@ module Holidays
 
     def self.custom_methods
       {
-        
+          
       }
     end
   end

data/lib/generated_definitions/europe.rb

@@ -2,17 +2,17 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: definitions/at.yaml, definitions/be_fr.yaml, definitions/be_nl.yaml, definitions/ch.yaml, definitions/cz.yaml, definitions/dk.yaml, definitions/de.yaml, definitions/el.yaml, definitions/es.yaml, definitions/fr.yaml, definitions/gb.yaml, definitions/hr.yaml, definitions/hu.yaml, definitions/ie.yaml, definitions/is.yaml, definitions/it.yaml, definitions/li.yaml, definitions/lt.yaml, definitions/nl.yaml, definitions/no.yaml, definitions/pl.yaml, definitions/pt.yaml, definitions/ro.yaml, definitions/sk.yaml, definitions/si.yaml, definitions/bg.yaml
+  # Definitions loaded: definitions/at.yaml, definitions/be_fr.yaml, definitions/be_nl.yaml, definitions/ch.yaml, definitions/cz.yaml, definitions/dk.yaml, definitions/de.yaml, definitions/el.yaml, definitions/es.yaml, definitions/fr.yaml, definitions/gb.yaml, definitions/hr.yaml, definitions/hu.yaml, definitions/ie.yaml, definitions/is.yaml, definitions/it.yaml, definitions/li.yaml, definitions/lt.yaml, definitions/nl.yaml, definitions/no.yaml, definitions/pl.yaml, definitions/pt.yaml, definitions/ro.yaml, definitions/sk.yaml, definitions/si.yaml, definitions/bg.yaml, definitions/ua.yaml
   #
   # 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_sorbian, :de_th_cath, :de_sn, :de_st, :de_by_cath, :de_by_augsburg, :de_bb, :de_mv, :de_th, :de_hb, :de_hh, :de_ni, :de_sh, :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_a, :fr_m, :fr, :gb, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :je, :gb_jsy, :gg, :gb_gsy, :gb_sct, :gb_con, :im, :gb_iom, :hr, :hu, :ie, :is, :it, :li, :lt, :nl, :no, :pl, :pt, :pt_li, :pt_po, :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_cath, :de_sn, :de_st, :de_by_cath, :de_by_augsburg, :de_bb, :de_mv, :de_th, :de_hb, :de_hh, :de_ni, :de_sh, :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_a, :fr_m, :fr, :gb, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :je, :gb_jsy, :gg, :gb_gsy, :gb_sct, :gb_con, :im, :gb_iom, :hr, :hu, :ie, :is, :it, :li, :lt, :nl, :no, :pl, :pt, :pt_li, :pt_po, :ro, :sk, :si, :bg_en, :bg_bg, :ua]
     end
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Ostermontag", :regions => [:at]},
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Ostermontag", :regions => [:at]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 39, :name => "Christi Himmelfahrt", :regions => [:at]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :name => "Pfingstmontag", :regions => [:at]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 60, :name => "Fronleichnam", :regions => [:at]},
@@ -146,7 +146,9 @@ module Holidays
             {:function => "orthodox_easter_julian(year)", :function_arguments => [:year], :function_modifier => -1, :name => "Велика събота", :regions => [:bg_bg]},
             {:function => "orthodox_easter_julian(year)", :function_arguments => [:year], :name => "Easter Sunday", :regions => [:bg_en]},
             {:function => "orthodox_easter_julian(year)", :function_arguments => [:year], :name => "Възкресение Христово. Великден", :regions => [:bg_bg, :bg_bg]},
-            {:function => "orthodox_easter_julian(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Easter Monday", :regions => [:bg_en]}],
+            {:function => "orthodox_easter_julian(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Easter Monday", :regions => [:bg_en]},
+            {:function => "orthodox_easter(year)", :function_arguments => [:year], :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Великдень", :regions => [:ua]},
+            {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => 49, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Трійця", :regions => [:ua]}],
       1 => [{:mday => 1, :name => "Neujahrstag", :regions => [:at]},
             {:mday => 6, :name => "Heilige Drei Könige", :regions => [:at]},
             {:mday => 1, :name => "Jour de l'an", :regions => [:be_fr]},
@@ -191,7 +193,9 @@ module Holidays
             {:mday => 6, :name => "Zjavenie Pána (Traja králi)", :regions => [:sk]},
             {:mday => 1, :name => "novo leto", :regions => [:si]},
             {:mday => 1, :name => "New Year's Day", :regions => [:bg_en]},
-            {:mday => 1, :name => "Нова година", :regions => [:bg_bg]}],
+            {:mday => 1, :name => "Нова година", :regions => [:bg_bg]},
+            {:mday => 1, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Новий Рік", :regions => [:ua]},
+            {:mday => 7, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Різдво Христове", :regions => [:ua]}],
       5 => [{:mday => 1, :name => "Staatsfeiertag", :regions => [:at]},
             {:mday => 1, :name => "Fête du travail", :regions => [:be_fr]},
             {:mday => 1, :name => "Feest van de Arbeid", :regions => [:be_nl]},
@@ -237,7 +241,10 @@ module Holidays
             {:mday => 6, :name => "St. George's Day", :regions => [:bg_en]},
             {:mday => 6, :name => "Гергьовден. Ден на храбростта", :regions => [:bg_bg]},
             {:mday => 24, :name => "Slavic Literacy Day", :regions => [:bg_en]},
-            {:mday => 24, :name => "Ден на славянската писменост", :regions => [:bg_bg]}],
+            {:mday => 24, :name => "Ден на славянската писменост", :regions => [:bg_bg]},
+            {:mday => 1, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "День праці", :regions => [:ua]},
+            {:mday => 2,  :year_ranges => [{:before => 2017}],:name => "День міжнародної солідарності трудящих", :regions => [:ua]},
+            {:mday => 9, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "День перемоги над нацизмом у Другій світовій війні", :regions => [:ua]}],
       8 => [{:mday => 15, :name => "Mariä Himmelfahrt", :regions => [:at]},
             {:mday => 15, :name => "Assomption", :regions => [:be_fr]},
             {:mday => 15, :name => "O.L.V. Hemelvaart", :regions => [:be_nl]},
@@ -263,7 +270,8 @@ module Holidays
             {:mday => 15, :name => "Assunção de Nossa Senhora", :regions => [:pt]},
             {:mday => 15, :name => "Adormirea Maicii Domnului", :regions => [:ro]},
             {:mday => 29, :name => "Výročie Slovenského národného povstania", :regions => [:sk]},
-            {:mday => 15, :name => "Marijino vnebovzetje", :regions => [:si]}],
+            {:mday => 15, :name => "Marijino vnebovzetje", :regions => [:si]},
+            {:mday => 24,  :year_ranges => [{:after => 1992}],:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "День Незалежності", :regions => [:ua]}],
       10 => [{:mday => 26, :name => "Nationalfeiertag", :regions => [:at]},
             {:mday => 28, :name => "Den vzniku samostatného československého státu", :regions => [:cz]},
             {:mday => 3, :name => "Tag der Deutschen Einheit", :regions => [:de]},
@@ -279,7 +287,8 @@ module Holidays
             {:wday => 1, :week => -1, :name => "October Bank Holiday", :regions => [:ie]},
             {:mday => 14, :type => :informal, :name => "Dzień Nauczyciela (Dzień Edukacji Narodowej)", :regions => [:pl]},
             {:mday => 5, :name => "Dia da República", :regions => [:pt]},
-            {:mday => 31, :name => "dan reformacije", :regions => [:si]}],
+            {:mday => 31, :name => "dan reformacije", :regions => [:si]},
+            {:mday => 14,  :year_ranges => [{:after => 2015}],:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "День захисника України", :regions => [:ua]}],
       11 => [{:mday => 1, :name => "Allerheiligen", :regions => [:at]},
             {:mday => 1, :name => "Toussaint", :regions => [:be_fr]},
             {:mday => 11, :name => "Armistice 1918", :regions => [:be_fr]},
@@ -393,7 +402,8 @@ module Holidays
             {:mday => 25, :name => "Christmas", :regions => [:bg_en]},
             {:mday => 25, :name => "Рождество Христово. Коледа", :regions => [:bg_bg]},
             {:mday => 26, :name => "Christmas", :regions => [:bg_en]},
-            {:mday => 26, :name => "Рождество Христово. Коледа", :regions => [:bg_bg]}],
+            {:mday => 26, :name => "Рождество Христово. Коледа", :regions => [:bg_bg]},
+            {:mday => 25,  :year_ranges => [{:after => 2017}],:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Різдво Христове", :regions => [:ua]}],
       7 => [{:mday => 21, :name => "Fête nationale", :regions => [:be_fr]},
             {:mday => 21, :name => "Nationale Feestdag", :regions => [:be_nl]},
             {:mday => 5, :name => "Den slovanských věrozvěstů Cyrila a Metoděje", :regions => [:cz]},
@@ -403,7 +413,8 @@ module Holidays
             {:mday => 5, :name => "Tynwald Day", :regions => [:im, :gb_iom]},
             {:mday => 12, :name => "Battle of the Boyne", :regions => [:gb_nir]},
             {:mday => 6, :name => "Valstybės diena", :regions => [:lt]},
-            {:mday => 5, :name => "Sviatok svätého Cyrila a svätého Metoda", :regions => [:sk]}],
+            {:mday => 5, :name => "Sviatok svätého Cyrila a svätého Metoda", :regions => [:sk]},
+            {:mday => 16,  :year_ranges => [{:limited => [1991]}],:name => "День Незалежності України", :regions => [:ua]}],
       3 => [{:mday => 1, :name => "Instauration de la République", :regions => [:ch_ne]},
             {:mday => 19, :name => "Josephstag", :regions => [:ch_ur, :ch_sz, :ch_nw, :ch_ti, :ch_vs]},
             {:mday => 25, :name => "Επέτειος της Επανάστασης του 1821", :regions => [:el]},
@@ -418,7 +429,8 @@ module Holidays
             {:mday => 8, :type => :informal, :name => "Dzień Kobiet", :regions => [:pl]},
             {:mday => 10, :type => :informal, :name => "Dzień Mężczyzn", :regions => [:pl]},
             {:mday => 3, :name => "Liberation Day", :regions => [:bg_en]},
-            {:mday => 3, :name => "Освобожението на България", :regions => [:bg_bg]}],
+            {:mday => 3, :name => "Освобожението на България", :regions => [:bg_bg]},
+            {:mday => 8, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Міжнародний жіночий день", :regions => [:ua]}],
       4 => [{:function => "ch_gl_naefelser_fahrt(year)", :function_arguments => [:year], :name => "Näfelser Fahrt", :regions => [:ch_gl]},
             {:mday => 1, :type => :informal, :name => "1. april", :regions => [:dk]},
             {:mday => 9, :type => :informal, :name => "Danmarks besættelse", :regions => [:dk]},
@@ -450,7 +462,8 @@ module Holidays
             {:mday => 10, :name => "Dia de Portugal", :regions => [:pt]},
             {:mday => 13, :name => "Dia de Santo António", :regions => [:pt_li]},
             {:mday => 24, :name => "Dia de São João", :regions => [:pt_po]},
-            {:mday => 25, :name => "dan državnosti", :regions => [:si]}],
+            {:mday => 25, :name => "dan državnosti", :regions => [:si]},
+            {:mday => 28,  :year_ranges => [{:after => 1997}],:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "День Конституції", :regions => [:ua]}],
       9 => [{:mday => 22, :name => "Mauritiustag", :regions => [:ch_ai]},
             {:mday => 25, :name => "Bruderklausenfest", :regions => [:ch_ow]},
             {:mday => 28, :name => "Den české státnosti", :regions => [:cz]},
@@ -479,7 +492,7 @@ module Holidays
 
     def self.custom_methods
       {
-        "ch_vd_lundi_du_jeune_federal(year)" => Proc.new { |year|
+          "ch_vd_lundi_du_jeune_federal(year)" => Proc.new { |year|
 date = Date.civil(year,9,1)
 # Find the first Sunday of September
 until date.wday.eql? 0 do

data/lib/generated_definitions/{federal_reserve.rb → federalreserve.rb}

@@ -2,32 +2,32 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: definitions/federal_reserve.yaml
+  # Definitions loaded: definitions/federalreserve.yaml
   #
   # All the definitions are available at https://github.com/holidays/holidays
-  module FEDERAL_RESERVE # :nodoc:
+  module FEDERALRESERVE # :nodoc:
     def self.defined_regions
-      [:federal_reserve]
+      [:federalreserve]
     end
 
     def self.holidays_by_month
       {
-              1 => [{:mday => 1, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "New Year's Day", :regions => [:federal_reserve]},
-            {:wday => 1, :week => 3, :name => "Birthday of Martin Luther King, Jr", :regions => [:federal_reserve]}],
-      2 => [{:wday => 1, :week => 3, :name => "Washington's Birthday", :regions => [:federal_reserve]}],
-      5 => [{:wday => 1, :week => -1, :name => "Memorial Day", :regions => [:federal_reserve]}],
-      7 => [{:mday => 4, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Independence Day", :regions => [:federal_reserve]}],
-      9 => [{:wday => 1, :week => 1, :name => "Labor Day", :regions => [:federal_reserve]}],
-      10 => [{:wday => 1, :week => 2, :name => "Columbus Day", :regions => [:federal_reserve]}],
-      11 => [{:mday => 11, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Veterans Day", :regions => [:federal_reserve]},
-            {:wday => 4, :week => 4, :name => "Thanksgiving Day", :regions => [:federal_reserve]}],
-      12 => [{:mday => 25, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:federal_reserve]}]
+                1 => [{:mday => 1, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "New Year's Day", :regions => [:federalreserve]},
+            {:wday => 1, :week => 3, :name => "Birthday of Martin Luther King, Jr", :regions => [:federalreserve]}],
+      2 => [{:wday => 1, :week => 3, :name => "Washington's Birthday", :regions => [:federalreserve]}],
+      5 => [{:wday => 1, :week => -1, :name => "Memorial Day", :regions => [:federalreserve]}],
+      7 => [{:mday => 4, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Independence Day", :regions => [:federalreserve]}],
+      9 => [{:wday => 1, :week => 1, :name => "Labor Day", :regions => [:federalreserve]}],
+      10 => [{:wday => 1, :week => 2, :name => "Columbus Day", :regions => [:federalreserve]}],
+      11 => [{:mday => 11, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Veterans Day", :regions => [:federalreserve]},
+            {:wday => 4, :week => 4, :name => "Thanksgiving Day", :regions => [:federalreserve]}],
+      12 => [{:mday => 25, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:federalreserve]}]
       }
     end
 
     def self.custom_methods
       {
-        
+          
       }
     end
   end

data/lib/generated_definitions/federalreservebanks.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+module Holidays
+  # This file is generated by the Ruby Holidays gem.
+  #
+  # Definitions loaded: definitions/federalreservebanks.yaml
+  #
+  # All the definitions are available at https://github.com/holidays/holidays
+  module FEDERALRESERVEBANKS # :nodoc:
+    def self.defined_regions
+      [:federalreservebanks]
+    end
+
+    def self.holidays_by_month
+      {
+                1 => [{:mday => 1, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "New Year's Day", :regions => [:federalreservebanks]},
+            {:wday => 1, :week => 3, :name => "Birthday of Martin Luther King, Jr", :regions => [:federalreservebanks]}],
+      2 => [{:wday => 1, :week => 3, :name => "Washington's Birthday", :regions => [:federalreservebanks]}],
+      5 => [{:wday => 1, :week => -1, :name => "Memorial Day", :regions => [:federalreservebanks]}],
+      7 => [{:mday => 4, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Independence Day", :regions => [:federalreservebanks]}],
+      9 => [{:wday => 1, :week => 1, :name => "Labor Day", :regions => [:federalreservebanks]}],
+      10 => [{:wday => 1, :week => 2, :name => "Columbus Day", :regions => [:federalreservebanks]}],
+      11 => [{:mday => 11, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Veterans Day", :regions => [:federalreservebanks]},
+            {:wday => 4, :week => 4, :name => "Thanksgiving Day", :regions => [:federalreservebanks]}],
+      12 => [{:mday => 25, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:federalreservebanks]}]
+      }
+    end
+
+    def self.custom_methods
+      {
+          
+      }
+    end
+  end
+end

data/lib/generated_definitions/fedex.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              1 => [{:mday => 1, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "New Year's Day", :regions => [:fedex]}],
+                1 => [{:mday => 1, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "New Year's Day", :regions => [:fedex]}],
       5 => [{:wday => 1, :week => -1, :name => "Memorial Day", :regions => [:fedex]}],
       7 => [{:mday => 4, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Independence Day", :regions => [:fedex]}],
       9 => [{:wday => 1, :week => 1, :name => "Labor Day", :regions => [:fedex]}],
@@ -25,7 +25,7 @@ module Holidays
 
     def self.custom_methods
       {
-        "day_after_thanksgiving(year)" => Proc.new { |year|
+          "day_after_thanksgiving(year)" => Proc.new { |year|
 Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 11, 4, 4) + 1
 },
 

data/lib/generated_definitions/fi.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Pitkäperjantai", :regions => [:fi]},
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Pitkäperjantai", :regions => [:fi]},
             {:function => "easter(year)", :function_arguments => [:year], :name => "Pääsiäispäivä", :regions => [:fi]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "2. Pääsiäispäivä", :regions => [:fi]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 39, :name => "Helatorstai", :regions => [:fi]},
@@ -32,7 +32,7 @@ module Holidays
 
     def self.custom_methods
       {
-        "fi_juhannusaatto(year)" => Proc.new { |year|
+          "fi_juhannusaatto(year)" => Proc.new { |year|
 date = Date.civil(year,6,19)
 if date.wday > 5 #if 19.6 is saturday
   date += 6

data/lib/generated_definitions/fr.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Vendredi saint", :regions => [:fr_a, :fr_m]},
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Vendredi saint", :regions => [:fr_a, :fr_m]},
             {:function => "easter(year)", :function_arguments => [:year], :type => :informal, :name => "Pâques", :regions => [:fr]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Lundi de Pâques", :regions => [:fr]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 39, :name => "Ascension", :regions => [:fr]},
@@ -32,7 +32,7 @@ module Holidays
 
     def self.custom_methods
       {
-        
+          
       }
     end
   end

data/lib/generated_definitions/gb.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Good Friday", :regions => [:gb]},
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Good Friday", :regions => [:gb]},
             {:function => "easter(year)", :function_arguments => [:year], :name => "Easter Sunday", :regions => [:gb]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Easter Monday", :regions => [:gb_eng, :gb_wls, :gb_eaw, :gb_nir, :je, :gb_jsy, :gg, :gb_gsy]}],
       1 => [{:mday => 1, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "New Year's Day", :regions => [:gb]},
@@ -36,7 +36,7 @@ module Holidays
 
     def self.custom_methods
       {
-        
+          
       }
     end
   end

data/lib/generated_definitions/ge.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "დიდი პარასკევი", :regions => [:ge]},
+                0 => [{:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "დიდი პარასკევი", :regions => [:ge]},
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => -1, :name => "დიდი შაბათი", :regions => [:ge]},
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :name => "ბრწყინვალე აღდგომის დღე", :regions => [:ge]},
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "მიცვალებულთა", :regions => [:ge]}],
@@ -34,7 +34,7 @@ module Holidays
 
     def self.custom_methods
       {
-        
+          
       }
     end
   end

data/lib/generated_definitions/hk.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "cn_new_lunar_day(year)", :function_arguments => [:year], :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Lunar New Year's Day", :regions => [:hk]},
+                0 => [{:function => "cn_new_lunar_day(year)", :function_arguments => [:year], :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Lunar New Year's Day", :regions => [:hk]},
             {:function => "cn_new_lunar_day(year)", :function_arguments => [:year], :function_modifier => 1, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "The second day of Lunar New Year", :regions => [:hk]},
             {:function => "cn_new_lunar_day(year)", :function_arguments => [:year], :function_modifier => 2, :observed => "to_weekday_if_boxing_weekend(date)", :observed_arguments => [:date], :name => "The third day of Lunar New Year", :regions => [:hk]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Good Friday", :regions => [:hk]},
@@ -29,7 +29,7 @@ module Holidays
 
     def self.custom_methods
       {
-        "cn_new_lunar_day(year)" => Proc.new { |year|
+          "cn_new_lunar_day(year)" => Proc.new { |year|
 month_day = case year
   when 1930, 1949, 1987, 2025, 2063, 2082, 2101, 2112, 2131, 2150, 2207, 2245, 2253, 2283, 2321
     [1, 29]

data/lib/generated_definitions/hr.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :name => "Uskrs", :regions => [:hr]},
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :name => "Uskrs", :regions => [:hr]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Uskrsni ponedjeljak", :regions => [:hr]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 60, :name => "Tijelovo", :regions => [:hr]}],
       1 => [{:mday => 1, :name => "Nova godina", :regions => [:hr]},
@@ -31,7 +31,7 @@ module Holidays
 
     def self.custom_methods
       {
-        
+          
       }
     end
   end

data/lib/generated_definitions/hu.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Húsvét hétfő", :regions => [:hu]},
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Húsvét hétfő", :regions => [:hu]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :name => "Pünkösd hétfő", :regions => [:hu]}],
       1 => [{:mday => 1, :name => "Újév", :regions => [:hu]}],
       3 => [{:mday => 15, :name => "1848/49-es forradalom és szabadságharc ünnepe", :regions => [:hu]}],
@@ -27,7 +27,7 @@ module Holidays
 
     def self.custom_methods
       {
-        
+          
       }
     end
   end

data/lib/generated_definitions/ie.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Easter Monday", :regions => [:ie]}],
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Easter Monday", :regions => [:ie]}],
       1 => [{:mday => 1, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "New Year's Day", :regions => [:ie]}],
       3 => [{:mday => 17, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "St. Patrick's Day", :regions => [:ie]}],
       5 => [{:wday => 1, :week => 1, :name => "May Day", :regions => [:ie]}],
@@ -26,7 +26,7 @@ module Holidays
 
     def self.custom_methods
       {
-        
+          
       }
     end
   end

data/lib/generated_definitions/is.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -48, :name => "Bolludagur", :regions => [:is]},
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -48, :name => "Bolludagur", :regions => [:is]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -47, :name => "Sprengidagur", :regions => [:is]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -46, :name => "Öskudagur", :regions => [:is]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -7, :name => "Pálmasunnudagur", :regions => [:is]},
@@ -43,7 +43,7 @@ module Holidays
 
     def self.custom_methods
       {
-        "is_sumardagurinn_fyrsti(year)" => Proc.new { |year|
+          "is_sumardagurinn_fyrsti(year)" => Proc.new { |year|
 date = Date.civil(year,4,18)
 if date.wday < 4
   date += (4 - date.wday)

data/lib/generated_definitions/it.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :name => "Pasqua", :regions => [:it]},
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :name => "Pasqua", :regions => [:it]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Lunedì dell'Angelo", :regions => [:it]}],
       1 => [{:mday => 1, :name => "Capodanno", :regions => [:it]},
             {:mday => 6, :name => "Epifania", :regions => [:it]}],
@@ -29,7 +29,7 @@ module Holidays
 
     def self.custom_methods
       {
-        
+          
       }
     end
   end

data/lib/generated_definitions/jp.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              1 => [{:mday => 1, :name => "元日", :regions => [:jp]},
+                1 => [{:mday => 1, :name => "元日", :regions => [:jp]},
             {:wday => 1, :week => 2, :name => "成人の日", :regions => [:jp]},
             {:mday => 1, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day], :name => "振替休日", :regions => [:jp]}],
       2 => [{:mday => 11, :name => "建国記念の日", :regions => [:jp]},
@@ -30,16 +30,22 @@ module Holidays
             {:mday => 4, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day], :name => "振替休日", :regions => [:jp]},
             {:mday => 5, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day], :name => "振替休日", :regions => [:jp]}],
       7 => [{:mday => 20,  :year_ranges => [{:between => 1996..2002}],:name => "海の日", :regions => [:jp]},
-            {:wday => 1, :week => 3,  :year_ranges => [{:after => 2003}],:name => "海の日", :regions => [:jp]},
-            {:function => "jp_marine_day_substitute(year)", :function_arguments => [:year],  :year_ranges => [{:between => 1996..2002}],:name => "振替休日", :regions => [:jp]}],
-      8 => [{:function => "jp_mountain_holiday(year)", :function_arguments => [:year],  :year_ranges => [{:after => 2016}],:name => "山の日", :regions => [:jp]},
+            {:wday => 1, :week => 3,  :year_ranges => [{:between => 2003..2019}],:name => "海の日", :regions => [:jp]},
+            {:mday => 23,  :year_ranges => [{:limited => [2020]}],:name => "海の日", :regions => [:jp]},
+            {:wday => 1, :week => 3,  :year_ranges => [{:after => 2021}],:name => "海の日", :regions => [:jp]},
+            {:function => "jp_marine_day_substitute(year)", :function_arguments => [:year],  :year_ranges => [{:between => 1996..2002}],:name => "振替休日", :regions => [:jp]},
+            {:mday => 24,  :year_ranges => [{:limited => [2020]}],:name => "スポーツの日", :regions => [:jp]}],
+      8 => [{:function => "jp_mountain_holiday(year)", :function_arguments => [:year],  :year_ranges => [{:between => 2016..2019}],:name => "山の日", :regions => [:jp]},
+            {:mday => 10,  :year_ranges => [{:limited => [2020]}],:name => "山の日", :regions => [:jp]},
+            {:function => "jp_mountain_holiday(year)", :function_arguments => [:year],  :year_ranges => [{:after => 2021}],:name => "山の日", :regions => [:jp]},
             {:function => "jp_mountain_holiday_substitute(year)", :function_arguments => [:year],  :year_ranges => [{:after => 2016}],:name => "振替休日", :regions => [:jp]}],
       9 => [{:wday => 1, :week => 3, :name => "敬老の日", :regions => [:jp]},
             {:function => "jp_respect_for_aged_holiday_substitute(year)", :function_arguments => [:year], :name => "振替休日", :regions => [:jp]},
             {:function => "jp_citizens_holiday(year)", :function_arguments => [:year],  :year_ranges => [{:after => 2003}],:name => "国民の休日", :regions => [:jp]},
             {:function => "jp_national_culture_day(year)", :function_arguments => [:year], :name => "秋分の日", :regions => [:jp]},
             {:function => "jp_national_culture_day_substitute(year)", :function_arguments => [:year], :name => "振替休日", :regions => [:jp]}],
-      10 => [{:wday => 1, :week => 2, :name => "体育の日", :regions => [:jp]},
+      10 => [{:wday => 1, :week => 2,  :year_ranges => [{:before => 2019}],:name => "体育の日", :regions => [:jp]},
+            {:wday => 1, :week => 2,  :year_ranges => [{:after => 2021}],:name => "スポーツの日", :regions => [:jp]},
             {:function => "jp_health_sports_day_substitute(year)", :function_arguments => [:year], :name => "振替休日", :regions => [:jp]}],
       11 => [{:mday => 3, :name => "文化の日", :regions => [:jp]},
             {:mday => 3, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day], :name => "振替休日", :regions => [:jp]},
@@ -52,7 +58,7 @@ module Holidays
 
     def self.custom_methods
       {
-        "jp_health_sports_day_substitute(year)" => Proc.new { |year|
+          "jp_health_sports_day_substitute(year)" => Proc.new { |year|
 Holidays::Factory::Definition.custom_methods_repository.find("jp_substitute_holiday(year, month, day)").call(year, 10, Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 10, 2, 1))
 },