holidays 1.0.8 → 1.1.0

data/lib/holidays/ups.rb

@@ -4,7 +4,7 @@ module Holidays
   #
   # Definitions loaded: data/ups.yaml
   #
-  # To use the definitions in this file, load it right after you load the 
+  # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'

data/lib/holidays/us.rb

@@ -4,7 +4,7 @@ module Holidays
   #
   # Definitions loaded: data/us.yaml, data/north_america_informal.yaml
   #
-  # To use the definitions in this file, load it right after you load the 
+  # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'

data/lib/holidays/ve.rb

@@ -4,7 +4,7 @@ module Holidays
   #
   # Definitions loaded: data/ve.yaml
   #
-  # To use the definitions in this file, load it right after you load the 
+  # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'

data/lib/holidays/version.rb

@@ -1,3 +1,3 @@
 module Holidays
-  VERSION = '1.0.8'
+  VERSION = '1.1.0'
 end

data/lib/holidays/vi.rb

@@ -4,7 +4,7 @@ module Holidays
   #
   # Definitions loaded: data/vi.yaml
   #
-  # To use the definitions in this file, load it right after you load the 
+  # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'

data/lib/holidays/za.rb

@@ -4,7 +4,7 @@ module Holidays
   #
   # Definitions loaded: data/za.yaml
   #
-  # To use the definitions in this file, load it right after you load the 
+  # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'

data/test/data/test_custom_govt_holiday_defs.yaml

@@ -0,0 +1,5 @@
+months:
+  3:
+  - name: Yaaay Government Day
+    regions: [custom_multiple_files, custom_multiple_files_govt]
+    mday: 1

data/test/data/test_multiple_custom_holiday_defs.yaml

@@ -0,0 +1,9 @@
+months:
+  10:
+  - name: Company Founding!
+    regions: [custom_multiple_files]
+    mday: 5
+tests: |
+    {Date.civil(2013,10,5) => 'Company Founding!'}.each do |date, name|
+      assert_equal name, (Holidays.on(date, :custom_multiple_files)[0] || {})[:name]
+    end

data/test/data/test_single_custom_holiday_defs.yaml

@@ -0,0 +1,9 @@
+months:
+  6:
+  - name: Company Founding
+    regions: [custom_single_file]
+    mday: 20
+tests: |
+    {Date.civil(2013,6,20) => 'Company Founding'}.each do |date, name|
+      assert_equal name, (Holidays.on(date, :custom_single_file)[0] || {})[:name]
+    end

data/test/defs/test_defs_au.rb

