holidays 1.0.5 → 1.0.6

data/data/fi.yaml

@@ -38,6 +38,9 @@ months:
     regions: [fi]
     mday: 1
   6:
+  - name: Juhannusaatto
+    regions: [fi]
+    function: fi_juhannusaatto(year)
   - name: Juhannuspäivä
     regions: [fi]
     function: fi_juhannuspaiva(year)
@@ -56,6 +59,17 @@ months:
     regions: [fi]
     mday: 26
 methods:
+  fi_juhannusaatto: |
+    # Finland: Mid-summer eve (Friday between June 19–25)
+    def self.fi_juhannusaatto(year)
+      date = Date.civil(year,6,19)
+      if date.wday > 5 #if 19.6 is saturday
+        date += 6
+      else 
+        date += (5 - date.wday)
+      end
+      date
+    end
   fi_juhannuspaiva: |
     # Finland: Mid-summer (Saturday between June 20–26)
     def self.fi_juhannuspaiva(year)
@@ -79,6 +93,11 @@ tests: |
      Date.civil(2008,5,1) => 'Vappu',
      Date.civil(2008,5,1) => 'Helatorstai',
      Date.civil(2008,5,11) => 'Helluntaipäivä',
+     Date.civil(2009,6,19) => 'Juhannusaatto',
+     Date.civil(2010,6,25) => 'Juhannusaatto',
+     Date.civil(2011,6,24) => 'Juhannusaatto',
+     Date.civil(2012,6,22) => 'Juhannusaatto',
+     Date.civil(2013,6,21) => 'Juhannusaatto',
      Date.civil(2005,6,25) => 'Juhannuspäivä',
      Date.civil(2006,6,24) => 'Juhannuspäivä',
      Date.civil(2007,6,23) => 'Juhannuspäivä',

data/data/fr.yaml

@@ -1,9 +1,9 @@
 # French holiday definitions for the Ruby Holiday gem.
 #
-# Updated: 2008-11-2*.
+# Updated: 2013-10-2*.
 # Sources:
-# - http://en.wikipedia.org/wiki/Holidays_in_France
-# - http://riviera.angloinfo.com/information/1/pub_hols.asp
+# - http://fr.wikipedia.org/wiki/Jours_f%C3%A9ri%C3%A9s_en_France#Les_f.C3.AAtes_f.C3.A9ri.C3.A9es
+# - http://vosdroits.service-public.fr/particuliers/F2405.xhtml
 --- 
 months:
   0: 
@@ -49,7 +49,7 @@ months:
     regions: [fr]
     mday: 11
   12:
-  - name: Nöel
+  - name: Noël
     regions: [fr]
     mday: 25
 tests: |
@@ -65,6 +65,6 @@ tests: |
      Date.civil(2007,8,15) => 'Assomption',
      Date.civil(2007,11,1) => 'Toussaint',
      Date.civil(2007,11,11) => 'Armistice 1918',
-     Date.civil(2007,12,25) => 'Nöel'}.each do |date, name|
+     Date.civil(2007,12,25) => 'Noël'}.each do |date, name|
       assert_equal name, (Holidays.on(date, :fr, :informal)[0] || {})[:name]
     end

data/data/gb.yaml

@@ -4,15 +4,15 @@
 # and Jersey.
 #
 # Updated: 2008-11-28.
-# Sources: 
+# Sources:
 # - http://en.wikipedia.org/wiki/List_of_holidays_by_country#United_Kingdom_and_Crown_dependencies
 #
-# Notes: 
+# Notes:
 # - Jersey, Guernsey and the Isle of Man are encode with both their ISO 3166-1 and ISO 3-3166-2 codes.
 # - England and Wales together should be encoded as [gb_eng, gb_wls, gb_eaw...]
---- 
+---
 months:
-  0: 
+  0:
   - name: Good Friday
     regions: [gb]
     function: easter(year)-2
