holidays 4.2.0 → 8.4.1

data/test/defs/test_defs_nyse.rb

@@ -7,17 +7,33 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class NyseDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_nyse
-{Date.civil(2008,1,1) => 'New Year\'s Day',
- Date.civil(2008,1,21) => 'Martin Luther King, Jr. Day',
- Date.civil(2008,2,18) => 'Presidents\' Day',
- Date.civil(2008,3,21) => 'Good Friday',
- Date.civil(2008,5,26) => 'Memorial Day',
- Date.civil(2008,7,4) => 'Independence Day',
- Date.civil(2008,9,1) => 'Labor Day',
- Date.civil(2008,11,27) => 'Thanksgiving',
- Date.civil(2008,12,25) => 'Christmas Day'}.each do |date, name|
-  assert_equal name, (Holidays.on(date, :nyse)[0] || {})[:name]
-end
+    assert_equal "New Year's Day", (Holidays.on(Date.civil(2008, 1, 1), [:nyse])[0] || {})[:name]
+
+    assert_equal "New Year's Day", (Holidays.on(Date.civil(2017, 1, 2), [:nyse], [:observed])[0] || {})[:name]
+assert_equal "New Year's Day", (Holidays.on(Date.civil(2012, 1, 2), [:nyse], [:observed])[0] || {})[:name]
+assert_equal "New Year's Day", (Holidays.on(Date.civil(2011, 1, 1), [:nyse], [:observed])[0] || {})[:name]
+assert_equal "New Year's Day", (Holidays.on(Date.civil(2006, 1, 2), [:nyse], [:observed])[0] || {})[:name]
+
+    assert_equal "Martin Luther King, Jr. Day", (Holidays.on(Date.civil(2008, 1, 21), [:nyse])[0] || {})[:name]
+
+    assert_equal "Presidents' Day", (Holidays.on(Date.civil(2008, 2, 18), [:nyse])[0] || {})[:name]
+
+    assert_equal "Good Friday", (Holidays.on(Date.civil(2008, 3, 21), [:nyse])[0] || {})[:name]
+
+    assert_equal "Memorial Day", (Holidays.on(Date.civil(2008, 5, 26), [:nyse])[0] || {})[:name]
+
+    assert_equal "Independence Day", (Holidays.on(Date.civil(2008, 7, 4), [:nyse])[0] || {})[:name]
+
+    assert_equal "Labor Day", (Holidays.on(Date.civil(2008, 9, 1), [:nyse])[0] || {})[:name]
+
+    assert_equal "Thanksgiving", (Holidays.on(Date.civil(2008, 11, 27), [:nyse])[0] || {})[:name]
+
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2008, 12, 25), [:nyse])[0] || {})[:name]
+
+    assert_equal "New Year's Day", (Holidays.on(Date.civil(2017, 1, 2), [:nyse], [:observed])[0] || {})[:name]
+assert_equal "New Year's Day", (Holidays.on(Date.civil(2012, 1, 2), [:nyse], [:observed])[0] || {})[:name]
+assert_equal "New Year's Day", (Holidays.on(Date.civil(2011, 1, 1), [:nyse], [:observed])[0] || {})[:name]
+assert_equal "New Year's Day", (Holidays.on(Date.civil(2006, 1, 2), [:nyse], [:observed])[0] || {})[:name]
 
   end
 end

data/test/defs/test_defs_nz.rb

