holidays 2.2.0 → 3.0.0

data/lib/{holidays → generated_definitions}/dk.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/dk.yaml
+  # Definitions loaded: definitions/dk.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/dk'
+  #   require 'generated_definitions/dk'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module DK # :nodoc:

data/lib/{holidays → generated_definitions}/ecb_target.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/ecb_target.yaml
+  # Definitions loaded: definitions/ecb_target.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/ecb_target'
+  #   require 'generated_definitions/ecb_target'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module ECB_TARGET # :nodoc:

data/lib/{holidays → generated_definitions}/el.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/el.yaml
+  # Definitions loaded: definitions/el.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/el'
+  #   require 'generated_definitions/el'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module EL # :nodoc:

data/lib/{holidays → generated_definitions}/es.rb

@@ -2,23 +2,23 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/es.yaml
+  # Definitions loaded: definitions/es.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/es'
+  #   require 'generated_definitions/es'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module ES # :nodoc:
     def self.defined_regions
-      [:es_pv, :es_ct, :es_na, :es_v, :es_vc, :es_an, :es, :es_ib, :es_cm, :es_mu, :es_m, :es_ar, :es_cl, :es_cn, :es_lo, :es_ga, :es_ce, :es_o, :es_ex]
+      [:es_pv, :es_na, :es_an, :es_ib, :es_cm, :es_mu, :es_m, :es_ar, :es_cl, :es_cn, :es_lo, :es_ga, :es_ce, :es_o, :es_ex, :es, :es_ct, :es_v, :es_vc]
     end
 
     def self.holidays_by_month
       {
-              0 => [{:function => lambda { |year| Holidays.easter(year)-3 }, :function_id => "easter(year)-3", :name => "Jueves Santo", :regions => [:es_pv, :es_ct, :es_na, :es_v, :es_vc, :es_an]},
+              0 => [{:function => lambda { |year| Holidays.easter(year)-3 }, :function_id => "easter(year)-3", :name => "Jueves Santo", :regions => [:es_pv, :es_na, :es_an, :es_ib, :es_cm, :es_mu, :es_m, :es_ar, :es_cl, :es_cn, :es_lo, :es_ga, :es_ce, :es_o, :es_ex]},
             {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Viernes Santo", :regions => [:es]},
             {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Lunes de Pascua", :regions => [:es_pv, :es_ct, :es_na, :es_v, :es_vc]}],
       1 => [{:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Año Nuevo", :regions => [:es]},
@@ -26,8 +26,8 @@ module Holidays
       2 => [{:mday => 28, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de Andalucía", :regions => [:es_an]}],
       3 => [{:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de las Islas Baleares", :regions => [:es_ib]},
             {:mday => 19, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "San José", :regions => [:es_v, :es_vc, :es_cm, :es_mu, :es_m]}],
-      4 => [{:mday => 23, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "San Jorge", :regions => [:es_ar, :es_cl]},
-            {:mday => 23, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de Aragón", :regions => [:es_ar]}],
+      4 => [{:mday => 23, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de Castilla y León", :regions => [:es_cl]},
+            {:mday => 23, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "San Jorge, Día de Aragón", :regions => [:es_ar]}],
       5 => [{:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día del Trabajador", :regions => [:es]},
             {:mday => 2, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Fiesta de la Comunidad", :regions => [:es_m]},
             {:mday => 30, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de las Canarias", :regions => [:es_cn]},

data/lib/{holidays → generated_definitions}/europe.rb

@@ -2,18 +2,18 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/at.yaml, data/be.yaml, data/ch.yaml, data/cz.yaml, data/dk.yaml, data/de.yaml, data/el.yaml, data/es.yaml, data/fr.yaml, data/gb.yaml, data/hr.yaml, data/hu.yaml, data/ie.yaml, data/is.yaml, data/it.yaml, data/li.yaml, data/lt.yaml, data/nl.yaml, data/no.yaml, data/pl.yaml, data/pt.yaml, data/ro.yaml, data/sk.yaml, data/si.yaml
+  # 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
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/europe'
+  #   require 'generated_definitions/europe'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module EUROPE # :nodoc:
     def self.defined_regions
-      [:at, :be, :ch_zh, :ch_be, :ch_lu, :ch_ur, :ch_sz, :ch_ow, :ch_nw, :ch_gl, :ch_zg, :ch_fr, :ch_so, :ch_bs, :ch_bl, :ch_sh, :ch_ar, :ch_ai, :ch_sg, :ch_gr, :ch_ag, :ch_tg, :ch_ti, :ch_vd, :ch_ne, :ch_ge, :ch_ju, :ch_vs, :ch, :cz, :dk, :de, :de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_st, :de_bb, :de_mv, :de_sn, :de_th, :el, :es_pv, :es_ct, :es_na, :es_v, :es_vc, :es_an, :es, :es_ib, :es_cm, :es_mu, :es_m, :es_ar, :es_cl, :es_cn, :es_lo, :es_ga, :es_ce, :es_o, :es_ex, :fr, :gb, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :gb_sct, :gb_con, :je, :gb_jsy, :gg, :gb_gsy, :im, :gb_iom, :hr, :hu, :ie, :is, :it, :li, :lt, :nl, :no, :pl, :pt, :ro, :sk, :si]
+      [:at, :be, :ch_zh, :ch_be, :ch_lu, :ch_ur, :ch_sz, :ch_ow, :ch_nw, :ch_gl, :ch_zg, :ch_fr, :ch_so, :ch_bs, :ch_bl, :ch_sh, :ch_ar, :ch_ai, :ch_sg, :ch_gr, :ch_ag, :ch_tg, :ch_ti, :ch_vd, :ch_ne, :ch_ge, :ch_ju, :ch_vs, :ch, :cz, :dk, :de, :de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_st, :de_by_aux, :de_bb, :de_mv, :de_sn, :de_th, :el, :es_pv, :es_na, :es_an, :es_ib, :es_cm, :es_mu, :es_m, :es_ar, :es_cl, :es_cn, :es_lo, :es_ga, :es_ce, :es_o, :es_ex, :es, :es_ct, :es_v, :es_vc, :fr, :gb, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :gb_sct, :gb_con, :je, :gb_jsy, :gg, :gb_gsy, :im, :gb_iom, :hr, :hu, :ie, :is, :it, :li, :lt, :nl, :no, :pl, :pt, :ro, :sk, :si]
     end
 
     def self.holidays_by_month
@@ -56,7 +56,7 @@ module Holidays
             {:function => lambda { |year| Holidays.orthodox_easter(year)+1 }, :function_id => "orthodox_easter(year)+1", :name => "Δευτέρα του Πάσχα", :regions => [:el]},
             {:function => lambda { |year| Holidays.orthodox_easter(year)-48 }, :function_id => "orthodox_easter(year)-48", :name => "Καθαρά Δευτέρα", :regions => [:el]},
             {:function => lambda { |year| Holidays.orthodox_easter(year)+50 }, :function_id => "orthodox_easter(year)+50", :name => "Αγίου Πνεύματος", :regions => [:el]},
-            {:function => lambda { |year| Holidays.easter(year)-3 }, :function_id => "easter(year)-3", :name => "Jueves Santo", :regions => [:es_pv, :es_ct, :es_na, :es_v, :es_vc, :es_an]},
+            {:function => lambda { |year| Holidays.easter(year)-3 }, :function_id => "easter(year)-3", :name => "Jueves Santo", :regions => [:es_pv, :es_na, :es_an, :es_ib, :es_cm, :es_mu, :es_m, :es_ar, :es_cl, :es_cn, :es_lo, :es_ga, :es_ce, :es_o, :es_ex]},
             {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Viernes Santo", :regions => [:es]},
             {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Lunes de Pascua", :regions => [:es_pv, :es_ct, :es_na, :es_v, :es_vc]},
             {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :type => :informal, :name => "Pâques", :regions => [:fr]},
@@ -219,6 +219,7 @@ module Holidays
             {:mday => 1, :name => "Bundesfeiertag", :regions => [:ch]},
             {:mday => 15, :name => "Mariä Himmelfahrt", :regions => [:ch_lu, :ch_ur, :ch_sz, :ch_ow, :ch_nw, :ch_zg, :ch_fr, :ch_so, :ch_ai, :ch_ag, :ch_ti, :ch_vs, :ch_ju]},
             {:mday => 15, :name => "Mariä Himmelfahrt", :regions => [:de_by, :de_sl]},
+            {:mday => 8, :name => "Friedensfest", :regions => [:de_by_aux]},
             {:mday => 15, :name => "Κοίμηση της Θεοτόκου", :regions => [:el]},
             {:mday => 15, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Asunción", :regions => [:es]},
             {:mday => 15, :name => "Assomption", :regions => [:fr]},
@@ -373,8 +374,8 @@ module Holidays
             {:mday => 1, :type => :informal, :name => "1. april", :regions => [:dk]},
             {:mday => 9, :type => :informal, :name => "Danmarks besættelse", :regions => [:dk]},
             {:mday => 16, :type => :informal, :name => "Dronningens fødselsdag", :regions => [:dk]},
-            {:mday => 23, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "San Jorge", :regions => [:es_ar, :es_cl]},
-            {:mday => 23, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de Aragón", :regions => [:es_ar]},
+            {:mday => 23, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de Castilla y León", :regions => [:es_cl]},
+            {:mday => 23, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "San Jorge, Día de Aragón", :regions => [:es_ar]},
             {:function => lambda { |year| Holidays.is_sumardagurinn_fyrsti(year) }, :function_id => "is_sumardagurinn_fyrsti(year)", :name => "Sumardagurinn fyrsti", :regions => [:is]},
             {:mday => 25, :name => "Festa della Liberazione", :regions => [:it]},
             {:mday => 27, :name => "Koningsdag", :regions => [:nl]},

data/lib/{holidays → generated_definitions}/fed_ex.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/fedex.yaml
+  # Definitions loaded: definitions/fedex.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/fed_ex'
+  #   require 'generated_definitions/fed_ex'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module FED_EX # :nodoc:
@@ -23,13 +23,18 @@ module Holidays
       7 => [{:mday => 4, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Independence Day", :regions => [:fedex]}],
       9 => [{:wday => 1, :week => 1, :name => "Labor Day", :regions => [:fedex]}],
       11 => [{:wday => 4, :week => 4, :name => "Thanksgiving", :regions => [:fedex]},
-            {:wday => 5, :week => 4, :name => "Day After Thanksgiving", :regions => [:fedex]}],
+            {:function => lambda { |year| Holidays.day_after_thanksgiving(year) }, :function_id => "day_after_thanksgiving(year)", :name => "Day After Thanksgiving", :regions => [:fedex]}],
       12 => [{:mday => 25, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Christmas Day", :regions => [:fedex]},
             {:mday => 31, :name => "New Year's Eve", :regions => [:fedex]}]
       }
     end
   end
 
+def self.day_after_thanksgiving(year)
+  Date.calculate_mday(year, 11, 4, 4) + 1
+end
+
+
 
 end
 

data/lib/{holidays → generated_definitions}/federal_reserve.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/federal_reserve.yaml
+  # Definitions loaded: definitions/federal_reserve.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/federal_reserve'
+  #   require 'generated_definitions/federal_reserve'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module FEDERAL_RESERVE # :nodoc:

data/lib/{holidays → generated_definitions}/fi.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/fi.yaml
+  # Definitions loaded: definitions/fi.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/fi'
+  #   require 'generated_definitions/fi'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module FI # :nodoc:

data/lib/{holidays → generated_definitions}/fr.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/fr.yaml
+  # Definitions loaded: definitions/fr.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/fr'
+  #   require 'generated_definitions/fr'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module FR # :nodoc:

data/lib/{holidays → generated_definitions}/gb.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/gb.yaml
+  # Definitions loaded: definitions/gb.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/gb'
+  #   require 'generated_definitions/gb'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module GB # :nodoc:

data/lib/{holidays → generated_definitions}/hr.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/hr.yaml
+  # Definitions loaded: definitions/hr.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/hr'
+  #   require 'generated_definitions/hr'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module HR # :nodoc:

data/lib/{holidays → generated_definitions}/hu.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/hu.yaml
+  # Definitions loaded: definitions/hu.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/hu'
+  #   require 'generated_definitions/hu'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module HU # :nodoc:

data/lib/{holidays → generated_definitions}/ie.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/ie.yaml
+  # Definitions loaded: definitions/ie.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/ie'
+  #   require 'generated_definitions/ie'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module IE # :nodoc:

data/lib/{holidays → generated_definitions}/is.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/is.yaml
+  # Definitions loaded: definitions/is.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/is'
+  #   require 'generated_definitions/is'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module IS # :nodoc:

data/lib/{holidays → generated_definitions}/it.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/it.yaml
+  # Definitions loaded: definitions/it.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/it'
+  #   require 'generated_definitions/it'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module IT # :nodoc:

data/lib/{holidays → generated_definitions}/jp.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/jp.yaml
+  # Definitions loaded: definitions/jp.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/jp'
+  #   require 'generated_definitions/jp'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module JP # :nodoc:
@@ -34,14 +34,14 @@ module Holidays
             {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 5, 4) }, :function_id => "jp_substitute_holiday(year, 5, 4)", :name => "振替休日", :regions => [:jp]},
             {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 5, 5) }, :function_id => "jp_substitute_holiday(year, 5, 5)", :name => "振替休日", :regions => [:jp]}],
       7 => [{:wday => 1, :week => 3, :name => "海の日", :regions => [:jp]},
-            {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 7, Date.calculate_mday(year, 7, 3, 1)) }, :function_id => "jp_substitute_holiday(year, 7, Date.calculate_mday(year, 7, 3, 1))", :name => "振替休日", :regions => [:jp]}],
+            {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 7, Holidays.calculate_day_of_month(year, 7, 3, 1)) }, :function_id => "jp_substitute_holiday(year, 7, Holidays.calculate_day_of_month(year, 7, 3, 1))", :name => "振替休日", :regions => [:jp]}],
       9 => [{:wday => 1, :week => 3, :name => "敬老の日", :regions => [:jp]},
-            {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 9, Date.calculate_mday(year, 9, 3, 1)) }, :function_id => "jp_substitute_holiday(year, 9, Date.calculate_mday(year, 9, 3, 1))", :name => "振替休日", :regions => [:jp]},
+            {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 9, Holidays.calculate_day_of_month(year, 9, 3, 1)) }, :function_id => "jp_substitute_holiday(year, 9, Holidays.calculate_day_of_month(year, 9, 3, 1))", :name => "振替休日", :regions => [:jp]},
             {:function => lambda { |year| Holidays.jp_citizons_holiday(year) }, :function_id => "jp_citizons_holiday(year)", :name => "国民の休日", :regions => [:jp]},
             {:function => lambda { |year| Holidays.jp_national_culture_day(year) }, :function_id => "jp_national_culture_day(year)", :name => "秋分の日", :regions => [:jp]},
             {:function => lambda { |year| Holidays.jp_substitute_holiday(Holidays.jp_national_culture_day(year)) }, :function_id => "jp_substitute_holiday(Holidays.jp_national_culture_day(year))", :name => "振替休日", :regions => [:jp]}],
       10 => [{:wday => 1, :week => 2, :name => "体育の日", :regions => [:jp]},
-            {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 10, Date.calculate_mday(year, 10, 2, 1)) }, :function_id => "jp_substitute_holiday(year, 10, Date.calculate_mday(year, 10, 2, 1))", :name => "振替休日", :regions => [:jp]}],
+            {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 10, Holidays.calculate_day_of_month(year, 10, 2, 1)) }, :function_id => "jp_substitute_holiday(year, 10, Holidays.calculate_day_of_month(year, 10, 2, 1))", :name => "振替休日", :regions => [:jp]}],
       11 => [{:mday => 3, :name => "文化の日", :regions => [:jp]},
             {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 11, 3) }, :function_id => "jp_substitute_holiday(year, 11, 3)", :name => "振替休日", :regions => [:jp]},
             {:mday => 23, :name => "勤労感謝の日", :regions => [:jp]},

data/lib/{holidays → generated_definitions}/li.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/li.yaml
+  # Definitions loaded: definitions/li.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/li'
+  #   require 'generated_definitions/li'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module LI # :nodoc:

data/lib/{holidays → generated_definitions}/lt.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/lt.yaml
+  # Definitions loaded: definitions/lt.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/lt'
+  #   require 'generated_definitions/lt'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module LT # :nodoc:

data/lib/{holidays → generated_definitions}/ma.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/ma.yaml
+  # Definitions loaded: definitions/ma.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/ma'
+  #   require 'generated_definitions/ma'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module MA # :nodoc:

data/lib/{holidays → generated_definitions}/mx.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/mx.yaml, data/north_america_informal.yaml
+  # Definitions loaded: definitions/mx.yaml, definitions/north_america_informal.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/mx'
+  #   require 'generated_definitions/mx'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module MX # :nodoc:

data/lib/{holidays → generated_definitions}/nerc.rb

@@ -2,13 +2,13 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/nerc.yaml
+  # Definitions loaded: definitions/nerc.yaml
   #
   # To use the definitions in this file, load it right after you load the
   # Holiday gem:
   #
   #   require 'holidays'
-  #   require 'holidays/nerc'
+  #   require 'generated_definitions/nerc'
   #
   # All the definitions are available at https://github.com/alexdunae/holidays
   module NERC # :nodoc: