holidays 2.2.0 → 3.0.0

data/test/defs/test_defs_hr.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/hr.yaml
+# Definitions loaded: definitions/hr.yaml
 class HrDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_hr

data/test/defs/test_defs_hu.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/hu.yaml
+# Definitions loaded: definitions/hu.yaml
 class HuDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_hu
@@ -23,7 +23,7 @@ class HuDefinitionTests < Test::Unit::TestCase  # :nodoc:
   assert_equal name, (Holidays.on(date, :hu, :informal)[0] || {})[:name]
 end
 
-assert !Date.civil(2012,3,14).holiday?(:hu), '2012-03-14 is not a holiday in Hungary'
+assert_equal [], Holidays.on(Date.civil(2012,3,14), :hu), '2012-03-14 is not a holiday in Hungary'
 
   end
 end

data/test/defs/test_defs_ie.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/ie.yaml
+# Definitions loaded: definitions/ie.yaml
 class IeDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_ie

data/test/defs/test_defs_is.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/is.yaml
+# Definitions loaded: definitions/is.yaml
 class IsDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_is

data/test/defs/test_defs_it.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/it.yaml
+# Definitions loaded: definitions/it.yaml
 class ItDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_it

data/test/defs/test_defs_jp.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/jp.yaml
+# Definitions loaded: definitions/jp.yaml
 class JpDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_jp

data/test/defs/test_defs_li.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/li.yaml
+# Definitions loaded: definitions/li.yaml
 class LiDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_li
@@ -20,15 +20,15 @@ class LiDefinitionTests < Test::Unit::TestCase  # :nodoc:
 end
 
 [:li].each do |r|
-  assert_equal 'Fronleichnam', Date.civil(2009,6,11).holidays(r)[0][:name]
+  assert_equal 'Fronleichnam', Holidays.on(Date.civil(2009,6,11), r)[0][:name]
 end
 
 [:li].each do |r|
-  assert_equal 'Staatsfeiertag', Date.civil(2009,8,15).holidays(r)[0][:name]
+  assert_equal 'Staatsfeiertag', Holidays.on(Date.civil(2009,8,15), r)[0][:name]
 end
 
 [:li].each do |r|
-  assert_equal 'Allerheiligen', Date.civil(2009,11,1).holidays(r)[0][:name]
+  assert_equal 'Allerheiligen', Holidays.on(Date.civil(2009,11,1), r)[0][:name]
 end
 
   end

data/test/defs/test_defs_lt.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/lt.yaml
+# Definitions loaded: definitions/lt.yaml
 class LtDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_lt

data/test/defs/test_defs_ma.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/ma.yaml
+# Definitions loaded: definitions/ma.yaml
 class MaDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_ma

data/test/defs/test_defs_mx.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/mx.yaml, data/north_america_informal.yaml
+# Definitions loaded: definitions/mx.yaml, definitions/north_america_informal.yaml
 class MxDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_mx

data/test/defs/test_defs_nerc.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/nerc.yaml
+# Definitions loaded: definitions/nerc.yaml
 class NercDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_nerc

data/test/defs/test_defs_nl.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/nl.yaml
+# Definitions loaded: definitions/nl.yaml
 class NlDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_nl

data/test/defs/test_defs_no.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/no.yaml
+# Definitions loaded: definitions/no.yaml
 class NoDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_no

data/test/defs/test_defs_north_america.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/ca.yaml, data/mx.yaml, data/us.yaml, data/north_america_informal.yaml
+# Definitions loaded: definitions/ca.yaml, definitions/mx.yaml, definitions/us.yaml, definitions/north_america_informal.yaml
 class North_americaDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_north_america
@@ -70,7 +70,7 @@ end
   assert_equal name, (Holidays.on(date, :mx, :informal)[0] || {})[:name]
 end  
 