@@ -7,34 +7,53 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class NzDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_nz
-{Date.civil(2007,1,1) => 'New Year\'s Day',
- Date.civil(2007,1,2) => 'Day after New Year\'s Day',
- Date.civil(2007,2,6) => 'Waitangi Day',
- Date.civil(2007,4,6) => 'Good Friday',
- Date.civil(2007,4,9) => 'Easter Monday',
- Date.civil(2007,4,25) => 'ANZAC Day',
- Date.civil(2007,12,25) => 'Christmas Day',
- Date.civil(2007,12,26) => 'Boxing Day'}.each do |date, name|
-  assert_equal name, (Holidays.on(date, :nz, :informal)[0] || {})[:name]
-end
-assert_equal 'ANZAC Day', Holidays.on(Date.civil(2015, 4, 25), :nz)[0][:name]
-assert_equal 'ANZAC Day', Holidays.on(Date.civil(2015, 4, 27), :nz, :observed)[0][:name]
-assert_equal 'ANZAC Day', Holidays.on(Date.civil(2016, 4, 25), :nz)[0][:name]
-assert_equal 'ANZAC Day', Holidays.on(Date.civil(2016, 4, 25), :nz, :observed)[0][:name]
-assert_equal 'Waitangi Day', Holidays.on(Date.civil(2015, 2, 6), :nz)[0][:name]
-assert_equal 'Waitangi Day', Holidays.on(Date.civil(2015, 2, 6), :nz, :observed)[0][:name]
-assert_equal 'Waitangi Day', Holidays.on(Date.civil(2016, 2, 6), :nz)[0][:name]
-assert_equal 'Waitangi Day', Holidays.on(Date.civil(2016, 2, 8), :nz, :observed)[0][:name]
-
-assert_equal 'Nelson Anniversary Day', Holidays.on(Date.civil(2016, 2, 1), :nz_ne, :observed)[0][:name]
-assert_equal 'Nelson Anniversary Day', Holidays.on(Date.civil(2017, 1, 30), :nz_ne, :observed)[0][:name]
-assert_equal 'Nelson Anniversary Day', Holidays.on(Date.civil(2018, 1, 29), :nz_ne, :observed)[0][:name]
-assert_equal 'Nelson Anniversary Day', Holidays.on(Date.civil(2019, 2, 4), :nz_ne, :observed)[0][:name]
-
-assert_equal 'Taranaki Anniversary Day', Holidays.on(Date.civil(2016, 3, 14), :nz_ta, :observed)[0][:name]
-assert_equal 'Taranaki Anniversary Day', Holidays.on(Date.civil(2017, 3, 13), :nz_ta, :observed)[0][:name]
-assert_equal 'Taranaki Anniversary Day', Holidays.on(Date.civil(2018, 3, 12), :nz_ta, :observed)[0][:name]
-assert_equal 'Taranaki Anniversary Day', Holidays.on(Date.civil(2019, 3, 11), :nz_ta, :observed)[0][:name]
+    assert_equal "New Year's Day", (Holidays.on(Date.civil(2007, 1, 1), [:nz], [:informal])[0] || {})[:name]
+
+    assert_equal "Day after New Year's Day", (Holidays.on(Date.civil(2007, 1, 2), [:nz], [:informal])[0] || {})[:name]
+
+    assert_equal "Waitangi Day", (Holidays.on(Date.civil(2007, 2, 6), [:nz], [:informal])[0] || {})[:name]
+
+    assert_equal "Good Friday", (Holidays.on(Date.civil(2007, 4, 6), [:nz], [:informal])[0] || {})[:name]
+
+    assert_equal "Easter Monday", (Holidays.on(Date.civil(2007, 4, 9), [:nz], [:informal])[0] || {})[:name]
+
+    assert_equal "ANZAC Day", (Holidays.on(Date.civil(2007, 4, 25), [:nz], [:informal])[0] || {})[:name]
+
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2007, 12, 25), [:nz], [:informal])[0] || {})[:name]
+
+    assert_equal "Boxing Day", (Holidays.on(Date.civil(2007, 12, 26), [:nz], [:informal])[0] || {})[:name]
+
+    assert_equal "ANZAC Day", (Holidays.on(Date.civil(2015, 4, 25), [:nz])[0] || {})[:name]
+
+    assert_equal "ANZAC Day", (Holidays.on(Date.civil(2015, 4, 27), [:nz], [:observed])[0] || {})[:name]
+
+    assert_equal "ANZAC Day", (Holidays.on(Date.civil(2016, 4, 25), [:nz])[0] || {})[:name]
+
+    assert_equal "ANZAC Day", (Holidays.on(Date.civil(2016, 4, 25), [:nz], [:observed])[0] || {})[:name]
+
+    assert_equal "Waitangi Day", (Holidays.on(Date.civil(2015, 2, 6), [:nz])[0] || {})[:name]
+
+    assert_equal "Waitangi Day", (Holidays.on(Date.civil(2015, 2, 6), [:nz], [:observed])[0] || {})[:name]
+
+    assert_equal "Waitangi Day", (Holidays.on(Date.civil(2016, 2, 6), [:nz])[0] || {})[:name]
+
+    assert_equal "Waitangi Day", (Holidays.on(Date.civil(2016, 2, 8), [:nz], [:observed])[0] || {})[:name]
+
+    assert_equal "Nelson Anniversary Day", (Holidays.on(Date.civil(2016, 2, 1), [:nz_ne], [:observed])[0] || {})[:name]
+
+    assert_equal "Nelson Anniversary Day", (Holidays.on(Date.civil(2017, 1, 30), [:nz_ne], [:observed])[0] || {})[:name]
+
+    assert_equal "Nelson Anniversary Day", (Holidays.on(Date.civil(2018, 1, 29), [:nz_ne], [:observed])[0] || {})[:name]
+
+    assert_equal "Nelson Anniversary Day", (Holidays.on(Date.civil(2019, 2, 4), [:nz_ne], [:observed])[0] || {})[:name]
+
+    assert_equal "Taranaki Anniversary Day", (Holidays.on(Date.civil(2016, 3, 14), [:nz_ta], [:observed])[0] || {})[:name]
+
+    assert_equal "Taranaki Anniversary Day", (Holidays.on(Date.civil(2017, 3, 13), [:nz_ta], [:observed])[0] || {})[:name]
+
+    assert_equal "Taranaki Anniversary Day", (Holidays.on(Date.civil(2018, 3, 12), [:nz_ta], [:observed])[0] || {})[:name]
+
+    assert_equal "Taranaki Anniversary Day", (Holidays.on(Date.civil(2019, 3, 11), [:nz_ta], [:observed])[0] || {})[:name]
 
   end
 end