@@ -22,21 +22,22 @@ months:
   - name: Easter Monday
     regions: [gb_eng, gb_wls, gb_eaw, gb_nir]
     function: easter(year)+1
-  1: 
+  1:
   - name: New Year's Day
     regions: [gb]
     mday: 1
+    observed: to_monday_if_weekend
   - name: New Year's
     regions: [gb_sct]
     mday: 2
-  3: 
+  3:
   - name: St. Piran's Day
     regions: [gb_con]
     mday: 5
   - name: St. Patrick's Day
     regions: [gb_nir]
     mday: 17
-  5: 
+  5:
   - name: May Day
     regions: [gb]
     week: 1
@@ -48,14 +49,14 @@ months:
     regions: [gb]
     week: -1
     wday: 1
-  7: 
+  7:
   - name: Tynwald Day
     regions: [im, gb_iom]
     mday: 5
   - name: Battle of the Boyne
     regions: [gb_nir]
     mday: 12
-  8: 
+  8:
   - name: Bank Holiday
     regions: [gb_sct]
     week: 1
@@ -64,12 +65,12 @@ months:
     regions: [gb_eng, gb_wls, gb_eaw, gb_nir]
     week: -1
     wday: 1
-  11: 
+  11:
   - name: Guy Fawkes Day
     regions: [gb]
     mday: 5
     type: informal
-  12: 
+  12:
   - name: Christmas Day
     regions: [gb]
     mday: 25
@@ -79,8 +80,7 @@ months:
     mday: 26
     observed: to_weekday_if_boxing_weekend
 tests: |