-{Date.civil(2008,1,1) => 'New Year\'s Day', 
+{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,5,26) => 'Memorial Day',
@@ -79,11 +79,13 @@ end
  Date.civil(2008,10,13) => 'Columbus Day',
  Date.civil(2008,11,11) => 'Veterans Day',
  Date.civil(2008,11,27) => 'Thanksgiving',
+ Date.civil(2013,11,28) => 'Thanksgiving',
  Date.civil(2008,12,25) => 'Christmas Day'}.each do |date, name|
   assert_equal name, (Holidays.on(date, :us)[0] || {})[:name]
 end
 {Date.civil(2008, 3, 31) => 'Cesar Chavez Day',
- Date.civil(2008, 11, 28) => 'Day after Thanksgiving'}.each do |date, name|
+ Date.civil(2008, 11, 28) => 'Day after Thanksgiving',
+ Date.civil(2013, 11, 29) => 'Day after Thanksgiving'}.each do |date, name|
  assert_equal name, (Holidays.on(date, :us, :us_ca)[0] || {})[:name]
 end
 

data/test/defs/test_defs_nyse.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/nyse.yaml
+# Definitions loaded: definitions/nyse.yaml
 class NyseDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_nyse

data/test/defs/test_defs_nz.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/nz.yaml
+# Definitions loaded: definitions/nz.yaml
 class NzDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_nz
@@ -17,14 +17,24 @@ class NzDefinitionTests < Test::Unit::TestCase  # :nodoc:
  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', Date.civil(2015, 4, 25).holidays(:nz)[0][:name]