data/test/defs/test_defs_pe.rb

@@ -0,0 +1,47 @@
+# encoding: utf-8
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
+
+# This file is generated by the Ruby Holiday gem.
+#
+# Definitions loaded: definitions/pe.yaml
+class PeDefinitionTests < Test::Unit::TestCase  # :nodoc:
+
+  def test_pe
+    assert_equal "Año Nuevo", (Holidays.on(Date.civil(2016, 1, 1), [:pe], [:informal])[0] || {})[:name]
+
+    assert_equal "Día de los Reyes Magos", (Holidays.on(Date.civil(2016, 1, 6), [:pe], [:informal])[0] || {})[:name]
+
+    assert_equal "Jueves Santo", (Holidays.on(Date.civil(2016, 3, 24), [:pe], [:informal])[0] || {})[:name]
+
+    assert_equal "Viernes Santo", (Holidays.on(Date.civil(2016, 3, 25), [:pe], [:informal])[0] || {})[:name]
+
+    assert_equal "Pascua", (Holidays.on(Date.civil(2016, 3, 27), [:pe], [:informal])[0] || {})[:name]
+
+    assert_equal "Día del Trabajador", (Holidays.on(Date.civil(2016, 5, 1), [:pe], [:informal])[0] || {})[:name]
+
+    assert_equal "Día de la Madre", (Holidays.on(Date.civil(2016, 5, 8), [:pe], [:informal])[0] || {})[:name]
+
+    assert_equal "Día de la Bandera", (Holidays.on(Date.civil(2016, 6, 7), [:pe], [:informal])[0] || {})[:name]
+
+    assert_equal "Día del Padre", (Holidays.on(Date.civil(2016, 6, 19), [:pe], [:informal])[0] || {})[:name]
+
+    assert_equal "San Pablo y San Pedro", (Holidays.on(Date.civil(2016, 6, 29), [:pe], [:informal])[0] || {})[:name]
+
+    assert_equal "Primer Día de la Independencia", (Holidays.on(Date.civil(2016, 7, 28), [:pe], [:informal])[0] || {})[:name]
+
+    assert_equal "Segundo Día de la Independencia", (Holidays.on(Date.civil(2016, 7, 29), [:pe], [:informal])[0] || {})[:name]
+
+    assert_equal "Santa Rosa de Lima", (Holidays.on(Date.civil(2016, 8, 30), [:pe], [:informal])[0] || {})[:name]
+
+    assert_equal "Día de las Fuerzas Armadas", (Holidays.on(Date.civil(2016, 9, 24), [:pe], [:informal])[0] || {})[:name]
+
+    assert_equal "Batalla de Angamos", (Holidays.on(Date.civil(2016, 10, 8), [:pe], [:informal])[0] || {})[:name]
+
+    assert_equal "Todos los Santos", (Holidays.on(Date.civil(2016, 11, 1), [:pe], [:informal])[0] || {})[:name]
+
+    assert_equal "Inmaculada Concepción", (Holidays.on(Date.civil(2016, 12, 8), [:pe], [:informal])[0] || {})[:name]
+
+    assert_equal "Navidad del Señor", (Holidays.on(Date.civil(2016, 12, 25), [:pe], [:informal])[0] || {})[:name]
+
+  end
+end

data/test/defs/test_defs_ph.rb

@@ -7,19 +7,23 @@ 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,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|
-  assert_equal name, (Holidays.on(date, :ph)[0] || {})[:name]
-end
+    assert_equal "Good Friday", (Holidays.on(Date.civil(2015, 4, 3), [:ph])[0] || {})[:name]
+
+    assert_equal "The Day of Valor", (Holidays.on(Date.civil(2015, 4, 9), [:ph])[0] || {})[:name]
+
+    assert_equal "Labor Day", (Holidays.on(Date.civil(2015, 5, 1), [:ph])[0] || {})[:name]
+
+    assert_equal "Independence Day", (Holidays.on(Date.civil(2015, 6, 12), [:ph])[0] || {})[:name]
+
+    assert_equal "Ninoy Aquino Day", (Holidays.on(Date.civil(2015, 8, 21), [:ph])[0] || {})[:name]
+
+    assert_equal "National Heroes Day", (Holidays.on(Date.civil(2015, 8, 31), [:ph])[0] || {})[:name]
+
+    assert_equal "Bonifacio Day", (Holidays.on(Date.civil(2015, 11, 30), [:ph])[0] || {})[:name]
+
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2015, 12, 25), [:ph])[0] || {})[:name]
+
+    assert_equal "Rizal Day", (Holidays.on(Date.civil(2015, 12, 30), [:ph])[0] || {})[:name]
 
   end
 end

data/test/defs/test_defs_pl.rb

