holidays 1.0.3 → 1.0.4

data/lib/holidays.rb

@@ -22,6 +22,9 @@ require 'date'
 # [<tt>:any</tt>]
 #   Any region.  Return holidays from any loaded region.
 #
+#
+# You can load all the available holiday definition sets by running
+#   Holidays.load_all
 # == Other options
 # [<tt>:observed</tt>]    Return holidays on the day they are observed (e.g. on a Monday if they fall on a Sunday).
 # [<tt>:informal</tt>]    Include informal holidays (e.g. Valentine's Day)
@@ -43,7 +46,7 @@ module Holidays
   # Exception thrown when an unknown region is requested.
   class UnknownRegionError < ArgumentError; end
 
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 
   @@regions = []
   @@holidays_by_month = {}
@@ -52,6 +55,7 @@ module Holidays
   WEEKS = {:first => 1, :second => 2, :third => 3, :fourth => 4, :fifth => 5, :last => -1, :second_last => -2, :third_last => -3}
   MONTH_LENGTHS = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
   DAY_SYMBOLS = Date::DAYNAMES.collect { |n| n.downcase.intern }
+  DEFINITION_PATH = File.expand_path(File.dirname(__FILE__) + '/holidays/')
 
   # Get all holidays on a given date.
   #
@@ -269,6 +273,19 @@ module Holidays
     date -= 1 if date.wday == 6
     date
   end
+  
+  # Returns an array of symbols all the available holiday definitions.
+  #
+  # Optional `full_path` param is used internally for loading all the definitions.
+  def self.available(full_path = false)
+    paths = Dir.glob(DEFINITION_PATH + '/*.rb')
+    full_path ? paths : paths.collect { |path| path.match(/([a-z_-]+)\.rb/i)[1].to_sym }
+  end
+  
+  # Load all available holiday definitions
+  def self.load_all
+    self.available(true).each { |path| require path }
+  end
 
 private
   # Returns [(arr)regions, (bool)observed, (bool)informal]
@@ -302,7 +319,7 @@ private
     end
 
     regions.flatten!
-
+    
     require "holidays/north_america" if regions.include?(:us) # special case for north_america/US cross-linking
 
     raise UnknownRegionError unless regions.all? { |r| r == :any or @@regions.include?(r) or begin require "holidays/#{r.to_s}"; rescue LoadError; false; end }

data/lib/holidays/MANIFEST

@@ -1,33 +1,34 @@
 ==== Regional definitions
 The following definition files are included in this installation:
 
-* holidays/at
-* holidays/au
-* holidays/br
-* holidays/ca
-* holidays/cz
-* holidays/de
-* holidays/dk
-* holidays/el
-* holidays/es
-* holidays/europe
-* holidays/fi
-* holidays/fr
-* holidays/gb
-* holidays/ie
-* holidays/is
-* holidays/it
-* holidays/jp
 * holidays/mx
+* holidays/at
+* holidays/nz
 * holidays/nl
+* holidays/dk
+* holidays/cz
+* holidays/scandinavia
 * holidays/no
-* holidays/north_america
-* holidays/nyse
-* holidays/nz
 * holidays/pt
-* holidays/scandinavia
-* holidays/se
+* holidays/nyse
+* holidays/it
 * holidays/united_nations
-* holidays/ups
+* holidays/au
 * holidays/us
+* holidays/ie
 * holidays/za
+* holidays/is
+* holidays/north_america
+* holidays/es
+* holidays/fi
+* holidays/el
+* holidays/europe
+* holidays/de
+* holidays/gb
+* holidays/ups
+* holidays/jp
+* holidays/fr
+* holidays/se
+* holidays/ca
+* holidays/br
+* holidays/pl

data/lib/holidays/at.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/at.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/at'
   #
-  # More definitions are available at http://code.dunae.ca/holidays.
+  # All the definitions are available at https://github.com/alexdunae/holidays
   module AT # :nodoc:
-    DEFINED_REGIONS = [:at]
+    def self.defined_regions
+      [:at]
+    end
 
