holidays 11.4.0 → 11.6.0

data/lib/holidays/definition/custom_methods/ie.rb

@@ -0,0 +1,22 @@
+require 'date'
+
+module Holidays
+  module Definition
+    module CustomMethods
+      # ie custom holiday calculations, ported verbatim from the
+      # +methods:+ block in definitions/ie.yaml.
+      module IE
+        class << self
+          def ie_st_brigids_day(year)
+            date = Date.civil(year, 2, 1)
+            if date.wday == 5
+              date
+            else
+              date + ((1 - date.wday) % 7)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/holidays/definition/custom_methods/is.rb

@@ -0,0 +1,23 @@
+require 'date'
+
+module Holidays
+  module Definition
+    module CustomMethods
+      # is custom holiday calculations, ported verbatim from the
+      # +methods:+ block in definitions/is.yaml.
+      module IS
+        class << self
+          def is_sumardagurinn_fyrsti(year)
+            date = Date.civil(year,4,18)
+            if date.wday < 4
+              date += (4 - date.wday)
+            else
+              date += (11 - date.wday)
+            end
+            date
+          end
+        end
+      end
+    end
+  end
+end

data/lib/holidays/definition/custom_methods/jp.rb

@@ -0,0 +1,107 @@
+require 'date'
+
+module Holidays
+  module Definition
+    module CustomMethods
+      # jp custom holiday calculations, ported verbatim from the
+      # +methods:+ block in definitions/jp.yaml.
+      module JP
+        class << self
+          def jp_health_sports_day_substitute(year)
+            Holidays::Factory::Definition.custom_methods_repository.find("jp_substitute_holiday(year, month, day)").call(year, 10, Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 10, 2, 1))
+          end
+
+          def 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
+
+          def jp_vernal_equinox_day_substitute(year)
+            date = Holidays::Factory::Definition.custom_methods_repository.find("jp_vernal_equinox_day(year)").call(year)
+            Holidays::Factory::Definition.custom_methods_repository.find("jp_substitute_holiday(year, month, day)").call(year, date.month, date.mday)
+          end
+
+          def jp_marine_day_substitute(year)
+            Holidays::Factory::Definition.custom_methods_repository.find("jp_substitute_holiday(year, month, day)").call(year, 7, Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 7, 3, 1))
+          end
+
+          def jp_national_culture_day(year)
+            day =
+              case year
+              when 1851..1899
+                22.2588
+              when 1900..1979
+                23.2588
+              when 1980..2099
+                23.2488
+              when 2100..2150
+                24.2488
+              else
+                raise IndexError.new("Out of range")
+              end
+            day += 0.242194 * (year - 1980) - ((year - 1980)/4).floor
+            day = day.floor
+            Date.civil(year, 9, day)
+          end
+
+          def jp_national_culture_day_substitute(year)
+            date = Holidays::Factory::Definition.custom_methods_repository.find("jp_national_culture_day(year)").call(year)
+            Holidays::Factory::Definition.custom_methods_repository.find("jp_substitute_holiday(year, month, day)").call(year, date.month, date.mday)
+          end
+
+          def jp_citizens_holiday(year)
+            ncd = Holidays::Factory::Definition.custom_methods_repository.find("jp_national_culture_day(year)").call(year)
+            if ncd.wday == 3
+              ncd - 1
+            else
+              nil
+            end
+          end
+
+          def jp_mountain_holiday(year)
+            Date.civil(year, 8, 11)
+          end
+
+          def jp_mountain_holiday_substitute(year)
+            date = Holidays::Factory::Definition.custom_methods_repository.find("jp_mountain_holiday(year)").call(year)
+            Holidays::Factory::Definition.custom_methods_repository.find("jp_substitute_holiday(year, month, day)").call(year, date.month, date.mday)
+          end
+
+          def jp_respect_for_aged_holiday_substitute(year)
+            Holidays::Factory::Definition.custom_methods_repository.find("jp_substitute_holiday(year, month, day)").call(year, 9, Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 9, 3, 1))
+          end
+
+          def jp_substitute_holiday(year, month, day)
+            date = Date.civil(year, month, day)
+            date.wday == 0 ? (Holidays::Factory::Definition.custom_methods_repository.find("jp_next_weekday(date)").call(date+1)) : nil
+          end
+
+          def jp_next_weekday(date)
+            # This suuuucks. I have no idea how to make this not reach into our interal ruby API to do this.
+            # I'm punting, I'll come back to this.
+            is_holiday = Holidays::JP.holidays_by_month[date.month].any? do |holiday|
+              next false unless holiday[:mday] == date.day
+              next true unless holiday[:year_ranges]
+              Holidays::Finder::Rules::YearRange.call(date.year, holiday[:year_ranges])
+            end
+            date.wday == 0 || is_holiday ? (Holidays::Factory::Definition.custom_methods_repository.find("jp_next_weekday(date)").call(date+1)) : date
+          end
+        end
+      end
+    end
+  end
+end

