holidays 3.3.0 → 4.0.0

data/definitions/ar.yaml

@@ -10,7 +10,8 @@ months:
   0:
   - name: Viernes Santo
     regions: [ar]
-    function: easter(year)-2
+    function: easter(year)
+    function_modifier: -2
   1:
   - name: Año Nuevo
     regions: [ar]

data/definitions/at.yaml

@@ -5,41 +5,45 @@
 # - http://de.wikipedia.org/wiki/Feiertage_in_%C3%96sterreich
 # - http://www.timeanddate.com/calendar/index.html?country=8
 # - http://www.germany.info/relaunch/welcome/travel/holidays.html
---- 
+---
 months:
-  0: 
+  0:
   - name: Ostermontag
     regions: [at]
-    function: easter(year)+1
+    function: easter(year)
+    function_modifier: 1
   - name: Christi Himmelfahrt
     regions: [at]
-    function: easter(year)+39
+    function: easter(year)
+    function_modifier: 39
   - name: Pfingstmontag
     regions: [at]
-    function: easter(year)+50
+    function: easter(year)
+    function_modifier: 50
   - name: Fronleichnam
     regions: [at]
-    function: easter(year)+60
-  1: 
+    function: easter(year)
+    function_modifier: 60
+  1:
   - name: Neujahrstag
     regions: [at]
     mday: 1
   - name: Heilige Drei Könige
     regions: [at]
     mday: 6
-  5: 
+  5:
   - name: Staatsfeiertag
     regions: [at]
     mday: 1
-  8: 
+  8:
   - name: Mariä Himmelfahrt
     regions: [at]
     mday: 15
-  10: 
+  10:
   - name: Nationalfeiertag
     regions: [at]
     mday: 26
-  11: 
+  11:
   - name: Allerheiligen
     regions: [at]
     mday: 1
@@ -54,7 +58,7 @@ months:
     regions: [at]
     mday: 26
 tests: |