-    HOLIDAYS_BY_MONTH = {
-      5 => [{:mday => 1, :name => "Staatsfeiertag", :regions => [:at]}],
-      0 => [{:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Ostermontag", :regions => [:at]},
+    def self.holidays_by_month
+      {
+              0 => [{:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Ostermontag", :regions => [:at]},
             {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Christi Himmelfahrt", :regions => [:at]},
             {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Pfingstmontag", :regions => [:at]},
             {:function => lambda { |year| Holidays.easter(year)+60 }, :function_id => "easter(year)+60", :name => "Fronleichnam", :regions => [:at]}],
-      11 => [{:mday => 1, :name => "Allerheiligen", :regions => [:at]}],
       1 => [{:mday => 1, :name => "Neujahrstag", :regions => [:at]},
             {:mday => 6, :name => "Heilige Drei Könige", :regions => [:at]}],
+      5 => [{:mday => 1, :name => "Staatsfeiertag", :regions => [:at]}],
+      8 => [{:mday => 15, :name => "Mariä Himmelfahrt", :regions => [:at]}],
+      10 => [{:mday => 26, :name => "Nationalfeiertag", :regions => [:at]}],
+      11 => [{:mday => 1, :name => "Allerheiligen", :regions => [:at]}],
       12 => [{:mday => 8, :name => "Mariä Empfängnis", :regions => [:at]},
             {:mday => 25, :name => "1. Weihnachtstag", :regions => [:at]},
-            {:mday => 26, :name => "2. Weihnachtstag", :regions => [:at]}],
-      8 => [{:mday => 15, :name => "Mariä Himmelfahrt", :regions => [:at]}],
-      10 => [{:mday => 26, :name => "Nationalfeiertag", :regions => [:at]}]
-    }
+            {:mday => 26, :name => "2. Weihnachtstag", :regions => [:at]}]
+      }
+    end
   end
 
 
 end
 
-Holidays.merge_defs(Holidays::AT::DEFINED_REGIONS, Holidays::AT::HOLIDAYS_BY_MONTH)
+Holidays.merge_defs(Holidays::AT.defined_regions, Holidays::AT.holidays_by_month)

data/lib/holidays/au.rb

@@ -1,43 +1,47 @@
 # 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/au.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/au'
   #
-  # More definitions are available at http://code.dunae.ca/holidays.
+  # All the definitions are available at https://github.com/alexdunae/holidays
   module AU # :nodoc:
-    DEFINED_REGIONS = [:au_qld, :au_nt, :au, :au_tas, :au_wa, :au_act, :au_nsw, :au_sa, :au_vic, :au_qld_brisbane]
+    def self.defined_regions
+      [:au, :au_tas, :au_wa, :au_vic, :au_qld, :au_nt, :au_act, :au_nsw, :au_sa, :au_qld_brisbane]
+    end
 
-    HOLIDAYS_BY_MONTH = {
-      5 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_qld]},
-            {:wday => 1, :week => 1, :name => "May Day", :regions => [:au_nt]}],
-      0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:au]},
+    def self.holidays_by_month
+      {
+              0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:au]},
             {:function => lambda { |year| Holidays.easter(year)-1 }, :function_id => "easter(year)-1", :name => "Easter Saturday", :regions => [:au]},
             {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Easter Monday", :regions => [:au]},
             {:function => lambda { |year| Holidays.easter(year)+2 }, :function_id => "easter(year)+2", :name => "Easter Monday", :regions => [:au_tas]}],
-      6 => [{:wday => 1, :week => 1, :name => "Foundation Day", :regions => [:au_wa]},
-            {:wday => 1, :week => 2, :name => "Queen's Birthday", :regions => [:au_act, :au_nsw, :au_sa, :au_tas, :au_nt, :au_qld, :au_vic]},
-            {:mday => 6, :type => :informal, :name => "Queensland Day", :regions => [:au_qld]}],
       1 => [{:mday => 1, :name => "New Year's Day", :regions => [:au]},
             {:mday => 26, :name => "Australia Day", :regions => [:au]}],
