holidays 1.0.3 → 1.0.4

data/lib/holidays/fi.rb

@@ -1,48 +1,52 @@
 # 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/fi.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/fi'
   #
-  # More definitions are available at http://code.dunae.ca/holidays.
+  # All the definitions are available at https://github.com/alexdunae/holidays
   module FI # :nodoc:
-    DEFINED_REGIONS = [:fi]
+    def self.defined_regions
+      [:fi]
+    end
 
-    HOLIDAYS_BY_MONTH = {
-      5 => [{:mday => 1, :name => "Vappu", :regions => [:fi]}],
-      0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Pitkäperjantai", :regions => [:fi]},
+    def self.holidays_by_month
+      {
+              0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Pitkäperjantai", :regions => [:fi]},
             {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Pääsiäispäivä", :regions => [:fi]},
             {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "2. Pääsiäispäivä", :regions => [:fi]},
             {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Helatorstai", :regions => [:fi]},
             {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "Helluntaipäivä", :regions => [:fi]},
             {:function => lambda { |year| Holidays.fi_pyhainpaiva(year) }, :function_id => "fi_pyhainpaiva(year)", :name => "Pyhäinpäivä", :regions => [:fi]}],
-      6 => [{:function => lambda { |year| Holidays.fi_juhannuspaiva(year) }, :function_id => "fi_juhannuspaiva(year)", :name => "Juhannuspäivä", :regions => [:fi]}],
       1 => [{:mday => 1, :name => "Uudenvuodenpäivä", :regions => [:fi]},
             {:mday => 6, :name => "Loppiainen", :regions => [:fi]}],
+      5 => [{:mday => 1, :name => "Vappu", :regions => [:fi]}],
+      6 => [{:function => lambda { |year| Holidays.fi_juhannuspaiva(year) }, :function_id => "fi_juhannuspaiva(year)", :name => "Juhannuspäivä", :regions => [:fi]}],
       12 => [{:mday => 6, :name => "Itsenäisyyspäivä", :regions => [:fi]},
             {:mday => 24, :name => "Jouluaatto", :regions => [:fi]},
             {:mday => 25, :name => "Joulupäivä", :regions => [:fi]},
             {:mday => 26, :name => "Tapaninpäivä", :regions => [:fi]}]
-    }
+      }
+    end
   end
 
-# Finland: All Saint's Day (Saturday between Oct 31 and Nov 6)
-def self.fi_pyhainpaiva(year)
-  date = Date.civil(year,10,31)
+# Finland: Mid-summer (Saturday between June 20–26)
+def self.fi_juhannuspaiva(year)
+  date = Date.civil(year,6,20)
   date += (6 - date.wday)
   date
 end
 
 
-# Finland: Mid-summer (Saturday between June 20–26)
-def self.fi_juhannuspaiva(year)
-  date = Date.civil(year,6,20)
+# Finland: All Saint's Day (Saturday between Oct 31 and Nov 6)
+def self.fi_pyhainpaiva(year)
+  date = Date.civil(year,10,31)
   date += (6 - date.wday)
   date
 end
@@ -51,4 +55,4 @@ end
 
 end
 
-Holidays.merge_defs(Holidays::FI::DEFINED_REGIONS, Holidays::FI::HOLIDAYS_BY_MONTH)
+Holidays.merge_defs(Holidays::FI.defined_regions, Holidays::FI.holidays_by_month)

data/lib/holidays/fr.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/fr.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/fr'
   #
-  # More definitions are available at http://code.dunae.ca/holidays.
+  # All the definitions are available at https://github.com/alexdunae/holidays
   module FR # :nodoc:
-    DEFINED_REGIONS = [:fr]
+    def self.defined_regions
+      [:fr]
+    end
 
-    HOLIDAYS_BY_MONTH = {
-      5 => [{:mday => 1, :name => "Fête du travail", :regions => [:fr]},
-            {:mday => 8, :name => "Victoire 1945", :regions => [:fr]}],
-      0 => [{:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Pâques", :regions => [:fr]},
+    def self.holidays_by_month
+      {
+              0 => [{:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Pâques", :regions => [:fr]},
             {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Lundi de Pâques", :regions => [:fr]},
             {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Ascension", :regions => [:fr]},
             {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "Pentecôte", :regions => [:fr]},
             {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Lundi de Pentecôte", :regions => [:fr]}],
-      11 => [{:mday => 1, :name => "Toussaint", :regions => [:fr]},
-            {:mday => 11, :name => "Armistice 1918", :regions => [:fr]}],
       1 => [{:mday => 1, :name => "Jour de l'an", :regions => [:fr]}],
-      12 => [{:mday => 25, :name => "Nöel", :regions => [:fr]}],
+      5 => [{:mday => 1, :name => "Fête du travail", :regions => [:fr]},
+            {:mday => 8, :name => "Victoire 1945", :regions => [:fr]}],
       7 => [{:mday => 14, :name => "Fête nationale", :regions => [:fr]}],
-      8 => [{:mday => 15, :name => "Assomption", :regions => [:fr]}]
-    }
+      8 => [{:mday => 15, :name => "Assomption", :regions => [:fr]}],
+      11 => [{:mday => 1, :name => "Toussaint", :regions => [:fr]},
+            {:mday => 11, :name => "Armistice 1918", :regions => [:fr]}],
+      12 => [{:mday => 25, :name => "Nöel", :regions => [:fr]}]
+      }
+    end
   end
 
 
 end
 
-Holidays.merge_defs(Holidays::FR::DEFINED_REGIONS, Holidays::FR::HOLIDAYS_BY_MONTH)
+Holidays.merge_defs(Holidays::FR.defined_regions, Holidays::FR.holidays_by_month)

data/lib/holidays/gb.rb

@@ -1,41 +1,45 @@
 # 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/gb.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/gb'
   #
-  # More definitions are available at http://code.dunae.ca/holidays.
+  # All the definitions are available at https://github.com/alexdunae/holidays
   module GB # :nodoc:
-    DEFINED_REGIONS = [:gb, :je, :gb_jsy, :gg, :gb_gsy, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :gb_sct, :im, :gb_iom, :gb_con]
+    def self.defined_regions
+      [:gb, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :gb_sct, :gb_con, :je, :gb_jsy, :gg, :gb_gsy, :im, :gb_iom]
+    end
 
-    HOLIDAYS_BY_MONTH = {
-      5 => [{:wday => 1, :week => 1, :name => "May Day", :regions => [:gb]},
-            {:mday => 9, :name => "Liberation Day", :regions => [:je, :gb_jsy, :gg, :gb_gsy]},
-            {:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:gb]}],
-      0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:gb]},
+    def self.holidays_by_month
+      {
+              0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:gb]},
             {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Easter Sunday", :regions => [:gb]},
             {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Easter Monday", :regions => [:gb_eng, :gb_wls, :gb_eaw, :gb_nir]}],
-      11 => [{:mday => 5, :type => :informal, :name => "Guy Fawkes Day", :regions => [:gb]}],
       1 => [{:mday => 1, :name => "New Year's Day", :regions => [:gb]},
             {:mday => 2, :name => "New Year's", :regions => [:gb_sct]}],
-      12 => [{:mday => 25, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "Christmas Day", :regions => [:gb]},
-            {:mday => 26, :observed => lambda { |date| Holidays.to_weekday_if_boxing_weekend(date) }, :observed_id => "to_weekday_if_boxing_weekend", :name => "Boxing Day", :regions => [:gb]}],
+      3 => [{:mday => 5, :name => "St. Piran's Day", :regions => [:gb_con]},
+            {:mday => 17, :name => "St. Patrick's Day", :regions => [:gb_nir]}],
+      5 => [{:wday => 1, :week => 1, :name => "May Day", :regions => [:gb]},
+            {:mday => 9, :name => "Liberation Day", :regions => [:je, :gb_jsy, :gg, :gb_gsy]},
+            {:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:gb]}],
       7 => [{:mday => 5, :name => "Tynwald Day", :regions => [:im, :gb_iom]},
             {:mday => 12, :name => "Battle of the Boyne", :regions => [:gb_nir]}],
       8 => [{:wday => 1, :week => 1, :name => "Bank Holiday", :regions => [:gb_sct]},
             {:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:gb_eng, :gb_wls, :gb_eaw, :gb_nir]}],
-      3 => [{:mday => 5, :name => "St. Piran's Day", :regions => [:gb_con]},
-            {:mday => 17, :name => "St. Patrick's Day", :regions => [:gb_nir]}]
-    }
+      11 => [{:mday => 5, :type => :informal, :name => "Guy Fawkes Day", :regions => [:gb]}],
+      12 => [{:mday => 25, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "Christmas Day", :regions => [:gb]},
+            {:mday => 26, :observed => lambda { |date| Holidays.to_weekday_if_boxing_weekend(date) }, :observed_id => "to_weekday_if_boxing_weekend", :name => "Boxing Day", :regions => [:gb]}]
+      }
+    end
   end
 
 
 end
 
-Holidays.merge_defs(Holidays::GB::DEFINED_REGIONS, Holidays::GB::HOLIDAYS_BY_MONTH)
+Holidays.merge_defs(Holidays::GB.defined_regions, Holidays::GB.holidays_by_month)

data/lib/holidays/ie.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/ie.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/ie'
   #
-  # More definitions are available at http://code.dunae.ca/holidays.
+  # All the definitions are available at https://github.com/alexdunae/holidays
   module IE # :nodoc:
-    DEFINED_REGIONS = [:ie]
+    def self.defined_regions
+      [:ie]
+    end
 
-    HOLIDAYS_BY_MONTH = {
+    def self.holidays_by_month
+      {
+              0 => [{:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Easter Monday", :regions => [:ie]}],
+      1 => [{:mday => 1, :name => "New Year's Day", :regions => [:ie]}],
+      3 => [{:mday => 17, :name => "St. Patrick's Day", :regions => [:ie]}],
       5 => [{:wday => 1, :week => 1, :name => "May Day", :regions => [:ie]}],
-      0 => [{:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Easter Monday", :regions => [:ie]}],
       6 => [{:wday => 1, :week => 1, :name => "Bank Holiday", :regions => [:ie]}],
-      1 => [{:mday => 1, :name => "New Year's Day", :regions => [:ie]}],
-      12 => [{:mday => 25, :name => "Christmas Day", :regions => [:ie]},
-            {:mday => 26, :name => "St. Stephen's Day", :regions => [:ie]}],
       8 => [{:wday => 1, :week => 1, :name => "Bank Holiday", :regions => [:ie]}],
-      3 => [{:mday => 17, :name => "St. Patrick's Day", :regions => [:ie]}],
-      10 => [{:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:ie]}]
-    }
+      10 => [{:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:ie]}],
+      12 => [{:mday => 25, :name => "Christmas Day", :regions => [:ie]},
+            {:mday => 26, :name => "St. Stephen's Day", :regions => [:ie]}]
+      }
+    end
   end
 
 
 end
 
-Holidays.merge_defs(Holidays::IE::DEFINED_REGIONS, Holidays::IE::HOLIDAYS_BY_MONTH)
+Holidays.merge_defs(Holidays::IE.defined_regions, Holidays::IE.holidays_by_month)

data/lib/holidays/is.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/is.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/is'
   #
-  # More definitions are available at http://code.dunae.ca/holidays.
+  # All the definitions are available at https://github.com/alexdunae/holidays
   module IS # :nodoc:
-    DEFINED_REGIONS = [:is]
+    def self.defined_regions
+      [:is]
+    end
 
-    HOLIDAYS_BY_MONTH = {
-      5 => [{:mday => 1, :name => "Verkalýðsdagurinn", :regions => [:is]},
-            {:mday => 13, :name => "Mæðradagurinn", :regions => [:is]}],
-      0 => [{:function => lambda { |year| Holidays.easter(year)-48 }, :function_id => "easter(year)-48", :name => "Bolludagur", :regions => [:is]},
+    def self.holidays_by_month
+      {
+              0 => [{:function => lambda { |year| Holidays.easter(year)-48 }, :function_id => "easter(year)-48", :name => "Bolludagur", :regions => [:is]},
             {:function => lambda { |year| Holidays.easter(year)-47 }, :function_id => "easter(year)-47", :name => "Sprengidagur", :regions => [:is]},
             {:function => lambda { |year| Holidays.easter(year)-46 }, :function_id => "easter(year)-46", :name => "Öskudagur", :regions => [:is]},
             {:function => lambda { |year| Holidays.easter(year)-7 }, :function_id => "easter(year)-7", :name => "Pálmasunnudagur", :regions => [:is]},
@@ -28,20 +29,23 @@ module Holidays
             {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Uppstigningardagur", :regions => [:is]},
             {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "Hvítasunnudagur", :regions => [:is]},
             {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Annar í hvítasunnu", :regions => [:is]}],
-      11 => [{:mday => 16, :name => "Dagur íslenskrar tungu", :regions => [:is]}],
-      6 => [{:mday => 3, :type => :informal, :name => "Sjómannadagurinn", :regions => [:is]},
-            {:mday => 17, :name => "Lýðveldisdagurinn", :regions => [:is]}],
       1 => [{:mday => 1, :name => "Nýársdagur", :regions => [:is]},
             {:mday => 6, :name => "Þrettándinn", :regions => [:is]},
             {:mday => 19, :type => :informal, :name => "Bóndadagur", :regions => [:is]}],
+      2 => [{:mday => 18, :type => :informal, :name => "Konudagur", :regions => [:is]}],
+      4 => [{:function => lambda { |year| Holidays.is_sumardagurinn_fyrsti(year) }, :function_id => "is_sumardagurinn_fyrsti(year)", :name => "Sumardagurinn fyrsti", :regions => [:is]}],
+      5 => [{:mday => 1, :name => "Verkalýðsdagurinn", :regions => [:is]},
+            {:mday => 13, :name => "Mæðradagurinn", :regions => [:is]}],
+      6 => [{:mday => 3, :type => :informal, :name => "Sjómannadagurinn", :regions => [:is]},
+            {:mday => 17, :name => "Lýðveldisdagurinn", :regions => [:is]}],
+      8 => [{:wday => 1, :week => 1, :name => "Frídagur verslunarmanna", :regions => [:is]}],
+      11 => [{:mday => 16, :name => "Dagur íslenskrar tungu", :regions => [:is]}],
       12 => [{:mday => 24, :name => "Jól", :regions => [:is]},
             {:mday => 25, :name => "Jól", :regions => [:is]},
             {:mday => 26, :name => "Jól", :regions => [:is]},
-            {:mday => 31, :name => "Gamlárskvöld", :regions => [:is]}],
-      2 => [{:mday => 18, :type => :informal, :name => "Konudagur", :regions => [:is]}],
-      8 => [{:wday => 1, :week => 1, :name => "Frídagur verslunarmanna", :regions => [:is]}],
-      4 => [{:function => lambda { |year| Holidays.is_sumardagurinn_fyrsti(year) }, :function_id => "is_sumardagurinn_fyrsti(year)", :name => "Sumardagurinn fyrsti", :regions => [:is]}]
-    }
+            {:mday => 31, :name => "Gamlárskvöld", :regions => [:is]}]
+      }
+    end
   end
 
 # Iceland: first day of summer (Thursday after 18 April)
@@ -59,4 +63,4 @@ end
 
 end
 
-Holidays.merge_defs(Holidays::IS::DEFINED_REGIONS, Holidays::IS::HOLIDAYS_BY_MONTH)
+Holidays.merge_defs(Holidays::IS.defined_regions, Holidays::IS.holidays_by_month)

data/lib/holidays/it.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/it.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/it'
   #
-  # More definitions are available at http://code.dunae.ca/holidays.
+  # All the definitions are available at https://github.com/alexdunae/holidays
   module IT # :nodoc:
-    DEFINED_REGIONS = [:it]
+    def self.defined_regions
+      [:it]
+    end
 
-    HOLIDAYS_BY_MONTH = {
-      5 => [{:mday => 1, :name => "Festa dei Lavoratori", :regions => [:it]}],
-      0 => [{:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Pasqua", :regions => [:it]},
+    def self.holidays_by_month
+      {
+              0 => [{:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Pasqua", :regions => [:it]},
             {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Lunedì dell'Angelo", :regions => [:it]}],
-      11 => [{:mday => 1, :name => "Ognissanti", :regions => [:it]}],
-      6 => [{:mday => 2, :name => "Festa della Repubblica", :regions => [:it]}],
       1 => [{:mday => 1, :name => "Capodanno", :regions => [:it]},
             {:mday => 6, :name => "Epifania", :regions => [:it]}],
+      4 => [{:mday => 25, :name => "Festa della Liberazione", :regions => [:it]}],
+      5 => [{:mday => 1, :name => "Festa dei Lavoratori", :regions => [:it]}],
+      6 => [{:mday => 2, :name => "Festa della Repubblica", :regions => [:it]}],
+      8 => [{:mday => 15, :name => "Assunzione", :regions => [:it]}],
+      11 => [{:mday => 1, :name => "Ognissanti", :regions => [:it]}],
       12 => [{:mday => 8, :name => "Immacolata Concezione", :regions => [:it]},
             {:mday => 25, :name => "Natale", :regions => [:it]},
-            {:mday => 26, :name => "Santo Stefano", :regions => [:it]}],
-      8 => [{:mday => 15, :name => "Assunzione", :regions => [:it]}],
-      4 => [{:mday => 25, :name => "Festa della Liberazione", :regions => [:it]}]
-    }
+            {:mday => 26, :name => "Santo Stefano", :regions => [:it]}]
+      }
+    end
   end
 
 
 end
 
-Holidays.merge_defs(Holidays::IT::DEFINED_REGIONS, Holidays::IT::HOLIDAYS_BY_MONTH)
+Holidays.merge_defs(Holidays::IT.defined_regions, Holidays::IT.holidays_by_month)

data/lib/holidays/jp.rb

@@ -1,59 +1,72 @@
 # 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/jp.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/jp'
   #
-  # More definitions are available at http://code.dunae.ca/holidays.
+  # All the definitions are available at https://github.com/alexdunae/holidays
   module JP # :nodoc:
-    DEFINED_REGIONS = [:jp]
+    def self.defined_regions
+      [:jp]
+    end
 
-    HOLIDAYS_BY_MONTH = {
+    def self.holidays_by_month
+      {
+              1 => [{:mday => 1, :name => "元日", :regions => [:jp]},
+            {:wday => 1, :week => 2, :name => "成人の日", :regions => [:jp]}],
+      2 => [{:mday => 11, :name => "建国記念日", :regions => [:jp]},
+            {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 2, 11) }, :function_id => "jp_substitute_holiday(year, 2, 11)", :name => "振替休日", :regions => [:jp]}],
+      3 => [{:function => lambda { |year| Holidays.jp_vernal_equinox_day(year) }, :function_id => "jp_vernal_equinox_day(year)", :name => "春分の日", :regions => [:jp]},
+            {:function => lambda { |year| Holidays.jp_substitute_holiday(Holidays.jp_vernal_equinox_day(year)) }, :function_id => "jp_substitute_holiday(Holidays.jp_vernal_equinox_day(year))", :name => "振替休日", :regions => [:jp]}],
+      4 => [{:mday => 29, :name => "昭和の日", :regions => [:jp]},
+            {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 4, 29) }, :function_id => "jp_substitute_holiday(year, 4, 29)", :name => "振替休日", :regions => [:jp]}],
       5 => [{:mday => 3, :name => "憲法記念日", :regions => [:jp]},
             {:mday => 4, :name => "みどりの日", :regions => [:jp]},
             {:mday => 5, :name => "こどもの日", :regions => [:jp]},
             {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 5, 3) }, :function_id => "jp_substitute_holiday(year, 5, 3)", :name => "振替休日", :regions => [:jp]},
             {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 5, 5) }, :function_id => "jp_substitute_holiday(year, 5, 5)", :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]},
-            {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 11, 23) }, :function_id => "jp_substitute_holiday(year, 11, 23)", :name => "振替休日", :regions => [:jp]}],
-      1 => [{:mday => 1, :name => "元日", :regions => [:jp]},
-            {:wday => 1, :week => 2, :name => "成人の日", :regions => [:jp]}],
-      12 => [{:mday => 23, :name => "天皇誕生日", :regions => [:jp]},
-            {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 12, 23) }, :function_id => "jp_substitute_holiday(year, 12, 23)", :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]}],
-      2 => [{:mday => 11, :name => "建国記念日", :regions => [:jp]},
-            {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 2, 11) }, :function_id => "jp_substitute_holiday(year, 2, 11)", :name => "振替休日", :regions => [:jp]}],
-      3 => [{:function => lambda { |year| Holidays.jp_vernal_equinox_day(year) }, :function_id => "jp_vernal_equinox_day(year)", :name => "春分の日", :regions => [:jp]},
-            {:function => lambda { |year| Holidays.jp_substitute_holiday(Holidays.jp_vernal_equinox_day(year)) }, :function_id => "jp_substitute_holiday(Holidays.jp_vernal_equinox_day(year))", :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_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]}],
-      4 => [{:mday => 29, :name => "昭和の日", :regions => [:jp]},
-            {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 4, 29) }, :function_id => "jp_substitute_holiday(year, 4, 29)", :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, Date.calculate_mday(year, 10, 2, 1)) }, :function_id => "jp_substitute_holiday(year, 10, Date.calculate_mday(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]},
+            {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 11, 23) }, :function_id => "jp_substitute_holiday(year, 11, 23)", :name => "振替休日", :regions => [:jp]}],
+      12 => [{:mday => 23, :name => "天皇誕生日", :regions => [:jp]},
+            {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 12, 23) }, :function_id => "jp_substitute_holiday(year, 12, 23)", :name => "振替休日", :regions => [:jp]}]
+      }
+    end
   end
 