@@ -7,140 +7,221 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class PlDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_pl
-{Date.civil(2011,1,1) => 'Nowy Rok',
-Date.civil(2011,5,1) => 'Święto Państwowe (Święto Pracy)',
-Date.civil(2011,5,3) => 'Święto Narodowe Trzeciego Maja',
-Date.civil(2011,11,1) => 'Wszystkich Świętych',
-Date.civil(2011,11,11) => 'Narodowe Święto Niepodległości',
-Date.civil(2011,12,25) => 'pierwszy dzień Bożego Narodzenia',
-Date.civil(2011,12,26) => 'drugi dzień Bożego Narodzenia'}.each do |date, name|
-  assert_equal name, (Holidays.on(date, :pl)[0] || {})[:name]
-end
+    assert_equal "Nowy Rok", (Holidays.on(Date.civil(2011, 1, 1), [:pl])[0] || {})[:name]
 
-# informal
-{Date.civil(2011,1,21) => 'Dzień Babci',
-Date.civil(2011,1,22) => 'Dzień Dziadka',
-Date.civil(2011,2,2) => 'Ofiarowanie Pańskie (Matki Boskiej Gromnicznej)',
-Date.civil(2011,2,14) => 'Dzień Zakochanych (Walentynki)',
-Date.civil(2010,3,8) => 'Dzień Kobiet',
-Date.civil(2011,3,10) => 'Dzień Mężczyzn',
-Date.civil(2011,4,1) => 'Prima Aprilis',
-Date.civil(2010,4,22) => 'Międzynarodowy Dzień Ziemi',
-Date.civil(2011,5,2) => 'Dzień Flagi Rzeczpospolitej Polskiej',
-Date.civil(2010,6,23) => 'Dzień Ojca',
-Date.civil(2011,9,30) => 'Dzień Chłopaka',
-Date.civil(2011,10,14) => 'Dzień Nauczyciela (Dzień Edukacji Narodowej)',
-Date.civil(2011,11,2) => 'Dzień Zaduszny',
-Date.civil(2011,11,29) => 'Andrzejki',
-Date.civil(2011,12,4) => 'Barbórka (Dzień Górnika, Naftowca i Gazownika)',
-Date.civil(2011,12,6) => 'Mikołajki',
-Date.civil(2011,12,24) => 'Wigilia Bożego Narodzenia',
-Date.civil(2011,12,31) => 'Sylwester'}.each do |date, name|
-  assert_equal name, (Holidays.on(date, :pl, :informal)[0] || {})[:name]
-end
+    assert_equal "Święto Państwowe (Święto Pracy)", (Holidays.on(Date.civil(2011, 5, 1), [:pl])[0] || {})[:name]
 
-# informal
-{Date.civil(2011,1,21) => 'Dzień Babci',
-Date.civil(2011,1,22) => 'Dzień Dziadka',
-Date.civil(2011,2,2) => 'Ofiarowanie Pańskie (Matki Boskiej Gromnicznej)',
-Date.civil(2011,2,14) => 'Dzień Zakochanych (Walentynki)',
-Date.civil(2010,3,8) => 'Dzień Kobiet',
-Date.civil(2011,3,10) => 'Dzień Mężczyzn',
-Date.civil(2011,4,1) => 'Prima Aprilis',
-Date.civil(2010,4,22) => 'Międzynarodowy Dzień Ziemi',
-Date.civil(2011,5,2) => 'Dzień Flagi Rzeczpospolitej Polskiej',
-Date.civil(2010,6,23) => 'Dzień Ojca',
-Date.civil(2011,9,30) => 'Dzień Chłopaka',
-Date.civil(2011,10,14) => 'Dzień Nauczyciela (Dzień Edukacji Narodowej)',
-Date.civil(2011,11,2) => 'Dzień Zaduszny',
-Date.civil(2011,11,29) => 'Andrzejki',
-Date.civil(2011,12,4) => 'Barbórka (Dzień Górnika, Naftowca i Gazownika)',
-Date.civil(2011,12,6) => 'Mikołajki',
-Date.civil(2011,12,24) => 'Wigilia Bożego Narodzenia',
-Date.civil(2011,12,31) => 'Sylwester'}.each do |date, name|
-  assert_equal nil, (Holidays.on(date, :pl)[0] || {})[:name]
-end
+    assert_equal "Święto Narodowe Trzeciego Maja", (Holidays.on(Date.civil(2011, 5, 3), [:pl])[0] || {})[:name]
 
-# Objawienie Pańskie (święto Trzech Króli) -- formal since 2011
-[Date.civil(2008,1,6), Date.civil(2009,1,6), Date.civil(2010,1,6)].each do |date|
-  assert_equal nil, (Holidays.on(date, :pl)[0] || {})[:name]
-end
-[Date.civil(2008,1,6), Date.civil(2009,1,6), Date.civil(2010,1,6)].each do |date|
-  assert_equal 'Objawienie Pańskie (święto Trzech Króli)', (Holidays.on(date, :pl, :informal)[0] || {})[:name]
-end
-[Date.civil(2011,1,6), Date.civil(2012,1,6), Date.civil(2013,1,6)].each do |date|
-  assert_equal 'Objawienie Pańskie (święto Trzech Króli)', (Holidays.on(date, :pl)[0] || {})[:name]
-end
+    assert_equal "Wszystkich Świętych", (Holidays.on(Date.civil(2011, 11, 1), [:pl])[0] || {})[:name]
 