data/lib/holidays/definition/custom_methods/kr.rb

@@ -0,0 +1,17 @@
+module Holidays
+  module Definition
+    module CustomMethods
+      # kr custom holiday calculations, ported verbatim from the
+      # +methods:+ block in definitions/kr.yaml.
+      module KR
+        class << self
+          # Seollal eve is the day before Seollal (Korean New Year), which is
+          # the first day of the first lunar month.
+          def kr_seollal_eve(year, region)
+            Holidays::Factory::Definition.custom_methods_repository.find("lunar_to_solar(year, month, day, region)").call(year, 1, 1, region) - 1
+          end
+        end
+      end
+    end
+  end
+end

data/lib/holidays/definition/custom_methods/lv.rb

@@ -0,0 +1,27 @@
+require 'date'
+
+module Holidays
+  module Definition
+    module CustomMethods
+      # lv custom holiday calculations, ported verbatim from the
+      # +methods:+ block in definitions/lv.yaml.
+      module LV
+        class << self
+          def lv_song_and_dance_festival_end_date(year)
+            case year
+            when 2018
+              # https://likumi.lv/ta/id/281541 (Ministru kabineta rīkojums Nr. 252 "Par XXVI Vispārējo latviešu dziesmu un XVI Deju svētku norises laiku")
+              Date.new(2018, 7, 8)
+            when 2023
+              # https://likumi.lv/ta/id/330067 (Ministru kabineta rīkojums Nr. 92 "Par XXVII Vispārējo latviešu dziesmu un XVII Deju svētku norises laiku")
+              Date.new(2023, 7, 9)
+            when 2028
+              # Event's period/next year is known, but precise dates aren't.
+              # Previously, dates were announced 2 years ahead, so on ~2026-05 this method would need to be revisited.
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/holidays/definition/custom_methods/nz.rb