-      12 => [{:mday => 25, :name => "Christmas Day", :regions => [:au]},
-            {:mday => 26, :name => "Boxing Day", :regions => [:au]}],
-      8 => [{:wday => 3, :week => -3, :name => "Ekka", :regions => [:au_qld_brisbane]}],
       3 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_wa]},
             {:wday => 1, :week => 2, :name => "Eight Hours Day", :regions => [:au_tas]},
             {:wday => 1, :week => 2, :name => "Labour Day", :regions => [:au_vic]}],
       4 => [{:mday => 25, :name => "ANZAC Day", :regions => [:au]}],
-      10 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_act, :au_nsw, :au_sa]}]
-    }
+      5 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_qld]},
+            {:wday => 1, :week => 1, :name => "May Day", :regions => [:au_nt]}],
+      6 => [{:wday => 1, :week => 1, :name => "Foundation Day", :regions => [:au_wa]},
+            {:wday => 1, :week => 2, :name => "Queen's Birthday", :regions => [:au_act, :au_nsw, :au_sa, :au_tas, :au_nt, :au_qld, :au_vic]},
+            {:mday => 6, :type => :informal, :name => "Queensland Day", :regions => [:au_qld]}],
+      8 => [{:wday => 3, :week => -3, :name => "Ekka", :regions => [:au_qld_brisbane]}],
+      10 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_act, :au_nsw, :au_sa]}],
+      12 => [{:mday => 25, :name => "Christmas Day", :regions => [:au]},
+            {:mday => 26, :name => "Boxing Day", :regions => [:au]}]
+      }
+    end
   end
 
 
 end
 
-Holidays.merge_defs(Holidays::AU::DEFINED_REGIONS, Holidays::AU::HOLIDAYS_BY_MONTH)
+Holidays.merge_defs(Holidays::AU.defined_regions, Holidays::AU.holidays_by_month)

data/lib/holidays/br.rb

@@ -1,36 +1,40 @@
 # 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/br.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/br'
   #
-  # More definitions are available at http://code.dunae.ca/holidays.
+  # All the definitions are available at https://github.com/alexdunae/holidays
   module BR # :nodoc:
-    DEFINED_REGIONS = [:br]
+    def self.defined_regions
+      [:br]
+    end
 
-    HOLIDAYS_BY_MONTH = {
-      5 => [{:mday => 1, :name => "Dia do Trabalho", :regions => [:br]}],
-      0 => [{:function => lambda { |year| Holidays.easter(year)-47 }, :function_id => "easter(year)-47", :type => :informal, :name => "Carnaval", :regions => [:br]},
+    def self.holidays_by_month
+      {
+              0 => [{:function => lambda { |year| Holidays.easter(year)-47 }, :function_id => "easter(year)-47", :type => :informal, :name => "Carnaval", :regions => [:br]},
             {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Sexta-feira Santa", :regions => [:br]},
             {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Páscoa", :regions => [:br]},
             {:function => lambda { |year| Holidays.easter(year)+60 }, :function_id => "easter(year)+60", :name => "Corpus Christ", :regions => [:br]}],
-      11 => [{:mday => 2, :name => "Dia de Finados", :regions => [:br]},
-            {:mday => 15, :name => "Proclamação da República", :regions => [:br]}],
       1 => [{:mday => 1, :name => "Dia da Confraternização Universal", :regions => [:br]}],
-      12 => [{:mday => 25, :name => "Natal", :regions => [:br]}],
-      9 => [{:mday => 7, :name => "Proclamação da Independência", :regions => [:br]}],
       4 => [{:mday => 21, :name => "Dia de Tiradentes", :regions => [:br]}],
-      10 => [{:mday => 12, :name => "Dia de Nossa Senhora Aparecida", :regions => [:br]}]
-    }
+      5 => [{:mday => 1, :name => "Dia do Trabalho", :regions => [:br]}],
+      9 => [{:mday => 7, :name => "Proclamação da Independência", :regions => [:br]}],
+      10 => [{:mday => 12, :name => "Dia de Nossa Senhora Aparecida", :regions => [:br]}],
+      11 => [{:mday => 2, :name => "Dia de Finados", :regions => [:br]},
+            {:mday => 15, :name => "Proclamação da República", :regions => [:br]}],
+      12 => [{:mday => 25, :name => "Natal", :regions => [:br]}]
+      }
+    end
   end
 
 
 end
 
-Holidays.merge_defs(Holidays::BR::DEFINED_REGIONS, Holidays::BR::HOLIDAYS_BY_MONTH)
+Holidays.merge_defs(Holidays::BR.defined_regions, Holidays::BR.holidays_by_month)

data/lib/holidays/ca.rb

@@ -1,54 +1,58 @@
 # 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/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/ca'
   #
-  # More definitions are available at http://code.dunae.ca/holidays.
+  # All the definitions are available at https://github.com/alexdunae/holidays
   module CA # :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, :us]
+    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, :us]
+    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]}],
+      1 => [{:mday => 1, :name => "New Year's Day", :regions => [:ca]},
+            {:mday => 2, :name => "New Year's", :regions => [:ca_qc]}],
+      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]},
+            {: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]},
+            {: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]},
             {: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]}],