@@ -42,8 +42,40 @@ assert_equal "Queen's Birthday", Date.civil(2012,6,11).holidays(:au_qld)[0][:nam
 assert_equal "Queen's Birthday", Date.civil(2012,10,1).holidays(:au_qld)[0][:name]
 assert_equal "Queen's Birthday", Date.civil(2013,6,10).holidays(:au_qld)[0][:name]
 
+assert_equal "Queen's Birthday", Date.civil(2014, 9, 29).holidays(:au_wa)[0][:name]
+assert_equal "Queen's Birthday", Date.civil(2015, 9, 28).holidays(:au_wa)[0][:name]
+assert_equal "Queen's Birthday", Date.civil(2016, 9, 26).holidays(:au_wa)[0][:name]
+
+assert_equal "Family & Community Day", Date.civil(2014, 9, 29).holidays(:au_act)[0][:name]
+assert_equal "Family & Community Day", Date.civil(2015, 9, 28).holidays(:au_act)[0][:name]
+assert_equal "Family & Community Day", Date.civil(2016, 9, 26).holidays(:au_act)[0][:name]
+
 assert_equal 'Australia Day', Date.civil(2014,1,26).holidays(:au_qld)[0][:name]
 assert_equal 'Australia Day', Date.civil(2014,1,27).holidays(:au_qld, :observed)[0][:name]
 
+assert_equal 'Cairns Show', Date.civil(2014,7,18).holidays(:au_qld_cairns)[0][:name]
+assert_equal 'Cairns Show', Date.civil(2013,7,19).holidays(:au_qld_cairns)[0][:name]
+
+assert_equal 'Royal Hobart Show', Date.civil(2013, 10, 24).holidays(:au_tas_south)[0][:name]
+assert_equal 'Royal Hobart Show', Date.civil(2014, 10, 23).holidays(:au_tas_south)[0][:name]
+assert_equal 'Royal Hobart Show', Date.civil(2015, 10, 22).holidays(:au_tas_south)[0][:name]
+assert_equal 'Royal Hobart Show', Date.civil(2016, 10, 20).holidays(:au_tas_south)[0][:name]
+
+assert_equal 'Recreation Day', Date.civil(2013, 11, 4).holidays(:au_tas_north)[0][:name]
+assert_equal 'Recreation Day', Date.civil(2014, 11, 3).holidays(:au_tas_north)[0][:name]
+assert_equal 'Recreation Day', Date.civil(2015, 11, 2).holidays(:au_tas_north)[0][:name]
+assert_equal 'Recreation Day', Date.civil(2016, 11, 7).holidays(:au_tas_north)[0][:name]
+
+assert_equal 'G20 Day', Date.civil(2014,11,14).holidays(:au_qld_brisbane)[0][:name]
+assert_equal [], Date.civil(2014,11,14).holidays(:au_qld)
+assert_equal [], Date.civil(2015,11,14).holidays(:au_qld_brisbane)
+
+assert_equal 'Melbourne Cup Day', Date.civil(2014,11,4).holidays(:au_vic)[0][:name]
+assert_equal 'Melbourne Cup Day', Date.civil(2015,11,3).holidays(:au_vic)[0][:name]
+
+assert_equal 'Royal Hobart Regatta', Date.civil(2012, 2, 13).holidays(:au_tas_south)[0][:name]
+assert_equal 'Royal Hobart Regatta', Date.civil(2014, 2, 10).holidays(:au_tas_south)[0][:name]
+assert_equal 'Royal Hobart Regatta', Date.civil(2015, 2, 9).holidays(:au_tas_south)[0][:name]
+assert_equal 'Royal Hobart Regatta', Date.civil(2016, 2, 8).holidays(:au_tas_south)[0][:name]
   end
 end

data/test/defs/test_defs_ca.rb

@@ -26,12 +26,37 @@ end
   assert_equal 'BC Family Day', Holidays.on(date, :ca_bc)[0][:name]
 end
 
+# Nova Scotia Heritage Day
+[ Date.civil(2015,2,16), Date.civil(2016,2,15) ].each do |date|
+  assert_equal 'Nova Scotia Heritage Day', Holidays.on(date, :ca_ns)[0][:name]
+end
+
+# Islander Day in PE
+[ Date.civil(2013,2,18), Date.civil(2014,2,17) ].each do |date|
+  assert_equal 'Islander Day', Holidays.on(date, :ca_pe)[0][:name]
+end
+
 # Victoria Day
 [Date.civil(2004,5,24), Date.civil(2005,5,23), Date.civil(2006,5,22),
  Date.civil(2007,5,21), Date.civil(2008,5,19)].each do |date|
   assert_equal 'Victoria Day', Holidays.on(date, :ca)[0][:name]
 end
 
+# First Monday in August
+[Date.civil(2013,8,5), Date.civil(2014,8,4), Date.civil(2015,8,3)].each do |date|
+  { :ca_bc => 'BC Day',
+    :ca_sk => 'Saskatchewan Day',
+    :ca_ab => 'Heritage Day',
+    :ca_ns => 'Natal Day',
+    :ca_on => 'Civic Holiday',
+    :ca_nt => 'Civic Holiday',
+    :ca_nu => 'Civic Holiday',
+    :ca_pe => 'Civic Holiday',
+    :ca_nb => 'New Brunswick Day' }.each do |region, name|
+    assert_equal name, Holidays.on(date, region)[0][:name]
+  end
+end
+
 
 {Date.civil(2013,2,2) => 'Groundhog Day',
  Date.civil(2013,2,14) => 'Valentine\'s Day',

data/test/defs/test_defs_cr.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
+
+# This file is generated by the Ruby Holiday gem.
+#
+# Definitions loaded: data/cr.yaml
+class CrDefinitionTests < Test::Unit::TestCase  # :nodoc:
+
+  def test_cr
+{Date.civil(2015,1,1) => 'Año Nuevo',
+ Date.civil(2015,4,11) => 'Día de Juan Santamaría',
+ Date.civil(2015,5,1) => 'Día del Trabajador',
+ Date.civil(2015,7,25) => 'Día de la Anexión de Guanacaste',
+ Date.civil(2015,8,2) => 'Día de la Virgen de los Angeles',
+ Date.civil(2015,8,15) => 'Día de la Madre',
+ Date.civil(2015,9,15) => 'Día de la Independencia',
+ Date.civil(2015,10,12) => 'Día de las Culturas',
+ Date.civil(2016,12,25) => 'Navidad'}.each do |date, name|
+  assert_equal name, (Holidays.on(date, :cr)[0] || {})[:name]
+end
+  end
+end

data/test/defs/test_defs_de.rb

@@ -39,27 +39,27 @@ end
   assert_equal 'Allerheiligen', Date.civil(2009,11,1).holidays(r)[0][:name]
 end
 
-[:de_be, :de_bb, :de_hb, :de_hh, :de_ni, :de_sh].each do |r|
+[:de_be, :de_hb, :de_hh, :de_ni, :de_sh].each do |r|
   assert_equal 'Tag der Deutschen Einheit', Date.civil(2009,10,3).holidays(r)[0][:name]
 end
 
-[:de_be, :de_hb, :de_hh, :de_ni, :de_sh].each do |r| 
+[:de_be, :de_hb, :de_hh, :de_ni, :de_sh].each do |r|
   assert !Date.civil(2009,1,6).holiday?(r), "Heilige Drei Könige is not a holiday in #{r}"
 end
 
-[:de_be, :de_hb, :de_hh, :de_ni, :de_sh].each do |r| 
+[:de_be, :de_hb, :de_hh, :de_ni, :de_sh].each do |r|
   assert !Date.civil(2009,6,11).holiday?(r), "Fronleichnam is not a holiday in #{r}"
 end
 
-[:de_be, :de_hb, :de_hh, :de_ni, :de_sh].each do |r| 
+[:de_be, :de_hb, :de_hh, :de_ni, :de_sh].each do |r|
   assert !Date.civil(2009,8,15).holiday?(r), "Mariä Himmelfahrt is not a holiday in #{r}"
 end
 
-[:de_be, :de_hb, :de_hh, :de_ni, :de_sh].each do |r| 
+[:de_be, :de_hb, :de_hh, :de_ni, :de_sh].each do |r|
   assert !Date.civil(2009,10,31).holiday?(r), 'Reformationstag is not a holiday in #{r}'
 end
 
-[:de_be, :de_bb, :de_hb, :de_hh, :de_ni, :de_sh].each do |r| 
+[:de_be, :de_hb, :de_hh, :de_ni, :de_sh].each do |r|
   assert !Date.civil(2009,11,1).holiday?(r), "Allerheiligen is not a holiday in #{r}"
 end
 

data/test/defs/test_defs_europe.rb

@@ -134,6 +134,30 @@ end
   assert_equal 'Allerheiligen', Date.civil(2009,11,1).holidays(r)[0][:name]
 end
 
+[:de_be, :de_hb, :de_hh, :de_ni, :de_sh].each do |r|
+  assert_equal 'Tag der Deutschen Einheit', Date.civil(2009,10,3).holidays(r)[0][:name]
+end
+
+[:de_be, :de_hb, :de_hh, :de_ni, :de_sh].each do |r|
+  assert !Date.civil(2009,1,6).holiday?(r), "Heilige Drei Könige is not a holiday in #{r}"
+end
+
+[:de_be, :de_hb, :de_hh, :de_ni, :de_sh].each do |r|
+  assert !Date.civil(2009,6,11).holiday?(r), "Fronleichnam is not a holiday in #{r}"
+end
+
+[:de_be, :de_hb, :de_hh, :de_ni, :de_sh].each do |r|
+  assert !Date.civil(2009,8,15).holiday?(r), "Mariä Himmelfahrt is not a holiday in #{r}"
+end
+
+[:de_be, :de_hb, :de_hh, :de_ni, :de_sh].each do |r|
+  assert !Date.civil(2009,10,31).holiday?(r), 'Reformationstag is not a holiday in #{r}'
+end
+
+[:de_be, :de_hb, :de_hh, :de_ni, :de_sh].each do |r|
+  assert !Date.civil(2009,11,1).holiday?(r), "Allerheiligen is not a holiday in #{r}"
+end
+
 assert !Date.civil(2010,5,8).holiday?(:de), '2010-05-08 is not a holiday in Germany'
 
 # Repentance Day

data/test/defs/test_defs_fed_ex.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
+
+# This file is generated by the Ruby Holiday gem.
+#
+# Definitions loaded: data/fedex.yaml
+class Fed_exDefinitionTests < Test::Unit::TestCase  # :nodoc:
+
+  def test_fed_ex
+{Date.civil(2015,1,1) => 'New Year\'s Day',
+ Date.civil(2015,5,25) => 'Memorial Day',
+ Date.civil(2015,7,4) => 'Independence Day',
+ Date.civil(2015,9,7) => 'Labor Day',
+ Date.civil(2015,11,26) => 'Thanksgiving',
+ Date.civil(2015,11,27) => 'Day After Thanksgiving',
+ Date.civil(2015,12,25) => 'Christmas Day',
+ Date.civil(2015,12,31) => 'New Year\'s Eve',}.each do |date, name|
+  assert_equal name, (Holidays.on(date, :ups)[0] || {})[:name]
+end
+  end
+end

data/test/defs/test_defs_federal_reserve.rb

@@ -10,72 +10,59 @@ class Federal_reserveDefinitionTests < Test::Unit::TestCase  # :nodoc:
 {Date.civil(2012,1,2) => "New Year's Day",
  Date.civil(2012,1,16) => "Birthday of Martin Luther King, Jr",
  Date.civil(2012,2,20) => "Washington's Birthday",
- Date.civil(2012,4,6) => "Good Friday",
  Date.civil(2012,5,28) => "Memorial Day",
  Date.civil(2012,7,4) => "Independence Day",
  Date.civil(2012,9,3) => "Labor Day",
  Date.civil(2012,10,8) => "Columbus Day",
  Date.civil(2012,11,12) => "Veterans Day",
  Date.civil(2012,11,22) => "Thanksgiving Day",
- Date.civil(2012,12,24) => "Christmas Eve",
  Date.civil(2012,12,25) => "Christmas Day",
- Date.civil(2012,12,31) => "New Year's Eve",
 
  Date.civil(2013,1,1) => "New Year's Day",
  Date.civil(2013,1,21) => "Birthday of Martin Luther King, Jr",
  Date.civil(2013,2,18) => "Washington's Birthday",
- Date.civil(2013,3,29) => "Good Friday",
  Date.civil(2013,5,27) => "Memorial Day",
  Date.civil(2013,7,4) => "Independence Day",
  Date.civil(2013,9,2) => "Labor Day",
  Date.civil(2013,10,14) => "Columbus Day",
  Date.civil(2013,11,11) => "Veterans Day",
  Date.civil(2013,11,28) => "Thanksgiving Day",
- Date.civil(2013,12,24) => "Christmas Eve",
  Date.civil(2013,12,25) => "Christmas Day",
- Date.civil(2013,12,31) => "New Year's Eve",
  
  Date.civil(2014,1,1) => "New Year's Day",
  Date.civil(2014,1,20) => "Birthday of Martin Luther King, Jr",
  Date.civil(2014,2,17) => "Washington's Birthday",
- Date.civil(2014,4,18) => "Good Friday",
  Date.civil(2014,5,26) => "Memorial Day",
  Date.civil(2014,7,4) => "Independence Day",
  Date.civil(2014,9,1) => "Labor Day",
  Date.civil(2014,10,13) => "Columbus Day",
  Date.civil(2014,11,11) => "Veterans Day",
  Date.civil(2014,11,27) => "Thanksgiving Day",
- Date.civil(2014,12,24) => "Christmas Eve",
  Date.civil(2014,12,25) => "Christmas Day",
- Date.civil(2014,12,31) => "New Year's Eve",
 
  Date.civil(2015,1,1) => "New Year's Day",
  Date.civil(2015,1,19) => "Birthday of Martin Luther King, Jr",
  Date.civil(2015,2,16) => "Washington's Birthday",
- Date.civil(2015,4,3) => "Good Friday",
  Date.civil(2015,5,25) => "Memorial Day",
  Date.civil(2015,7,4) => "Independence Day",
  Date.civil(2015,9,7) => "Labor Day",
  Date.civil(2015,10,12) => "Columbus Day",
  Date.civil(2015,11,11) => "Veterans Day",
  Date.civil(2015,11,26) => "Thanksgiving Day",
- Date.civil(2015,12,24) => "Christmas Eve",
  Date.civil(2015,12,25) => "Christmas Day",
- Date.civil(2015,12,31) => "New Year's Eve",
 
  Date.civil(2016,1,1) => "New Year's Day",
  Date.civil(2016,1,18) => "Birthday of Martin Luther King, Jr",
  Date.civil(2016,2,15) => "Washington's Birthday",
- Date.civil(2016,3,25) => "Good Friday",
  Date.civil(2016,5,30) => "Memorial Day",
  Date.civil(2016,7,4) => "Independence Day",
  Date.civil(2016,9,5) => "Labor Day",
  Date.civil(2016,10,10) => "Columbus Day",
  Date.civil(2016,11,11) => "Veterans Day",
  Date.civil(2016,11,24) => "Thanksgiving Day",
- Date.civil(2016,12,24) => "Christmas Eve",
  Date.civil(2016,12,26) => "Christmas Day",
- Date.civil(2016,12,31) => "New Year's Eve",
+
+ Date.civil(2017,1, 20) => "Inauguration Day",
  }.each do |date, name|
    assert_equal name, (Holidays.on(date, :federal_reserve, :observed)[0] || {})[:name]
  end

data/test/defs/test_defs_jp.rb

@@ -21,6 +21,7 @@ class JpDefinitionTests < Test::Unit::TestCase  # :nodoc:
  Date.civil(2008,12,23) => '天皇誕生日',
  Date.civil(2010,3,22) => '振替休日',
  Date.civil(2008,11,24) => '振替休日',
+ Date.civil(2012,1,2) => '振替休日',
 }.each do |date, name|
    assert_equal name, (Holidays.on(date, :jp, :informal)[0] || {})[:name]
 end

data/test/defs/test_defs_north_america.rb

@@ -26,12 +26,37 @@ end
   assert_equal 'BC Family Day', Holidays.on(date, :ca_bc)[0][:name]
 end
 
+# Nova Scotia Heritage Day
+[ Date.civil(2015,2,16), Date.civil(2016,2,15) ].each do |date|
+  assert_equal 'Nova Scotia Heritage Day', Holidays.on(date, :ca_ns)[0][:name]
+end
+
+# Islander Day in PE
+[ Date.civil(2013,2,18), Date.civil(2014,2,17) ].each do |date|
+  assert_equal 'Islander Day', Holidays.on(date, :ca_pe)[0][:name]
+end
+
 # Victoria Day
 [Date.civil(2004,5,24), Date.civil(2005,5,23), Date.civil(2006,5,22),
  Date.civil(2007,5,21), Date.civil(2008,5,19)].each do |date|
   assert_equal 'Victoria Day', Holidays.on(date, :ca)[0][:name]
 end
 
+# First Monday in August
+[Date.civil(2013,8,5), Date.civil(2014,8,4), Date.civil(2015,8,3)].each do |date|
+  { :ca_bc => 'BC Day',
+    :ca_sk => 'Saskatchewan Day',
+    :ca_ab => 'Heritage Day',
+    :ca_ns => 'Natal Day',
+    :ca_on => 'Civic Holiday',
+    :ca_nt => 'Civic Holiday',
+    :ca_nu => 'Civic Holiday',
+    :ca_pe => 'Civic Holiday',
+    :ca_nb => 'New Brunswick Day' }.each do |region, name|
+    assert_equal name, Holidays.on(date, region)[0][:name]
+  end
+end
+
 
 {Date.civil(2007,1,1) => 'Año nuevo', 
  Date.civil(2007,2,5) => 'Día de la Constitución', 

data/test/defs/test_defs_united_nations.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
+
+# This file is generated by the Ruby Holiday gem.
+#
+# Definitions loaded: data/united_nations.yaml
+class United_nationsDefinitionTests < Test::Unit::TestCase  # :nodoc:
+
+  def test_united_nations
+
+  end
+end

data/test/test_custom_holidays.rb

@@ -0,0 +1,35 @@
+require File.expand_path(File.dirname(__FILE__)) + '/test_helper'
+
+class CustomHolidaysTest < Test::Unit::TestCase
+
+  def test_custom_region_present_after_single_file_parsing
+    assert_raises Holidays::UnknownRegionError do
+      Holidays.on(Date.civil(2013,6,20), :custom_single_file)
+    end
+
+    Holidays.load_custom('test/data/test_single_custom_holiday_defs.yaml')
+
+    assert_not_equal [], Holidays.on(Date.civil(2013,6,20), :custom_single_file)
+  end
+
+  def test_custom_holidays_present_after_multiple_file_parsing
+    assert_raises Holidays::UnknownRegionError do
+      Holidays.on(Date.civil(2013, 10,5), :custom_multiple_files)
+    end
+
+    assert_raises Holidays::UnknownRegionError do
+      Holidays.on(Date.civil(2013,3,1), :custom_multiple_files)
+    end
+
+    assert_raises Holidays::UnknownRegionError do
+      Holidays.on(Date.civil(2013,3,1), :custom_multiple_files_govt)
+    end
+
+    Holidays.load_custom('test/data/test_multiple_custom_holiday_defs.yaml', 'test/data/test_custom_govt_holiday_defs.yaml')
+
+    assert_not_equal [], Holidays.on(Date.civil(2013,10,5), :custom_multiple_files)
+    assert_not_equal [], Holidays.on(Date.civil(2013,3,1), :custom_multiple_files)
+    assert_not_equal [], Holidays.on(Date.civil(2013,3,1), :custom_multiple_files_govt)
+  end
+
+end