@@ -0,0 +1,77 @@
+require 'date'
+
+module Holidays
+  module Definition
+    module CustomMethods
+      # nz custom holiday calculations, ported verbatim from the
+      # +methods:+ block in definitions/nz.yaml.
+      module NZ
+        class << self
+          def closest_monday(date)
+            if [1, 2, 3, 4].include?(date.wday)
+              date -= (date.wday - 1)
+            elsif 0 == date.wday
+              date += 1
+            else
+              date += 8 - date.wday
+            end
+            date
+          end
+
+          def previous_friday(date)
+            date - 3
+          end
+
+          def next_week(date)
+            date + 7
+          end
+
+          def nz_canterbury_anniversary(year)
+            date = Date.civil(year, 11, 1)
+            date += 1 until date.tuesday?
+            date += 1
+            date += 1 until date.friday?
+            date + 7
+          end
+
+          def matariki(year)
+            @matariki_dates ||= {
+            '2022' => Date.civil(2022, 6, 24),
+            '2023' => Date.civil(2023, 7, 14),
+            '2024' => Date.civil(2024, 6, 28),
+            '2025' => Date.civil(2025, 6, 20),
+            '2026' => Date.civil(2026, 7, 10),
+            '2027' => Date.civil(2027, 6, 25),
+            '2028' => Date.civil(2028, 7, 14),
+            '2029' => Date.civil(2029, 7, 6),
+            '2030' => Date.civil(2030, 6, 21),
+            '2031' => Date.civil(2031, 7, 11),
+            '2032' => Date.civil(2032, 7, 2),
+            '2033' => Date.civil(2033, 6, 24),
+            '2034' => Date.civil(2034, 7, 7),
+            '2035' => Date.civil(2035, 6, 29),
+            '2036' => Date.civil(2036, 7, 18),
+            '2037' => Date.civil(2037, 7, 10),
+            '2038' => Date.civil(2038, 6, 25),
+            '2039' => Date.civil(2039, 7, 15),
+            '2040' => Date.civil(2040, 7, 6),
+            '2041' => Date.civil(2041, 7, 19),
+            '2042' => Date.civil(2042, 7, 11),
+            '2043' => Date.civil(2043, 7, 3),
+            '2044' => Date.civil(2044, 6, 24),
+            '2045' => Date.civil(2045, 7, 7),
+            '2046' => Date.civil(2046, 6, 29),
+            '2047' => Date.civil(2047, 7, 19),
+            '2048' => Date.civil(2048, 7, 3),
+            '2049' => Date.civil(2049, 6, 25),
+            '2050' => Date.civil(2050, 7, 15),
+            '2051' => Date.civil(2051, 6, 30),
+            '2052' => Date.civil(2052, 6, 21),
+            }
+            @matariki_dates[year.to_s]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/holidays/definition/custom_methods/ph.rb

@@ -0,0 +1,19 @@
+require 'date'
+
+module Holidays
+  module Definition
+    module CustomMethods
+      # ph custom holiday calculations, ported verbatim from the
+      # +methods:+ block in definitions/ph.yaml.
+      module PH
+        class << self
+          def ph_heroes_day(year)
+            date = Date.new(year, 8, -1)
+            date -= (date.wday - 1) % 7
+            date
+          end
+        end
+      end
+    end
+  end
+end

data/lib/holidays/definition/custom_methods/registry.rb