-def self.jp_citizons_holiday(year)
-  year < 2003 and return nil
-  ncd = Holidays.jp_national_culture_day(year)
-  if ncd.wday == 3
-    ncd - 1
-  else
-    nil
-  end
+def self.jp_vernal_equinox_day(year)
+  day =
+    case year
+    when 1851..1899
+      19.8277
+    when 1900..1979
+      20.8357
+    when 1980..2099
+      20.8431
+    when 2100..2150
+      21.8510
+    else
+      raise IndexError.new("Out of range")
+    end
+  day += 0.242194 * (year - 1980) - ((year - 1980)/4).floor
+  day = day.floor
+  Date.civil(year, 3, day)
 end
 
 
@@ -77,33 +90,24 @@ def self.jp_national_culture_day(year)
 end
 
 
-def self.jp_substitute_holiday(*date)
-  date = date[0].kind_of?(Date) ? date.first : Date.civil(*date)
-  date.wday == 0 ? date+1 : nil
+def self.jp_citizons_holiday(year)
+  year < 2003 and return nil
+  ncd = Holidays.jp_national_culture_day(year)
+  if ncd.wday == 3
+    ncd - 1
+  else
+    nil
+  end
 end
 
 
-def self.jp_vernal_equinox_day(year)
-  day =
-    case year
-    when 1851..1899
-      19.8277
-    when 1900..1979
-      20.8357
-    when 1980..2099
-      20.8431
-    when 2100..2150
-      21.8510
-    else
-      raise IndexError.new("Out of range")
-    end
-  day += 0.242194 * (year - 1980) - ((year - 1980)/4).floor
-  day = day.floor
-  Date.civil(year, 3, day)
+def self.jp_substitute_holiday(*date)
+  date = date[0].kind_of?(Date) ? date.first : Date.civil(*date)
+  date.wday == 0 ? date+1 : nil
 end
 
 
 
 end
 
-Holidays.merge_defs(Holidays::JP::DEFINED_REGIONS, Holidays::JP::HOLIDAYS_BY_MONTH)
+Holidays.merge_defs(Holidays::JP.defined_regions, Holidays::JP.holidays_by_month)