holidays 3.3.0 → 4.0.0

data/definitions/hr.yaml

@@ -3,7 +3,7 @@
 # Updated: 2012-08-29.
 # Sources:
 #  http://en.wikipedia.org/wiki/Public_holidays_in_Croatia
---- 
+---
 months:
   0:
   - name: Uskrs
@@ -11,10 +11,12 @@ months:
     function: easter(year)
   - name: Uskrsni ponedjeljak
     regions: [hr]
-    function: easter(year)+1
+    function: easter(year)
+    function_modifier: 1
   - name: Tijelovo
     regions: [hr]
-    function: easter(year)+60
+    function: easter(year)
+    function_modifier: 60
   1:
   - name: Nova godina
     regions: [hr]
@@ -56,8 +58,8 @@ months:
     regions: [hr]
     mday: 26
 tests: |
-  {Date.civil(2012,1,1) => 'Nova godina', 
-   Date.civil(2012,1,6) => 'Sveta tri kralja', 
+  {Date.civil(2012,1,1) => 'Nova godina',
+   Date.civil(2012,1,6) => 'Sveta tri kralja',
    Date.civil(2012,5,1) => 'Međunarodni praznik rada',
    Date.civil(2012,6,22) => 'Dan antifašističke borbe',
    Date.civil(2012,6,25) => 'Dan državnosti',
@@ -69,7 +71,7 @@ tests: |
    Date.civil(2012,12,26) => 'Sveti Stjepan'}.each do |date, name|
     assert_equal name, (Holidays.on(date, :hr, :informal)[0] || {})[:name]
   end
-  
+
   # Tijelovo
   [Date.civil(2008,5,22), Date.civil(2009,6,11), Date.civil(2010,6,3),
    Date.civil(2012,6,7), Date.civil(2013,5,30), Date.civil(2014,6,19)].each do |date|

data/definitions/hu.yaml

@@ -1,15 +1,17 @@
 # Hungarian holiday definitions for the Ruby Holiday gem.
 #
 # Updated: 2012-03-01 by spap
---- 
+---
 months:
-  0: 
+  0:
   - name: Húsvét hétfő
     regions: [hu]
-    function: easter(year)+1
+    function: easter(year)
+    function_modifier: 1
   - name: Pünkösd hétfő
     regions: [hu]
-    function: easter(year)+50
+    function: easter(year)
+    function_modifier: 50
   1:
   - name: Újév
     regions: [hu]
@@ -42,8 +44,8 @@ months:
     regions: [hu]
     mday: 26
 tests: |
-    {Date.civil(2012,1,1) => 'Újév', 
-     Date.civil(2011,1,1) => 'Újév', 
+    {Date.civil(2012,1,1) => 'Újév',
+     Date.civil(2011,1,1) => 'Újév',
      Date.civil(2012,3,15) => '1848/49-es forradalom és szabadságharc ünnepe',
      Date.civil(2011,4,25) => 'Húsvét hétfő',
      Date.civil(2012,4,9) => 'Húsvét hétfő',

data/definitions/ie.yaml

@@ -5,23 +5,24 @@
 # - http://en.wikipedia.org/wiki/Public_holidays_in_the_Republic_of_Ireland
 # - http://www.citizensinformation.ie/categories/employment/employment-rights-and-conditions/leave-and-holidays/public-holidays-in-ireland
 # While there is mention that Jan 2 2012 was not officially a bank holiday, in reality very few businesses will not observe that date as a bank holiday
---- 
+---
 months:
-  0: 
+  0:
   - name: Easter Monday
     regions: [ie]
-    function: easter(year)+1
-  1: 
+    function: easter(year)
+    function_modifier: 1
+  1:
   - name: New Year's Day
     regions: [ie]
     mday: 1
-    observed: to_monday_if_weekend
-  3: 
+    observed: to_monday_if_weekend(date)
+  3:
   - name: St. Patrick's Day
     regions: [ie]
     mday: 17
-    observed: to_monday_if_weekend
-  5: 
+    observed: to_monday_if_weekend(date)
+  5:
   - name: May Day
     regions: [ie]
     week: 1
@@ -31,35 +32,35 @@ months:
     regions: [ie]
     week: 1
     wday: 1
-  8: 
+  8:
   - name: August Bank Holiday
     regions: [ie]
     week: 1
     wday: 1
-  10: 
+  10:
   - name: October Bank Holiday
     regions: [ie]
     week: -1
     wday: 1
-  12: 
+  12:
   - name: Christmas Day
     regions: [ie]
     mday: 25
-    observed: to_monday_if_weekend
+    observed: to_monday_if_weekend(date)
   - name: St. Stephen's Day
     regions: [ie]
     mday: 26
-    observed: ie_st_stephens_day
+    observed: ie_st_stephens_day(date)
 methods:
-  ie_st_stephens_day: |
+  ie_st_stephens_day:
     # Ireland - Stephens Day is always the day after christmas day
-    def self.ie_st_stephens_day(date)
+    arguments: date
+    source: |
       case date.wday
       when 6, 0 then date + 2
       when 1 then date + 1
       else date
       end
-    end
 tests: |
     {Date.civil(2008,1,1) => 'New Year\'s Day',
      Date.civil(2008,3,17) => 'St. Patrick\'s Day',

data/definitions/index.yaml

@@ -19,7 +19,7 @@ defs:
   EL: ['el.yaml']
   ES: ['es.yaml']
   Federal_Reserve: ['federal_reserve.yaml']
-  Fed_Ex: ['fedex.yaml']
+  FedEx: ['fedex.yaml']
   FI: ['fi.yaml']
   FR: ['fr.yaml']
   GB: ['gb.yaml']

data/definitions/is.yaml

@@ -6,43 +6,53 @@
 # - http://www.iceland.is/history-and-culture/Traditions/IcelandicHolidays/
 # - http://en.wikipedia.org/wiki/Public_holidays_in_Iceland
 # - http://www.qppstudio.net/publicholidays2007/iceland.htm
---- 
+---
 months:
-  0: 
+  0:
   - name: Bolludagur
     regions: [is]
-    function: easter(year)-48
+    function: easter(year)
+    function_modifier: -48
   - name: Sprengidagur
     regions: [is]
-    function: easter(year)-47
+    function: easter(year)
+    function_modifier: -47
   - name: Öskudagur
     regions: [is]
-    function: easter(year)-46
+    function: easter(year)
+    function_modifier: -46
   - name: Pálmasunnudagur
     regions: [is]
-    function: easter(year)-7
+    function: easter(year)
+    function_modifier: -7
   - name: Skírdagur
     regions: [is]
-    function: easter(year)-3
+    function: easter(year)
+    function_modifier: -3
   - name: Föstudaginn langi
     regions: [is]
-    function: easter(year)-2
+    function: easter(year)
+    function_modifier: -2
   - name: Páskadagur
     regions: [is]
     function: easter(year)
   - name: Annar í páskum
     regions: [is]
-    function: easter(year)+1
+    function: easter(year)
+    function_modifier: 1
   - name: Uppstigningardagur
     regions: [is]
-    function: easter(year)+39
+    function: easter(year)
+    function_modifier: 39
   - name: Hvítasunnudagur
     regions: [is]
-    function: easter(year)+49
+    function: easter(year)
+    function_modifier: 49
   - name: Annar í hvítasunnu
     regions: [is]
-    function: easter(year)+50
-  1: 
+    function: easter(year)
+    function_modifier: 50
+  1:
   - name: Nýársdagur
     regions: [is]
     mday: 1
@@ -57,7 +67,7 @@ months:
   - name: Konudagur
     regions: [is]
     mday: 18
-    type: informal  
+    type: informal
   4:
   - name: Sumardagurinn fyrsti
     regions: [is]
@@ -100,9 +110,10 @@ months:
     regions: [is]
     mday: 31
 methods:
-  is_sumardagurinn_fyrsti: |
+  is_sumardagurinn_fyrsti:
     # Iceland: first day of summer (Thursday after 18 April)
-    def self.is_sumardagurinn_fyrsti(year)
+    arguments: year
+    source: |
       date = Date.civil(year,4,18)
       if date.wday < 4
         date += (4 - date.wday)
@@ -110,9 +121,8 @@ methods:
         date += (11 - date.wday)
       end
       date
-    end
 tests: |
-    {Date.civil(2007,1,1) => 'Nýársdagur', 
+    {Date.civil(2007,1,1) => 'Nýársdagur',
      Date.civil(2007,1,6) => 'Þrettándinn',
      Date.civil(2007,1,19) => 'Bóndadagur',
      Date.civil(2007,2,18) => 'Konudagur',
@@ -133,4 +143,4 @@ tests: |
      Date.civil(2007,12,26) => 'Jól',
      Date.civil(2007,12,31) => 'Gamlárskvöld'}.each do |date, name|
       assert_equal name, (Holidays.on(date, :is, :informal)[0] || {})[:name]
-    end
+    end

data/definitions/it.yaml

@@ -3,16 +3,17 @@
 # Updated: 2008-11-23.
 # Sources:
 # - http://en.wikipedia.org/wiki/Holidays_in_Italy
---- 
+---
 months:
-  0: 
+  0:
   - name: Pasqua
     regions: [it]
     function: easter(year)
   - name: Lunedì dell'Angelo
     regions: [it]
-    function: easter(year)+1
-  1: 
+    function: easter(year)
+    function_modifier: 1
+  1:
   - name: Capodanno
     regions: [it]
     mday: 1
@@ -23,7 +24,7 @@ months:
   - name: Festa della Liberazione
     regions: [it]
     mday: 25
-  5: 
+  5:
   - name: Festa dei Lavoratori
     regions: [it]
     mday: 1
@@ -31,11 +32,11 @@ months:
   - name: Festa della Repubblica
     regions: [it]
     mday: 2
-  8: 
+  8:
   - name: Assunzione
     regions: [it]
     mday: 15
-  11: 
+  11:
   - name: Ognissanti
     regions: [it]
     mday: 1
@@ -50,7 +51,7 @@ months:
     regions: [it]
     mday: 26
 tests: |
-    {Date.civil(2007,1,1) => 'Capodanno', 
+    {Date.civil(2007,1,1) => 'Capodanno',
      Date.civil(2007,1,6) => 'Epifania',
      Date.civil(2007,4,8) => 'Pasqua',
      Date.civil(2007,4,9) => 'Lunedì dell\'Angelo',
@@ -63,4 +64,4 @@ tests: |
      Date.civil(2007,12,25) => 'Natale',
      Date.civil(2007,12,26) => 'Santo Stefano'}.each do |date, name|
       assert_equal name, (Holidays.on(date, :it, :informal)[0] || {})[:name]
-    end
+    end

data/definitions/jp.yaml

@@ -2,6 +2,10 @@
 # Reference:
 #   - http://www.h3.dion.ne.jp/~sakatsu/holiday_topic.htm
 #   - http://www8.cao.go.jp/chosei/shukujitsu/gaiyou.html
+#   - https://en.wikipedia.org/wiki/Public_holidays_in_Japan
+#
+# For Japanese/English translations of each holiday:
+#   - http://www.japanesecalendar.net/holidays/2016/
 #
 # This definition can calculate current Japanese holidays,
 # don't compat with past changes of Japan Holiday Act.
@@ -11,7 +15,13 @@
 #  2014-11-09: Added substitute holiday by Yoshiyuki Hirano <yoshiyuki.hirano@henteco-labs.com>
 #  2015-05-10: Non-Monday substitute holidays by Shuhei Kagawa <shuhei.kagawa@gmail.com>
 #  2015-12-15: Added mountain day by Tsuyoshi Sano <ttwo32@gmail.com>
+#  2016-03-26: Updated to match new custom method signature. See below for more. Phil Trimble <philtrimble@gmail.com>
 #
+# NOTE: This is the most complex set of custom date methods in the entire
+# project, mainly surrounding the idea of 'substitute' holidays. Since this is
+# the only one that is this complex I have settled on a less-than-ideal solution.
+# It is overly verbose and not easy to follow. It will be a target for refactoring
+# in the near future.
 ---
 months:
   1:
@@ -24,28 +34,31 @@ months:
     week: 2
   - name: 振替休日
     regions: [jp]
-    function: jp_substitute_holiday(year, 1, 1)
+    mday: 1
+    function: jp_substitute_holiday(year, month, day)
   2:
   - name: 建国記念日
     regions: [jp]
     mday: 11
   - name: 振替休日
     regions: [jp]
-    function: jp_substitute_holiday(year, 2, 11)
+    mday: 11
+    function: jp_substitute_holiday(year, month, day)
   3:
   - name: 春分の日
     regions: [jp]
     function: jp_vernal_equinox_day(year)
   - name: 振替休日
     regions: [jp]
-    function: jp_substitute_holiday(Holidays.jp_vernal_equinox_day(year))
+    function: jp_vernal_equinox_day_substitute(year)
   4:
   - name: 昭和の日
     regions: [jp]
     mday: 29
   - name: 振替休日
     regions: [jp]
-    function: jp_substitute_holiday(year, 4, 29)
+    mday: 29
+    function: jp_substitute_holiday(year, month, day)
   5:
   - name: 憲法記念日
     regions: [jp]
@@ -58,30 +71,33 @@ months:
     mday: 5
   - name: 振替休日
     regions: [jp]
-    function: jp_substitute_holiday(year, 5, 3)
+    mday: 3
+    function: jp_substitute_holiday(year, month, day)
   - name: 振替休日
     regions: [jp]
-    function: jp_substitute_holiday(year, 5, 4)
+    mday: 4
+    function: jp_substitute_holiday(year, month, day)
   - name: 振替休日
     regions: [jp]
-    function: jp_substitute_holiday(year, 5, 5)
+    mday: 5
+    function: jp_substitute_holiday(year, month, day)
   7:
   - name: 海の日
     regions: [jp]
     mday: 20
     year_ranges:
       - between: 1996..2002
-  - name: 振替休日
-    regions: [jp]
-    function: jp_substitute_holiday(year, 7, 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)
+    year_ranges:
+      - between: 1996..2002
   8:
   - name: 山の日
     regions: [jp]
@@ -92,7 +108,7 @@ months:
     regions: [jp]
     year_ranges:
       - after: 2016
-    function: jp_substitute_holiday(Holidays.jp_mountain_holiday(year))
+    function: jp_mountain_holiday_substitute(year)
   9:
   - name: 敬老の日
     regions: [jp]
@@ -100,16 +116,16 @@ months:
     week: 3
   - name: 振替休日
     regions: [jp]
-    function: jp_substitute_holiday(year, 9, Holidays.calculate_day_of_month(year, 9, 3, 1))
+    function: jp_respect_for_aged_holiday_substitute(year)
   - name: 国民の休日
     regions: [jp]
-    function: jp_citizons_holiday(year)
+    function: jp_citizens_holiday(year)
   - name: 秋分の日
     regions: [jp]
     function: jp_national_culture_day(year)
   - name: 振替休日
     regions: [jp]
-    function: jp_substitute_holiday(Holidays.jp_national_culture_day(year))
+    function: jp_national_culture_day_substitute(year)
   10:
   - name: 体育の日
     regions: [jp]
@@ -117,30 +133,39 @@ months:
     week: 2
   - name: 振替休日
     regions: [jp]
-    function: jp_substitute_holiday(year, 10, Holidays.calculate_day_of_month(year, 10, 2, 1))
+    function: jp_health_sports_day_substitute(year)
   11:
   - name: 文化の日
     regions: [jp]
     mday: 3
   - name: 振替休日
     regions: [jp]
-    function: jp_substitute_holiday(year, 11, 3)
+    mday: 3
+    function: jp_substitute_holiday(year, month, day)
   - name: 勤労感謝の日
     regions: [jp]
     mday: 23
   - name: 振替休日
     regions: [jp]
-    function: jp_substitute_holiday(year, 11, 23)
+    mday: 23
+    function: jp_substitute_holiday(year, month, day)
   12:
   - name: 天皇誕生日
     regions: [jp]
     mday: 23
   - name: 振替休日
     regions: [jp]
-    function: jp_substitute_holiday(year, 12, 23)
+    mday: 23
+    function: jp_substitute_holiday(year, month, day)
+
 methods:
-  jp_vernal_equinox_day: |
-    def self.jp_vernal_equinox_day(year)
+  jp_health_sports_day_substitute:
+    arguments: year
+    source: |
+      Holidays::DefinitionFactory.custom_methods_repository.find("jp_substitute_holiday(year, month, day)").call(year, 10, Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 10, 2, 1))
+  jp_vernal_equinox_day:
+    arguments: year
+    source: |
       day =
         case year
         when 1851..1899
@@ -157,9 +182,18 @@ methods:
       day += 0.242194 * (year - 1980) - ((year - 1980)/4).floor
       day = day.floor
       Date.civil(year, 3, day)
-    end
-  jp_national_culture_day: |
-    def self.jp_national_culture_day(year)
+  jp_vernal_equinox_day_substitute:
+    arguments: year
+    source: |
+      date = Holidays::DefinitionFactory.custom_methods_repository.find("jp_vernal_equinox_day(year)").call(year)
+      Holidays::DefinitionFactory.custom_methods_repository.find("jp_substitute_holiday(year, month, day)").call(year, date.month, date.mday)
+  jp_marine_day_substitute:
+    arguments: year
+    source: |
+      Holidays::DefinitionFactory.custom_methods_repository.find("jp_substitute_holiday(year, month, day)").call(year, 7, Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 7, 3, 1))
+  jp_national_culture_day:
+    arguments: year
+    source: |
       day =
         case year
         when 1851..1899
@@ -176,34 +210,48 @@ methods:
       day += 0.242194 * (year - 1980) - ((year - 1980)/4).floor
       day = day.floor
       Date.civil(year, 9, day)
-    end
-  jp_citizons_holiday: |
-    def self.jp_citizons_holiday(year)
+  jp_national_culture_day_substitute:
+    arguments: year
+    source: |
+      date = Holidays::DefinitionFactory.custom_methods_repository.find("jp_national_culture_day(year)").call(year)
+      Holidays::DefinitionFactory.custom_methods_repository.find("jp_substitute_holiday(year, month, day)").call(year, date.month, date.mday)
+  jp_citizens_holiday:
+    arguments: year
+    source: |
       year < 2003 and return nil
-      ncd = Holidays.jp_national_culture_day(year)
+      ncd = Holidays::DefinitionFactory.custom_methods_repository.find("jp_national_culture_day(year)").call(year)
       if ncd.wday == 3
         ncd - 1
       else
         nil
       end
-    end
-  jp_mountain_holiday: |
-    def self.jp_mountain_holiday(year)
+  jp_mountain_holiday:
+    arguments: year
+    source: |
+      return nil if year < 2016
       Date.civil(year, 8, 11)
-    end
-  jp_substitute_holiday: |
-    def self.jp_substitute_holiday(*date)
-      return nil unless date[0]
-      date = date[0].kind_of?(Date) ? date.first : Date.civil(*date)
-      date.wday == 0 ? Holidays.jp_next_weekday(date+1) : nil
-    end
-  jp_next_weekday(date): |
-    def self.jp_next_weekday(date)
+  jp_mountain_holiday_substitute:
+    arguments: year
+    source: |
+      date = Holidays::DefinitionFactory.custom_methods_repository.find("jp_mountain_holiday(year)").call(year)
+      Holidays::DefinitionFactory.custom_methods_repository.find("jp_substitute_holiday(year, month, day)").call(year, date.month, date.mday)
+  jp_respect_for_aged_holiday_substitute:
+    arguments: year
+    source: |
+      Holidays::DefinitionFactory.custom_methods_repository.find("jp_substitute_holiday(year, month, day)").call(year, 9, Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 9, 3, 1))
+  jp_substitute_holiday:
+    arguments: year, month, day
+    source: |
+      date = Date.civil(year, month, day)
+      date.wday == 0 ? (Holidays::DefinitionFactory.custom_methods_repository.find("jp_next_weekday(date)").call(date+1)) : nil
+  jp_next_weekday:
+    arguments: date
+    source: |
       is_holiday = Holidays::JP.holidays_by_month[date.month].any? do |holiday|
         holiday[:mday] == date.day
       end
-      date.wday == 0 || is_holiday ? Holidays.jp_next_weekday(date+1) : date
-    end
+      date.wday == 0 || is_holiday ? (Holidays::DefinitionFactory.custom_methods_repository.find("jp_next_weekday(date)").call(date+1)) : date
+
 tests: |
   {Date.civil(2008,1,1) => '元日',
    Date.civil(2010,1,11) => '成人の日',
@@ -265,4 +313,4 @@ tests: |
   end
 
   # before 2016, there is no mountain holiday.
-  assert_nil Date.civil(2015,8,11).holidays(:jp)[0]
+  assert_nil Holidays.on(Date.civil(2015,8,11), :jp)[0]