@@ -0,0 +1,104 @@
+require 'holidays/definition/custom_methods/ar'
+require 'holidays/definition/custom_methods/au'
+require 'holidays/definition/custom_methods/ca'
+require 'holidays/definition/custom_methods/ch'
+require 'holidays/definition/custom_methods/cn'
+require 'holidays/definition/custom_methods/cl'
+require 'holidays/definition/custom_methods/co'
+require 'holidays/definition/custom_methods/de'
+require 'holidays/definition/custom_methods/fedex'
+require 'holidays/definition/custom_methods/fi'
+require 'holidays/definition/custom_methods/ie'
+require 'holidays/definition/custom_methods/is'
+require 'holidays/definition/custom_methods/jp'
+require 'holidays/definition/custom_methods/kr'
+require 'holidays/definition/custom_methods/lv'
+require 'holidays/definition/custom_methods/nz'
+require 'holidays/definition/custom_methods/ph'
+require 'holidays/definition/custom_methods/se'
+require 'holidays/definition/custom_methods/tr'
+require 'holidays/definition/custom_methods/us'
+
+module Holidays
+  module Definition
+    module CustomMethods
+      # Maps the full call-signature string used by YAML +function:+/+observed:+
+      # references to the native proc that implements it. Seeded into
+      # Factory::Definition.custom_methods_repository at boot by
+      # Holidays::Bootstrap.call, alongside the global built-in methods.
+      #
+      # Native replacement for the old per-region +methods:/ruby:+ YAML blocks.
+      # No eval, no public registration API.
+      #
+      # ca_victoria_day and day_after_thanksgiving each have byte-identical
+      # duplicates in other region YAML files; hosted once here and shared.
+      def self.all
+        {
+          "afl_grand_final(year)" => AU.method(:afl_grand_final).to_proc,
+          "ca_victoria_day(year)" => CA.method(:ca_victoria_day).to_proc,
+          "ch_be_zibelemaerit(year)" => CH.method(:ch_be_zibelemaerit).to_proc,
+          "ch_ge_jeune_genevois(year)" => CH.method(:ch_ge_jeune_genevois).to_proc,
+          "ch_gl_naefelser_fahrt(year)" => CH.method(:ch_gl_naefelser_fahrt).to_proc,
+          "ch_vd_lundi_du_jeune_federal(year)" => CH.method(:ch_vd_lundi_du_jeune_federal).to_proc,
+          "christmas_eve_holiday(date)" => US.method(:christmas_eve_holiday).to_proc,
+          "closest_monday(date)" => NZ.method(:closest_monday).to_proc,
+          "cn_qingming(year)" => CN.method(:cn_qingming).to_proc,
+          "columbus_day_cl(year)" => CL.method(:columbus_day_cl).to_proc,
+          "day_after_thanksgiving(year)" => FEDEX.method(:day_after_thanksgiving).to_proc,
+          "de_buss_und_bettag(year)" => DE.method(:de_buss_und_bettag).to_proc,
+          "election_day(year)" => US.method(:election_day).to_proc,
+          "even_year_election_day(year)" => US.method(:even_year_election_day).to_proc,
+          "fi_juhannusaatto(year)" => FI.method(:fi_juhannusaatto).to_proc,
+          "fi_juhannuspaiva(year)" => FI.method(:fi_juhannuspaiva).to_proc,
+          "fi_pyhainpaiva(year)" => FI.method(:fi_pyhainpaiva).to_proc,
+          "georgia_state_holiday(year, month)" => US.method(:georgia_state_holiday).to_proc,
+          "hobart_show_day(year)" => AU.method(:hobart_show_day).to_proc,
+          "ie_st_brigids_day(year)" => IE.method(:ie_st_brigids_day).to_proc,
+          "independence_day(region, date)" => US.method(:independence_day).to_proc,
+          "is_sumardagurinn_fyrsti(year)" => IS.method(:is_sumardagurinn_fyrsti).to_proc,
+          "jp_citizens_holiday(year)" => JP.method(:jp_citizens_holiday).to_proc,
+          "jp_health_sports_day_substitute(year)" => JP.method(:jp_health_sports_day_substitute).to_proc,
+          "jp_marine_day_substitute(year)" => JP.method(:jp_marine_day_substitute).to_proc,
+          "jp_mountain_holiday(year)" => JP.method(:jp_mountain_holiday).to_proc,
+          "jp_mountain_holiday_substitute(year)" => JP.method(:jp_mountain_holiday_substitute).to_proc,
+          "jp_national_culture_day(year)" => JP.method(:jp_national_culture_day).to_proc,
+          "jp_national_culture_day_substitute(year)" => JP.method(:jp_national_culture_day_substitute).to_proc,
+          "jp_next_weekday(date)" => JP.method(:jp_next_weekday).to_proc,
+          "jp_respect_for_aged_holiday_substitute(year)" => JP.method(:jp_respect_for_aged_holiday_substitute).to_proc,
+          "jp_substitute_holiday(year, month, day)" => JP.method(:jp_substitute_holiday).to_proc,
+          "jp_vernal_equinox_day(year)" => JP.method(:jp_vernal_equinox_day).to_proc,
+          "jp_vernal_equinox_day_substitute(year)" => JP.method(:jp_vernal_equinox_day_substitute).to_proc,
+          "juneteenth_national_independence_day(region, date)" => US.method(:juneteenth_national_independence_day).to_proc,
+          "kr_seollal_eve(year, region)" => KR.method(:kr_seollal_eve).to_proc,
+          "lee_jackson_day(year, month)" => US.method(:lee_jackson_day).to_proc,
+          "lv_song_and_dance_festival_end_date(year)" => LV.method(:lv_song_and_dance_festival_end_date).to_proc,
+          "march_pub_hol_sa(year)" => AU.method(:march_pub_hol_sa).to_proc,
+          "matariki(year)" => NZ.method(:matariki).to_proc,
+          "may_pub_hol_sa(year)" => AU.method(:may_pub_hol_sa).to_proc,
+          "next_week(date)" => NZ.method(:next_week).to_proc,
+          "nz_canterbury_anniversary(year)" => NZ.method(:nz_canterbury_anniversary).to_proc,
+          "other_churches_day_cl(year)" => CL.method(:other_churches_day_cl).to_proc,
+          "ph_heroes_day(year)" => PH.method(:ph_heroes_day).to_proc,
+          "previous_friday(date)" => NZ.method(:previous_friday).to_proc,
+          "qld_brisbane_ekka_holiday(year)" => AU.method(:qld_brisbane_ekka_holiday).to_proc,
+          "qld_kings_bday_october(year)" => AU.method(:qld_kings_bday_october).to_proc,
+          "qld_labour_day_may(year)" => AU.method(:qld_labour_day_may).to_proc,
+          "qld_labour_day_october(year)" => AU.method(:qld_labour_day_october).to_proc,
+          "qld_queens_bday_october(year)" => AU.method(:qld_queens_bday_october).to_proc,
+          "qld_queens_birthday_june(year)" => AU.method(:qld_queens_birthday_june).to_proc,
+          "ramadan_feast(year)" => TR.method(:ramadan_feast).to_proc,
+          "rosh_hashanah(year)" => US.method(:rosh_hashanah).to_proc,
+          "sacrifice_feast(year)" => TR.method(:sacrifice_feast).to_proc,
+          "se_alla_helgons_dag(year)" => SE.method(:se_alla_helgons_dag).to_proc,
+          "se_midsommardagen(year)" => SE.method(:se_midsommardagen).to_proc,
+          "st_peter_st_paul_cl(year)" => CL.method(:st_peter_st_paul_cl).to_proc,
+          "to_following_monday_if_not_monday(date)" => CO.method(:to_following_monday_if_not_monday).to_proc,
+          "to_nearest_monday(date)" => AR.method(:to_nearest_monday).to_proc,
+          "to_nearest_monday_after(date)" => AU.method(:to_nearest_monday_after).to_proc,
+          "us_inauguration_day(year)" => US.method(:us_inauguration_day).to_proc,
+          "yom_kippur(year)" => US.method(:yom_kippur).to_proc,
+        }
+      end
+    end
+  end
+end