-    {Date.civil(2009,1,1) => 'Neujahrstag', 
+    {Date.civil(2009,1,1) => 'Neujahrstag',
      Date.civil(2009,4,13) => 'Ostermontag',
      Date.civil(2009,5,1) => 'Staatsfeiertag',
      Date.civil(2009,5,21) => 'Christi Himmelfahrt',
@@ -64,5 +68,5 @@ tests: |
      Date.civil(2009,12,26) => '2. Weihnachtstag'}.each do |date, name|
       assert_equal name, (Holidays.on(date, :at, :informal)[0] || {})[:name]
     end
-    
+
     assert_equal [], Holidays.on(Date.civil(2010,5,8), :at), '2010-05-08 is not a holiday in Austria'

data/definitions/au.yaml

@@ -1,40 +1,43 @@
 # Australian holiday definitions for the Ruby Holiday gem.
 # Updated: 2008-11-29.
-# Sources:  
+# Sources:
 # - http://en.wikipedia.org/wiki/Australian_public_holidays
 # - http://www.docep.wa.gov.au/lr/LabourRelations/Content/Wages%20and%20Conditions/Public%20Holidays/Public_Holidays.html
 # - http://www.wst.tas.gov.au/employment_info/public_holidays
 # - https://www.fairwork.gov.au/leave/public-holidays/list-of-public-holidays
 --- 
 months:
-  0: 
+  0:
   - name: Good Friday
     regions: [au]
-    function: easter(year)-2
+    function: easter(year)
+    function_modifier: -2
   - name: Easter Saturday
     regions: [au_nsw, au_vic, au_qld, au_nt, au_act, au_sa]
-    function: easter(year)-1
+    function: easter(year)
+    function_modifier: -1
   - name: Easter Sunday
     regions: [au_nsw, au_vic]
     function: easter(year)
   - name: Easter Monday
     regions: [au]
-    function: easter(year)+1
-  1: 
+    function: easter(year)
+    function_modifier: 1
+  1:
   - name: New Year's Day
     regions: [au]
     mday: 1
-    observed: to_monday_if_weekend
+    observed: to_monday_if_weekend(date)
   - name: Australia Day
     regions: [au]
     mday: 26
-    observed: to_monday_if_weekend
+    observed: to_monday_if_weekend(date)
   2:
   - name: Royal Hobart Regatta
     regions: [au_tas_south]
     week: 2
     wday: 1
-  3: 
+  3:
   - name: Labour Day
     regions: [au_wa]
     week: 1
@@ -50,19 +53,19 @@ months:
   - name: March Public Holiday
     regions: [au_sa]
     function: march_pub_hol_sa(year)
-  4: 
+  4:
   - name: ANZAC Day
     regions: [au]
     mday: 25
   - name: ANZAC Day
     regions: [au_nsw, au_vic, au_qld, au_nt, au_act, au_sa, au_tas]
     mday: 25
-    observed: to_monday_if_sunday
+    observed: to_monday_if_sunday(date)
   - name: ANZAC Day
     regions: [au_wa]
     mday: 25
-    observed: to_monday_if_weekend
-  5: 
+    observed: to_monday_if_weekend(date)
+  5:
   - name: Labour Day
     regions: [au_qld]
     function: qld_labour_day_may(year)
@@ -73,7 +76,7 @@ months:
   - name: May Public Holiday
     regions: [au_sa]
     function: may_pub_hol_sa(year)
-  6: 
+  6:
   - name: Foundation Day
     regions: [au_wa]
     week: 1
@@ -119,11 +122,11 @@ months:
   - name: Labour Day
     regions: [au_qld]
     function: qld_labour_day_october(year)
-    observed: to_monday_if_weekend
+    observed: to_monday_if_weekend(date)
   - name: Queen's Birthday
     regions: [au_qld]
     function: qld_queens_bday_october(year)
-    observed: to_monday_if_weekend
+    observed: to_monday_if_weekend(date)
   - name: Royal Hobart Show
     regions: [au_tas_south]
     function: hobart_show_day(year)
@@ -139,108 +142,110 @@ months:
     regions: [au_vic_melbourne]
     week: 1
     wday: 2
-  12: 
+  12:
   - name: Christmas Day # CHRISTMAS DAY - ACT, NSW, QLD, Tas, WA observe on 27th (and 25th) if 25th is a Sunday
     regions: [au_qld, au_nsw, au_act, au_tas, au_wa]
     mday: 25
-    observed: to_tuesday_if_sunday_or_monday_if_saturday
+    observed: to_tuesday_if_sunday_or_monday_if_saturday(date)
   - name: Christmas Day # CHRISTMAS DAY - SA observes on 26th if 25th is a Sunday (Boxing Day goes to 27th)
     regions: [au_sa]
     mday: 25
-    observed: to_monday_if_weekend
+    observed: to_monday_if_weekend(date)
   - name: Christmas Day # CHRISTMAS DAY - Victoria and NT don't observe 25th if weekend - xmas is on the 27th
     regions: [au_vic, au_nt]
     function: xmas_to_weekday_if_weekend(year)
   - name: Boxing Day
     regions: [au_nsw, au_vic, au_qld, au_act, au_wa]
     mday: 26
-    observed: to_tuesday_if_sunday_or_monday_if_saturday
+    observed: to_tuesday_if_sunday_or_monday_if_saturday(date)
   - name: Boxing Day
     regions: [au_sa]
     function: to_weekday_if_boxing_weekend_from_year_or_to_tuesday_if_monday(year)
   - name: Boxing Day
     regions: [au_tas, au_nt]
     function: to_weekday_if_boxing_weekend_from_year(year)
+
 methods:
-  afl_grand_final: |
-    def self.afl_grand_final(year)
+  afl_grand_final:
+    arguments: year
+    source: |
       if year == 2015
         Date.civil(2015, 10, 2)
       end
-    end    
-  qld_queens_bday_october: |
+  qld_queens_bday_october:
     # http://www.justice.qld.gov.au/fair-and-safe-work/industrial-relations/public-holidays/dates
     # celebrated twice in 2012
     # in october again from 2016
-    def self.qld_queens_bday_october(year)
+    arguments: year
+    source: |
       if year >= 2016
-        Holidays.calculate_day_of_month(year, 10, 1, 1)
+        DateCalculatorFactory.day_of_month_calculator.call(year, 10, 1, 1)
       elsif year == 2012
         1
       else
         nil
       end
-    end
-  qld_labour_day_may: |
+  qld_queens_birthday_june:
+    # http://www.justice.qld.gov.au/fair-and-safe-work/industrial-relations/public-holidays/dates
+    # in june until 2015
+    arguments: year
+    source: |
+      if year <= 2015
+        DateCalculatorFactory.day_of_month_calculator.call(year, 6, 2, 1)
+      end
+  qld_labour_day_may:
     # http://www.justice.qld.gov.au/fair-and-safe-work/industrial-relations/public-holidays/dates
     # for 2013 to 2016 it was in October, otherwise it's in May
-    def self.qld_labour_day_may(year)
+    arguments: year
+    source: |
       if year < 2013 || year >= 2016
-        Holidays.calculate_day_of_month(year, 5, 1, 1)
+        DateCalculatorFactory.day_of_month_calculator.call(year, 5, 1, 1)
       end
-    end
-  qld_labour_day_october: |
+  qld_labour_day_october:
     # http://www.justice.qld.gov.au/fair-and-safe-work/industrial-relations/public-holidays/dates
     # for 2013 to 2016 it was in October, otherwise it's in May
-    def self.qld_labour_day_october(year)
+    arguments: year
+    source: |
       if year >= 2013 && year < 2016
-        Holidays.calculate_day_of_month(year, 10, 1, 1)
+        DateCalculatorFactory.day_of_month_calculator.call(year, 10, 1, 1)
       end
-    end
-  qld_queens_birthday_june: |
-    # http://www.justice.qld.gov.au/fair-and-safe-work/industrial-relations/public-holidays/dates
-    # in june until 2015
-    def self.qld_queens_birthday_june(year)
-      if year <= 2015
-        Holidays.calculate_day_of_month(year, 6, 2, 1)
-      end
-    end
-  g20_day_2014_only: |
+  g20_day_2014_only:
     # http://www.justice.qld.gov.au/fair-and-safe-work/industrial-relations/public-holidays/dates
     # G20 day in brisbane, in 2014, on november 14
-    def self.g20_day_2014_only(year)
+    arguments: year
+    source: |
       year == 2014 ? 14 : nil
-    end
-  hobart_show_day: |
+  hobart_show_day:
     # 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, Holidays.calculate_day_of_month(year, 10, 4, :saturday))
+    # The Thursday before the fourth Saturday in October.
+    arguments: year
+    source: |
+      fourth_sat_in_oct = Date.civil(year, 10, Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 10, 4, :saturday))
       fourth_sat_in_oct - 2 # the thursday before
