holidays 2.2.0 → 3.0.0

data/lib/holidays/use_case/context/dates_driver_builder.rb

@@ -0,0 +1,64 @@
+# This context builds a hash that contains {:year => [<array of months>]}. The idea is that
+# we will iterate over each year and then over each month internally and check to see if the
+# supplied dates match any holidays for the region and date. So if we supply start_date of 2015/1/1
+# and end_date of 2015/6/1 then we will return a date driver of {:2015 => [0, 1, 2, 5, 6, 7]}.
+# In the  logic in the 'between' use case we will iterate over this and compare dates in these
+# months to the supplied range to determine whether they should be returned to the user.
+module Holidays
+  module UseCase
+    module Context
+      class DatesDriverBuilder
+        def call(start_date, end_date)
+          dates_driver = {}
+
+          (start_date..end_date).each do |current_date|
+            dates_driver[current_date.year] = [] unless dates_driver[current_date.year]
+            dates_driver[current_date.year] << current_date.month
+
+            dates_driver = add_border_months(current_date, dates_driver)
+          end
+
+          clean(dates_driver)
+        end
+
+        private
+
+        # As part of https://github.com/holidays/holidays/issues/146 I am returning
+        # additional months in an attempt to catch month-spanning date situations (i.e.
+        # dates falling on 2/1 but being observed on 1/31). By including the additional months
+        # we are increasing runtimes slightly but improving accuracy, which is more important
+        # to me at this stage.
+        def add_border_months(current_date, dates_driver)
+          if current_date.month == 1
+            dates_driver[current_date.year] << 2
+
+            prev_year = current_date.year - 1
+            dates_driver[prev_year] = [] unless dates_driver[prev_year]
+            dates_driver[prev_year] << 12
+          elsif current_date.month == 12
+            dates_driver[current_date.year] << 11
+
+            next_year = current_date.year + 1
+            dates_driver[next_year] = [] unless dates_driver[next_year]
+            dates_driver[next_year] << 1
+          else
+            dates_driver[current_date.year] << current_date.month - 1 << current_date.month + 1
+          end
+
+          dates_driver
+        end
+
+        def clean(dates_driver)
+          dates_driver.each do |year, months|
+            dates_driver[year] << 0 # Always add variable month '0' for proc calc purposes
+
+            dates_driver[year].uniq!
+            dates_driver[year].sort!
+          end
+
+          dates_driver
+        end
+      end
+    end
+  end
+end

data/lib/holidays/use_case_factory.rb

@@ -0,0 +1,20 @@
+require 'holidays/use_case/context/between'
+require 'holidays/use_case/context/dates_driver_builder'
+
+module Holidays
+  class UseCaseFactory
+    class << self
+      def between
+        UseCase::Context::Between.new(
+          DefinitionFactory.holidays_by_month_repository,
+          DateCalculatorFactory.day_of_month_calculator,
+          DefinitionFactory.proc_cache_repository,
+        )
+      end
+
+      def dates_driver_builder
+        UseCase::Context::DatesDriverBuilder.new
+      end
+    end
+  end
+end

data/lib/holidays/version.rb

@@ -1,3 +1,3 @@
 module Holidays
-  VERSION = '2.2.0'
+  VERSION = '3.0.0'
 end

data/test/defs/test_defs_ar.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/ar.yaml
+# Definitions loaded: definitions/ar.yaml
 class ArDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_ar

data/test/defs/test_defs_at.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/at.yaml
+# Definitions loaded: definitions/at.yaml
 class AtDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_at
@@ -18,7 +18,7 @@ class AtDefinitionTests < Test::Unit::TestCase  # :nodoc:
   assert_equal name, (Holidays.on(date, :at, :informal)[0] || {})[:name]
 end
 
-assert !Date.civil(2010,5,8).holiday?(:at), '2010-05-08 is not a holiday in Austria'
+assert_equal [], Holidays.on(Date.civil(2010,5,8), :at), '2010-05-08 is not a holiday in Austria'
 
   end
 end

data/test/defs/test_defs_au.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/au.yaml
+# Definitions loaded: definitions/au.yaml
 class AuDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_au
@@ -12,71 +12,67 @@ class AuDefinitionTests < Test::Unit::TestCase  # :nodoc:
  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|
+ Date.civil(2007,12,25) => 'Christmas Day'}.each do |date, name|
   assert_equal name, (Holidays.on(date, :au, :informal)[0] || {})[:name]
 end
 
 [:au_sa, :au_act, :au_nsw, :au_].each do |r|
