holidays 3.3.0 → 4.0.0

data/lib/generated_definitions/sk.rb

@@ -10,7 +10,7 @@ module Holidays
   #   require 'holidays'
   #   require 'generated_definitions/sk'
   #
-  # All the definitions are available at https://github.com/alexdunae/holidays
+  # All the definitions are available at https://github.com/holidays/holidays
   module SK # :nodoc:
     def self.defined_regions
       [:sk]
@@ -18,8 +18,8 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Veľkonočný pondelok", :regions => [:sk]},
-            {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Veľký piatok", :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]}],
       5 => [{:mday => 1, :name => "Sviatok práce", :regions => [:sk]},
@@ -35,9 +35,11 @@ module Holidays
             {:mday => 26, :name => "2. sviatok vianočný", :regions => [:sk]}]
       }
     end
-  end
-
 
+    def self.custom_methods
+      {
+        
+      }
+    end
+  end
 end
-
-Holidays.merge_defs(Holidays::SK.defined_regions, Holidays::SK.holidays_by_month)

data/lib/generated_definitions/united_nations.rb

@@ -10,7 +10,7 @@ module Holidays
   #   require 'holidays'
   #   require 'generated_definitions/united_nations'
   #
-  # All the definitions are available at https://github.com/alexdunae/holidays
+  # All the definitions are available at https://github.com/holidays/holidays
   module UNITED_NATIONS # :nodoc:
     def self.defined_regions
       [:united_nations]
@@ -77,9 +77,11 @@ module Holidays
             {:mday => 18, :name => "International Migrants Day", :regions => [:united_nations]}]
       }
     end
-  end
-
 
+    def self.custom_methods
+      {
+        
+      }
+    end
+  end
 end
-
-Holidays.merge_defs(Holidays::UNITED_NATIONS.defined_regions, Holidays::UNITED_NATIONS.holidays_by_month)

data/lib/generated_definitions/ups.rb

@@ -10,7 +10,7 @@ module Holidays
   #   require 'holidays'
   #   require 'generated_definitions/ups'
   #
-  # All the definitions are available at https://github.com/alexdunae/holidays
+  # All the definitions are available at https://github.com/holidays/holidays
   module UPS # :nodoc:
     def self.defined_regions
       [:ups]
@@ -18,24 +18,25 @@ module Holidays
 
     def self.holidays_by_month
       {
-              1 => [{:mday => 1, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :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 => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Independence 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]}],
       11 => [{:wday => 4, :week => 4, :name => "Thanksgiving", :regions => [:ups]},
-            {:function => lambda { |year| Holidays.day_after_thanksgiving(year) }, :function_id => "day_after_thanksgiving(year)", :name => "Day After Thanksgiving", :regions => [:ups]}],
-      12 => [{:mday => 25, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Christmas Day", :regions => [:ups]},
+            {:function => "day_after_thanksgiving(year)", :function_arguments => [:year], :name => "Day After Thanksgiving", :regions => [:ups]}],
+      12 => [{:mday => 25, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:ups]},
             {:mday => 31, :name => "New Year's Eve", :regions => [:ups]}]
       }
     end
-  end
-
-def self.day_after_thanksgiving(year)
-  Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 11, 4, 4) + 1
-end
 
+    def self.custom_methods
+      {
+        "day_after_thanksgiving(year)" => Proc.new { |year|
+Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 11, 4, 4) + 1
+},
 
 
+      }
+    end
+  end
 end
-
-Holidays.merge_defs(Holidays::UPS.defined_regions, Holidays::UPS.holidays_by_month)

data/lib/generated_definitions/us.rb

@@ -10,7 +10,7 @@ module Holidays
   #   require 'holidays'
   #   require 'generated_definitions/us'
   #
-  # All the definitions are available at https://github.com/alexdunae/holidays
+  # All the definitions are available at https://github.com/holidays/holidays
   module US # :nodoc:
     def self.defined_regions
       [:us, :us_dc, :us_ca, :ca]
@@ -18,11 +18,11 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :type => :informal, :name => "Good Friday", :regions => [:us]},
-            {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :type => :informal, :name => "Easter Sunday", :regions => [:us]}],
-      1 => [{:mday => 1, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "New Year's Day", :regions => [:us]},
+              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :type => :informal, :name => "Good Friday", :regions => [:us]},
+            {:function => "easter(year)", :function_arguments => [:year], :type => :informal, :name => "Easter Sunday", :regions => [:us]}],
+      1 => [{:mday => 1, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :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]}],
+            {:function => "us_inauguration_day(year)", :function_arguments => [:year], :name => "Inauguration Day", :regions => [:us_dc]}],
       2 => [{: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]}],