-# Tłusty Czwartek
-[Date.civil(2008,1,31), Date.civil(2009,2,19), Date.civil(2010,2,11),
- Date.civil(2011,3,3), Date.civil(2012,2,16)].each do |date|
-  assert_equal 'Tłusty Czwartek', (Holidays.on(date, :pl, :informal)[0] || {})[:name]
-end
+    assert_equal "Narodowe Święto Niepodległości", (Holidays.on(Date.civil(2011, 11, 11), [:pl])[0] || {})[:name]
 
-# Ostatki
-[Date.civil(2008,2,5), Date.civil(2009,2,24), Date.civil(2010,2,16),
- Date.civil(2011,3,8), Date.civil(2012,2,21)].each do |date|
-  assert_equal 'Ostatki', (Holidays.on(date, :pl, :informal)[0] || {})[:name]
-end
+    assert_equal "pierwszy dzień Bożego Narodzenia", (Holidays.on(Date.civil(2011, 12, 25), [:pl])[0] || {})[:name]
 
-# Środa Popielcowa
-[Date.civil(2008,2,6), Date.civil(2009,2,25), Date.civil(2010,2,17),
- Date.civil(2011,3,9), Date.civil(2012,2,22)].each do |date|
-  assert_equal 'Środa Popielcowa', (Holidays.on(date, :pl, :informal)[0] || {})[:name]
-end
+    assert_equal "drugi dzień Bożego Narodzenia", (Holidays.on(Date.civil(2011, 12, 26), [:pl])[0] || {})[:name]
 
-# Niedziela Palmowa
-[Date.civil(2008,3,16), Date.civil(2009,4,5), Date.civil(2010,3,28),
- Date.civil(2011,4,17), Date.civil(2012,4,1)].each do |date|
-  assert_equal 'Niedziela Palmowa', (Holidays.on(date, :pl, :informal)[0] || {})[:name]
-end
+    assert_equal "Dzień Babci", (Holidays.on(Date.civil(2011, 1, 21), [:pl], [:informal])[0] || {})[:name]
 
-# Wielki Czwartek
-[Date.civil(2008,3,20), Date.civil(2009,4,9), Date.civil(2010,4,1),
- Date.civil(2011,4,21), Date.civil(2012,4,5)].each do |date|
-  assert_equal 'Wielki Czwartek', (Holidays.on(date, :pl, :informal)[0] || {})[:name]
-end
+    assert_equal "Dzień Dziadka", (Holidays.on(Date.civil(2011, 1, 22), [:pl], [:informal])[0] || {})[:name]
 
-# Wielki Piątek
-[Date.civil(2008,3,21), Date.civil(2009,4,10), Date.civil(2010,4,2),
- Date.civil(2011,4,22), Date.civil(2012,4,6)].each do |date|
-  assert_equal 'Wielki Piątek', (Holidays.on(date, :pl, :informal)[0] || {})[:name]
-end
+    assert_equal "Ofiarowanie Pańskie (Matki Boskiej Gromnicznej)", (Holidays.on(Date.civil(2011, 2, 2), [:pl], [:informal])[0] || {})[:name]
 
-# Wielka Sobota
-[Date.civil(2008,3,22), Date.civil(2009,4,11), Date.civil(2010,4,3),
- Date.civil(2011,4,23), Date.civil(2012,4,7)].each do |date|
-  assert_equal 'Wielka Sobota', (Holidays.on(date, :pl, :informal)[0] || {})[:name]
-end
+    assert_equal "Dzień Zakochanych (Walentynki)", (Holidays.on(Date.civil(2011, 2, 14), [:pl], [:informal])[0] || {})[:name]
 
-# Niedziela Wielkanocna
-[Date.civil(2008,3,23), Date.civil(2009,4,12), Date.civil(2010,4,4),
- Date.civil(2011,4,24), Date.civil(2012,4,8)].each do |date|
-  assert_equal 'Niedziela Wielkanocna', (Holidays.on(date, :pl)[0] || {})[:name]
-end
+    assert_equal "Dzień Kobiet", (Holidays.on(Date.civil(2010, 3, 8), [:pl], [:informal])[0] || {})[:name]
 
-# Poniedziałek Wielkanocny (Lany Poniedziałek)
-[Date.civil(2008,3,24), Date.civil(2009,4,13), Date.civil(2010,4,5),
- Date.civil(2011,4,25), Date.civil(2012,4,9)].each do |date|
-  assert_equal 'Poniedziałek Wielkanocny (Lany Poniedziałek)', (Holidays.on(date, :pl)[0] || {})[:name]
-end
+    assert_equal "Dzień Mężczyzn", (Holidays.on(Date.civil(2011, 3, 10), [:pl], [:informal])[0] || {})[:name]
 