-      11 => [{:mday => 11, :name => "Remembrance Day", :regions => [:ca]}],
       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]}],
-      1 => [{:mday => 1, :name => "New Year's Day", :regions => [:ca]},
-            {:mday => 2, :name => "New Year's", :regions => [:ca_qc]}],
-      12 => [{:mday => 25, :name => "Christmas Day", :regions => [:ca]},
-            {:mday => 26, :name => "Boxing Day", :regions => [:ca]}],
       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]}],
-      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]},
-            {: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]},
-            {:mday => 17, :type => :informal, :name => "St. Patrick's Day", :regions => [:us, :ca]}],
       9 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:ca]}],
-      4 => [{: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 => 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]}],
+      12 => [{:mday => 25, :name => "Christmas Day", :regions => [:ca]},
+            {:mday => 26, :name => "Boxing Day", :regions => [:ca]}],
+      4 => [{: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
@@ -66,4 +70,4 @@ end
 
 end
 
-Holidays.merge_defs(Holidays::CA::DEFINED_REGIONS, Holidays::CA::HOLIDAYS_BY_MONTH)
+Holidays.merge_defs(Holidays::CA.defined_regions, Holidays::CA.holidays_by_month)

data/lib/holidays/cz.rb

@@ -1,36 +1,40 @@
 # 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/cz.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/cz'
   #
-  # More definitions are available at http://code.dunae.ca/holidays.
+  # All the definitions are available at https://github.com/alexdunae/holidays
   module CZ # :nodoc:
-    DEFINED_REGIONS = [:cz]
+    def self.defined_regions
+      [:cz]
+    end
 
-    HOLIDAYS_BY_MONTH = {
+    def self.holidays_by_month
+      {
+              0 => [{:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Velikonoční pondělí", :regions => [:cz]}],
+      1 => [{:mday => 1, :name => "Den obnovy samostatného českého státu", :regions => [:cz]}],
       5 => [{:mday => 1, :name => "Svátek práce", :regions => [:cz]},
             {:mday => 8, :name => "Den vítězství", :regions => [:cz]}],
-      0 => [{:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Velikonoční pondělí", :regions => [:cz]}],
-      11 => [{:mday => 17, :name => "Den boje za svobodu a demokracii", :regions => [:cz]}],
-      1 => [{:mday => 1, :name => "Den obnovy samostatného českého státu", :regions => [:cz]}],
-      12 => [{:mday => 24, :name => "Štědrý den", :regions => [:cz]},
-            {:mday => 25, :name => "1. svátek vánoční", :regions => [:cz]},
-            {:mday => 26, :name => "2. svátek vánoční", :regions => [:cz]}],
       7 => [{:mday => 5, :name => "Den slovanských věrozvěstů Cyrila a Metoděje", :regions => [:cz]},
             {:mday => 6, :name => "Den upálení mistra Jana Husa", :regions => [:cz]}],
       9 => [{:mday => 28, :name => "Den české státnosti", :regions => [:cz]}],
-      10 => [{:mday => 28, :name => "Den vzniku samostatného československého státu", :regions => [:cz]}]
-    }
+      10 => [{:mday => 28, :name => "Den vzniku samostatného československého státu", :regions => [:cz]}],
+      11 => [{:mday => 17, :name => "Den boje za svobodu a demokracii", :regions => [:cz]}],
+      12 => [{:mday => 24, :name => "Štědrý den", :regions => [:cz]},
+            {:mday => 25, :name => "1. svátek vánoční", :regions => [:cz]},
+            {:mday => 26, :name => "2. svátek vánoční", :regions => [:cz]}]
+      }
+    end
   end
 
 
 end
 
-Holidays.merge_defs(Holidays::CZ::DEFINED_REGIONS, Holidays::CZ::HOLIDAYS_BY_MONTH)
+Holidays.merge_defs(Holidays::CZ.defined_regions, Holidays::CZ.holidays_by_month)

data/lib/holidays/de.rb

@@ -1,36 +1,40 @@
 # 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/de.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/de'
   #
-  # More definitions are available at http://code.dunae.ca/holidays.
+  # All the definitions are available at https://github.com/alexdunae/holidays
   module DE # :nodoc:
-    DEFINED_REGIONS = [:de, :de_bw, :de_by, :de_nw, :de_rp, :de_sl, :de_sn, :de_he, :de_st, :de_bb, :de_mv, :de_th]
+    def self.defined_regions
+      [:de, :de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_st, :de_bb, :de_mv, :de_sn, :de_th]
+    end
 
-    HOLIDAYS_BY_MONTH = {
-      5 => [{:mday => 1, :name => "Tag der Arbeit", :regions => [:de]}],
-      0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Karfreitag", :regions => [:de]},
+    def self.holidays_by_month
+      {
+              0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Karfreitag", :regions => [:de]},
             {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Ostermontag", :regions => [:de]},
             {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Christi Himmelfahrt", :regions => [:de]},
             {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Pfingstmontag", :regions => [:de]},
             {:function => lambda { |year| Holidays.easter(year)+60 }, :function_id => "easter(year)+60", :name => "Fronleichnam", :regions => [:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl]}],
-      11 => [{:mday => 1, :name => "Allerheiligen", :regions => [:de_bw, :de_by, :de_nw, :de_rp, :de_sl]},
-            {:function => lambda { |year| Holidays.de_buss_und_bettag(year) }, :function_id => "de_buss_und_bettag(year)", :name => "Buß- und Bettag", :regions => [:de_sn]}],
       1 => [{:mday => 1, :name => "Neujahrstag", :regions => [:de]},
             {:mday => 6, :name => "Heilige Drei Könige", :regions => [:de_bw, :de_by, :de_st]}],
-      12 => [{:mday => 25, :name => "1. Weihnachtstag", :regions => [:de]},
-            {:mday => 26, :name => "2. Weihnachtstag", :regions => [:de]}],
+      5 => [{:mday => 1, :name => "Tag der Arbeit", :regions => [:de]}],
       8 => [{:mday => 15, :name => "Mariä Himmelfahrt", :regions => [:de_by, :de_sl]}],
       10 => [{:mday => 3, :name => "Tag der Deutschen Einheit", :regions => [:de]},
-            {:mday => 31, :name => "Reformationstag", :regions => [:de_bb, :de_mv, :de_sn, :de_st, :de_th]}]
-    }
+            {:mday => 31, :name => "Reformationstag", :regions => [:de_bb, :de_mv, :de_sn, :de_st, :de_th]}],
+      11 => [{:mday => 1, :name => "Allerheiligen", :regions => [:de_bw, :de_by, :de_nw, :de_rp, :de_sl]},
+            {:function => lambda { |year| Holidays.de_buss_und_bettag(year) }, :function_id => "de_buss_und_bettag(year)", :name => "Buß- und Bettag", :regions => [:de_sn]}],
+      12 => [{:mday => 25, :name => "1. Weihnachtstag", :regions => [:de]},
+            {:mday => 26, :name => "2. Weihnachtstag", :regions => [:de]}]
+      }
+    end
   end
 
 # Germany: Wednesday before November 23
@@ -48,4 +52,4 @@ end
 
 end
 
-Holidays.merge_defs(Holidays::DE::DEFINED_REGIONS, Holidays::DE::HOLIDAYS_BY_MONTH)
+Holidays.merge_defs(Holidays::DE.defined_regions, Holidays::DE.holidays_by_month)