-  assert_equal 'Labour Day', Date.civil(2007,10,1).holidays(r)[0][:name]
+  assert_equal 'Labour Day', Holidays.on(Date.civil(2007,10,1), r)[0][:name]
 end
 
 [:au_sa, :au_act, :au_nsw, :au_vic, :au_tas, :au_qld, :au_nt, :au_].each do |r|
-  assert_equal 'Queen\'s Birthday', Date.civil(2007,6,11).holidays(r)[0][:name]
+  assert_equal 'Queen\'s Birthday', Holidays.on(Date.civil(2007,6,11), r)[0][:name]
 end
 
-assert_equal 'Labour Day', Date.civil(2007,3,5).holidays(:au_wa)[0][:name]
-assert_equal 'Labour Day', Date.civil(2007,3,12).holidays(:au_vic)[0][:name]
-assert_equal 'Labour Day', Date.civil(2007,5,7).holidays(:au_qld)[0][:name]
+assert_equal 'Labour Day', Holidays.on(Date.civil(2007,3,5), :au_wa)[0][:name]
+assert_equal 'Labour Day', Holidays.on(Date.civil(2007,3,12), :au_vic)[0][:name]
+assert_equal 'Labour Day', Holidays.on(Date.civil(2007,5,7), :au_qld)[0][:name]
 
-assert_equal 'Easter Sunday', Date.civil(2007,4,8).holidays(:au_nsw)[0][:name]
+assert_equal 'Easter Sunday', Holidays.on(Date.civil(2007,4,8), :au_nsw)[0][:name]
 
-assert_equal 'May Day', Date.civil(2007,5,7).holidays(:au_nt)[0][:name]
+assert_equal 'May Day', Holidays.on(Date.civil(2007,5,7), :au_nt)[0][:name]
 
-assert_equal 'Eight Hours Day', Date.civil(2007,3,12).holidays(:au_tas)[0][:name]
+assert_equal 'Eight Hours Day', Holidays.on(Date.civil(2007,3,12), :au_tas)[0][:name]
 
-assert_equal 'Labour Day', Date.civil(2013,10,7).holidays(:au_qld)[0][:name]
-assert_equal 'Labour Day', Date.civil(2012,5,7).holidays(:au_qld)[0][:name]
+assert_equal 'Labour Day', Holidays.on(Date.civil(2013,10,7), :au_qld)[0][:name]
+assert_equal 'Labour Day', Holidays.on(Date.civil(2012,5,7), :au_qld)[0][:name]
 