-# Zesłanie Ducha Świętego (Zielone Świątki)
-[Date.civil(2008,5,11), Date.civil(2009,5,31), Date.civil(2010,5,23),
- Date.civil(2011,6,12), Date.civil(2012,5,27)].each do |date|
-  assert_equal 'Zesłanie Ducha Świętego (Zielone Świątki)', (Holidays.on(date, :pl)[0] || {})[:name]
-end
+    assert_equal "Prima Aprilis", (Holidays.on(Date.civil(2011, 4, 1), [:pl], [:informal])[0] || {})[:name]
 
-# Uroczystość Najświętszego Ciała i Krwi Pańskiej (Boże Ciało)
-[Date.civil(2008,5,22), Date.civil(2009,6,11), Date.civil(2010,6,3),
- Date.civil(2011,6,23), Date.civil(2012,6,7)].each do |date|
-  assert_equal 'Uroczystość Najświętszego Ciała i Krwi Pańskiej (Boże Ciało)', (Holidays.on(date, :pl)[0] || {})[:name]
-end
+    assert_equal "Międzynarodowy Dzień Ziemi", (Holidays.on(Date.civil(2010, 4, 22), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Dzień Flagi Rzeczpospolitej Polskiej", (Holidays.on(Date.civil(2011, 5, 2), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Dzień Ojca", (Holidays.on(Date.civil(2010, 6, 23), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Dzień Chłopaka", (Holidays.on(Date.civil(2011, 9, 30), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Dzień Nauczyciela (Dzień Edukacji Narodowej)", (Holidays.on(Date.civil(2011, 10, 14), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Dzień Zaduszny", (Holidays.on(Date.civil(2011, 11, 2), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Andrzejki", (Holidays.on(Date.civil(2011, 11, 29), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Barbórka (Dzień Górnika, Naftowca i Gazownika)", (Holidays.on(Date.civil(2011, 12, 4), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Mikołajki", (Holidays.on(Date.civil(2011, 12, 6), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Wigilia Bożego Narodzenia", (Holidays.on(Date.civil(2011, 12, 24), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Sylwester", (Holidays.on(Date.civil(2011, 12, 31), [:pl], [:informal])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2011, 1, 21), [:pl])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2011, 1, 22), [:pl])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2011, 2, 2), [:pl])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2011, 2, 14), [:pl])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2010, 3, 8), [:pl])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2011, 3, 10), [:pl])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2011, 4, 1), [:pl])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2010, 4, 22), [:pl])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2011, 5, 2), [:pl])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2010, 6, 23), [:pl])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2011, 9, 30), [:pl])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2011, 10, 14), [:pl])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2011, 11, 2), [:pl])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2011, 11, 29), [:pl])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2011, 12, 4), [:pl])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2011, 12, 6), [:pl])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2011, 12, 24), [:pl])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2011, 12, 31), [:pl])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2008, 1, 6), [:pl])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2009, 1, 6), [:pl])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2010, 1, 6), [:pl])[0] || {})[:name]
+
+    assert_equal "Objawienie Pańskie (święto Trzech Króli)", (Holidays.on(Date.civil(2008, 1, 6), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Objawienie Pańskie (święto Trzech Króli)", (Holidays.on(Date.civil(2009, 1, 6), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Objawienie Pańskie (święto Trzech Króli)", (Holidays.on(Date.civil(2010, 1, 6), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Objawienie Pańskie (święto Trzech Króli)", (Holidays.on(Date.civil(2011, 1, 6), [:pl])[0] || {})[:name]
+
+    assert_equal "Objawienie Pańskie (święto Trzech Króli)", (Holidays.on(Date.civil(2012, 1, 6), [:pl])[0] || {})[:name]
+
+    assert_equal "Objawienie Pańskie (święto Trzech Króli)", (Holidays.on(Date.civil(2013, 1, 6), [:pl])[0] || {})[:name]
+
+    assert_equal "Tłusty Czwartek", (Holidays.on(Date.civil(2008, 1, 31), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Tłusty Czwartek", (Holidays.on(Date.civil(2009, 2, 19), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Tłusty Czwartek", (Holidays.on(Date.civil(2010, 2, 11), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Tłusty Czwartek", (Holidays.on(Date.civil(2011, 3, 3), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Tłusty Czwartek", (Holidays.on(Date.civil(2012, 2, 16), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Ostatki", (Holidays.on(Date.civil(2008, 2, 5), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Ostatki", (Holidays.on(Date.civil(2009, 2, 24), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Ostatki", (Holidays.on(Date.civil(2010, 2, 16), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Ostatki", (Holidays.on(Date.civil(2011, 3, 8), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Ostatki", (Holidays.on(Date.civil(2012, 2, 21), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Środa Popielcowa", (Holidays.on(Date.civil(2008, 2, 6), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Środa Popielcowa", (Holidays.on(Date.civil(2009, 2, 25), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Środa Popielcowa", (Holidays.on(Date.civil(2010, 2, 17), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Środa Popielcowa", (Holidays.on(Date.civil(2011, 3, 9), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Środa Popielcowa", (Holidays.on(Date.civil(2012, 2, 22), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Niedziela Palmowa", (Holidays.on(Date.civil(2008, 3, 16), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Niedziela Palmowa", (Holidays.on(Date.civil(2009, 4, 5), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Niedziela Palmowa", (Holidays.on(Date.civil(2010, 3, 28), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Niedziela Palmowa", (Holidays.on(Date.civil(2011, 4, 17), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Niedziela Palmowa", (Holidays.on(Date.civil(2012, 4, 1), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Wielki Czwartek", (Holidays.on(Date.civil(2008, 3, 20), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Wielki Czwartek", (Holidays.on(Date.civil(2009, 4, 9), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Wielki Czwartek", (Holidays.on(Date.civil(2010, 4, 1), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Wielki Czwartek", (Holidays.on(Date.civil(2011, 4, 21), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Wielki Czwartek", (Holidays.on(Date.civil(2012, 4, 5), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Wielki Piątek", (Holidays.on(Date.civil(2008, 3, 21), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Wielki Piątek", (Holidays.on(Date.civil(2009, 4, 10), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Wielki Piątek", (Holidays.on(Date.civil(2010, 4, 2), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Wielki Piątek", (Holidays.on(Date.civil(2011, 4, 22), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Wielki Piątek", (Holidays.on(Date.civil(2012, 4, 6), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Wielka Sobota", (Holidays.on(Date.civil(2008, 3, 22), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Wielka Sobota", (Holidays.on(Date.civil(2009, 4, 11), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Wielka Sobota", (Holidays.on(Date.civil(2010, 4, 3), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Wielka Sobota", (Holidays.on(Date.civil(2011, 4, 23), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Wielka Sobota", (Holidays.on(Date.civil(2012, 4, 7), [:pl], [:informal])[0] || {})[:name]
+
+    assert_equal "Niedziela Wielkanocna", (Holidays.on(Date.civil(2008, 3, 23), [:pl])[0] || {})[:name]
+
+    assert_equal "Niedziela Wielkanocna", (Holidays.on(Date.civil(2009, 4, 12), [:pl])[0] || {})[:name]
+
+    assert_equal "Niedziela Wielkanocna", (Holidays.on(Date.civil(2010, 4, 4), [:pl])[0] || {})[:name]
+
+    assert_equal "Niedziela Wielkanocna", (Holidays.on(Date.civil(2011, 4, 24), [:pl])[0] || {})[:name]
+
+    assert_equal "Niedziela Wielkanocna", (Holidays.on(Date.civil(2012, 4, 8), [:pl])[0] || {})[:name]
+
+    assert_equal "Poniedziałek Wielkanocny (Lany Poniedziałek)", (Holidays.on(Date.civil(2008, 3, 24), [:pl])[0] || {})[:name]
+
+    assert_equal "Poniedziałek Wielkanocny (Lany Poniedziałek)", (Holidays.on(Date.civil(2009, 4, 13), [:pl])[0] || {})[:name]
+
+    assert_equal "Poniedziałek Wielkanocny (Lany Poniedziałek)", (Holidays.on(Date.civil(2010, 4, 5), [:pl])[0] || {})[:name]
+
+    assert_equal "Poniedziałek Wielkanocny (Lany Poniedziałek)", (Holidays.on(Date.civil(2011, 4, 25), [:pl])[0] || {})[:name]
+
+    assert_equal "Poniedziałek Wielkanocny (Lany Poniedziałek)", (Holidays.on(Date.civil(2012, 4, 9), [:pl])[0] || {})[:name]
+
+    assert_equal "Zesłanie Ducha Świętego (Zielone Świątki)", (Holidays.on(Date.civil(2008, 5, 11), [:pl])[0] || {})[:name]
+
+    assert_equal "Zesłanie Ducha Świętego (Zielone Świątki)", (Holidays.on(Date.civil(2009, 5, 31), [:pl])[0] || {})[:name]
+
+    assert_equal "Zesłanie Ducha Świętego (Zielone Świątki)", (Holidays.on(Date.civil(2010, 5, 23), [:pl])[0] || {})[:name]
+
+    assert_equal "Zesłanie Ducha Świętego (Zielone Świątki)", (Holidays.on(Date.civil(2011, 6, 12), [:pl])[0] || {})[:name]
+
+    assert_equal "Zesłanie Ducha Świętego (Zielone Świątki)", (Holidays.on(Date.civil(2012, 5, 27), [:pl])[0] || {})[:name]
+
+    assert_equal "Uroczystość Najświętszego Ciała i Krwi Pańskiej (Boże Ciało)", (Holidays.on(Date.civil(2008, 5, 22), [:pl])[0] || {})[:name]
+
+    assert_equal "Uroczystość Najświętszego Ciała i Krwi Pańskiej (Boże Ciało)", (Holidays.on(Date.civil(2009, 6, 11), [:pl])[0] || {})[:name]
+
+    assert_equal "Uroczystość Najświętszego Ciała i Krwi Pańskiej (Boże Ciało)", (Holidays.on(Date.civil(2010, 6, 3), [:pl])[0] || {})[:name]
+
+    assert_equal "Uroczystość Najświętszego Ciała i Krwi Pańskiej (Boże Ciało)", (Holidays.on(Date.civil(2011, 6, 23), [:pl])[0] || {})[:name]
+
+    assert_equal "Uroczystość Najświętszego Ciała i Krwi Pańskiej (Boże Ciało)", (Holidays.on(Date.civil(2012, 6, 7), [:pl])[0] || {})[:name]
 
-# Wniebowzięcie Najświętszej Maryi Panny & Święto Wojska Polskiego
-  assert_equal 'Wniebowzięcie Najświętszej Maryi Panny', (Holidays.on(Date.civil(2011,8,15), :pl)[0] || {})[:name]
-  assert_equal 'Święto Wojska Polskiego', (Holidays.on(Date.civil(2011,8,15), :pl)[1] || {})[:name]
+    assert_equal "Wniebowzięcie Najświętszej Maryi Panny", (Holidays.on(Date.civil(2011, 8, 15), [:pl])[0] || {})[:name]
 
   end
 end

data/test/defs/test_defs_pt.rb

@@ -7,21 +7,41 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class PtDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_pt
-{Date.civil(2008,1,1) => 'Ano Novo',
- Date.civil(2005,2,8) => 'Carnaval',
- Date.civil(2006,2,28) => 'Carnaval',
- Date.civil(2007,2,20) => 'Carnaval',
- Date.civil(2008,2,5) => 'Carnaval',
- Date.civil(2008,3,21) => 'Sexta-feira Santa',
- Date.civil(2008,3,23) => 'Páscoa',
- Date.civil(2008,4,25) => 'Dia da Liberdade',
- Date.civil(2008,5,1) => 'Dia do Trabalhador',
- Date.civil(2008,6,10) => 'Dia de Portugal',
- Date.civil(2008,8,15) => 'Assunção de Nossa Senhora',
- Date.civil(2008,12,8) => 'Imaculada Conceição',
- Date.civil(2008,12,25) => 'Natal'}.each do |date, name|
-  assert_equal name, (Holidays.on(date, :pt, :informal)[0] || {})[:name]
-end
+    assert_equal "Ano Novo", (Holidays.on(Date.civil(2008, 1, 1), [:pt], [:informal])[0] || {})[:name]
+
+    assert_equal "Carnaval", (Holidays.on(Date.civil(2005, 2, 8), [:pt], [:informal])[0] || {})[:name]
+
+    assert_equal "Carnaval", (Holidays.on(Date.civil(2006, 2, 28), [:pt], [:informal])[0] || {})[:name]
+
+    assert_equal "Carnaval", (Holidays.on(Date.civil(2007, 2, 20), [:pt], [:informal])[0] || {})[:name]
+
+    assert_equal "Carnaval", (Holidays.on(Date.civil(2008, 2, 5), [:pt], [:informal])[0] || {})[:name]
+
+    assert_equal "Sexta-feira Santa", (Holidays.on(Date.civil(2008, 3, 21), [:pt], [:informal])[0] || {})[:name]
+
+    assert_equal "Páscoa", (Holidays.on(Date.civil(2008, 3, 23), [:pt], [:informal])[0] || {})[:name]
+
+    assert_equal "Páscoa", (Holidays.on(Date.civil(2016, 3, 27), [:pt], [:informal])[0] || {})[:name]
+
+    assert_equal "Dia da Liberdade", (Holidays.on(Date.civil(2008, 4, 25), [:pt], [:informal])[0] || {})[:name]
+
+    assert_equal "Dia do Trabalhador", (Holidays.on(Date.civil(2008, 5, 1), [:pt], [:informal])[0] || {})[:name]
+
+    assert_equal "Corpo de Deus", (Holidays.on(Date.civil(2016, 5, 26), [:pt], [:informal])[0] || {})[:name]
+
+    assert_equal "Dia de Portugal", (Holidays.on(Date.civil(2008, 6, 10), [:pt], [:informal])[0] || {})[:name]
+
+    assert_equal "Assunção de Nossa Senhora", (Holidays.on(Date.civil(2008, 8, 15), [:pt], [:informal])[0] || {})[:name]
+
+    assert_equal "Dia da República", (Holidays.on(Date.civil(2008, 10, 5), [:pt], [:informal])[0] || {})[:name]
+
+    assert_equal "Dia de Todos-os-Santos", (Holidays.on(Date.civil(2008, 11, 1), [:pt], [:informal])[0] || {})[:name]
+
+    assert_equal "Restauração da Independência", (Holidays.on(Date.civil(2008, 12, 1), [:pt], [:informal])[0] || {})[:name]
+
+    assert_equal "Imaculada Conceição", (Holidays.on(Date.civil(2008, 12, 8), [:pt], [:informal])[0] || {})[:name]
+
+    assert_equal "Natal", (Holidays.on(Date.civil(2008, 12, 25), [:pt], [:informal])[0] || {})[:name]
 
   end
 end