holidays 3.2.0 → 3.3.0

data/lib/holidays/definition/context/generator.rb

@@ -75,7 +75,7 @@ module Holidays
 
                 exists = false
                 rules_by_month[month].each do |ex|
-                  if ex[:name] == rule[:name] and ex[:wday] == rule[:wday] and ex[:mday] == rule[:mday] and ex[:week] == rule[:week] and ex[:type] == rule[:type] and ex[:function] == rule[:function] and ex[:observed] == rule[:observed]
+                  if ex[:name] == rule[:name] and ex[:wday] == rule[:wday] and ex[:mday] == rule[:mday] and ex[:week] == rule[:week] and ex[:type] == rule[:type] and ex[:function] == rule[:function] and ex[:observed] == rule[:observed] and ex[:year_ranges] == rule[:year_ranges]
                     ex[:regions] << rule[:regions].flatten
                     exists = true
                   end

data/lib/holidays/definition/repository/holidays_by_month.rb

@@ -41,7 +41,7 @@ module Holidays
         private
 
         def definition_exists?(existing_def, target_def)
-          existing_def[:name] == target_def[:name] && existing_def[:wday] == target_def[:wday] && existing_def[:mday] == target_def[:mday] && existing_def[:week] == target_def[:week] && existing_def[:function_id] == target_def[:function_id] && existing_def[:type] == target_def[:type] && existing_def[:observed_id] == target_def[:observed_id]
+          existing_def[:name] == target_def[:name] && existing_def[:wday] == target_def[:wday] && existing_def[:mday] == target_def[:mday] && existing_def[:week] == target_def[:week] && existing_def[:function_id] == target_def[:function_id] && existing_def[:type] == target_def[:type] && existing_def[:observed_id] == target_def[:observed_id] && existing_def[:year_ranges] == target_def[:year_ranges]
         end
       end
     end

data/lib/holidays/option/context/parse_options.rb

@@ -56,7 +56,7 @@ module Holidays
               region_definition = "#{DEFINITIONS_PATH}/#{region.to_s}"
               begin
                 require region_definition #FIXME This is unacceptable, we can't be loading external files while parsing options
-              rescue LoadError => e
+              rescue LoadError
                 # This could be a sub region that does not have any holiday
                 # definitions of its own; try to load the containing region instead.
                 if region.to_s =~ /_/

data/lib/holidays/version.rb

@@ -1,3 +1,3 @@
 module Holidays
-  VERSION = '3.2.0'
+  VERSION = '3.3.0'
 end

data/test/defs/test_defs_ar.rb

@@ -7,21 +7,25 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class ArDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_ar
-{Date.civil(2013,1,1) => 'Año Nuevo',
- Date.civil(2013,3,24) => 'Día Nacional de la Memoria por la Verdad y la Justicia',
- Date.civil(2013,3,28) => 'Jueves Santo',
- Date.civil(2013,3,29) => 'Viernes Santo',
- Date.civil(2013,4,2) => 'Día del Veterano y de los Caídos en la Guerra de Malvinas',
- Date.civil(2013,5,1) => 'Día del Trabajador',
- Date.civil(2013,5,25) => 'Día de la Revolución de Mayo',
- Date.civil(2013,6,20) => 'Día de la Bandera',
- Date.civil(2013,7,9) => 'Día de la Independencia',
- Date.civil(2013,8,19) => 'Paso a la Inmortalidad del General José de San Martín',
- Date.civil(2013,10,14) => 'Día del Respeto a la Diversidad Cultural',
- Date.civil(2013,11,25) => 'Día de la Soberanía nacional',
- Date.civil(2013,12,8) => 'Inmaculada Concepción de María',
- Date.civil(2013,12,25) => 'Navidad'}.each do |date, name|
+{Date.civil(2016,1,1) => 'Año Nuevo',
+ Date.civil(2016,2,8) => 'Carnaval',
+ Date.civil(2016,2,9) => 'Carnaval',
+ Date.civil(2016,3,24) => 'Día Nacional de la Memoria por la Verdad y la Justicia',
+ Date.civil(2016,3,25) => 'Viernes Santo',
+ Date.civil(2016,4,2) => 'Día del Veterano y de los Caídos en la Guerra de Malvinas',
+ Date.civil(2016,5,1) => 'Día del Trabajador',
+ Date.civil(2016,5,25) => 'Día de la Revolución de Mayo',
+ Date.civil(2016,6,20) => 'Día de la Bandera',
+ Date.civil(2016,7,8) => 'Feriado puente turístico',
+ Date.civil(2016,7,9) => 'Día de la Independencia',
+ Date.civil(2016,8,15) => 'Paso a la Inmortalidad del General José de San Martín',
+ Date.civil(2016,10,12) => 'Día del Respeto a la Diversidad Cultural',
+ Date.civil(2016,11,20) => 'Día de la Soberanía Nacional',
+ Date.civil(2016,12,8) => 'Inmaculada Concepción de María',
+ Date.civil(2016,12,9) => 'Feriado puente turístico',
+ Date.civil(2016,12,25) => 'Navidad'}.each do |date, name|
   assert_equal name, (Holidays.on(date, :ar, :informal)[0] || {})[:name]
 end