-assert_equal 'ANZAC Day', Date.civil(2015, 4, 27).holidays(:nz, :observed)[0][:name]
-assert_equal 'ANZAC Day', Date.civil(2016, 4, 25).holidays(:nz)[0][:name]
-assert_equal 'ANZAC Day', Date.civil(2016, 4, 25).holidays(:nz, :observed)[0][:name]
-assert_equal 'Waitangi Day', Date.civil(2015, 2, 6).holidays(:nz)[0][:name]
-assert_equal 'Waitangi Day', Date.civil(2015, 2, 6).holidays(:nz, :observed)[0][:name]
-assert_equal 'Waitangi Day', Date.civil(2016, 2, 6).holidays(:nz)[0][:name]
-assert_equal 'Waitangi Day', Date.civil(2016, 2, 8).holidays(:nz, :observed)[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_ph.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/ph.yaml
+# Definitions loaded: definitions/ph.yaml
 class PhDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_ph

data/test/defs/test_defs_pl.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/pl.yaml
+# Definitions loaded: definitions/pl.yaml
 class PlDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_pl

data/test/defs/test_defs_pt.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/pt.yaml
+# Definitions loaded: definitions/pt.yaml
 class PtDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_pt

data/test/defs/test_defs_ro.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/ro.yaml
+# Definitions loaded: definitions/ro.yaml
 class RoDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_ro
@@ -30,8 +30,7 @@ class RoDefinitionTests < Test::Unit::TestCase  # :nodoc:
   assert_equal name, (Holidays.on(date, :ro, :informal)[0] || {})[:name]
  end
 
- assert !Date.civil(2013,7,23).holiday?(:ro), '2010-07-23 is not a holiday in Romania'
- assert !Date.civil(2013,7,23).holiday?(:ro), '2010-07-23 is not a holiday in Romania'
+ assert_equal [], Holidays.on(Date.civil(2013,7,23), :ro), '2013-07-23 is not a holiday in Romania'
 
   end
 end

data/test/defs/test_defs_scandinavia.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/dk.yaml, data/is.yaml, data/no.yaml, data/se.yaml, data/fi.yaml
+# Definitions loaded: definitions/dk.yaml, definitions/is.yaml, definitions/no.yaml, definitions/se.yaml, definitions/fi.yaml
 class ScandinaviaDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_scandinavia

data/test/defs/test_defs_se.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/se.yaml
+# Definitions loaded: definitions/se.yaml
 class SeDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_se

data/test/defs/test_defs_sg.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/sg.yaml
+# Definitions loaded: definitions/sg.yaml
 class SgDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_sg

data/test/defs/test_defs_si.rb

@@ -3,18 +3,18 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/si.yaml
+# Definitions loaded: definitions/si.yaml
 class SiDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_si
-assert_equal 'velikonočna nedelja', Date.civil(2015,4,5).holidays(:si)[0][:name]
-assert_equal 'velikonočna nedelja', Date.civil(2016,3,27).holidays(:si)[0][:name]
+assert_equal 'velikonočna nedelja', Holidays.on(Date.civil(2015,4,5), :si)[0][:name]
+assert_equal 'velikonočna nedelja', Holidays.on(Date.civil(2016,3,27), :si)[0][:name]
 
-assert_equal 'velikonočni ponedeljek', Date.civil(2015,4,6).holidays(:si)[0][:name]
-assert_equal 'velikonočni ponedeljek', Date.civil(2016,3,28).holidays(:si)[0][:name]
+assert_equal 'velikonočni ponedeljek', Holidays.on(Date.civil(2015,4,6), :si)[0][:name]
+assert_equal 'velikonočni ponedeljek', Holidays.on(Date.civil(2016,3,28), :si)[0][:name]
 
-assert_equal 'binkošti', Date.civil(2015,5,24).holidays(:si)[0][:name]
-assert_equal 'binkošti', Date.civil(2016,5,15).holidays(:si)[0][:name]
+assert_equal 'binkošti', Holidays.on(Date.civil(2015,5,24), :si)[0][:name]
+assert_equal 'binkošti', Holidays.on(Date.civil(2016,5,15), :si)[0][:name]
 
 (2014..2020).each do |year|
   {Date.civil(year,1,1) => 'novo leto',

data/test/defs/test_defs_sk.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/sk.yaml
+# Definitions loaded: definitions/sk.yaml
 class SkDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_sk

data/test/defs/test_defs_united_nations.rb

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

data/test/defs/test_defs_ups.rb

@@ -3,19 +3,22 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/ups.yaml
+# Definitions loaded: definitions/ups.yaml
 class UpsDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_ups
-{Date.civil(2008,1,1) => 'New Year\'s Day', 
+{Date.civil(2008,1,1) => 'New Year\'s Day',
  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,11,28) => 'Day After Thanksgiving',
+ Date.civil(2013,11,28) => 'Thanksgiving',
+ Date.civil(2013,11,29) => 'Day After Thanksgiving',
  Date.civil(2008,12,25) => 'Christmas Day',
  Date.civil(2008,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_us.rb

@@ -3,11 +3,11 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/us.yaml, data/north_america_informal.yaml
+# Definitions loaded: definitions/us.yaml, definitions/north_america_informal.yaml
 class UsDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_us
-{Date.civil(2008,1,1) => 'New Year\'s Day', 
+{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,5,26) => 'Memorial Day',
@@ -16,11 +16,13 @@ class UsDefinitionTests < Test::Unit::TestCase  # :nodoc:
  Date.civil(2008,10,13) => 'Columbus Day',
  Date.civil(2008,11,11) => 'Veterans Day',
  Date.civil(2008,11,27) => 'Thanksgiving',
+ Date.civil(2013,11,28) => 'Thanksgiving',
  Date.civil(2008,12,25) => 'Christmas Day'}.each do |date, name|
   assert_equal name, (Holidays.on(date, :us)[0] || {})[:name]
 end
 {Date.civil(2008, 3, 31) => 'Cesar Chavez Day',
- Date.civil(2008, 11, 28) => 'Day after Thanksgiving'}.each do |date, name|
+ Date.civil(2008, 11, 28) => 'Day after Thanksgiving',
+ Date.civil(2013, 11, 29) => 'Day after Thanksgiving'}.each do |date, name|
  assert_equal name, (Holidays.on(date, :us, :us_ca)[0] || {})[:name]
 end
 

data/test/defs/test_defs_ve.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/ve.yaml
+# Definitions loaded: definitions/ve.yaml
 class VeDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_ve

data/test/defs/test_defs_vi.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: data/vi.yaml
+# Definitions loaded: definitions/vi.yaml
 class ViDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_vi