-    end
-  march_pub_hol_sa: |
+  march_pub_hol_sa:
     # http://www.safework.sa.gov.au/show_page.jsp?id=2483#.VQ9Mfmb8-8E
     # The Holidays Act 1910 provides for the third Monday in May to be a public holiday. Since 2006 this public holiday has been observed on the second Monday in March through the issuing of a special Proclamation by the Governor.
-    def self.march_pub_hol_sa(year)
+    arguments: year
+    source: |
       if year < 2006
         nil
       else
         Date.civil(year, 3, Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 3, :second, :monday))
       end
-    end
-  may_pub_hol_sa: |
+  may_pub_hol_sa:
     # http://www.safework.sa.gov.au/show_page.jsp?id=2483#.VQ9Mfmb8-8E
     # The Holidays Act 1910 provides for the third Monday in May to be a public holiday. Since 2006 this public holiday has been observed on the second Monday in March through the issuing of a special Proclamation by the Governor.
-    def self.may_pub_hol_sa(year)
+    arguments: year
+    source: |
       if year >= 2006
         nil
       else
         Date.civil(year, 5, Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 5, :third, :monday))
       end
-    end
+
 tests: |
-    {Date.civil(2007,1,1) => 'New Year\'s Day', 
-     Date.civil(2007,1,26) => 'Australia Day', 
+    {Date.civil(2007,1,1) => 'New Year\'s Day',
+     Date.civil(2007,1,26) => 'Australia Day',
      Date.civil(2007,4,6) => 'Good Friday',
      Date.civil(2007,4,9) => 'Easter Monday',
      Date.civil(2007,4,25) => 'ANZAC Day'}.each do |date, name|
@@ -367,4 +372,4 @@ tests: |
     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_nt)[0][:name]