+
   end
 end

data/test/defs/test_defs_au.rb

@@ -11,8 +11,7 @@ class AuDefinitionTests < Test::Unit::TestCase  # :nodoc:
  Date.civil(2007,1,26) => 'Australia 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'}.each do |date, name|
+ Date.civil(2007,4,25) => 'ANZAC Day'}.each do |date, name|
   assert_equal name, (Holidays.on(date, :au, :informal)[0] || {})[:name]
 end
 
@@ -36,10 +35,14 @@ assert_equal 'Eight Hours Day', Holidays.on(Date.civil(2007,3,12), :au_tas)[0][:
 
 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 'Labour Day', Holidays.on(Date.civil(2015,10,5), :au_qld)[0][:name]
+assert_equal 'Labour Day', Holidays.on(Date.civil(2016,5,2), :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", Holidays.on(Date.civil(2015,6,8), :au_qld)[0][:name]
+assert_equal "Queen's Birthday", Holidays.on(Date.civil(2016,10,3), :au_qld)[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]
@@ -109,5 +112,29 @@ assert_equal 'Royal Hobart Regatta', Holidays.on(Date.civil(2014, 2, 10), :au_ta
 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]
 
+# CHRISTMAS DAY - ACT, NSW, QLD, Tas, WA observe on 27th (and 25th) if 25th is a Sunday
+assert_equal "Christmas Day", Date.civil(2016, 12, 25).holidays(:au_qld)[0][:name]
+assert_equal "Christmas Day", Date.civil(2016, 12, 27).holidays(:au_qld, :observed)[0][:name]
+assert_equal "Christmas Day", Date.civil(2016, 12, 25).holidays(:au_nsw)[0][:name]
+assert_equal "Christmas Day", Date.civil(2016, 12, 27).holidays(:au_nsw, :observed)[0][:name]
+assert_equal "Christmas Day", Date.civil(2016, 12, 25).holidays(:au_act)[0][:name]
+assert_equal "Christmas Day", Date.civil(2016, 12, 27).holidays(:au_act, :observed)[0][:name]
+assert_equal "Christmas Day", Date.civil(2016, 12, 25).holidays(:au_tas)[0][:name]
+assert_equal "Christmas Day", Date.civil(2016, 12, 27).holidays(:au_tas, :observed)[0][:name]
+assert_equal "Christmas Day", Date.civil(2016, 12, 25).holidays(:au_wa)[0][:name]
+assert_equal "Christmas Day", Date.civil(2016, 12, 27).holidays(:au_wa, :observed)[0][:name]
+
+# CHRISTMAS DAY - SA observes on 26th if 25th is a Sunday (Boxing Day goes to 27th)
+assert_equal "Christmas Day", Date.civil(2016, 12, 25).holidays(:au_sa)[0][:name]
+assert_equal "Christmas Day", Date.civil(2016, 12, 26).holidays(:au_sa, :observed)[0][:name]
+assert_equal "Boxing Day", Date.civil(2016, 12, 27).holidays(:au_sa)[0][:name]
+
+# CHRISTMAS DAY - Victoria and NT don't observe 25th if weekend - xmas is on the 27th
+assert_nil Date.civil(2016, 12, 25).holidays(:au_vic)[0]
+assert_nil Date.civil(2016, 12, 25).holidays(:au_nt)[0]
+assert_equal "Boxing Day", Date.civil(2016, 12, 26).holidays(:au_vic)[0][:name]
+assert_equal "Boxing Day", Date.civil(2016, 12, 26).holidays(:au_nt)[0][:name]
+assert_equal "Christmas Day", Date.civil(2016, 12, 27).holidays(:au_vic)[0][:name]
+assert_equal "Christmas Day", Date.civil(2016, 12, 27).holidays(:au_nt)[0][:name]
   end
 end

data/test/defs/{test_defs_be.rb → test_defs_be_fr.rb}

@@ -3,10 +3,10 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: definitions/be.yaml
-class BeDefinitionTests < Test::Unit::TestCase  # :nodoc:
+# Definitions loaded: definitions/be_fr.yaml
+class Be_frDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
-  def test_be
+  def test_be_fr
 {Date.civil(2007,1,1) => 'Jour de l\'an',
  Date.civil(2007,4,8) => 'Pâques',
  Date.civil(2007,4,9) => 'Lundi de Pâques',
@@ -19,7 +19,8 @@ class BeDefinitionTests < Test::Unit::TestCase  # :nodoc:
  Date.civil(2007,11,1) => 'Toussaint',
  Date.civil(2007,11,11) => 'Armistice 1918',
  Date.civil(2007,12,25) => 'Noël'}.each do |date, name|
-  assert_equal name, (Holidays.on(date, :be, :informal)[0] || {})[:name]
+  assert_equal name, (Holidays.on(date, :be_fr, :informal)[0] || {})[:name]
 end
+
   end
 end

data/test/defs/test_defs_be_nl.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
+
+# This file is generated by the Ruby Holiday gem.
+#
+# Definitions loaded: definitions/be_nl.yaml
+class Be_nlDefinitionTests < Test::Unit::TestCase  # :nodoc:
+
+  def test_be_nl
+{Date.civil(2007,1,1) => 'Nieuwjaar',
+ Date.civil(2007,4,8) => 'Pasen',
+ Date.civil(2007,4,9) => 'Paasmaandag',
+ Date.civil(2007,5,1) => 'Feest van de Arbeid',
+ Date.civil(2007,5,17) => 'O.H. Hemelvaart',
+ Date.civil(2007,5,27) => 'Pinksteren',
+ Date.civil(2007,5,28) => 'Pinkstermaandag',
+ Date.civil(2007,7,21) => 'Nationale Feestdag',
+ Date.civil(2007,8,15) => 'O.L.V. Hemelvaart',
+ Date.civil(2007,11,1) => 'Allerheiligen',
+ Date.civil(2007,11,11) => 'Wapenstilstand 1918',
+ Date.civil(2007,12,25) => 'Kerstmis'}.each do |date, name|
+  assert_equal name, (Holidays.on(date, :be_nl, :informal)[0] || {})[:name]
+end
+
+  end
+end

data/test/defs/test_defs_de.rb

@@ -7,16 +7,20 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class DeDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_de
-{Date.civil(2009,1,1) => 'Neujahrstag', 
+{Date.civil(2009,1,1) => 'Neujahrstag',
  Date.civil(2009,4,10) => 'Karfreitag',
+ Date.civil(2009,4,12) => 'Ostersonntag',
  Date.civil(2009,4,13) => 'Ostermontag',
  Date.civil(2009,5,1) => 'Tag der Arbeit',
  Date.civil(2009,5,21) => 'Christi Himmelfahrt',
+ Date.civil(2009,5,31) => 'Pfingstsonntag',
  Date.civil(2009,6,1) => 'Pfingstmontag',
  Date.civil(2009,10,3) => 'Tag der Deutschen Einheit',
+ Date.civil(2009,12,24) => 'Heilig Abend',
  Date.civil(2009,12,25) => '1. Weihnachtstag',
- Date.civil(2009,12,26) => '2. Weihnachtstag'}.each do |date, name|
-  assert_equal name, (Holidays.on(date, :de, :informal)[0] || {})[:name]
+ Date.civil(2009,12,26) => '2. Weihnachtstag',
+ Date.civil(2009,12,31) => 'Silvester'}.each do |date, name|
+  assert_equal name, (Holidays.on(date, :de, :informal)[0] || {})[:name], "Failed on '#{name}' for date '#{date}'"
 end
 
 [:de_bw, :de_by, :de_st, :de_].each do |r|
@@ -35,12 +39,22 @@ end
   assert_equal 'Reformationstag', Holidays.on(Date.civil(2009,10,31), r)[0][:name]
 end
 
+# Free day in schools
+[:de_bw].each do |r|
+  assert_equal 'Reformationstag', Holidays.on(Date.civil(2009,10,31), r, :informal)[0][:name]
+end
+
+# 500 years reformation in 2017
+assert_equal 'Reformationstag', Holidays.on(Date.civil(2017,10,31), :de)[0][:name]
+assert_equal [], Holidays.on(Date.civil(2016,10,31), :de), "Reformationstag is not a holiday in 2016 in whole Germany"
+assert_equal [], Holidays.on(Date.civil(2018,10,31), :de), "Reformationstag is not a holiday in 2018 in whole Germany"
+
 [:de_bw, :de_by, :de_nw, :de_rp, :de_sl, :de_].each do |r|
   assert_equal 'Allerheiligen', Holidays.on(Date.civil(2009,11,1), r)[0][:name]
 end
 
 [:de_by_aux].each do |r|
-  assert_equal 'Friedensfest', Date.civil(2015,8,8).holidays(r)[0][:name]
+  assert_equal 'Friedensfest', Holidays.on(Date.civil(2015,8,8),r)[0][:name]
 end
 
 [:de,
@@ -59,5 +73,12 @@ assert_equal 'Buß- und Bettag', Holidays.on(Date.civil(2005,11,16), :de_sn)[0][
 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]
 
+# Carnival
+[:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn].each do |r|
+  assert_equal 'Weiberfastnacht', Holidays.on(Date.civil(2016,2,4),r,:informal)[0][:name]
+  assert_equal 'Rosenmontag', Holidays.on(Date.civil(2016,2,8),r,:informal)[0][:name]
+  assert_equal 'Aschermittwoch', Holidays.on(Date.civil(2016,2,10),r,:informal)[0][:name]
+ end
+
   end
 end

data/test/defs/test_defs_europe.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: definitions/at.yaml, definitions/be.yaml, definitions/ch.yaml, definitions/cz.yaml, definitions/dk.yaml, definitions/de.yaml, definitions/el.yaml, definitions/es.yaml, definitions/fr.yaml, definitions/gb.yaml, definitions/hr.yaml, definitions/hu.yaml, definitions/ie.yaml, definitions/is.yaml, definitions/it.yaml, definitions/li.yaml, definitions/lt.yaml, definitions/nl.yaml, definitions/no.yaml, definitions/pl.yaml, definitions/pt.yaml, definitions/ro.yaml, definitions/sk.yaml, definitions/si.yaml, definitions/bg.yaml
+# Definitions loaded: definitions/at.yaml, definitions/be_fr.yaml, definitions/be_nl.yaml, definitions/ch.yaml, definitions/cz.yaml, definitions/dk.yaml, definitions/de.yaml, definitions/el.yaml, definitions/es.yaml, definitions/fr.yaml, definitions/gb.yaml, definitions/hr.yaml, definitions/hu.yaml, definitions/ie.yaml, definitions/is.yaml, definitions/it.yaml, definitions/li.yaml, definitions/lt.yaml, definitions/nl.yaml, definitions/no.yaml, definitions/pl.yaml, definitions/pt.yaml, definitions/ro.yaml, definitions/sk.yaml, definitions/si.yaml, definitions/bg.yaml
 class EuropeDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_europe
@@ -33,9 +33,26 @@ assert_equal [], Holidays.on(Date.civil(2010,5,8), :at), '2010-05-08 is not a ho
  Date.civil(2007,11,1) => 'Toussaint',
  Date.civil(2007,11,11) => 'Armistice 1918',
  Date.civil(2007,12,25) => 'Noël'}.each do |date, name|
-  assert_equal name, (Holidays.on(date, :be, :informal)[0] || {})[:name]
+  assert_equal name, (Holidays.on(date, :be_fr, :informal)[0] || {})[:name]
 end
 
+
+{Date.civil(2007,1,1) => 'Nieuwjaar',
+ Date.civil(2007,4,8) => 'Pasen',
+ Date.civil(2007,4,9) => 'Paasmaandag',
+ Date.civil(2007,5,1) => 'Feest van de Arbeid',
+ Date.civil(2007,5,17) => 'O.H. Hemelvaart',
+ Date.civil(2007,5,27) => 'Pinksteren',
+ Date.civil(2007,5,28) => 'Pinkstermaandag',
+ Date.civil(2007,7,21) => 'Nationale Feestdag',
+ Date.civil(2007,8,15) => 'O.L.V. Hemelvaart',
+ Date.civil(2007,11,1) => 'Allerheiligen',
+ Date.civil(2007,11,11) => 'Wapenstilstand 1918',
+ Date.civil(2007,12,25) => 'Kerstmis'}.each do |date, name|
+  assert_equal name, (Holidays.on(date, :be_nl, :informal)[0] || {})[:name]
+end
+
+
 { Date.civil(2012,8,1) => 'Bundesfeiertag',
   Date.civil(2012,12,25) => 'Weihnachten',
   Date.civil(2012,05,17) => 'Auffahrt'
@@ -102,16 +119,20 @@ end
 end
 
 
-{Date.civil(2009,1,1) => 'Neujahrstag', 
+{Date.civil(2009,1,1) => 'Neujahrstag',
  Date.civil(2009,4,10) => 'Karfreitag',
+ Date.civil(2009,4,12) => 'Ostersonntag',
  Date.civil(2009,4,13) => 'Ostermontag',
  Date.civil(2009,5,1) => 'Tag der Arbeit',
  Date.civil(2009,5,21) => 'Christi Himmelfahrt',
+ Date.civil(2009,5,31) => 'Pfingstsonntag',
  Date.civil(2009,6,1) => 'Pfingstmontag',
  Date.civil(2009,10,3) => 'Tag der Deutschen Einheit',
+ Date.civil(2009,12,24) => 'Heilig Abend',
  Date.civil(2009,12,25) => '1. Weihnachtstag',
- Date.civil(2009,12,26) => '2. Weihnachtstag'}.each do |date, name|
-  assert_equal name, (Holidays.on(date, :de, :informal)[0] || {})[:name]
+ Date.civil(2009,12,26) => '2. Weihnachtstag',
+ Date.civil(2009,12,31) => 'Silvester'}.each do |date, name|
+  assert_equal name, (Holidays.on(date, :de, :informal)[0] || {})[:name], "Failed on '#{name}' for date '#{date}'"
 end
 
 [:de_bw, :de_by, :de_st, :de_].each do |r|
@@ -130,12 +151,22 @@ end
   assert_equal 'Reformationstag', Holidays.on(Date.civil(2009,10,31), r)[0][:name]
 end
 
+# Free day in schools
+[:de_bw].each do |r|
+  assert_equal 'Reformationstag', Holidays.on(Date.civil(2009,10,31), r, :informal)[0][:name]
+end
+
+# 500 years reformation in 2017
+assert_equal 'Reformationstag', Holidays.on(Date.civil(2017,10,31), :de)[0][:name]
+assert_equal [], Holidays.on(Date.civil(2016,10,31), :de), "Reformationstag is not a holiday in 2016 in whole Germany"
+assert_equal [], Holidays.on(Date.civil(2018,10,31), :de), "Reformationstag is not a holiday in 2018 in whole Germany"
+
 [:de_bw, :de_by, :de_nw, :de_rp, :de_sl, :de_].each do |r|
   assert_equal 'Allerheiligen', Holidays.on(Date.civil(2009,11,1), r)[0][:name]
 end
 
 [:de_by_aux].each do |r|
-  assert_equal 'Friedensfest', Date.civil(2015,8,8).holidays(r)[0][:name]
+  assert_equal 'Friedensfest', Holidays.on(Date.civil(2015,8,8),r)[0][:name]
 end
 
 [:de,
@@ -154,6 +185,13 @@ assert_equal 'Buß- und Bettag', Holidays.on(Date.civil(2005,11,16), :de_sn)[0][
 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]
 
+# Carnival
+[:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn].each do |r|
+  assert_equal 'Weiberfastnacht', Holidays.on(Date.civil(2016,2,4),r,:informal)[0][:name]
+  assert_equal 'Rosenmontag', Holidays.on(Date.civil(2016,2,8),r,:informal)[0][:name]
+  assert_equal 'Aschermittwoch', Holidays.on(Date.civil(2016,2,10),r,:informal)[0][:name]
+ end
+
 
 {Date.civil(2011,1,1) => 'Πρωτοχρονιά', 
  Date.civil(2011,1,6) => 'Θεοφάνεια',

data/test/defs/test_defs_jp.rb

@@ -51,6 +51,14 @@ end
   assert_equal '国民の休日', Holidays.on(date, :jp)[0][:name]
 end
 
+# marine day since 1996
+[Date.civil(1996, 7, 20), Date.civil(2002, 7, 20), Date.civil(2003, 7, 21),
+ Date.civil(2004, 7, 19), Date.civil(2005, 7, 18), Date.civil(2006, 7, 17),
+ Date.civil(2007, 7, 16), Date.civil(2009, 7, 20), Date.civil(2013, 7, 15),
+ Date.civil(2014, 7, 21)].each do |date|
+  assert_equal '海の日', Holidays.on(date, :jp)[0][:name]
+end
+
 # mountain holiday start since 2016
 [Date.civil(2016,8,11), Date.civil(2017,8,11),Date.civil(2018,8,11),
  Date.civil(2019,8,11), Date.civil(2020,8,11),Date.civil(2021,8,11),

data/test/holidays/date_calculator/test_weekend_modifier.rb

@@ -30,4 +30,14 @@ class WeekendModifierDateCalculatorTests < Test::Unit::TestCase
   def test_to_weekday_if_boxing_weekend_from_year
     assert_equal Date.civil(2015, 12, 28), @subject.to_weekday_if_boxing_weekend_from_year(2015)
   end
+
+  def test_to_weekday_if_boxing_weekend_from_year_or_to_tuesday_if_monday
+    assert_equal Date.civil(2015, 12, 28), @subject.to_weekday_if_boxing_weekend_from_year_or_to_tuesday_if_monday(2015) # saturday to monday
+    assert_equal Date.civil(2016, 12, 27), @subject.to_weekday_if_boxing_weekend_from_year_or_to_tuesday_if_monday(2016) # monday to tuesday
+  end
+
+  def test_to_tuesday_if_sunday_or_monday_if_saturday
+    assert_equal Date.civil(2016, 12, 26), @subject.to_tuesday_if_sunday_or_monday_if_saturday(Date.civil(2016, 12, 24)) # sat to mon
+    assert_equal Date.civil(2016, 12, 27), @subject.to_tuesday_if_sunday_or_monday_if_saturday(Date.civil(2016, 12, 25)) # sun to tue
+  end
 end

data/test/test_all_regions.rb

@@ -12,7 +12,7 @@ class MultipleRegionsTests < Test::Unit::TestCase
 
     defs.each do |f|
       assert f.kind_of?(String)
-      assert File.exists?(f)
+      assert File.exist?(f)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holidays
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Alex Dunae
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,11 +98,12 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- definitions/SYNTAX.rdoc
+- definitions/README.md
 - definitions/ar.yaml
 - definitions/at.yaml
 - definitions/au.yaml
-- definitions/be.yaml
+- definitions/be_fr.yaml
+- definitions/be_nl.yaml
 - definitions/bg.yaml
 - definitions/br.yaml
 - definitions/ca.yaml
@@ -158,6 +159,8 @@ files:
 - lib/generated_definitions/at.rb
 - lib/generated_definitions/au.rb
 - lib/generated_definitions/be.rb
+- lib/generated_definitions/be_fr.rb
+- lib/generated_definitions/be_nl.rb
 - lib/generated_definitions/bg.rb
 - lib/generated_definitions/br.rb
 - lib/generated_definitions/ca.rb
@@ -234,7 +237,8 @@ files:
 - test/defs/test_defs_ar.rb
 - test/defs/test_defs_at.rb
 - test/defs/test_defs_au.rb
-- test/defs/test_defs_be.rb
+- test/defs/test_defs_be_fr.rb
+- test/defs/test_defs_be_nl.rb
 - test/defs/test_defs_bg.rb
 - test/defs/test_defs_br.rb
 - test/defs/test_defs_ca.rb
@@ -343,7 +347,8 @@ test_files:
 - test/defs/test_defs_ar.rb
 - test/defs/test_defs_at.rb
 - test/defs/test_defs_au.rb
-- test/defs/test_defs_be.rb
+- test/defs/test_defs_be_fr.rb
+- test/defs/test_defs_be_nl.rb
 - test/defs/test_defs_bg.rb
 - test/defs/test_defs_br.rb
 - test/defs/test_defs_ca.rb

data/definitions/SYNTAX.rdoc

@@ -1,111 +0,0 @@
-== Holiday Gem Definition Syntax
-
-All holidays are defined in YAML files in the <tt>data/</tt> directory.  These  definition files have three main parts: *months*, *methods* and *tests*. Before you start, you may want to look some of the existing files at http://code.dunae.ca/svn/holidays/trunk/data.
-
-=== Months
-
-Holidays are grouped by month from 1 through 12.  Each entry within a month can have several fields.
-
-[<tt>name</tt>]     The name of the holiday.
-[<tt>regions</tt>]  One or more region codes.
-
-===== Dates defined by a fixed date (e.g. January 1st) 
-
-[<tt>mday</tt>]  Integer representing day of the month (1 through 31).
-
-For example, the following holiday is on the first of January and available in the <tt>ca</tt>, <tt>us</tt> and <tt>au</tt> regions.
-
-    1:
-    - name: New Year's Day
-      regions: [ca, us, au]
-      mday: 1
-
-===== Dates defined by a week number (e.g. first Monday of a month)
-
-[<tt>wday</tt>]  Integer representing day of the week (0 = Sunday through 6 = Saturday).
-[<tt>week</tt>]  Integer representing week number (1 = first week, 3 = third week, -1 = last week),
-
-
-For example, the following holiday is on the first Monday of September and available in the <tt>ca</tt> region.
-
-    9:
-    - name: Labour Day
-      regions: [ca]
-      week: 1
-      wday: 1
-
-=== Calculating dates with methods
-
-In addition to defining holidays by day or week, you can create custom methods to calculate a date.
-
-For example, Canada celebrates Victoria Day, which falls on the Monday on or before May 24.  So, under the <tt>methods</tt> section we could create a custom method that returns a Date object.
-
-  methods:
-    ca_victoria_day: |
-      def self.ca_victoria_day(year)
-        date = Date.civil(year,5,24)
-        if date.wday > 1
-          date -= (date.wday - 1)
-        elsif date.wday == 0
-          date -= 6
-        end
-        date
-      end
-
-This would be represented in the <tt>months</tt> section as:
-
-    5:
-    - name: Victoria Day
-      regions: [ca]
-      function: ca_victoria_day(year)
-
-If a holiday can occur in different months (e.g. Easter) it can go in the '0' month.
-
-    0:
-    - name: Easter Monday
-      regions: [ca]
-      function: easter(year)+1
-
-Calculated-date functions take the year (integer) as a parameter and must return either a Date object or an integer representing the day of the month.
-
-
-=== Calculating observed dates
-
-Several built-in methods are available for holidays that are observed on varying dates.  For example, for a holiday that is observed on Monday if it falls on a weekend you could write:
-
-    7:
-    - name: Canada Day
-      regions: [ca]
-      mday: 1
-      observed: to_monday_if_weekend(date)
-
-Methods included in the Holidays module are:
-
-* Holidays#to_monday_if_sunday
-* Holidays#to_monday_if_weekend
-* Holidays#to_weekday_if_boxing_weekend
-* Holidays#to_weekday_if_weekend
-
-Observed-date functions take a Date object as a parameter and must return either a Date object or an integer representing the day of the month.
-
-
-
-=== Tests
-
-All definition files should have tests included.  In the YAML file, tests are just a block of Ruby code.
-
-  tests: |
-    {Date.civil(2008,1,1) => 'New Year\'s Day', 
-     Date.civil(2008,3,21) => 'Good Friday', 
-     Date.civil(2008,3,24) => 'Easter Monday',
-     Date.civil(2008,9,1) => 'Labour Day',
-     Date.civil(2008,12,25) => 'Christmas Day',
-     Date.civil(2008,12,26) => 'Boxing Day'}.each do |date, name|
-      assert_equal name, (Holidays.on(date, :ca, :informal)[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