holidays 1.0.3 → 1.0.4

data/lib/holidays/li.rb

@@ -0,0 +1,48 @@
+# encoding: utf-8
+module Holidays
+  # This file is generated by the Ruby Holidays gem.
+  #
+  # Definitions loaded: data/li.yaml
+  #
+  # To use the definitions in this file, load it right after you load the 
+  # Holiday gem:
+  #
+  #   require 'holidays'
+  #   require 'holidays/li'
+  #
+  # All the definitions are available at https://github.com/alexdunae/holidays
+  module LI # :nodoc:
+    def self.defined_regions
+      [:li]
+    end
+
+    def self.holidays_by_month
+      {
+              0 => [{:function => lambda { |year| Holidays.easter(year)-47 }, :function_id => "easter(year)-47", :name => "Fasnachtsdienstag", :regions => [:li]},
+            {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Karfreitag", :regions => [:li]},
+            {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :type => :informal, :name => "Ostern", :regions => [:li]},
+            {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Ostermontag", :regions => [:li]},
+            {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Auffahrt", :regions => [:li]},
+            {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Pfingstmontag", :regions => [:li]},
+            {:function => lambda { |year| Holidays.easter(year)+60 }, :function_id => "easter(year)+60", :name => "Fronleichnam", :regions => [:li]}],
+      1 => [{:mday => 1, :name => "Neujahrstag", :regions => [:li]},
+            {:mday => 6, :name => "Heilige Drei Könige", :regions => [:li]}],
+      2 => [{:mday => 2, :name => "Maria Lichtmess", :regions => [:li]}],
+      3 => [{:mday => 19, :name => "St. Josef", :regions => [:li]}],
+      5 => [{:mday => 1, :name => "Tag der Arbeit", :regions => [:li]}],
+      8 => [{:mday => 15, :name => "Staatsfeiertag", :regions => [:li]}],
+      9 => [{:mday => 8, :name => "Maria Geburt", :regions => [:li]}],
+      11 => [{:mday => 1, :name => "Allerheiligen", :regions => [:li]}],
+      12 => [{:mday => 8, :name => "Maria Empfängnis", :regions => [:li]},
+            {:mday => 24, :name => "Heilig Abend", :regions => [:li]},
+            {:mday => 25, :name => "Weihnachten", :regions => [:li]},
+            {:mday => 26, :name => "Stefanstag", :regions => [:li]},
+            {:mday => 31, :name => "Silvester", :regions => [:li]}]
+      }
+    end
+  end
+
+
+end
+
+Holidays.merge_defs(Holidays::LI.defined_regions, Holidays::LI.holidays_by_month)

data/lib/holidays/mx.rb

@@ -1,52 +1,56 @@
 # encoding: utf-8
 module Holidays
-  # This file is generated by the Ruby Holiday gem.
+  # This file is generated by the Ruby Holidays gem.
   #
   # Definitions loaded: data/mx.yaml, data/north_america_informal.yaml
   #
-  # To use the definitions in this file, load them right after you load the 
+  # To use the definitions in this file, load it right after you load the 
   # Holiday gem:
   #
   #   require 'holidays'
   #   require 'holidays/mx'
   #
-  # More definitions are available at http://code.dunae.ca/holidays.
+  # All the definitions are available at https://github.com/alexdunae/holidays
   module MX # :nodoc:
-    DEFINED_REGIONS = [:mx, :mx_pue, :us, :ca]
+    def self.defined_regions
+      [:mx, :mx_pue, :us, :ca]
+    end
 
-    HOLIDAYS_BY_MONTH = {
+    def self.holidays_by_month
+      {
+              1 => [{:mday => 1, :name => "Año nuevo", :regions => [:mx]},
+            {:mday => 6, :name => "Dia de los Santos Reyes", :regions => [:mx]}],
+      2 => [{:wday => 1, :week => 1, :name => "Día de la Constitución", :regions => [:mx]},
+            {:mday => 2, :type => :informal, :name => "Groundhog Day", :regions => [:us, :ca]},
+            {:mday => 14, :type => :informal, :name => "Valentine's Day", :regions => [:us, :ca]}],
+      3 => [{:wday => 1, :week => 3, :name => "Natalicio de Benito Juárez", :regions => [:mx]},
+            {:mday => 17, :type => :informal, :name => "St. Patrick's Day", :regions => [:us, :ca]}],
+      4 => [{:mday => 30, :type => :informal, :name => "Día del Niño", :regions => [:mx]},
+            {:mday => 1, :type => :informal, :name => "April Fool's Day", :regions => [:us, :ca]},
+            {:mday => 22, :type => :informal, :name => "Earth Day", :regions => [:us, :ca]}],
       5 => [{:mday => 1, :name => "Día del Trabajo", :regions => [:mx]},
             {:mday => 5, :type => :informal, :name => "Cinco de Mayo", :regions => [:mx]},
             {:mday => 5, :name => "La Batalla de Puebla", :regions => [:mx_pue]},
             {:mday => 10, :type => :informal, :name => "Día de la Madre", :regions => [:mx]},
             {:mday => 15, :type => :informal, :name => "Día del Maestro", :regions => [:mx]},
             {:wday => 0, :week => 3, :type => :informal, :name => "Father's Day", :regions => [:us, :ca]}],
+      6 => [{:wday => 0, :week => 3, :type => :informal, :name => "Día del Padre", :regions => [:mx]}],
+      9 => [{:mday => 15, :name => "Grito de Dolores", :regions => [:mx]},
+            {:mday => 16, :name => "Día de la Independencia", :regions => [:mx]}],
+      10 => [{:mday => 12, :type => :informal, :name => "Día de la Raza", :regions => [:mx]},
+            {:mday => 31, :type => :informal, :name => "Halloween", :regions => [:us, :ca]}],
       11 => [{:mday => 1, :type => :informal, :name => "Todos los Santos", :regions => [:mx]},
             {:mday => 2, :type => :informal, :name => "Los Fieles Difuntos", :regions => [:mx]},
             {:wday => 1, :week => 3, :name => "Día de la Revolución", :regions => [:mx]}],
-      6 => [{:wday => 0, :week => 3, :type => :informal, :name => "Día del Padre", :regions => [:mx]}],
-      1 => [{:mday => 1, :name => "Año nuevo", :regions => [:mx]},
-            {:mday => 6, :name => "Dia de los Santos Reyes", :regions => [:mx]}],
       12 => [{:mday => 12, :type => :informal, :name => "Día de la Virgen de Guadalupe", :regions => [:mx]},
             {:mday => 24, :type => :informal, :name => "Nochebuena", :regions => [:mx]},
             {:mday => 25, :name => "Navidad", :regions => [:mx]},
-            {:mday => 28, :name => "Los Santos Inocentes", :regions => [:mx]}],
-      2 => [{:wday => 1, :week => 1, :name => "Día de la Constitución", :regions => [:mx]},
-            {:mday => 2, :type => :informal, :name => "Groundhog Day", :regions => [:us, :ca]},
-            {:mday => 14, :type => :informal, :name => "Valentine's Day", :regions => [:us, :ca]}],
-      3 => [{:wday => 1, :week => 3, :name => "Natalicio de Benito Juárez", :regions => [:mx]},
-            {:mday => 17, :type => :informal, :name => "St. Patrick's Day", :regions => [:us, :ca]}],
-      9 => [{:mday => 15, :name => "Grito de Dolores", :regions => [:mx]},
-            {:mday => 16, :name => "Día de la Independencia", :regions => [:mx]}],
-      4 => [{:mday => 30, :type => :informal, :name => "Día del Niño", :regions => [:mx]},
-            {:mday => 1, :type => :informal, :name => "April Fool's Day", :regions => [:us, :ca]},
-            {:mday => 22, :type => :informal, :name => "Earth Day", :regions => [:us, :ca]}],
-      10 => [{:mday => 12, :type => :informal, :name => "Día de la Raza", :regions => [:mx]},
-            {:mday => 31, :type => :informal, :name => "Halloween", :regions => [:us, :ca]}]
-    }
+            {:mday => 28, :name => "Los Santos Inocentes", :regions => [:mx]}]
+      }
+    end
   end
 
 
 end
 
-Holidays.merge_defs(Holidays::MX::DEFINED_REGIONS, Holidays::MX::HOLIDAYS_BY_MONTH)
+Holidays.merge_defs(Holidays::MX.defined_regions, Holidays::MX.holidays_by_month)

data/lib/holidays/nl.rb

@@ -1,37 +1,41 @@
 # encoding: utf-8
 module Holidays
-  # This file is generated by the Ruby Holiday gem.
+  # This file is generated by the Ruby Holidays gem.
   #
   # Definitions loaded: data/nl.yaml
   #
-  # To use the definitions in this file, load them right after you load the 
+  # To use the definitions in this file, load it right after you load the 
   # Holiday gem:
   #
   #   require 'holidays'
   #   require 'holidays/nl'
   #
-  # More definitions are available at http://code.dunae.ca/holidays.
+  # All the definitions are available at https://github.com/alexdunae/holidays
   module NL # :nodoc:
-    DEFINED_REGIONS = [:nl]
+    def self.defined_regions
+      [:nl]
+    end
 
-    HOLIDAYS_BY_MONTH = {
-      5 => [{:mday => 4, :name => "Dodenherdenking", :regions => [:nl]},
-            {:mday => 5, :name => "Bevrijdingsdag", :regions => [:nl]}],
-      0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Goede Vrijdag", :regions => [:nl]},
+    def self.holidays_by_month
+      {
+              0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Goede Vrijdag", :regions => [:nl]},
             {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Pasen", :regions => [:nl]},
             {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Pasen", :regions => [:nl]},
             {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Hemelvaartsdag", :regions => [:nl]},
             {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "Pinksteren", :regions => [:nl]},
             {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Pinksteren", :regions => [:nl]}],
       1 => [{:mday => 1, :name => "Nieuwjaar", :regions => [:nl]}],
+      4 => [{:mday => 30, :name => "Koninginnedag", :regions => [:nl]}],
+      5 => [{:mday => 4, :name => "Dodenherdenking", :regions => [:nl]},
+            {:mday => 5, :name => "Bevrijdingsdag", :regions => [:nl]}],
       12 => [{:mday => 5, :type => :informal, :name => "Sinterklaas", :regions => [:nl]},
             {:mday => 25, :name => "Kerstmis", :regions => [:nl]},
-            {:mday => 26, :name => "Kerstmis", :regions => [:nl]}],
-      4 => [{:mday => 30, :name => "Koninginnedag", :regions => [:nl]}]
-    }
+            {:mday => 26, :name => "Kerstmis", :regions => [:nl]}]
+      }
+    end
   end
 
 
 end
 
-Holidays.merge_defs(Holidays::NL::DEFINED_REGIONS, Holidays::NL::HOLIDAYS_BY_MONTH)
+Holidays.merge_defs(Holidays::NL.defined_regions, Holidays::NL.holidays_by_month)

data/lib/holidays/no.rb

@@ -1,23 +1,24 @@
 # encoding: utf-8
 module Holidays
-  # This file is generated by the Ruby Holiday gem.
+  # This file is generated by the Ruby Holidays gem.
   #
   # Definitions loaded: data/no.yaml
   #
-  # To use the definitions in this file, load them right after you load the 
+  # To use the definitions in this file, load it right after you load the 
   # Holiday gem:
   #
   #   require 'holidays'
   #   require 'holidays/no'
   #
-  # More definitions are available at http://code.dunae.ca/holidays.
+  # All the definitions are available at https://github.com/alexdunae/holidays
   module NO # :nodoc:
-    DEFINED_REGIONS = [:no]
+    def self.defined_regions
+      [:no]
+    end
 
-    HOLIDAYS_BY_MONTH = {
-      5 => [{:mday => 1, :name => "1. mai", :regions => [:no]},
-            {:mday => 17, :name => "17. mai", :regions => [:no]}],
-      0 => [{:function => lambda { |year| Holidays.easter(year)-49 }, :function_id => "easter(year)-49", :type => :informal, :name => "Fastelavn", :regions => [:no]},
+    def self.holidays_by_month
+      {
+              0 => [{:function => lambda { |year| Holidays.easter(year)-49 }, :function_id => "easter(year)-49", :type => :informal, :name => "Fastelavn", :regions => [:no]},
             {:function => lambda { |year| Holidays.easter(year)-7 }, :function_id => "easter(year)-7", :name => "Palmesøndag", :regions => [:no]},
             {:function => lambda { |year| Holidays.easter(year)-3 }, :function_id => "easter(year)-3", :name => "Skjærtorsdag", :regions => [:no]},
             {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Langfredag", :regions => [:no]},
@@ -27,14 +28,17 @@ module Holidays
             {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "1. pinsedag", :regions => [:no]},
             {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "2. pinsedag", :regions => [:no]}],
       1 => [{:mday => 1, :name => "Nyttårsdag", :regions => [:no]}],
+      5 => [{:mday => 1, :name => "1. mai", :regions => [:no]},
+            {:mday => 17, :name => "17. mai", :regions => [:no]}],
       12 => [{:mday => 24, :type => :informal, :name => "Julaften", :regions => [:no]},
             {:mday => 25, :name => "1. juledag", :regions => [:no]},
             {:mday => 26, :name => "2. juledag", :regions => [:no]},
             {:mday => 31, :type => :informal, :name => "Nyttårsaften", :regions => [:no]}]
-    }
+      }
+    end
   end
 
 
 end
 
-Holidays.merge_defs(Holidays::NO::DEFINED_REGIONS, Holidays::NO::HOLIDAYS_BY_MONTH)
+Holidays.merge_defs(Holidays::NO.defined_regions, Holidays::NO.holidays_by_month)

data/lib/holidays/north_america.rb

@@ -1,20 +1,42 @@
 # encoding: utf-8
 module Holidays
-  # This file is generated by the Ruby Holiday gem.
+  # This file is generated by the Ruby Holidays gem.
   #
   # Definitions loaded: data/ca.yaml, data/mx.yaml, data/us.yaml, data/north_america_informal.yaml
   #
-  # To use the definitions in this file, load them right after you load the 
+  # To use the definitions in this file, load it right after you load the 
   # Holiday gem:
   #
   #   require 'holidays'
   #   require 'holidays/north_america'
   #
-  # More definitions are available at http://code.dunae.ca/holidays.
+  # All the definitions are available at https://github.com/alexdunae/holidays
   module North_America # :nodoc:
-    DEFINED_REGIONS = [:ca, :ca_qc, :ca_nf, :ca_nt, :ca_nu, :ca_ab, :ca_on, :ca_sk, :ca_mb, :ca_bc, :ca_ns, :ca_yk, :mx, :mx_pue, :us, :us_dc]
+    def self.defined_regions
+      [:ca, :ca_qc, :ca_ab, :ca_on, :ca_sk, :ca_mb, :ca_nf, :ca_nt, :ca_nu, :ca_bc, :ca_ns, :ca_yk, :mx, :mx_pue, :us, :us_dc]
+    end
 
-    HOLIDAYS_BY_MONTH = {
+    def self.holidays_by_month
+      {
+              0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:ca]},
+            {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :type => :informal, :name => "Easter Monday", :regions => [:ca]},
+            {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :type => :informal, :name => "Good Friday", :regions => [:us]}],
+      1 => [{:mday => 1, :name => "New Year's Day", :regions => [:ca]},
+            {:mday => 2, :name => "New Year's", :regions => [:ca_qc]},
+            {:mday => 1, :name => "Año nuevo", :regions => [:mx]},
+            {:mday => 6, :name => "Dia de los Santos Reyes", :regions => [:mx]},
+            {:mday => 1, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "New Year's Day", :regions => [:us]},
+            {:wday => 1, :week => 3, :name => "Martin Luther King, Jr. Day", :regions => [:us]},
+            {:function => lambda { |year| Holidays.us_inauguration_day(year) }, :function_id => "us_inauguration_day(year)", :name => "Inauguration Day", :regions => [:us_dc]}],
+      2 => [{:wday => 1, :week => 3, :name => "Family Day", :regions => [:ca_ab, :ca_on, :ca_sk]},
+            {:wday => 1, :week => 3, :name => "Louis Riel Day", :regions => [:ca_mb]},
+            {:wday => 1, :week => 1, :name => "Día de la Constitución", :regions => [:mx]},
+            {:wday => 1, :week => 3, :name => "Presidents' Day", :regions => [:us]},
+            {:mday => 2, :type => :informal, :name => "Groundhog Day", :regions => [:us, :ca]},
+            {:mday => 14, :type => :informal, :name => "Valentine's Day", :regions => [:us, :ca]}],
+      3 => [{:mday => 23, :name => "St. George's Day", :regions => [:ca_nf]},
+            {:wday => 1, :week => 3, :name => "Natalicio de Benito Juárez", :regions => [:mx]},
+            {:mday => 17, :type => :informal, :name => "St. Patrick's Day", :regions => [:us, :ca]}],
       5 => [{:function => lambda { |year| Holidays.ca_victoria_day(year) }, :function_id => "ca_victoria_day(year)", :name => "Victoria Day", :regions => [:ca]},
             {:function => lambda { |year| Holidays.ca_victoria_day(year) }, :function_id => "ca_victoria_day(year)", :name => "National Patriotes Day", :regions => [:ca_qc]},
             {:mday => 1, :name => "Día del Trabajo", :regions => [:mx]},
@@ -24,64 +46,46 @@ module Holidays
             {:mday => 15, :type => :informal, :name => "Día del Maestro", :regions => [:mx]},
             {:wday => 1, :week => -1, :name => "Memorial Day", :regions => [:us]},
             {:wday => 0, :week => 3, :type => :informal, :name => "Father's Day", :regions => [:us, :ca]}],
-      0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:ca]},
-            {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :type => :informal, :name => "Easter Monday", :regions => [:ca]},
-            {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :type => :informal, :name => "Good Friday", :regions => [:us]}],
-      11 => [{:mday => 11, :name => "Remembrance Day", :regions => [:ca]},
-            {:mday => 1, :type => :informal, :name => "Todos los Santos", :regions => [:mx]},
-            {:mday => 2, :type => :informal, :name => "Los Fieles Difuntos", :regions => [:mx]},
-            {:wday => 1, :week => 3, :name => "Día de la Revolución", :regions => [:mx]},
-            {:mday => 11, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Veterans Day", :regions => [:us]},
-            {:wday => 4, :week => 4, :name => "Thanksgiving", :regions => [:us]}],
       6 => [{:mday => 24, :name => "Discovery Day", :regions => [:ca_nf]},
             {:mday => 24, :name => "Fête Nationale", :regions => [:ca_qc]},
             {:mday => 21, :name => "National Aboriginal Day", :regions => [:ca_nt]},
             {:wday => 0, :week => 3, :type => :informal, :name => "Día del Padre", :regions => [:mx]}],
-      1 => [{:mday => 1, :name => "New Year's Day", :regions => [:ca]},
-            {:mday => 2, :name => "New Year's", :regions => [:ca_qc]},
-            {:mday => 1, :name => "Año nuevo", :regions => [:mx]},
-            {:mday => 6, :name => "Dia de los Santos Reyes", :regions => [:mx]},
-            {:mday => 1, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "New Year's Day", :regions => [:us]},
-            {:wday => 1, :week => 3, :name => "Martin Luther King, Jr. Day", :regions => [:us]},
-            {:function => lambda { |year| Holidays.us_inauguration_day(year) }, :function_id => "us_inauguration_day(year)", :name => "Inauguration Day", :regions => [:us_dc]}],
-      12 => [{:mday => 25, :name => "Christmas Day", :regions => [:ca]},
-            {:mday => 26, :name => "Boxing Day", :regions => [:ca]},
-            {:mday => 12, :type => :informal, :name => "Día de la Virgen de Guadalupe", :regions => [:mx]},
-            {:mday => 24, :type => :informal, :name => "Nochebuena", :regions => [:mx]},
-            {:mday => 25, :name => "Navidad", :regions => [:mx]},
-            {:mday => 28, :name => "Los Santos Inocentes", :regions => [:mx]},
-            {:mday => 25, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Christmas Day", :regions => [:us]}],
       7 => [{:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Canada Day", :regions => [:ca]},
             {:mday => 12, :name => "Orangemen's Day", :regions => [:ca_nf]},
             {:mday => 9, :name => "Nunavut Day", :regions => [:ca_nu]},
             {:mday => 4, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Independence Day", :regions => [:us]}],
-      2 => [{:wday => 1, :week => 3, :name => "Family Day", :regions => [:ca_ab, :ca_on, :ca_sk]},
-            {:wday => 1, :week => 3, :name => "Louis Riel Day", :regions => [:ca_mb]},
-            {:wday => 1, :week => 1, :name => "Día de la Constitución", :regions => [:mx]},
-            {:wday => 1, :week => 3, :name => "Presidents' Day", :regions => [:us]},
-            {:mday => 2, :type => :informal, :name => "Groundhog Day", :regions => [:us, :ca]},
-            {:mday => 14, :type => :informal, :name => "Valentine's Day", :regions => [:us, :ca]}],
       8 => [{:wday => 1, :week => 1, :name => "BC Day", :regions => [:ca_bc]},
             {:wday => 1, :week => 1, :name => "Saskatchewan Day", :regions => [:ca_sk]},
             {:wday => 1, :week => 1, :name => "Heritage Day", :regions => [:ca_ab]},
             {:wday => 1, :week => 1, :name => "Natal Day", :regions => [:ca_ns]},
             {:wday => 1, :week => 1, :name => "Civic Holiday", :regions => [:ca_on]},
             {:wday => 1, :week => 3, :name => "Discovery Day", :regions => [:ca_yk]}],
-      3 => [{:mday => 23, :name => "St. George's Day", :regions => [:ca_nf]},
-            {:wday => 1, :week => 3, :name => "Natalicio de Benito Juárez", :regions => [:mx]},
-            {:mday => 17, :type => :informal, :name => "St. Patrick's Day", :regions => [:us, :ca]}],
       9 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:ca]},
             {:mday => 15, :name => "Grito de Dolores", :regions => [:mx]},
             {:mday => 16, :name => "Día de la Independencia", :regions => [:mx]},
             {:wday => 1, :week => 1, :name => "Labor Day", :regions => [:us]}],
-      4 => [{:mday => 30, :type => :informal, :name => "Día del Niño", :regions => [:mx]},
-            {:mday => 1, :type => :informal, :name => "April Fool's Day", :regions => [:us, :ca]},
-            {:mday => 22, :type => :informal, :name => "Earth Day", :regions => [:us, :ca]}],
       10 => [{:wday => 1, :week => 2, :name => "Thanksgiving", :regions => [:ca]},
             {:mday => 12, :type => :informal, :name => "Día de la Raza", :regions => [:mx]},
             {:wday => 1, :week => 2, :name => "Columbus Day", :regions => [:us]},
-            {:mday => 31, :type => :informal, :name => "Halloween", :regions => [:us, :ca]}]
-    }
+            {:mday => 31, :type => :informal, :name => "Halloween", :regions => [:us, :ca]}],
+      11 => [{:mday => 11, :name => "Remembrance Day", :regions => [:ca]},
+            {:mday => 1, :type => :informal, :name => "Todos los Santos", :regions => [:mx]},
+            {:mday => 2, :type => :informal, :name => "Los Fieles Difuntos", :regions => [:mx]},
+            {:wday => 1, :week => 3, :name => "Día de la Revolución", :regions => [:mx]},
+            {:mday => 11, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Veterans Day", :regions => [:us]},
+            {:wday => 4, :week => 4, :name => "Thanksgiving", :regions => [:us]}],
+      12 => [{:mday => 25, :name => "Christmas Day", :regions => [:ca]},
+            {:mday => 26, :name => "Boxing Day", :regions => [:ca]},
+            {:mday => 12, :type => :informal, :name => "Día de la Virgen de Guadalupe", :regions => [:mx]},
+            {:mday => 24, :type => :informal, :name => "Nochebuena", :regions => [:mx]},
+            {:mday => 25, :name => "Navidad", :regions => [:mx]},
+            {:mday => 28, :name => "Los Santos Inocentes", :regions => [:mx]},
+            {:mday => 25, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Christmas Day", :regions => [:us]}],
+      4 => [{:mday => 30, :type => :informal, :name => "Día del Niño", :regions => [:mx]},
+            {:mday => 1, :type => :informal, :name => "April Fool's Day", :regions => [:us, :ca]},
+            {:mday => 22, :type => :informal, :name => "Earth Day", :regions => [:us, :ca]}]
+      }
+    end
   end
 
 # Monday on or before May 24
@@ -105,4 +109,4 @@ end
 
 end
 
-Holidays.merge_defs(Holidays::North_America::DEFINED_REGIONS, Holidays::North_America::HOLIDAYS_BY_MONTH)
+Holidays.merge_defs(Holidays::North_America.defined_regions, Holidays::North_America.holidays_by_month)

data/lib/holidays/nyse.rb

@@ -1,33 +1,37 @@
 # encoding: utf-8
 module Holidays
-  # This file is generated by the Ruby Holiday gem.
+  # This file is generated by the Ruby Holidays gem.
   #
   # Definitions loaded: data/nyse.yaml
   #
-  # To use the definitions in this file, load them right after you load the 
+  # To use the definitions in this file, load it right after you load the 
   # Holiday gem:
   #
   #   require 'holidays'
   #   require 'holidays/nyse'
   #
-  # More definitions are available at http://code.dunae.ca/holidays.
+  # All the definitions are available at https://github.com/alexdunae/holidays
   module NYSE # :nodoc:
-    DEFINED_REGIONS = [:nyse]
+    def self.defined_regions
+      [:nyse]
+    end
 
-    HOLIDAYS_BY_MONTH = {
-      5 => [{:wday => 1, :week => -1, :name => "Memorial Day", :regions => [:nyse]}],
-      0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:nyse]}],
-      11 => [{:wday => 4, :week => 4, :name => "Thanksgiving", :regions => [:nyse]}],
+    def self.holidays_by_month
+      {
+              0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:nyse]}],
       1 => [{:mday => 1, :name => "New Year's Day", :regions => [:nyse]},
             {:wday => 1, :week => 3, :name => "Martin Luther King, Jr. Day", :regions => [:nyse]}],
-      12 => [{:mday => 25, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Christmas Day", :regions => [:nyse]}],
-      7 => [{:mday => 4, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Independence Day", :regions => [:nyse]}],
       2 => [{:wday => 1, :week => 3, :name => "Presidents' Day", :regions => [:nyse]}],
-      9 => [{:wday => 1, :week => 1, :name => "Labor Day", :regions => [:nyse]}]
-    }
+      5 => [{:wday => 1, :week => -1, :name => "Memorial Day", :regions => [:nyse]}],
+      7 => [{:mday => 4, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Independence Day", :regions => [:nyse]}],
+      9 => [{:wday => 1, :week => 1, :name => "Labor Day", :regions => [:nyse]}],
+      11 => [{:wday => 4, :week => 4, :name => "Thanksgiving", :regions => [:nyse]}],
+      12 => [{:mday => 25, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Christmas Day", :regions => [:nyse]}]
+      }
+    end
   end
 
 
 end
 
-Holidays.merge_defs(Holidays::NYSE::DEFINED_REGIONS, Holidays::NYSE::HOLIDAYS_BY_MONTH)
+Holidays.merge_defs(Holidays::NYSE.defined_regions, Holidays::NYSE.holidays_by_month)

data/lib/holidays/nz.rb

@@ -1,45 +1,49 @@
 # encoding: utf-8
 module Holidays
-  # This file is generated by the Ruby Holiday gem.
+  # This file is generated by the Ruby Holidays gem.
   #
   # Definitions loaded: data/nz.yaml
   #
-  # To use the definitions in this file, load them right after you load the 
+  # To use the definitions in this file, load it right after you load the 
   # Holiday gem:
   #
   #   require 'holidays'
   #   require 'holidays/nz'
   #
-  # More definitions are available at http://code.dunae.ca/holidays.
+  # All the definitions are available at https://github.com/alexdunae/holidays
   module NZ # :nodoc:
-    DEFINED_REGIONS = [:nz_ca, :nz_ch, :nz, :nz_wl, :nz_sl, :nz_we, :nz_ak, :nz_nl, :nz_ot, :nz_sc, :nz_hb, :nz_mb]
+    def self.defined_regions
+      [:nz, :nz_sl, :nz_we, :nz_ak, :nz_nl, :nz_ot, :nz_sc, :nz_hb, :nz_mb, :nz_ca, :nz_ch, :nz_wl]
+    end
 
-    HOLIDAYS_BY_MONTH = {
-      0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:nz]},
+    def self.holidays_by_month
+      {
+              0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:nz]},
             {:function => lambda { |year| Holidays.easter(year)-1 }, :function_id => "easter(year)-1", :name => "Easter Saturday", :regions => [:nz]},
             {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Easter Monday", :regions => [:nz]}],
-      11 => [{:wday => 5, :week => 2, :name => "Canterbury Anniversary Day", :regions => [:nz_ca]},
-            {:mday => 30, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Chatham Island Anniversary Day", :regions => [:nz_ch]}],
-      6 => [{:wday => 1, :week => 1, :name => "Queen's Birthday", :regions => [:nz]}],
       1 => [{:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "New Year's Day", :regions => [:nz]},
             {:mday => 2, :observed => lambda { |date| Holidays.to_weekday_if_boxing_weekend(date) }, :observed_id => "to_weekday_if_boxing_weekend", :name => "Day after New Year's Day", :regions => [:nz]},
             {:mday => 17, :name => "Southland Anniversary Day", :regions => [:nz_sl]},
             {:mday => 22, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Wellington Anniversary Day", :regions => [:nz_we]},
             {:mday => 29, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Auckland Anniversary Day", :regions => [:nz_ak]},
             {:mday => 29, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Northland Anniversary Day", :regions => [:nz_nl]}],
-      12 => [{:mday => 1, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Westland Anniversary Day", :regions => [:nz_wl]},
-            {:mday => 25, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "Christmas Day", :regions => [:nz]},
-            {:mday => 26, :observed => lambda { |date| Holidays.to_weekday_if_boxing_weekend(date) }, :observed_id => "to_weekday_if_boxing_weekend", :name => "Boxing Day", :regions => [:nz]}],
       2 => [{:mday => 1, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Nelson Anniversary Day", :regions => [:nz_ak]},
             {:mday => 6, :name => "Waitangi Day", :regions => [:nz]}],
       3 => [{:mday => 23, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Otago Anniversary Day", :regions => [:nz_ot]},
             {:wday => 1, :week => 2, :name => "Taranaki Anniversary Day", :regions => [:nz_ak]}],
-      9 => [{:wday => 1, :week => 4, :name => "Dominion Day", :regions => [:nz_sc]}],
       4 => [{:mday => 25, :name => "ANZAC Day", :regions => [:nz]}],
+      6 => [{:wday => 1, :week => 1, :name => "Queen's Birthday", :regions => [:nz]}],
+      9 => [{:wday => 1, :week => 4, :name => "Dominion Day", :regions => [:nz_sc]}],
       10 => [{:wday => 1, :week => 1, :observed => lambda { |date| Holidays.previous_friday(date) }, :observed_id => "previous_friday", :name => "Hawke's bay Anniversary Day", :regions => [:nz_hb]},
             {:wday => 1, :week => 4, :name => "Labour Day", :regions => [:nz]},
-            {:wday => 1, :week => 4, :observed => lambda { |date| Holidays.next_week(date) }, :observed_id => "next_week", :name => "Marlborough Anniversary Day", :regions => [:nz_mb]}]
-    }
+            {:wday => 1, :week => 4, :observed => lambda { |date| Holidays.next_week(date) }, :observed_id => "next_week", :name => "Marlborough Anniversary Day", :regions => [:nz_mb]}],
+      11 => [{:wday => 5, :week => 2, :name => "Canterbury Anniversary Day", :regions => [:nz_ca]},
+            {:mday => 30, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Chatham Island Anniversary Day", :regions => [:nz_ch]}],
+      12 => [{:mday => 1, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Westland Anniversary Day", :regions => [:nz_wl]},
+            {:mday => 25, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "Christmas Day", :regions => [:nz]},
+            {:mday => 26, :observed => lambda { |date| Holidays.to_weekday_if_boxing_weekend(date) }, :observed_id => "to_weekday_if_boxing_weekend", :name => "Boxing Day", :regions => [:nz]}]
+      }
+    end
   end
 
 def self.closest_monday(date)
@@ -54,16 +58,16 @@ def self.closest_monday(date)
 end
 
 
-def self.next_week(date)
-  date + 7
-end
-
 def self.previous_friday(date)
   date - 3
 end
 
 
+def self.next_week(date)
+  date + 7
+end
+
 
 end
 
-Holidays.merge_defs(Holidays::NZ::DEFINED_REGIONS, Holidays::NZ::HOLIDAYS_BY_MONTH)
+Holidays.merge_defs(Holidays::NZ.defined_regions, Holidays::NZ.holidays_by_month)