data/definitions/be_fr.yaml

@@ -3,29 +3,33 @@
 # Updated: 2012-06-20.
 # Sources:
 # - http://en.wikipedia.org/wiki/Public_holidays_in_Belgium
---- 
+---
 months:
-  0: 
+  0:
   - name: Pâques
     regions: [be_fr]
     function: easter(year)
   - name: Lundi de Pâques
     regions: [be_fr]
-    function: easter(year)+1
+    function: easter(year)
+    function_modifier: 1
   - name: Ascension
     regions: [be_fr]
-    function: easter(year)+39
+    function: easter(year)
+    function_modifier: 39
   - name: Pentecôte
     regions: [be_fr]
-    function: easter(year)+49
+    function: easter(year)
+    function_modifier: 49
   - name: Lundi de Pentecôte
     regions: [be_fr]
-    function: easter(year)+50
-  1: 
+    function: easter(year)
+    function_modifier: 50
+  1:
   - name: Jour de l'an
     regions: [be_fr]
     mday: 1
-  5: 
+  5:
   - name: Fête du travail
     regions: [be_fr]
     mday: 1
@@ -33,11 +37,11 @@ months:
   - name: Fête nationale
     regions: [be_fr]
     mday: 21
-  8: 
+  8:
   - name: Assomption
     regions: [be_fr]
     mday: 15
-  11: 
+  11:
   - name: Toussaint
     regions: [be_fr]
     mday: 1

data/definitions/be_nl.yaml

@@ -11,16 +11,20 @@ months:
     function: easter(year)
   - name: Paasmaandag
     regions: [be_nl]
-    function: easter(year)+1
+    function: easter(year)
+    function_modifier: 1
   - name: O.H. Hemelvaart
     regions: [be_nl]
-    function: easter(year)+39
+    function: easter(year)
+    function_modifier: 39
   - name: Pinksteren
     regions: [be_nl]
-    function: easter(year)+49
+    function: easter(year)
+    function_modifier: 49
   - name: Pinkstermaandag
     regions: [be_nl]
-    function: easter(year)+50
+    function: easter(year)
+    function_modifier: 50
   1:
   - name: Nieuwjaar
     regions: [be_nl]

data/definitions/bg.yaml

@@ -7,16 +7,20 @@ months:
   0:
   - name: Good Friday
     regions: [bg_en]
-    function: orthodox_easter_julian(year)-2
+    function: orthodox_easter_julian(year)
+    function_modifier: -2
   - name: Разпети петък
     regions: [bg_bg]
-    function: orthodox_easter_julian(year)-2
+    function: orthodox_easter_julian(year)
+    function_modifier: -2
   - name: Holy Saturday
     regions: [bg_en]
-    function: orthodox_easter_julian(year)-1
+    function: orthodox_easter_julian(year)
+    function_modifier: -1
   - name: Велика събота
     regions: [bg_bg]
-    function: orthodox_easter_julian(year)-1
+    function: orthodox_easter_julian(year)
+    function_modifier: -1
   - name: Easter Sunday
     regions: [bg_en]
     function: orthodox_easter_julian(year)
@@ -25,10 +29,12 @@ months:
     function: orthodox_easter_julian(year)
   - name: Easter Monday
     regions: [bg_en]
-    function: orthodox_easter_julian(year)+1
+    function: orthodox_easter_julian(year)
+    function_modifier: 1
   - name: Възкресение Христово. Великден
     regions: [bg_bg]
-    function: orthodox_easter_julian(year)+1
+    function: orthodox_easter_julian(year)
+    function_modifier: 1
   1:
   - name: New Year's Day
     regions: [bg_en]