holidays 6.6.1 → 7.0.0

data/lib/generated_definitions/scandinavia.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -49, :type => :informal, :name => "Fastelavn", :regions => [:dk]},
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -49, :type => :informal, :name => "Fastelavn", :regions => [:dk]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -7, :type => :informal, :name => "Palmesøndag", :regions => [:dk]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -3, :name => "Skærtorsdag", :regions => [:dk]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Langfredag", :regions => [:dk]},
@@ -115,7 +115,7 @@ module Holidays
 
     def self.custom_methods
       {
-        "is_sumardagurinn_fyrsti(year)" => Proc.new { |year|
+          "is_sumardagurinn_fyrsti(year)" => Proc.new { |year|
 date = Date.civil(year,4,18)
 if date.wday < 4
   date += (4 - date.wday)

data/lib/generated_definitions/se.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Långfredagen", :regions => [:se]},
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Långfredagen", :regions => [:se]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -1, :type => :informal, :name => "Påskafton", :regions => [:se]},
             {:function => "easter(year)", :function_arguments => [:year], :name => "Påskdagen", :regions => [:se]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Annandag påsk", :regions => [:se]},
@@ -34,7 +34,7 @@ module Holidays
 
     def self.custom_methods
       {
-        "se_midsommardagen(year)" => Proc.new { |year|
+          "se_midsommardagen(year)" => Proc.new { |year|
 date = Date.civil(year,6,20)
 date += (6 - date.wday)
 date

data/lib/generated_definitions/sg.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Good Friday", :regions => [:sg]}],
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Good Friday", :regions => [:sg]}],
       1 => [{:mday => 1, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "New Year's Day", :regions => [:sg]}],
       2 => [{:mday => 14, :type => :informal, :name => "Valentine's Day", :regions => [:sg]},
             {:mday => 15, :type => :informal, :name => "Total Defence Day", :regions => [:sg]}],
@@ -24,7 +24,7 @@ module Holidays
 
     def self.custom_methods
       {
-        
+          
       }
     end
   end

data/lib/generated_definitions/si.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :name => "velikonočna nedelja", :regions => [:si]},
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :name => "velikonočna nedelja", :regions => [:si]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "velikonočni ponedeljek", :regions => [:si]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 49, :name => "binkošti", :regions => [:si]}],
       1 => [{:mday => 1, :name => "novo leto", :regions => [:si]}],
@@ -31,7 +31,7 @@ module Holidays
 
     def self.custom_methods
       {
-        
+          
       }
     end
   end

data/lib/generated_definitions/sk.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Veľkonočný pondelok", :regions => [:sk]},
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Veľkonočný pondelok", :regions => [:sk]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Veľký piatok", :regions => [:sk]}],
       1 => [{:mday => 1, :name => "Nový rok", :regions => [:sk]},
             {:mday => 6, :name => "Zjavenie Pána (Traja králi)", :regions => [:sk]}],
@@ -32,7 +32,7 @@ module Holidays
 
     def self.custom_methods
       {
-        
+          
       }
     end
   end

data/lib/generated_definitions/{south_america.rb → southamerica.rb}

@@ -5,14 +5,14 @@ module Holidays
   # Definitions loaded: definitions/ar.yaml, definitions/br.yaml, definitions/cl.yaml, definitions/co.yaml, definitions/pe.yaml, definitions/ve.yaml
   #
   # All the definitions are available at https://github.com/holidays/holidays
-  module SOUTH_AMERICA # :nodoc:
+  module SOUTHAMERICA # :nodoc:
     def self.defined_regions
       [:ar, :br, :cl, :co, :pe, :ve]
     end
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Viernes Santo", :regions => [:ar]},
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Viernes Santo", :regions => [:ar]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -48, :name => "Carnaval Lunes", :regions => [:ar]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -47, :name => "Carnaval Martes", :regions => [:ar]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -47, :type => :informal, :name => "Carnaval", :regions => [:br]},
@@ -112,7 +112,7 @@ module Holidays
 
     def self.custom_methods
       {
-        "st_peter_st_paul_cl(year)" => Proc.new { |year|
+          "st_peter_st_paul_cl(year)" => Proc.new { |year|
 date = Date.civil(year, 6, 29)
 if [2,3,4].include?(date.wday)
   date -= (date.wday - 1)

data/lib/generated_definitions/tn.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              1 => [{:mday => 1, :name => "Jour de l'an", :regions => [:tn]},
+                1 => [{:mday => 1, :name => "Jour de l'an", :regions => [:tn]},
             {:mday => 14, :name => "Fête de la Révolution et de la Jeunesse", :regions => [:tn]}],
       3 => [{:mday => 20, :name => "Fête de l'Indépendance", :regions => [:tn]}],
       4 => [{:mday => 9, :name => "Journée des Martyrs", :regions => [:tn]}],
@@ -25,7 +25,7 @@ module Holidays
 
     def self.custom_methods
       {
-        
+          
       }
     end
   end

data/lib/generated_definitions/tr.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "ramadan_feast(year)", :function_arguments => [:year], :name => "Ramazan Bayramı", :regions => [:tr]},
+                0 => [{:function => "ramadan_feast(year)", :function_arguments => [:year], :name => "Ramazan Bayramı", :regions => [:tr]},
             {:function => "ramadan_feast(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Ramazan Bayramı (ikinci tatil)", :regions => [:tr]},
             {:function => "ramadan_feast(year)", :function_arguments => [:year], :function_modifier => 2, :name => "Ramazan Bayramı (üçüncü tatil)", :regions => [:tr]},
             {:function => "sacrifice_feast(year)", :function_arguments => [:year], :name => "Kurban Bayramı", :regions => [:tr]},
@@ -31,7 +31,7 @@ module Holidays
 
     def self.custom_methods
       {
-        "ramadan_feast(year)" => Proc.new { |year|
+          "ramadan_feast(year)" => Proc.new { |year|
 begin_of_ramadan_feast = {
     '2014' => Date.civil(2014, 7, 28),
     '2015' => Date.civil(2015, 7, 17),

data/lib/generated_definitions/ua.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+module Holidays
+  # This file is generated by the Ruby Holidays gem.
+  #
+  # Definitions loaded: definitions/ua.yaml
+  #
+  # All the definitions are available at https://github.com/holidays/holidays
+  module UA # :nodoc:
+    def self.defined_regions
+      [:ua]
+    end
+
+    def self.holidays_by_month
+      {
+                0 => [{:function => "orthodox_easter(year)", :function_arguments => [:year], :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Великдень", :regions => [:ua]},
+            {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => 49, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Трійця", :regions => [:ua]}],
+      1 => [{:mday => 1, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Новий Рік", :regions => [:ua]},
+            {:mday => 7, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Різдво Христове", :regions => [:ua]}],
+      3 => [{:mday => 8, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Міжнародний жіночий день", :regions => [:ua]}],
+      5 => [{:mday => 1, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "День праці", :regions => [:ua]},
+            {:mday => 2,  :year_ranges => [{:before => 2017}],:name => "День міжнародної солідарності трудящих", :regions => [:ua]},
+            {:mday => 9, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "День перемоги над нацизмом у Другій світовій війні", :regions => [:ua]}],
+      6 => [{:mday => 28,  :year_ranges => [{:after => 1997}],:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "День Конституції", :regions => [:ua]}],
+      7 => [{:mday => 16,  :year_ranges => [{:limited => [1991]}],:name => "День Незалежності України", :regions => [:ua]}],
+      8 => [{:mday => 24,  :year_ranges => [{:after => 1992}],:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "День Незалежності", :regions => [:ua]}],
+      10 => [{:mday => 14,  :year_ranges => [{:after => 2015}],:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "День захисника України", :regions => [:ua]}],
+      12 => [{:mday => 25,  :year_ranges => [{:after => 2017}],:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Різдво Христове", :regions => [:ua]}]
+      }
+    end
+
+    def self.custom_methods
+      {
+          
+      }
+    end
+  end
+end

data/lib/generated_definitions/{united_nations.rb → unitednations.rb}

@@ -2,79 +2,79 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: definitions/united_nations.yaml
+  # Definitions loaded: definitions/unitednations.yaml
   #
   # All the definitions are available at https://github.com/holidays/holidays
-  module UNITED_NATIONS # :nodoc:
+  module UNITEDNATIONS # :nodoc:
     def self.defined_regions
-      [:united_nations]
+      [:unitednations]
     end
 
     def self.holidays_by_month
       {
-              2 => [{:mday => 2, :name => "International Mother Language Day", :regions => [:united_nations]}],
-      3 => [{:mday => 8, :name => "United Nations Day for Women's Rights and International Peace", :regions => [:united_nations]},
-            {:mday => 21, :name => "International Day for the Elimination of Racial Discrimination", :regions => [:united_nations]},
-            {:mday => 21, :name => "Beginning of the Week of Solidarity with the Peoples Struggling against Racism and Racial Discrimination", :regions => [:united_nations]},
-            {:mday => 22, :name => "World Day for Water", :regions => [:united_nations]},
-            {:mday => 23, :name => "World Meteorological Day", :regions => [:united_nations]}],
-      4 => [{:mday => 7, :name => "World Health Day", :regions => [:united_nations]},
-            {:mday => 23, :name => "World Book and Copyright Day", :regions => [:united_nations]}],
-      5 => [{:mday => 3, :name => "World Press Freedom Day", :regions => [:united_nations]},
-            {:mday => 15, :name => "International Day of Families", :regions => [:united_nations]},
-            {:mday => 17, :name => "World Telecommunication Day", :regions => [:united_nations]},
-            {:mday => 21, :name => "World Day for Cultural Diversity for Dialogue and Development", :regions => [:united_nations]},
-            {:mday => 22, :name => "International Day for Biological Diversity", :regions => [:united_nations]},
-            {:mday => 25, :name => "Beginning of the Week of Solidarity with the Peoples of Non-Self-Governing Territories", :regions => [:united_nations]},
-            {:mday => 29, :name => "International Day of United Nations Peacekeepers", :regions => [:united_nations]},
-            {:mday => 31, :name => "World No-Tobacco Day", :regions => [:united_nations]}],
-      6 => [{:mday => 4, :name => "International Day of Innocent Children Victims of Aggression", :regions => [:united_nations]},
-            {:mday => 5, :name => "World Environment Day", :regions => [:united_nations]},
-            {:mday => 17, :name => "World Day to Combat Desertification and Drought", :regions => [:united_nations]},
-            {:mday => 20, :name => "World Refugee Day", :regions => [:united_nations]},
-            {:mday => 23, :name => "United Nations Public Service Day", :regions => [:united_nations]},
-            {:mday => 26, :name => "International Day against Drug Abuse and Illicit Trafficking", :regions => [:united_nations]},
-            {:mday => 26, :name => "International Day in Support of Victims of Torture", :regions => [:united_nations]}],
-      7 => [{:wday => 6, :week => 1, :name => "International Day of Cooperatives", :regions => [:united_nations]},
-            {:mday => 11, :name => "World Population Day", :regions => [:united_nations]}],
-      8 => [{:mday => 9, :name => "International Day of the World's Indigenous People", :regions => [:united_nations]},
-            {:mday => 12, :name => "International Youth Day", :regions => [:united_nations]},
-            {:mday => 23, :name => "International Day for the Remembrance of the Slave Trade and Its Abolition", :regions => [:united_nations]}],
-      9 => [{:mday => 8, :name => "International Literacy Day", :regions => [:united_nations]},
-            {:mday => 16, :name => "International Day for the Preservation of the Ozone Layer", :regions => [:united_nations]},
-            {:mday => 21, :name => "International Day of Peace", :regions => [:united_nations]},
-            {:mday => 1, :name => "International Day of Older Persons", :regions => [:united_nations]}],
-      10 => [{:mday => 4, :name => "World Space Week", :regions => [:united_nations]},
-            {:mday => 5, :name => "World Teachers' Day", :regions => [:united_nations]},
-            {:wday => 1, :week => 1, :name => "World Habitat Day", :regions => [:united_nations]},
-            {:wday => 3, :week => 2, :name => "International Day for Natural Disaster Reduction", :regions => [:united_nations]},
-            {:mday => 9, :name => "World Post Day", :regions => [:united_nations]},
-            {:mday => 10, :name => "World Mental Health Day", :regions => [:united_nations]},
-            {:mday => 16, :name => "World Food Day", :regions => [:united_nations]},
-            {:mday => 17, :name => "International Day for the Eradication of Poverty", :regions => [:united_nations]},
-            {:mday => 24, :name => "United Nations Day", :regions => [:united_nations]},
-            {:mday => 24, :name => "World Development Information Day", :regions => [:united_nations]},
-            {:mday => 24, :name => "Disarmament Week", :regions => [:united_nations]}],
-      11 => [{:mday => 6, :name => "International Day for Preventing the Exploitation of the Environment in War and Armed Conflict", :regions => [:united_nations]},
-            {:mday => 16, :name => "International Day for Tolerance", :regions => [:united_nations]},
-            {:mday => 20, :name => "Africa Industrialization Day", :regions => [:united_nations]},
-            {:mday => 20, :name => "Universal Children's Day", :regions => [:united_nations]},
-            {:mday => 21, :name => "World Television Day", :regions => [:united_nations]},
-            {:mday => 25, :name => "International Day for the Elimination of Violence against Women", :regions => [:united_nations]},
-            {:mday => 29, :name => "International Day of Solidarity with the Palestinian People", :regions => [:united_nations]}],
-      12 => [{:mday => 1, :name => "World AIDS Day", :regions => [:united_nations]},
-            {:mday => 2, :name => "International Day for the Abolition of Slavery", :regions => [:united_nations]},
-            {:mday => 3, :name => "International Day of Disabled Persons", :regions => [:united_nations]},
-            {:mday => 5, :name => "International Volunteer Day for Economic and Social Development", :regions => [:united_nations]},
-            {:mday => 7, :name => "International Civil Aviation Day", :regions => [:united_nations]},
-            {:mday => 10, :name => "Human Rights Day", :regions => [:united_nations]},
-            {:mday => 18, :name => "International Migrants Day", :regions => [:united_nations]}]
+                2 => [{:mday => 2, :name => "International Mother Language Day", :regions => [:unitednations]}],
+      3 => [{:mday => 8, :name => "United Nations Day for Women's Rights and International Peace", :regions => [:unitednations]},
+            {:mday => 21, :name => "International Day for the Elimination of Racial Discrimination", :regions => [:unitednations]},
+            {:mday => 21, :name => "Beginning of the Week of Solidarity with the Peoples Struggling against Racism and Racial Discrimination", :regions => [:unitednations]},
+            {:mday => 22, :name => "World Day for Water", :regions => [:unitednations]},
+            {:mday => 23, :name => "World Meteorological Day", :regions => [:unitednations]}],
+      4 => [{:mday => 7, :name => "World Health Day", :regions => [:unitednations]},
+            {:mday => 23, :name => "World Book and Copyright Day", :regions => [:unitednations]}],
+      5 => [{:mday => 3, :name => "World Press Freedom Day", :regions => [:unitednations]},
+            {:mday => 15, :name => "International Day of Families", :regions => [:unitednations]},
+            {:mday => 17, :name => "World Telecommunication Day", :regions => [:unitednations]},
+            {:mday => 21, :name => "World Day for Cultural Diversity for Dialogue and Development", :regions => [:unitednations]},
+            {:mday => 22, :name => "International Day for Biological Diversity", :regions => [:unitednations]},
+            {:mday => 25, :name => "Beginning of the Week of Solidarity with the Peoples of Non-Self-Governing Territories", :regions => [:unitednations]},
+            {:mday => 29, :name => "International Day of United Nations Peacekeepers", :regions => [:unitednations]},
+            {:mday => 31, :name => "World No-Tobacco Day", :regions => [:unitednations]}],
+      6 => [{:mday => 4, :name => "International Day of Innocent Children Victims of Aggression", :regions => [:unitednations]},
+            {:mday => 5, :name => "World Environment Day", :regions => [:unitednations]},
+            {:mday => 17, :name => "World Day to Combat Desertification and Drought", :regions => [:unitednations]},
+            {:mday => 20, :name => "World Refugee Day", :regions => [:unitednations]},
+            {:mday => 23, :name => "United Nations Public Service Day", :regions => [:unitednations]},
+            {:mday => 26, :name => "International Day against Drug Abuse and Illicit Trafficking", :regions => [:unitednations]},
+            {:mday => 26, :name => "International Day in Support of Victims of Torture", :regions => [:unitednations]}],
+      7 => [{:wday => 6, :week => 1, :name => "International Day of Cooperatives", :regions => [:unitednations]},
+            {:mday => 11, :name => "World Population Day", :regions => [:unitednations]}],
+      8 => [{:mday => 9, :name => "International Day of the World's Indigenous People", :regions => [:unitednations]},
+            {:mday => 12, :name => "International Youth Day", :regions => [:unitednations]},
+            {:mday => 23, :name => "International Day for the Remembrance of the Slave Trade and Its Abolition", :regions => [:unitednations]}],
+      9 => [{:mday => 8, :name => "International Literacy Day", :regions => [:unitednations]},
+            {:mday => 16, :name => "International Day for the Preservation of the Ozone Layer", :regions => [:unitednations]},
+            {:mday => 21, :name => "International Day of Peace", :regions => [:unitednations]},
+            {:mday => 1, :name => "International Day of Older Persons", :regions => [:unitednations]}],
+      10 => [{:mday => 4, :name => "World Space Week", :regions => [:unitednations]},
+            {:mday => 5, :name => "World Teachers' Day", :regions => [:unitednations]},
+            {:wday => 1, :week => 1, :name => "World Habitat Day", :regions => [:unitednations]},
+            {:wday => 3, :week => 2, :name => "International Day for Natural Disaster Reduction", :regions => [:unitednations]},
+            {:mday => 9, :name => "World Post Day", :regions => [:unitednations]},
+            {:mday => 10, :name => "World Mental Health Day", :regions => [:unitednations]},
+            {:mday => 16, :name => "World Food Day", :regions => [:unitednations]},
+            {:mday => 17, :name => "International Day for the Eradication of Poverty", :regions => [:unitednations]},
+            {:mday => 24, :name => "United Nations Day", :regions => [:unitednations]},
+            {:mday => 24, :name => "World Development Information Day", :regions => [:unitednations]},
+            {:mday => 24, :name => "Disarmament Week", :regions => [:unitednations]}],
+      11 => [{:mday => 6, :name => "International Day for Preventing the Exploitation of the Environment in War and Armed Conflict", :regions => [:unitednations]},
+            {:mday => 16, :name => "International Day for Tolerance", :regions => [:unitednations]},
+            {:mday => 20, :name => "Africa Industrialization Day", :regions => [:unitednations]},
+            {:mday => 20, :name => "Universal Children's Day", :regions => [:unitednations]},
+            {:mday => 21, :name => "World Television Day", :regions => [:unitednations]},
+            {:mday => 25, :name => "International Day for the Elimination of Violence against Women", :regions => [:unitednations]},
+            {:mday => 29, :name => "International Day of Solidarity with the Palestinian People", :regions => [:unitednations]}],
+      12 => [{:mday => 1, :name => "World AIDS Day", :regions => [:unitednations]},
+            {:mday => 2, :name => "International Day for the Abolition of Slavery", :regions => [:unitednations]},
+            {:mday => 3, :name => "International Day of Disabled Persons", :regions => [:unitednations]},
+            {:mday => 5, :name => "International Volunteer Day for Economic and Social Development", :regions => [:unitednations]},
+            {:mday => 7, :name => "International Civil Aviation Day", :regions => [:unitednations]},
+            {:mday => 10, :name => "Human Rights Day", :regions => [:unitednations]},
+            {:mday => 18, :name => "International Migrants Day", :regions => [:unitednations]}]
       }
     end
 
     def self.custom_methods
       {
-        
+          
       }
     end
   end

data/lib/generated_definitions/ups.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              1 => [{:mday => 1, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "New Year's Day", :regions => [:ups]}],
+                1 => [{:mday => 1, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "New Year's Day", :regions => [:ups]}],
       5 => [{:wday => 1, :week => -1, :name => "Memorial Day", :regions => [:ups]}],
       7 => [{:mday => 4, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Independence Day", :regions => [:ups]}],
       9 => [{:wday => 1, :week => 1, :name => "Labor Day", :regions => [:ups]}],
@@ -25,7 +25,7 @@ module Holidays
 
     def self.custom_methods
       {
-        "day_after_thanksgiving(year)" => Proc.new { |year|
+          "day_after_thanksgiving(year)" => Proc.new { |year|
 Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 11, 4, 4) + 1
 },
 

data/lib/generated_definitions/us.rb

@@ -2,7 +2,7 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: definitions/us.yaml, definitions/north_america_informal.yaml
+  # Definitions loaded: definitions/us.yaml, definitions/northamericainformal.yaml
   #
   # All the definitions are available at https://github.com/holidays/holidays
   module US # :nodoc:
@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -47, :name => "Shrove Tuesday", :regions => [:us_fl]},
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -47, :name => "Shrove Tuesday", :regions => [:us_fl]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -47, :name => "Mardi Gras Day", :regions => [:us_la]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :type => :informal, :name => "Good Friday", :regions => [:us]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Good Friday", :regions => [:us_ct, :us_de, :us_gu, :us_hi, :us_in, :us_ky, :us_la, :us_nj, :us_nc, :us_nd, :us_pr, :us_tn]},
@@ -90,7 +90,7 @@ module Holidays
 
     def self.custom_methods
       {
-        "christmas_eve_holiday(date)" => Proc.new { |date|
+          "christmas_eve_holiday(date)" => Proc.new { |date|
 beginning_of_month = Date.civil(date.year, date.month, 1)
 (date.saturday? || date.sunday?) ? date.downto(beginning_of_month).find {|d| d if d.wday == 5} : date
 },

data/lib/generated_definitions/ve.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -48, :name => "Lunes Carnaval", :regions => [:ve]},
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -48, :name => "Lunes Carnaval", :regions => [:ve]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -47, :name => "Martes Carnaval", :regions => [:ve]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -3, :name => "Jueves Santo", :regions => [:ve]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Viernes Santo", :regions => [:ve]}],
@@ -29,7 +29,7 @@ module Holidays
 
     def self.custom_methods
       {
-        
+          
       }
     end
   end

data/lib/generated_definitions/vi.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              1 => [{:mday => 1, :name => "Tết dương lịch", :regions => [:vi]}],
+                1 => [{:mday => 1, :name => "Tết dương lịch", :regions => [:vi]}],
       3 => [{:mday => 10, :function => "lunar_to_solar(year, month, day, region)", :function_arguments => [:year, :month, :day, :region], :name => "Giỗ tổ Hùng Vương", :regions => [:vi]}],
       4 => [{:mday => 30, :name => "Ngày Giải phóng miền Nam, thống nhất đất nước", :regions => [:vi]}],
       5 => [{:mday => 1, :name => "Ngày Quốc tế Lao động", :regions => [:vi]}],
@@ -22,7 +22,7 @@ module Holidays
 
     def self.custom_methods
       {
-        
+          
       }
     end
   end

data/lib/generated_definitions/za.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Good Friday", :regions => [:za]},
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Good Friday", :regions => [:za]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Family Day", :regions => [:za]}],
       1 => [{:mday => 1, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "New Year's Day", :regions => [:za]}],
       3 => [{:mday => 21, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Human Rights Day", :regions => [:za]}],
@@ -29,7 +29,7 @@ module Holidays
 
     def self.custom_methods
       {
-        
+          
       }
     end
   end

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

@@ -11,12 +11,13 @@ module Holidays
   module Definition
     module Context
       class Generator
-        def initialize(custom_method_parser, custom_method_source_decorator, custom_methods_repository, test_parser, test_source_generator)
+        def initialize(custom_method_parser, custom_method_source_decorator, custom_methods_repository, test_parser, test_source_generator, module_source_generator)
           @custom_method_parser = custom_method_parser
           @custom_method_source_decorator = custom_method_source_decorator
           @custom_methods_repository = custom_methods_repository
           @test_parser = test_parser
           @test_source_generator = test_source_generator
+          @module_source_generator = module_source_generator
         end
 
         def parse_definition_files(files)
@@ -66,7 +67,7 @@ module Holidays
             custom_method_string << @custom_method_source_decorator.call(code) + ",\n\n"
           end
 
-          module_src = generate_module_src(module_name, files, regions, month_strings, custom_method_string)
+          module_src = @module_source_generator.call(module_name, files, regions, month_strings, custom_method_string)
           test_src = @test_source_generator.call(module_name, files, tests)
 
           return module_src, test_src || ''
@@ -216,40 +217,6 @@ module Holidays
             method.arguments.collect { |arg| arg.to_sym }
           end
         end
-
-        def generate_module_src(module_name, files, regions, month_strings, custom_methods)
-          module_src = ""
-
-          module_src =<<-EOM
-# encoding: utf-8
-module Holidays
-  # This file is generated by the Ruby Holidays gem.
-  #
-  # Definitions loaded: #{files.join(', ')}
-  #
-  # All the definitions are available at https://github.com/holidays/holidays
-  module #{module_name.to_s.upcase} # :nodoc:
-    def self.defined_regions
-      [:#{regions.join(', :')}]
-    end
-
-    def self.holidays_by_month
-      {
-        #{month_strings.join(",\n")}
-      }
-    end
-
-    def self.custom_methods
-      {
-        #{custom_methods}
-      }
-    end
-  end
-end
-        EOM
-
-          return module_src
-        end
       end
     end
   end