data/lib/holidays/definition/custom_methods/se.rb

@@ -0,0 +1,25 @@
+require 'date'
+
+module Holidays
+  module Definition
+    module CustomMethods
+      # se custom holiday calculations, ported verbatim from the
+      # +methods:+ block in definitions/se.yaml.
+      module SE
+        class << self
+          def se_midsommardagen(year)
+            date = Date.civil(year,6,20)
+            date += (6 - date.wday)
+            date
+          end
+
+          def se_alla_helgons_dag(year)
+            date = Date.civil(year,10,31)
+            date += (6 - date.wday)
+            date
+          end
+        end
+      end
+    end
+  end
+end

data/lib/holidays/definition/custom_methods/tr.rb

@@ -0,0 +1,68 @@
+require 'date'
+
+module Holidays
+  module Definition
+    module CustomMethods
+      # tr custom holiday calculations.
+      #
+      # Ramazan Bayramı is 1 Shawwal and Kurban Bayramı is 10 Dhul-Hijjah of
+      # the Hijri calendar. Both are derived from the arithmetic Islamic
+      # calendar (Holidays::DateCalculator::HijriDate). The civil holidays are
+      # proclaimed by Türkiye's Diyanet and in most years so far have landed a
+      # day (2016 Ramazan Bayramı, two days) before the arithmetic result;
+      # DIYANET_OVERRIDES pins those years to the proclaimed date. Years with
+      # no entry fall back to the calculation. See definitions#377.
+      module TR
+        SHAWWAL = 10
+        DHU_AL_HIJJAH = 12
+
+        # Proclaimed first days that differ from the arithmetic calendar,
+        # keyed by [feast, gregorian_year]. Sourced from the Diyanet dates
+        # that the definition file previously carried as a fixed table, plus
+        # https://vakithesaplama.diyanet.gov.tr/resmitatiller.php for 2021-2030.
+        DIYANET_OVERRIDES = {
+          [:ramadan_feast, 2014] => Date.new(2014, 7, 28),
+          [:ramadan_feast, 2015] => Date.new(2015, 7, 17),
+          [:ramadan_feast, 2016] => Date.new(2016, 7, 5),
+          [:ramadan_feast, 2017] => Date.new(2017, 6, 25),
+          [:ramadan_feast, 2019] => Date.new(2019, 6, 4),
+          [:ramadan_feast, 2022] => Date.new(2022, 5, 2),
+          [:ramadan_feast, 2023] => Date.new(2023, 4, 21),
+          [:ramadan_feast, 2025] => Date.new(2025, 3, 30),
+          [:ramadan_feast, 2027] => Date.new(2027, 3, 9),
+          [:ramadan_feast, 2028] => Date.new(2028, 2, 26),
+          [:ramadan_feast, 2030] => Date.new(2030, 2, 4),
+
+          [:sacrifice_feast, 2014] => Date.new(2014, 10, 4),
+          [:sacrifice_feast, 2016] => Date.new(2016, 9, 12),
+          [:sacrifice_feast, 2017] => Date.new(2017, 9, 1),
+          [:sacrifice_feast, 2018] => Date.new(2018, 8, 21),
+          [:sacrifice_feast, 2019] => Date.new(2019, 8, 11),
+          [:sacrifice_feast, 2022] => Date.new(2022, 7, 9),
+          [:sacrifice_feast, 2023] => Date.new(2023, 6, 28),
+          [:sacrifice_feast, 2024] => Date.new(2024, 6, 16),
+          [:sacrifice_feast, 2025] => Date.new(2025, 6, 6),
+          [:sacrifice_feast, 2027] => Date.new(2027, 5, 16),
+          [:sacrifice_feast, 2030] => Date.new(2030, 4, 13),
+        }.freeze
+
+        class << self
+          def ramadan_feast(year)
+            feast(:ramadan_feast, year, SHAWWAL, 1)
+          end
+
+          def sacrifice_feast(year)
+            feast(:sacrifice_feast, year, DHU_AL_HIJJAH, 10)
+          end
+
+          private
+
+          def feast(name, year, hijri_month, hijri_day)
+            DIYANET_OVERRIDES[[name, year]] ||
+              Holidays::Factory::DateCalculator.hijri_date.gregorian_year_occurrence(year, hijri_month, hijri_day)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/holidays/definition/custom_methods/us.rb