-assert_equal "Queen's Birthday", Date.civil(2012,6,11).holidays(:au_qld)[0][:name]
-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", Holidays.on(Date.civil(2012,6,11), :au_qld)[0][:name]
+assert_equal "Queen's Birthday", Holidays.on(Date.civil(2012,10,1), :au_qld)[0][:name]
+assert_equal "Queen's Birthday", Holidays.on(Date.civil(2013,6,10), :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 "Queen's Birthday", Holidays.on(Date.civil(2014, 9, 29), :au_wa)[0][:name]
+assert_equal "Queen's Birthday", Holidays.on(Date.civil(2015, 9, 28), :au_wa)[0][:name]
+assert_equal "Queen's Birthday", Holidays.on(Date.civil(2016, 9, 26), :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 "Family & Community Day", Holidays.on(Date.civil(2014, 9, 29), :au_act)[0][:name]
+assert_equal "Family & Community Day", Holidays.on(Date.civil(2015, 9, 28), :au_act)[0][:name]
+assert_equal "Family & Community Day", Holidays.on(Date.civil(2016, 9, 26), :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 'Australia Day', Holidays.on(Date.civil(2014,1,26), :au_qld)[0][:name]
+assert_equal 'Australia Day', Holidays.on(Date.civil(2014,1,27), :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 'Cairns Show', Holidays.on(Date.civil(2014,7,18), :au_qld_cairns)[0][:name]
+assert_equal 'Cairns Show', Holidays.on(Date.civil(2013,7,19), :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 'Royal Hobart Show', Holidays.on(Date.civil(2013, 10, 24), :au_tas_south)[0][:name]
+assert_equal 'Royal Hobart Show', Holidays.on(Date.civil(2014, 10, 23), :au_tas_south)[0][:name]
+assert_equal 'Royal Hobart Show', Holidays.on(Date.civil(2015, 10, 22), :au_tas_south)[0][:name]
+assert_equal 'Royal Hobart Show', Holidays.on(Date.civil(2016, 10, 20), :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 'Recreation Day', Holidays.on(Date.civil(2013, 11, 4), :au_tas_north)[0][:name]
+assert_equal 'Recreation Day', Holidays.on(Date.civil(2014, 11, 3), :au_tas_north)[0][:name]
+assert_equal 'Recreation Day', Holidays.on(Date.civil(2015, 11, 2), :au_tas_north)[0][:name]
+assert_equal 'Recreation Day', Holidays.on(Date.civil(2016, 11, 7), :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_nil Date.civil(2014,11,4).holidays(:au_vic)[0]
+assert_nil Date.civil(2015,11,3).holidays(:au_vic)[0]
 
-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 'Melbourne Cup Day', Holidays.on(Date.civil(2014,11,4), :au_vic_melbourne)[0][:name]
+assert_equal 'Melbourne Cup Day', Holidays.on(Date.civil(2015,11,3), :au_vic_melbourne)[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]
+assert_equal 'Friday before the AFL Grand Final', Date.civil(2015,10,2).holidays(:au_vic)[0][:name]
+assert_nil Date.civil(2016,10,2).holidays(:au_vic)[0]
 
 assert_equal "May Public Holiday", Date.civil(2005, 5, 16).holidays(:au_sa)[0][:name]
 assert_equal [], Date.civil(2014, 5, 19).holidays(:au_sa)
@@ -91,5 +87,27 @@ assert_equal "ANZAC Day", Date.civil(2015, 4, 25).holidays(:au_qld)[0][:name]
 assert_equal "ANZAC Day", Date.civil(2015, 4, 25).holidays(:au_wa)[0][:name]
 assert_equal [], Date.civil(2015, 4, 27).holidays(:au_qld, :observed)
 assert_equal "ANZAC Day", Date.civil(2015, 4, 27).holidays(:au_wa, :observed)[0][:name]
+
+# BOXING DAY - QLD observes weekend and monday
+assert_equal "Boxing Day", Date.civil(2015, 12, 26).holidays(:au_qld)[0][:name]
+assert_equal "Boxing Day", Date.civil(2015, 12, 28).holidays(:au_qld, :observed)[0][:name]
+
+# BOXING DAY - SA gets monday only. same for TAS and NT.
+assert_nil Date.civil(2015, 12, 26).holidays(:au_sa)[0]
+assert_equal "Boxing Day", Date.civil(2015, 12, 28).holidays(:au_sa)[0][:name]
+assert_nil Date.civil(2015, 12, 26).holidays(:au_tas)[0]
+assert_equal "Boxing Day", Date.civil(2015, 12, 28).holidays(:au_tas)[0][:name]
+assert_nil Date.civil(2015, 12, 26).holidays(:au_nt)[0]
+assert_equal "Boxing Day", Date.civil(2015, 12, 28).holidays(:au_nt)[0][:name]
+
+assert_equal 'G20 Day', Holidays.on(Date.civil(2014,11,14), :au_qld_brisbane)[0][:name]
+assert_equal [], Holidays.on(Date.civil(2014,11,14), :au_qld)
+assert_equal [], Holidays.on(Date.civil(2015,11,14), :au_qld_brisbane)
+
+assert_equal 'Royal Hobart Regatta', Holidays.on(Date.civil(2012, 2, 13), :au_tas_south)[0][:name]
+assert_equal 'Royal Hobart Regatta', Holidays.on(Date.civil(2014, 2, 10), :au_tas_south)[0][:name]
+assert_equal 'Royal Hobart Regatta', Holidays.on(Date.civil(2015, 2, 9), :au_tas_south)[0][:name]
+assert_equal 'Royal Hobart Regatta', Holidays.on(Date.civil(2016, 2, 8), :au_tas_south)[0][:name]
+
   end
 end

data/test/defs/test_defs_be.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/be.yaml
+# Definitions loaded: definitions/be.yaml
 class BeDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_be

data/test/defs/test_defs_br.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/br.yaml
+# Definitions loaded: definitions/br.yaml
 class BrDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_br

data/test/defs/test_defs_ca.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/north_america_informal.yaml
+# Definitions loaded: definitions/ca.yaml, definitions/north_america_informal.yaml
 class CaDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_ca

data/test/defs/test_defs_ch.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/ch.yaml
+# Definitions loaded: definitions/ch.yaml
 class ChDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_ch

data/test/defs/test_defs_cl.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/cl.yaml
+# Definitions loaded: definitions/cl.yaml
 class ClDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_cl

data/test/defs/test_defs_cr.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/cr.yaml
+# Definitions loaded: definitions/cr.yaml
 class CrDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_cr

data/test/defs/test_defs_cz.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/cz.yaml
+# Definitions loaded: definitions/cz.yaml
 class CzDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_cz

data/test/defs/test_defs_de.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/de.yaml
+# Definitions loaded: definitions/de.yaml
 class DeDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_de
@@ -20,56 +20,44 @@ class DeDefinitionTests < Test::Unit::TestCase  # :nodoc:
 end
 
 [:de_bw, :de_by, :de_st, :de_].each do |r|
-  assert_equal 'Heilige Drei Könige', Date.civil(2009,1,6).holidays(r)[0][:name]
+  assert_equal 'Heilige Drei Könige', Holidays.on(Date.civil(2009,1,6), r)[0][:name]
 end
 
 [:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_].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
 
 [:de_by, :de_sl, :de_].each do |r|
-  assert_equal 'Mariä Himmelfahrt', Date.civil(2009,8,15).holidays(r)[0][:name]
+  assert_equal 'Mariä Himmelfahrt', Holidays.on(Date.civil(2009,8,15), r)[0][:name]
 end
 
 [:de_bb, :de_mv, :de_sn, :de_st, :de_th, :de_].each do |r|
-  assert_equal 'Reformationstag', Date.civil(2009,10,31).holidays(r)[0][:name]
+  assert_equal 'Reformationstag', Holidays.on(Date.civil(2009,10,31), r)[0][:name]
 end
 
 [:de_bw, :de_by, :de_nw, :de_rp, :de_sl, :de_].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
 
-[: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]
+[:de_by_aux].each do |r|
+  assert_equal 'Friedensfest', Date.civil(2015,8,8).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}"
+[:de,
+ :de_bw, :de_by, :de_bb, :de_he, :de_mv,
+ :de_nw, :de_rp, :de_sl, :de_sn, :de_st, :de_th].each do |r|
+  assert_equal [], Holidays.on(Date.civil(2015,8,8), r), "Friedensfest 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_equal [], Holidays.on(Date.civil(2010,5,8), :de), '2010-05-08 is not a holiday in Germany'
 
-assert !Date.civil(2010,5,8).holiday?(:de), '2010-05-08 is not a holiday in Germany'
+assert_equal [], Holidays.on(Date.civil(2010,8,8), :de), '2010-08-08 is not a holiday in Germany'
 
 # Repentance Day
-assert_equal 'Buß- und Bettag', Date.civil(2004,11,17).holidays(:de_sn)[0][:name]
-assert_equal 'Buß- und Bettag', Date.civil(2005,11,16).holidays(:de_sn)[0][:name]
-assert_equal 'Buß- und Bettag', Date.civil(2006,11,22).holidays(:de_sn)[0][:name]
-assert_equal 'Buß- und Bettag', Date.civil(2009,11,18).holidays(:de_sn)[0][:name]
+assert_equal 'Buß- und Bettag', Holidays.on(Date.civil(2004,11,17), :de_sn)[0][:name]
+assert_equal 'Buß- und Bettag', Holidays.on(Date.civil(2005,11,16), :de_sn)[0][:name]
+assert_equal 'Buß- und Bettag', Holidays.on(Date.civil(2006,11,22), :de_sn)[0][:name]
+assert_equal 'Buß- und Bettag', Holidays.on(Date.civil(2009,11,18), :de_sn)[0][:name]
 
   end
 end

data/test/defs/test_defs_dk.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
+# Definitions loaded: definitions/dk.yaml
 class DkDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_dk

data/test/defs/test_defs_ecb_target.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/ecb_target.yaml
+# Definitions loaded: definitions/ecb_target.yaml
 class Ecb_targetDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_ecb_target
@@ -16,8 +16,8 @@ class Ecb_targetDefinitionTests < Test::Unit::TestCase  # :nodoc:
   assert_equal name, (Holidays.on(date, :ecb_target)[0] || {})[:name]
 end
 
-assert_equal 'Good Friday', Date.civil(2013,3,29).holidays(:ecb_target)[0][:name]
-assert_equal 'Easter Monday', Date.civil(2013,4,1).holidays(:ecb_target)[0][:name]
+assert_equal 'Good Friday', Holidays.on(Date.civil(2013,3,29), :ecb_target)[0][:name]
+assert_equal 'Easter Monday', Holidays.on(Date.civil(2013,4,1), :ecb_target)[0][:name]
 
   end
 end