@@ -31,33 +31,32 @@ module Holidays
       5 => [{:wday => 1, :week => -1, :name => "Memorial Day", :regions => [:us]},
             {:wday => 0, :week => 2, :type => :informal, :name => "Mother's Day", :regions => [:us, :ca]},
             {:wday => 6, :week => 3, :type => :informal, :name => "Armed Forces Day", :regions => [:us]}],
-      7 => [{:mday => 4, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Independence Day", :regions => [:us]}],
+      7 => [{:mday => 4, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Independence Day", :regions => [:us]}],
       9 => [{:wday => 1, :week => 1, :name => "Labor Day", :regions => [:us]}],
       10 => [{:wday => 1, :week => 2, :name => "Columbus Day", :regions => [:us]},
             {:mday => 31, :type => :informal, :name => "Halloween", :regions => [:us, :ca]}],
-      11 => [{:mday => 11, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Veterans Day", :regions => [:us]},
+      11 => [{:mday => 11, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Veterans Day", :regions => [:us]},
             {:wday => 4, :week => 4, :name => "Thanksgiving", :regions => [:us]},
-            {:function => lambda { |year| Holidays.day_after_thanksgiving(year) }, :function_id => "day_after_thanksgiving(year)", :name => "Day after Thanksgiving", :regions => [:us_ca]}],
-      12 => [{:mday => 25, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Christmas Day", :regions => [:us]}],
+            {:function => "day_after_thanksgiving(year)", :function_arguments => [:year], :name => "Day after Thanksgiving", :regions => [:us_ca]}],
+      12 => [{:mday => 25, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:us]}],
       4 => [{:mday => 1, :type => :informal, :name => "April Fool's Day", :regions => [:us, :ca]},
             {:mday => 22, :type => :informal, :name => "Earth Day", :regions => [:us, :ca]}],
       6 => [{:wday => 0, :week => 3, :type => :informal, :name => "Father's Day", :regions => [:us, :ca]}]
       }
     end
-  end
-
-# January 20, every fourth year, following Presidential election
-def self.us_inauguration_day(year)
-  year % 4 == 1 ? 20 : nil
-end
 
+    def self.custom_methods
+      {
+        "us_inauguration_day(year)" => Proc.new { |year|
+year % 4 == 1 ? 20 : nil
+},
 
-def self.day_after_thanksgiving(year)
-  Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 11, 4, 4) + 1
-end
-
+"day_after_thanksgiving(year)" => Proc.new { |year|
+Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 11, 4, 4) + 1
+},
 
 
+      }
+    end
+  end
 end
-
-Holidays.merge_defs(Holidays::US.defined_regions, Holidays::US.holidays_by_month)

data/lib/generated_definitions/ve.rb

@@ -10,7 +10,7 @@ module Holidays
   #   require 'holidays'
   #   require 'generated_definitions/ve'
   #
-  # All the definitions are available at https://github.com/alexdunae/holidays
+  # All the definitions are available at https://github.com/holidays/holidays
   module VE # :nodoc:
     def self.defined_regions
       [:ve]
@@ -18,10 +18,10 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => lambda { |year| Holidays.easter(year)-48 }, :function_id => "easter(year)-48", :name => "Lunes Carnaval", :regions => [:ve]},
-            {:function => lambda { |year| Holidays.easter(year)-47 }, :function_id => "easter(year)-47", :name => "Martes Carnaval", :regions => [:ve]},
-            {:function => lambda { |year| Holidays.easter(year)-3 }, :function_id => "easter(year)-3", :name => "Jueves Santo", :regions => [:ve]},
-            {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Viernes Santo", :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]}],
       1 => [{:mday => 1, :name => "Año Nuevo", :regions => [:ve]}],
       4 => [{:mday => 19, :name => "Declaración Independencia", :regions => [:ve]}],
       5 => [{:mday => 1, :name => "Día del Trabajador", :regions => [:ve]}],
@@ -32,9 +32,11 @@ module Holidays
       12 => [{:mday => 25, :name => "Día de Navidad", :regions => [:ve]}]
       }
     end
-  end
-
 
+    def self.custom_methods
+      {
+        
+      }
+    end
+  end
 end
-
-Holidays.merge_defs(Holidays::VE.defined_regions, Holidays::VE.holidays_by_month)

data/lib/generated_definitions/vi.rb

@@ -10,7 +10,7 @@ module Holidays
   #   require 'holidays'
   #   require 'generated_definitions/vi'
   #
-  # All the definitions are available at https://github.com/alexdunae/holidays
+  # All the definitions are available at https://github.com/holidays/holidays
   module VI # :nodoc:
     def self.defined_regions
       [:vi]
@@ -24,9 +24,11 @@ module Holidays
       9 => [{:mday => 2, :name => "National Day", :regions => [:vi]}]
       }
     end
-  end
-
 
+    def self.custom_methods
+      {
+        
+      }
+    end
+  end
 end
-
-Holidays.merge_defs(Holidays::VI.defined_regions, Holidays::VI.holidays_by_month)

data/lib/generated_definitions/za.rb

@@ -10,7 +10,7 @@ module Holidays
   #   require 'holidays'
   #   require 'generated_definitions/za'
   #
-  # All the definitions are available at https://github.com/alexdunae/holidays
+  # All the definitions are available at https://github.com/holidays/holidays
   module ZA # :nodoc:
     def self.defined_regions
       [:za]
@@ -18,23 +18,25 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:za]},
-            {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Family Day", :regions => [:za]}],
-      1 => [{:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "New Year's Day", :regions => [:za]}],
-      3 => [{:mday => 21, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Human Rights Day", :regions => [:za]}],
-      4 => [{:mday => 27, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Freedom Day", :regions => [:za]}],
-      5 => [{:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Workers Day", :regions => [:za]}],
-      6 => [{:mday => 16, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Youth Day", :regions => [:za]}],
-      8 => [{:mday => 9, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "National Women's Day", :regions => [:za]}],
-      9 => [{:mday => 24, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Heritage Day", :regions => [:za]}],
-      12 => [{:mday => 16, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Day of Reconciliation", :regions => [:za]},
-            {:mday => 25, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Christmas Day", :regions => [:za]},
-            {:mday => 26, :observed => lambda { |date| Holidays.to_weekday_if_boxing_weekend(date) }, :observed_id => "to_weekday_if_boxing_weekend", :name => "Day of Goodwill", :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]}],
+      4 => [{:mday => 27, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Freedom Day", :regions => [:za]}],
+      5 => [{:mday => 1, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Workers Day", :regions => [:za]}],
+      6 => [{:mday => 16, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Youth Day", :regions => [:za]}],
+      8 => [{:mday => 9, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "National Women's Day", :regions => [:za]}],
+      9 => [{:mday => 24, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Heritage Day", :regions => [:za]}],
+      12 => [{:mday => 16, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Day of Reconciliation", :regions => [:za]},
+            {:mday => 25, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:za]},
+            {:mday => 26, :observed => "to_weekday_if_boxing_weekend(date)", :observed_arguments => [:date], :name => "Day of Goodwill", :regions => [:za]}]
       }
     end
-  end
-
 
+    def self.custom_methods
+      {
+        
+      }
+    end
+  end
 end
-
-Holidays.merge_defs(Holidays::ZA.defined_regions, Holidays::ZA.holidays_by_month)

data/lib/holidays.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+## encoding: utf-8
 $:.unshift File.dirname(__FILE__)
 
 require 'date'
@@ -7,6 +7,8 @@ require 'holidays/definition_factory'
 require 'holidays/date_calculator_factory'
 require 'holidays/option_factory'
 require 'holidays/use_case_factory'
+require 'holidays/errors'
+require 'holidays/load_all_definitions'
 
 # == Region options
 # Holidays can be defined as belonging to one or more regions and sub regions.
@@ -47,9 +49,6 @@ require 'holidays/use_case_factory'
 #
 #   Holidays.between(from, to, :ca_bc, :informal)
 module Holidays
-  # Exception thrown when an unknown region is requested.
-  class UnknownRegionError < ArgumentError; end
-
   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 }
@@ -78,7 +77,7 @@ module Holidays
     #
     # The given Date can be any day of the week.
     # Returns true if any holidays fall on Monday - Friday of the given week.
-    def full_week?(date, *options)
+    def any_holidays_during_work_week?(date, *options)
       days_to_monday = date.wday - 1
       days_to_friday = 5 - date.wday
       start_date = date - days_to_monday
@@ -113,7 +112,7 @@ module Holidays
 
       start_date, end_date = get_date(start_date), get_date(end_date)
 
-      if cached_holidays = DefinitionFactory.cache_repository.find(start_date, end_date, options)
+      if cached_holidays = definition_cache_repository.find(start_date, end_date, options)
         return cached_holidays
       end
 
@@ -128,93 +127,25 @@ module Holidays
       start_date, end_date = get_date(start_date), get_date(end_date)
       cache_data = between(start_date, end_date, *options)
 
-      DefinitionFactory.cache_repository.cache_between(start_date, end_date, cache_data, options)
-    end
-
-    #TODO This should not be publicly available. I need to restructure the public
-    #     API for this class to something more sensible.
-    def merge_defs(regions, holidays) # :nodoc:
-      DefinitionFactory.merger.call(regions, holidays)
-    end
-
-    def easter(year)
-      DateCalculatorFactory::Easter::Gregorian.easter_calculator.calculate_easter_for(year)
-    end
-
-    def orthodox_easter(year)
-      DateCalculatorFactory::Easter::Gregorian.easter_calculator.calculate_orthodox_easter_for(year)
-    end
-
-    def orthodox_easter_julian(year)
-      DateCalculatorFactory::Easter::Julian.easter_calculator.calculate_orthodox_easter_for(year)
-    end
-
-    def to_monday_if_sunday(date)
-      DateCalculatorFactory.weekend_modifier.to_monday_if_sunday(date)
-    end
-
-    def to_monday_if_weekend(date)
-      DateCalculatorFactory.weekend_modifier.to_monday_if_weekend(date)
-    end
-
-    def to_weekday_if_boxing_weekend(date)
-      DateCalculatorFactory.weekend_modifier.to_weekday_if_boxing_weekend(date)
-    end
-
-    def to_tuesday_if_sunday_or_monday_if_saturday(year)
-      DateCalculatorFactory.weekend_modifier.to_tuesday_if_sunday_or_monday_if_saturday(year)
-    end
-
-    def xmas_to_weekday_if_weekend(year)
-      DateCalculatorFactory.weekend_modifier.xmas_to_weekday_if_weekend(year)
-    end
-
-    def to_weekday_if_boxing_weekend_from_year_or_to_tuesday_if_monday(year)
-      DateCalculatorFactory.weekend_modifier.to_weekday_if_boxing_weekend_from_year_or_to_tuesday_if_monday(year)
-    end
-
-    def to_weekday_if_boxing_weekend_from_year(year)
-      DateCalculatorFactory.weekend_modifier.to_weekday_if_boxing_weekend_from_year(year)
-    end
-
-    def to_weekday_if_weekend(date)
-      DateCalculatorFactory.weekend_modifier.to_weekday_if_weekend(date)
-    end
-
-    def calculate_day_of_month(year, month, day, wday)
-      DateCalculatorFactory.day_of_month_calculator.call(year, month, day, wday)
-    end
-
-    # Returns an array of symbols all the available holiday definitions.
-    #
-    # Optional `full_path` param is used internally for loading all the definitions.
-    def available(full_path = false)
-      paths = Dir.glob(FULL_DEFINITIONS_PATH + '/*.rb')
-      full_path ? paths : paths.collect { |path| path.match(/([a-z_-]+)\.rb/i)[1].to_sym }
+      definition_cache_repository.cache_between(start_date, end_date, cache_data, options)
     end
 
     # Returns an array of symbols of all the available holiday regions.
-    def regions
-      DefinitionFactory.regions_repository.all
-    end
-
-    # Load all available holiday definitions
-    def load_all
-      available(true).each { |path| require path }
+    def available_regions
+      Holidays::REGIONS
     end
 
     # Parses provided holiday definition file(s) and loads them so that they are immediately available.
     def load_custom(*files)
       regions, rules_by_month, custom_methods, tests = DefinitionFactory.file_parser.parse_definition_files(files)
-      merge_defs(regions, rules_by_month)
-    end
 
-    # Parses provided holiday definition file(s) and returns strings containing the generated module and test source
-    def parse_definition_files_and_return_source(module_name, *files)
-      regions, rules_by_month, custom_methods, tests = DefinitionFactory.file_parser.parse_definition_files(files)
-      module_src, test_src = DefinitionFactory.source_generator.generate_definition_source(module_name, files, regions, rules_by_month, custom_methods, tests)
+      custom_methods.each do |method_key, method_entity|
+        custom_methods[method_key] = Holidays::DefinitionFactory.custom_method_proc_decorator.call(method_entity)
+      end
 
-      return module_src, test_src, regions
+      DefinitionFactory.merger.call(regions, rules_by_month, custom_methods)
+
+      rules_by_month
     end
 
     private
@@ -226,5 +157,11 @@ module Holidays
         Date.civil(date.year, date.mon, date.mday)
       end
     end
+
+    def definition_cache_repository
+      DefinitionFactory.cache_repository
+    end
   end
 end
+
+Holidays::LoadAllDefinitions.call