@@ -0,0 +1,119 @@
+require 'date'
+
+module Holidays
+  module Definition
+    module CustomMethods
+      # us custom holiday calculations, ported verbatim from the
+      # +methods:+ block in definitions/us.yaml.
+      module US
+        class << self
+          def christmas_eve_holiday(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
+          end
+
+          def rosh_hashanah(year)
+            rosh_hashanah_dates = {
+                '2014' => Date.civil(2014, 9, 25),
+                '2015' => Date.civil(2015, 9, 14),
+                '2016' => Date.civil(2016, 10, 3),
+                '2017' => Date.civil(2017, 9, 21),
+                '2018' => Date.civil(2018, 9, 10),
+                '2019' => Date.civil(2019, 9, 30),
+                '2020' => Date.civil(2020, 9, 19)
+            }
+            rosh_hashanah_dates[year.to_s]
+          end
+
+          def yom_kippur(year)
+            yom_kippur_dates = {
+                '2014' => Date.civil(2014, 10, 4),
+                '2015' => Date.civil(2015, 9, 23),
+                '2016' => Date.civil(2016, 10, 12),
+                '2017' => Date.civil(2017, 9, 30),
+                '2018' => Date.civil(2018, 9, 19),
+                '2019' => Date.civil(2019, 10, 9),
+                '2020' => Date.civil(2020, 9, 28)
+            }
+            yom_kippur_dates[year.to_s]
+          end
+
+          def georgia_state_holiday(year, month)
+            beginning_of_month = Date.civil(year, month, 1)
+            state_holiday = Date.civil(year, month, 26)
+            state_holiday.downto(beginning_of_month).find {|date| date if date.wday == 1 }
+          end
+
+          def lee_jackson_day(year, month)
+            day_of_holiday = Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, month, 3, 1)
+            beginning_of_month = Date.civil(year, month, 1)
+            king_day = Date.civil(year, month, day_of_holiday)
+            king_day.downto(beginning_of_month).find {|date| date if date.wday == 5 }
+          end
+
+          def juneteenth_national_independence_day(region, date)
+            if region == :us_ut
+              case date.wday
+              when 1
+                date
+              when 2,3,4,5
+                date - (date.wday - 1)
+              when 6
+                date + 2
+              when 0
+                date + 1
+              end
+            elsif date.wday == 0
+              date + 1
+            elsif date.wday == 6
+              date - 1
+            else
+              date
+            end
+          end
+
+          # Independence Day observed shift, which varies by region:
+          #   - us_ri: Rhode Island moves to the following Monday on a weekend
+          #     (Saturday -> +2, Sunday -> +1).
+          #   - us_tx: Texas does not shift, the date is returned unchanged.
+          #   - everyone else: nearest weekday, same as +to_weekday_if_weekend+
+          #     (Saturday -> Friday, Sunday -> Monday).
+          def independence_day(region, date)
+            if region == :us_ri
+              case date.wday
+              when 6
+                date + 2
+              when 0
+                date + 1
+              else
+                date
+              end
+            elsif region == :us_tx
+              date
+            elsif date.wday == 6
+              date - 1
+            elsif date.wday == 0
+              date + 1
+            else
+              date
+            end
+          end
+
+          def election_day(year)
+            Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 11, 1, 1) + 1
+          end
+
+          def even_year_election_day(year)
+            if year % 2 == 0
+              Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 11, 1, 1) + 1
+            end
+          end
+
+          def us_inauguration_day(year)
+            year % 4 == 1 ? 20 : nil
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,7 +4,12 @@ module Holidays
   module Definition
     module Generator
       class Module
-        def call(module_name, files, regions, month_strings, custom_methods)
+        # NOTE: +custom_methods+ is accepted for backwards-compatible call sites but is
+        # no longer baked into the generated module. Per-region custom methods are now
+        # hosted natively under lib/holidays/definition/custom_methods/ and seeded into
+        # the repository at boot. YAML files that still carry methods:/ruby: blocks are
+        # tolerated: their bodies are simply ignored here.
+        def call(module_name, files, regions, month_strings, custom_methods = nil)
           raise ArgumentError.new("module name cannot be nil") if module_name.nil?
           raise ArgumentError.new("module name cannot be blank") if module_name.empty?
 
@@ -38,9 +43,7 @@ module Holidays
     end
 
     def self.custom_methods
-      {
-          #{custom_methods}
-      }
+      {}
     end
   end
 end

data/lib/holidays/definition/repository/proc_result_cache.rb

@@ -33,6 +33,10 @@ module Holidays
           @proc_cache[proc_key]
         end
 
+        def reset!
+          @proc_cache = {}
+        end
+
         private
 
         def validate!(function, function_arguments)