-    {Date.civil(2008,1,1) => 'New Year\'s Day', 
-     Date.civil(2008,3,21) => 'Good Friday',
+    {Date.civil(2008,3,21) => 'Good Friday',
      Date.civil(2008,3,23) => 'Easter Sunday',
      Date.civil(2008,5,5) => 'May Day',
      Date.civil(2008,5,26) => 'Bank Holiday',
@@ -99,8 +99,13 @@ tests: |
     assert_equal 'Boxing Day', Date.civil(2008,12,26).holidays(:gb_, :observed)[0][:name]
     assert_equal 'Boxing Day', Date.civil(2009,12,28).holidays(:gb_, :observed)[0][:name]
     assert_equal 'Boxing Day', Date.civil(2010,12,28).holidays(:gb_, :observed)[0][:name]
+    assert_equal 'Boxing Day', Date.civil(2011,12,27).holidays(:gb_, :observed)[0][:name]
+
+    assert_equal 'New Year\'s Day', Date.civil(2010,1,1).holidays(:gb, :observed)[0][:name]
+    assert_equal 'New Year\'s Day', Date.civil(2011,1,3).holidays(:gb, :observed)[0][:name]
+    assert_equal 'New Year\'s Day', Date.civil(2012,1,2).holidays(:gb, :observed)[0][:name]
 
     [:gb_wls, :gb_eng, :gb_nir, :gb_eaw, :gb_].each do |r|
       assert_equal 'Easter Monday', Date.civil(2008,3,24).holidays(r)[0][:name]
       assert_equal 'Bank Holiday', Date.civil(2008,8,25).holidays(r)[0][:name]
-    end
+    end

data/data/hr.yaml

@@ -0,0 +1,77 @@
+# Croatian holiday definitions for the Ruby Holiday gem.
+#
+# Updated: 2012-08-29.
+# Sources:
+#  http://en.wikipedia.org/wiki/Public_holidays_in_Croatia
+--- 
+months:
+  0:
+  - name: Uskrs
+    regions: [hr]
+    function: easter(year)
+  - name: Uskrsni ponedjeljak
+    regions: [hr]
+    function: easter(year)+1
+  - name: Tijelovo
+    regions: [hr]
+    function: easter(year)+60
+  1:
+  - name: Nova godina
+    regions: [hr]
+    mday: 1
+  - name: Sveta tri kralja
+    regions: [hr]
+    mday: 6
+  5:
+  - name: Međunarodni praznik rada
+    regions: [hr]
+    mday: 1
+  6:
+  - name: Dan antifašističke borbe
+    regions: [hr]
+    mday: 22
+  - name: Dan državnosti
+    regions: [hr]
+    mday: 25
+  8:
+  - name: Dan pobjede i domovinske zahvalnosti i dan hrvatskih branitelja
+    regions: [hr]
+    mday: 5
+  - name: Velika Gospa
+    regions: [hr]
+    mday: 15
+  10:
+  - name: Dan neovisnosti
+    regions: [hr]
+    mday: 8
+  11:
+  - name: Dan svih svetih
+    regions: [hr]
+    mday: 1
+  12:
+  - name: Božić
+    regions: [hr]
+    mday: 25
+  - name: Sveti Stjepan
+    regions: [hr]
+    mday: 26
+tests: |
+  {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',
+   Date.civil(2012,8,5) => 'Dan pobjede i domovinske zahvalnosti i dan hrvatskih branitelja',
+   Date.civil(2012,8,15) => 'Velika Gospa',
+   Date.civil(2012,10,8) => 'Dan neovisnosti',
+   Date.civil(2012,11,1) => 'Dan svih svetih',
+   Date.civil(2012,12,25) => 'Božić',
+   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|
+    assert_equal 'Tijelovo', Holidays.on(date, :hr)[0][:name]
+  end

data/data/ie.yaml

@@ -1,9 +1,10 @@
 # Ireland holiday definitions for the Ruby Holiday gem.
 #
-# Updated: 2008-11-28.
+# Updated: 2012-03-16.
 # Sources:
 # - 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: 
@@ -14,27 +15,29 @@ months:
   - name: New Year's Day
     regions: [ie]
     mday: 1
+    observed: to_monday_if_weekend
   3: 
   - name: St. Patrick's Day
     regions: [ie]
     mday: 17
+    observed: to_monday_if_weekend
   5: 
   - name: May Day
     regions: [ie]
     week: 1
     wday: 1
   6:
-  - name: Bank Holiday
+  - name: June Bank Holiday
     regions: [ie]
     week: 1
     wday: 1
   8: 
-  - name: Bank Holiday
+  - name: August Bank Holiday
     regions: [ie]
     week: 1
     wday: 1
   10: 
-  - name: Bank Holiday
+  - name: October Bank Holiday
     regions: [ie]
     week: -1
     wday: 1
@@ -42,17 +45,42 @@ months:
   - name: Christmas Day
     regions: [ie]
     mday: 25
+    observed: to_monday_if_weekend
   - name: St. Stephen's Day
     regions: [ie]
     mday: 26
+    observed: ie_st_stephens_day
+methods:
+  ie_st_stephens_day: |
+    # Ireland - Stephens Day is always the day after christmas day
+    def self.ie_st_stephens_day(date)
+      date += 2 if date.wday == 6
+      date += 2 if date.wday == 0
+      date += 1 if date.wday == 1
+      date
+    end
 tests: |
     {Date.civil(2008,1,1) => 'New Year\'s Day', 
      Date.civil(2008,3,17) => 'St. Patrick\'s Day',
      Date.civil(2008,3,24) => 'Easter Monday',
      Date.civil(2008,5,5) => 'May Day',
-     Date.civil(2008,6,2) => 'Bank Holiday',
-     Date.civil(2008,8,4) => 'Bank Holiday',
+     Date.civil(2008,6,2) => 'June Bank Holiday',
+     Date.civil(2008,8,4) => 'August Bank Holiday',
+     Date.civil(2008,10,27) => 'October Bank Holiday',
      Date.civil(2008,12,25) => 'Christmas Day',
      Date.civil(2008,12,26) => 'St. Stephen\'s Day'}.each do |date, name|
-      assert_equal name, (Holidays.on(date, :ie, :informal)[0] || {})[:name]
-    end
+      assert_equal name, (Holidays.on(date, :ie)[0] || {})[:name]
+    end
+    {Date.civil(2012,1,2) => 'New Year\'s Day', 
+     Date.civil(2012,3,19) => 'St. Patrick\'s Day',
+     Date.civil(2012,4,9) => 'Easter Monday',
+     Date.civil(2012,5,7) => 'May Day',
+     Date.civil(2012,6,4) => 'June Bank Holiday',
+     Date.civil(2012,8,6) => 'August Bank Holiday',
+     Date.civil(2012,10,29) => 'October Bank Holiday',
+     Date.civil(2011,12,26) => 'Christmas Day',
+     Date.civil(2011,12,27) => 'St. Stephen\'s Day',
+     Date.civil(2012,12,25) => 'Christmas Day',
+     Date.civil(2012,12,26) => 'St. Stephen\'s Day'}.each do |date, name|
+      assert_equal name, (Holidays.on(date, :ie, :observed)[0] || {})[:name]
+    end

data/data/index.yaml

@@ -1,30 +1,38 @@
 # Definition build list
---- 
+---
 defs:
+  AR: ['ar.yaml']
   AT: ['at.yaml']
   AU: ['au.yaml']
+  BE: ['be.yaml']
   BR: ['br.yaml']
   CA: ['ca.yaml', 'north_america_informal.yaml']
+  CH: ['ch.yaml']
   CZ: ['cz.yaml']
   DK: ['dk.yaml']
   DE: ['de.yaml']
   EL: ['el.yaml']
   ES: ['es.yaml']
+  Federal_Reserve: ['federal_reserve.yaml']
   FI: ['fi.yaml']
   FR: ['fr.yaml']
   GB: ['gb.yaml']
+  HR: ['hr.yaml']
   HU: ['hu.yaml']
   IE: ['ie.yaml']
   IS: ['is.yaml']
   IT: ['it.yaml']
   LI: ['li.yaml']
+  MA: ['ma.yaml']
   MX: ['mx.yaml', 'north_america_informal.yaml']
+  NERC: ['nerc.yaml']
   NL: ['nl.yaml']
   "NO": ['no.yaml']
   NYSE: ['nyse.yaml']
   NZ: ['nz.yaml']
   PL: ['pl.yaml']
   PT: ['pt.yaml']
+  RO: ['ro.yaml']
   SE: ['se.yaml']
   US: ['us.yaml', 'north_america_informal.yaml']
   United_Nations: ['united_nations.yaml']
@@ -32,5 +40,7 @@ defs:
   ZA: ['za.yaml']
   North_America: ['ca.yaml', 'mx.yaml', 'us.yaml', 'north_america_informal.yaml']
   Scandinavia: ['dk.yaml', 'is.yaml', 'no.yaml', 'se.yaml', 'fi.yaml']
-  Europe: ['at.yaml', 'cz.yaml', 'dk.yaml', 'de.yaml', 'el.yaml', 'es.yaml', 'fr.yaml', 'gb.yaml', 'hu.yaml', 'ie.yaml', 'is.yaml', 'it.yaml', 'li.yaml', 'nl.yaml', 'no.yaml', 'pl.yaml', 'pt.yaml']
+  Europe: ['at.yaml', 'be.yaml', 'ch.yaml', 'cz.yaml', 'dk.yaml', 'de.yaml', 'el.yaml', 'es.yaml', 'fr.yaml', 'gb.yaml', 'hr.yaml', 'hu.yaml', 'ie.yaml', 'is.yaml', 'it.yaml', 'li.yaml', 'nl.yaml', 'no.yaml', 'pl.yaml', 'pt.yaml', 'ro.yaml', 'sk.yaml']
   JP: ['jp.yaml']
+  VE: ['ve.yaml']
+  SK: ['sk.yaml']

data/data/ma.yaml

@@ -0,0 +1,52 @@
+# Morocco holiday (incomplete)definitions for the Ruby Holiday gem.
+#
+# Updated: 2013-07-01.
+# Some dates in Islamic Calendar are missing.
+# Sources:
+# - http://en.wikipedia.org/wiki/Public_holidays_in_Morocco
+--- 
+months:
+  1: 
+  - name: Ras l' âm
+    regions: [ma]
+    mday: 1
+  - name: Takdim watikat al-istiqlal
+    regions: [ma]
+    mday: 11
+  5: 
+  - name: Eid Ash-Shughl
+    regions: [ma]
+    mday: 1
+  7:
+  - name: Eid Al-Ârch
+    regions: [ma]
+    mday: 30
+  8: 
+  - name: Zikra Oued Ed-Dahab
+    regions: [ma]
+    mday: 14
+  - name: Thawrat al malik wa shâab
+    regions: [ma]
+    mday: 20
+  - name: Eid Al Milad
+    regions: [ma]
+    mday: 21
+  11: 
+  - name: Eid Al Massira Al Khadra
+    regions: [ma]
+    mday: 6
+  - name: Eid Al Istiqulal
+    regions: [ma]
+    mday: 18
+tests: |
+    {Date.civil(2007,1,1) => 'Ras l\' âm', 
+     Date.civil(2007,1,11) => 'Takdim watikat al-istiqlal',
+     Date.civil(2007,5,1) => 'Eid Ash-Shughl',
+     Date.civil(2007,7,30) => 'Eid Al-Ârch',
+     Date.civil(2007,8,14) => 'Zikra Oued Ed-Dahab',
+     Date.civil(2007,8,20) => 'Thawrat al malik wa shâab',
+     Date.civil(2007,8,21) => 'Eid Al Milad',
+     Date.civil(2007,11,6) => 'Eid Al Massira Al Khadra',
+     Date.civil(2007,11,18) => 'Eid Al Istiqulal'}.each do |date, name|
+      assert_equal name, (Holidays.on(date, :ma, :informal)[0] || {})[:name]
+    end

data/data/nerc.yaml

@@ -0,0 +1,51 @@
+# NERC holiday definitions for the Ruby Holiday gem.
+#
+# By Adam Strickland
+# Source: www.nerc.com/docs/oc/rs/Additional_Off-peak_Days.doc
+#
+# Updated 2013-01-03.
+---
+months:
+  1:
+  - name: New Year's Day
+    regions: [nerc]
+    mday: 1
+    observed: to_monday_if_sunday
+  5:
+  - name: Memorial Day
+    week: -1
+    regions: [nerc]
+    wday: 1
+  7: 
+  - name: Independence Day
+    regions: [nerc]
+    mday: 4
+    observed: to_monday_if_sunday
+  9: 
+  - name: Labor Day
+    week: 1
+    regions: [nerc]
+    wday: 1
+  11:
+  - name: Thanksgiving
+    week: 4
+    regions: [nerc]
+    wday: 4
+  12: 
+  - name: Christmas Day
+    regions: [nerc]
+    mday: 25
+    observed: to_monday_if_sunday
+methods:
+tests: |
+    {Date.civil(2013,1,1) => 'New Year\'s Day',
+     Date.civil(2017,1,2) => 'New Year\'s Day',
+     Date.civil(2013,5,27) => 'Memorial Day',
+     Date.civil(2013,7,4) => 'Independence Day',
+     Date.civil(2010,7,5) => 'Independence Day',
+     Date.civil(2013,9,2) => 'Labor Day',
+     Date.civil(2013,11,28) => 'Thanksgiving',
+     Date.civil(2013,12,25) => 'Christmas Day',
+     Date.civil(2011,12,26) => 'Christmas Day'}.each do |date, name|
+      assert_equal name, (Holidays.on(date, :nerc, :observed)[0] || {})[:name]
+    end