holidays 11.5.0 → 11.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 450c972e94224caf8a44edc3865c9d7246aa7a0f0ac16c5d41156ff2ca460741
-  data.tar.gz: 2a17f504696cdf7f345fb75b2b715f24f34218c132bb50d61265c8556475aee5
+  metadata.gz: a0cce6439fbf9b7dafb577ae8ea715393556a6304fd312ac626c944a1c0ba6da
+  data.tar.gz: 9f177f9d50d4c98d74df77f95eed42b3de5f91f1ea52e10c8252ec0f3bf0569f
 SHA512:
-  metadata.gz: 1379f15a3ad2d6f06278d7e3806007145a58e78dadbaba0395aabc44bde996f36fc76b088be197a2101d7088b6b1107b924ed8fc850bbe91327e9c7a7bdeb947
-  data.tar.gz: 2cce27a209357ec151b8048cdf2c5a6b532b4613693c52673d489d9c9604fe03394d8c2abb911939ecb44dafac2dfa63eb7cd2b29cd96bc113864868e9285ddf
+  metadata.gz: 23b54b4312a073ef3eab2ee4eb3948ebd91a9b7e6cf33706a1b3105eeb9b3112660649027fce7b6253d17f6a149954b456ab78aac8b8855a08268b2ed739a6eb
+  data.tar.gz: 7cc582e293f9d6b2ce9b5b92c715c2e0294eef6986ac04133be3a75cda4bb7fdd0912739794ce0361ab04d29af968983e1bdd14f777e2c85d39e56eb036a4de6

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Ruby Holidays Gem CHANGELOG
 
+## 11.7.0
+
+* Update to [v9.2.0 definitions](https://github.com/holidays/definitions/releases/tag/v9.2.0): `ma` Eid al-Fitr and Eid al-Adha, `my` Hari Raya Puasa and Hari Raya Haji.
+* Add `ma` Eid al-Fitr and Eid al-Adha, calculated from the Hijri calendar. Years where the date proclaimed by the Ministry of Habous and Islamic Affairs differs from the calculation (Eid al-Fitr 2022, Eid al-Adha 2021) use the proclaimed date. [#510](https://github.com/holidays/holidays/pull/510), [#392](https://github.com/holidays/holidays/issues/392)
+* Add `my` Hari Raya Puasa and Hari Raya Haji, calculated from the Hijri calendar. Years where the gazetted date differs from the calculation use the gazetted date, and a holiday falling on a Sunday is observed on the following Monday. [#511](https://github.com/holidays/holidays/pull/511), [#392](https://github.com/holidays/holidays/issues/392)
+* Fix `next_holidays` returning too few holidays and skipping some. It only searched the 12 months after the start date; it now keeps searching later years until enough holidays are found. [#514](https://github.com/holidays/holidays/pull/514), [#513](https://github.com/holidays/holidays/issues/513)
+
+## 11.6.0
+
+* Update to [v9.1.0 definitions](https://github.com/holidays/definitions/releases/tag/v9.1.0): `tr` feast dates calculated instead of table-driven, `vn` Giỗ Tổ Hùng Vương date fixes, and a region-aware `us` Independence Day observed shift.
+* Calculate `tr` Ramazan Bayramı and Kurban Bayramı from a Hijri calendar instead of a hand-maintained per-year table, so they no longer silently disappear past 2030. [#504](https://github.com/holidays/holidays/pull/504)
+* Fix `vn` Giỗ Tổ Hùng Vương dates for 2018-2023, caused by a lunar calendar leap-month bug in the 2017 table row. [#506](https://github.com/holidays/holidays/pull/506)
+* Add a region-aware `independence_day` observed method for `us` Independence Day, replacing the `us_va`-only shift. Most regions shift to the nearest weekday, `us_ri` shifts to the following Monday, and `us_tx` never shifts. [#508](https://github.com/holidays/holidays/pull/508)
+
 ## 11.5.0
 
 * Update to [v9.0.0 definitions](https://github.com/holidays/definitions/releases/tag/v9.0.0): new `cn` region; `jp`, `kr`, `nz_sl`, `nz_hb`, `ro` date fixes; `tr` feasts through 2030; `de_be` 2025; informal Day of the Dead for `us`/`ca`. The v9.0.0 major is a definitions format change only and does not affect gem results or API.

data/README.md

@@ -20,6 +20,7 @@ This gem is tested with the following ruby versions:
   * 3.4
   * 4.0
   * JRuby 10.0.5.0
+  * JRuby 10.1.0.0
 
 ## Semver
 

data/lib/generated_definitions/ma.rb

@@ -12,7 +12,9 @@ module Holidays
 
     def self.holidays_by_month
       {
-                1 => [{:mday => 1, :name => "Ras l' âm", :regions => [:ma]},
+                0 => [{:function => "eid_al_fitr(year)", :function_arguments => [:year], :name => "Eid al-Fitr", :regions => [:ma]},
+            {:function => "eid_al_adha(year)", :function_arguments => [:year], :name => "Eid al-Adha", :regions => [:ma]}],
+      1 => [{:mday => 1, :name => "Ras l' âm", :regions => [:ma]},
             {:mday => 11, :name => "Takdim watikat al-istiqlal", :regions => [:ma]}],
       5 => [{:mday => 1, :name => "Eid Ash-Shughl", :regions => [:ma]}],
       7 => [{:mday => 30, :name => "Eid Al-Ârch", :regions => [:ma]}],

data/lib/generated_definitions/my.rb

@@ -12,7 +12,9 @@ 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 => [:my]}],
+                0 => [{:function => "hari_raya_puasa(year)", :function_arguments => [:year], :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Hari Raya Puasa", :regions => [:my]},
+            {:function => "hari_raya_haji(year)", :function_arguments => [:year], :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Hari Raya Haji", :regions => [:my]}],
+      1 => [{:mday => 1, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "New Year's Day", :regions => [:my]}],
       5 => [{:mday => 1, :name => "Labour Day", :regions => [:my]}],
       6 => [{:mday => 4, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Agong's Birthday", :regions => [:my]}],
       8 => [{:mday => 31, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Independence Day", :regions => [:my]}],

data/lib/generated_definitions/northamerica.rb

@@ -83,8 +83,7 @@ module Holidays
             {:mday => 12, :type => :informal, :name => "Orangemen's Day", :regions => [:ca_nl]},
             {:mday => 9, :year_ranges => { :from => 2020 },:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Nunavut Day", :regions => [:ca_nu]},
             {:mday => 3, :name => "Emancipation Day", :regions => [:us_vi]},
-            {:mday => 4, :name => "Independence Day", :regions => [:us]},
-            {:mday => 4, :function => "to_weekday_if_weekend(date)", :function_arguments => [:date], :name => "Independence Day (Holiday)", :regions => [:us_va]},
+            {:mday => 4, :observed => "independence_day(region, date)", :observed_arguments => [:region, :date], :name => "Independence Day", :regions => [:us]},
             {:mday => 24, :name => "Pioneer Day", :regions => [:us_ut]}],
       8 => [{:wday => 1, :week => 1, :name => "B.C. Day", :regions => [:ca_bc]},
             {:wday => 1, :week => 1, :name => "Saskatchewan Day", :regions => [:ca_sk]},

data/lib/generated_definitions/us.rb

@@ -58,8 +58,7 @@ module Holidays
             {:mday => 20, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "West Virginia Day", :regions => [:us_wv]},
             {:wday => 0, :week => 3, :type => :informal, :name => "Father's Day", :regions => [:us, :ca]}],
       7 => [{:mday => 3, :name => "Emancipation Day", :regions => [:us_vi]},
-            {:mday => 4, :name => "Independence Day", :regions => [:us]},
-            {:mday => 4, :function => "to_weekday_if_weekend(date)", :function_arguments => [:date], :name => "Independence Day (Holiday)", :regions => [:us_va]},
+            {:mday => 4, :observed => "independence_day(region, date)", :observed_arguments => [:region, :date], :name => "Independence Day", :regions => [:us]},
             {:mday => 24, :name => "Pioneer Day", :regions => [:us_ut]}],
       8 => [{:wday => 1, :week => 2, :name => "Victory Day", :regions => [:us_ri]},
             {:mday => 16, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Bennington Battle Day", :regions => [:us_vt]},

data/lib/holidays/date_calculator/hijri_date.rb

@@ -0,0 +1,52 @@
+require 'date'
+
+module Holidays
+  module DateCalculator
+    # Arithmetic ("tabular", a.k.a. Kuwaiti) Islamic calendar.
+    #
+    # Months alternate 30 and 29 days; leap years add a day to the twelfth
+    # month on a fixed 11-of-30 cycle. This is a purely arithmetic calendar,
+    # so it can land a day (occasionally two) either side of a locally
+    # proclaimed date. Callers that need the proclaimed date layer their own
+    # override table on top of this (see
+    # Holidays::Definition::CustomMethods::TR).
+    class HijriDate
+      # Julian day number of 1 Muharram 1 AH minus one day, chosen so that
+      # to_jd's month/day terms are added directly. Corresponds to the civil
+      # epoch (Friday, 16 July 622 CE proleptic Julian).
+      EPOCH_JDN = 1948439
+
+      def to_gregorian(hijri_year, hijri_month, hijri_day)
+        Date.jd(to_jd(hijri_year, hijri_month, hijri_day))
+      end
+
+      # Given a Gregorian year and a fixed Hijri month/day, return the
+      # occurrence that falls within that Gregorian year, or nil if none does.
+      #
+      # A fixed Hijri date drifts ~11 days earlier each Gregorian year, so
+      # roughly once every 33 years it falls twice in the same Gregorian year
+      # (once in early January, once in late December). Only the earlier
+      # occurrence is returned.
+      def gregorian_year_occurrence(gregorian_year, hijri_month, hijri_day)
+        candidate_hijri_year = gregorian_year - 579
+
+        (candidate_hijri_year - 1..candidate_hijri_year + 1).each do |hijri_year|
+          date = to_gregorian(hijri_year, hijri_month, hijri_day)
+          return date if date.year == gregorian_year
+        end
+
+        nil
+      end
+
+      private
+
+      def to_jd(year, month, day)
+        day +
+          (29.5 * (month - 1)).ceil +
+          (year - 1) * 354 +
+          (3 + 11 * year) / 30 +
+          EPOCH_JDN
+      end
+    end
+  end
+end

data/lib/holidays/date_calculator/lunar_date.rb

@@ -152,7 +152,7 @@ module Holidays
         [384, 1, 2, 1, 2, 1, 2, 1, 2, 4, 2, 1, 2].freeze,
         [354, 1, 2, 1, 1, 2, 1, 2, 2, 2, 1, 2, 1].freeze,
         [355, 2, 1, 2, 1, 1, 2, 1, 2, 2, 1, 2, 2].freeze,
-        [355, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 2].freeze,
+        [384, 1, 2, 1, 2, 1, 5, 1, 2, 1, 2, 2, 2].freeze, # 2017 has a leap 6th month; previous entry omitted it, shifting every later date
         [354, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 2].freeze,
         [354, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2].freeze,
         [384, 2, 1, 2, 4, 2, 1, 1, 2, 1, 2, 1, 2].freeze,

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

@@ -3,10 +3,12 @@ module Holidays
     module Context
       # Merge a new set of definitions into the Holidays module.
       class Merger
-        def initialize(holidays_by_month_repo, regions_repo, custom_methods_repo)
+        def initialize(holidays_by_month_repo, regions_repo, custom_methods_repo, cache_repo, proc_result_cache_repo)
           @holidays_repo = holidays_by_month_repo
           @regions_repo = regions_repo
           @custom_methods_repo = custom_methods_repo
+          @cache_repo = cache_repo
+          @proc_result_cache_repo = proc_result_cache_repo
         end
 
         def call(target_regions, target_holidays, target_custom_methods, target_custom_method_sources = {})
@@ -17,6 +19,9 @@ module Holidays
             target_custom_method_sources,
             derive_function_regions(target_holidays),
           )
+        ensure
+          @cache_repo.reset!
+          @proc_result_cache_repo.reset!
         end
 
         private

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

@@ -0,0 +1,48 @@
+require 'date'
+
+module Holidays
+  module Definition
+    module CustomMethods
+      # ma custom holiday calculations.
+      #
+      # Eid al-Fitr is 1 Shawwal and Eid al-Adha 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 Morocco's Ministry of Habous and Islamic Affairs and in
+      # some years land a day off from the arithmetic result; MINISTRY_OVERRIDES
+      # pins those years to the proclaimed date. Years with no entry fall back
+      # to the calculation. See holidays#392.
+      module MA
+        SHAWWAL = 10
+        DHU_AL_HIJJAH = 12
+
+        # Proclaimed first days that differ from the arithmetic calendar,
+        # keyed by [feast, gregorian_year]. Sourced from the Ministry of
+        # Habous and Islamic Affairs communiques reported via maroc.ma,
+        # Hespress, and Morocco World News.
+        MINISTRY_OVERRIDES = {
+          [:eid_al_fitr, 2022] => Date.new(2022, 5, 2),
+
+          [:eid_al_adha, 2021] => Date.new(2021, 7, 21),
+        }.freeze
+
+        class << self
+          def eid_al_fitr(year)
+            feast(:eid_al_fitr, year, SHAWWAL, 1)
+          end
+
+          def eid_al_adha(year)
+            feast(:eid_al_adha, year, DHU_AL_HIJJAH, 10)
+          end
+
+          private
+
+          def feast(name, year, hijri_month, hijri_day)
+            MINISTRY_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/my.rb

@@ -0,0 +1,55 @@
+require 'date'
+
+module Holidays
+  module Definition
+    module CustomMethods
+      # my custom holiday calculations.
+      #
+      # Hari Raya Puasa (Eid al-Fitr) is 1 Shawwal and Hari Raya Haji (Eid
+      # al-Adha) is 10 Dhul-Hijjah of the Hijri calendar. Both are derived
+      # from the arithmetic Islamic calendar (Holidays::DateCalculator::HijriDate).
+      # The civil holidays are fixed by the Yang di-Pertuan Agong (Conference
+      # of Rulers) on JAKIM's moon-sighting advice and in some years have
+      # landed a day before the arithmetic result; GAZETTE_OVERRIDES pins
+      # those years to the gazetted date. Years with no entry fall back to
+      # the calculation. See holidays#392.
+      module MY
+        SHAWWAL = 10
+        DHU_AL_HIJJAH = 12
+
+        # Gazetted first days that differ from the arithmetic calendar,
+        # keyed by [feast, gregorian_year]. Sourced from the official
+        # Malaysian public holiday gazette, cross-checked against
+        # definitions/sg.yaml (agrees in every overlapping year 2017-2026).
+        GAZETTE_OVERRIDES = {
+          [:hari_raya_puasa, 2014] => Date.new(2014, 7, 28),
+          [:hari_raya_puasa, 2015] => Date.new(2015, 7, 17),
+          [:hari_raya_puasa, 2016] => Date.new(2016, 7, 6),
+          [:hari_raya_puasa, 2017] => Date.new(2017, 6, 25),
+          [:hari_raya_puasa, 2026] => Date.new(2026, 3, 21),
+
+          [:hari_raya_haji, 2016] => Date.new(2016, 9, 12),
+          [:hari_raya_haji, 2017] => Date.new(2017, 9, 1),
+          [:hari_raya_haji, 2019] => Date.new(2019, 8, 11),
+        }.freeze
+
+        class << self
+          def hari_raya_puasa(year)
+            feast(:hari_raya_puasa, year, SHAWWAL, 1)
+          end
+
+          def hari_raya_haji(year)
+            feast(:hari_raya_haji, year, DHU_AL_HIJJAH, 10)
+          end
+
+          private
+
+          def feast(name, year, hijri_month, hijri_day)
+            GAZETTE_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/registry.rb

@@ -13,6 +13,8 @@ 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/ma'
+require 'holidays/definition/custom_methods/my'
 require 'holidays/definition/custom_methods/nz'
 require 'holidays/definition/custom_methods/ph'
 require 'holidays/definition/custom_methods/se'
@@ -46,14 +48,19 @@ module Holidays
           "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,
+          "eid_al_adha(year)" => MA.method(:eid_al_adha).to_proc,
+          "eid_al_fitr(year)" => MA.method(:eid_al_fitr).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,
+          "hari_raya_haji(year)" => MY.method(:hari_raya_haji).to_proc,
+          "hari_raya_puasa(year)" => MY.method(:hari_raya_puasa).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,

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

@@ -3,54 +3,63 @@ require 'date'
 module Holidays
   module Definition
     module CustomMethods
-      # tr custom holiday calculations, ported verbatim from the
-      # +methods:+ block in definitions/tr.yaml.
+      # 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)
-            begin_of_ramadan_feast = {
-                '2014' => Date.civil(2014, 7, 28),
-                '2015' => Date.civil(2015, 7, 17),
-                '2016' => Date.civil(2016, 7, 5),
-                '2017' => Date.civil(2017, 6, 25),
-                '2018' => Date.civil(2018, 6, 15),
-                '2019' => Date.civil(2019, 6, 4),
-                '2020' => Date.civil(2020, 5, 24),
-                '2021' => Date.civil(2021, 5, 13),
-                '2022' => Date.civil(2022, 5, 2),
-                '2023' => Date.civil(2023, 4, 21),
-                '2024' => Date.civil(2024, 4, 10),
-                '2025' => Date.civil(2025, 3, 30),
-                '2026' => Date.civil(2026, 3, 20),
-                '2027' => Date.civil(2027, 3, 9),
-                '2028' => Date.civil(2028, 2, 26),
-                '2029' => Date.civil(2029, 2, 15),
-                '2030' => Date.civil(2030, 2, 4)
-            }
-            begin_of_ramadan_feast[year.to_s]
+            feast(:ramadan_feast, year, SHAWWAL, 1)
           end
 
           def sacrifice_feast(year)
-            begin_of_sacrifice_feast = {
-                '2014' => Date.civil(2014, 10, 4),
-                '2015' => Date.civil(2015, 9, 24),
-                '2016' => Date.civil(2016, 9, 12),
-                '2017' => Date.civil(2017, 9, 1),
-                '2018' => Date.civil(2018, 8, 21),
-                '2019' => Date.civil(2019, 8, 11),
-                '2020' => Date.civil(2020, 7, 31),
-                '2021' => Date.civil(2021, 7, 20),
-                '2022' => Date.civil(2022, 7, 9),
-                '2023' => Date.civil(2023, 6, 28),
-                '2024' => Date.civil(2024, 6, 16),
-                '2025' => Date.civil(2025, 6, 6),
-                '2026' => Date.civil(2026, 5, 27),
-                '2027' => Date.civil(2027, 5, 16),
-                '2028' => Date.civil(2028, 5, 5),
-                '2029' => Date.civil(2029, 4, 24),
-                '2030' => Date.civil(2030, 4, 13)
-            }
-            begin_of_sacrifice_feast[year.to_s]
+            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

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

@@ -72,6 +72,33 @@ module Holidays
             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

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)

data/lib/holidays/factory/date_calculator.rb

@@ -2,6 +2,7 @@ require 'holidays/date_calculator/easter'
 require 'holidays/date_calculator/weekend_modifier'
 require 'holidays/date_calculator/day_of_month'
 require 'holidays/date_calculator/lunar_date'
+require 'holidays/date_calculator/hijri_date'
 
 module Holidays
   module Factory
@@ -25,10 +26,14 @@ module Holidays
       end
 
       class << self
-        def lunar_date 
+        def lunar_date
           Holidays::DateCalculator::LunarDate.new
         end
 
+        def hijri_date
+          Holidays::DateCalculator::HijriDate.new
+        end
+
         def weekend_modifier
           Holidays::DateCalculator::WeekendModifier.new
         end

data/lib/holidays/factory/definition.rb

@@ -57,6 +57,8 @@ module Holidays
             holidays_by_month_repository,
             regions_repository,
             custom_methods_repository,
+            cache_repository,
+            proc_result_cache_repository,
           )
         end
 

data/lib/holidays/finder/context/next_holiday.rb

@@ -2,6 +2,11 @@ module Holidays
   module Finder
     module Context
       class NextHoliday
+        # Holidays are searched one 12 month window at a time. The search widens until
+        # enough holidays are found or this many years have been searched, which stops
+        # a region with no upcoming holidays from being searched forever.
+        MAX_YEARS = 50
+
         def initialize(definition_search, dates_driver_builder, options_parser)
           @definition_search = definition_search
           @dates_driver_builder = dates_driver_builder
@@ -12,31 +17,36 @@ module Holidays
           validate!(holidays_count, from_date)
 
           regions, observed, informal = @options_parser.call(options)
+          opts = gather_options(observed, informal)
 
           holidays = []
-          opts = gather_options(observed, informal)
 
-          # This could be smarter but I don't have any evidence that just checking for
-          # the next 12 months will cause us issues. If it does we can implement something
-          # smarter here to check in smaller increments.
-          dates_driver = @dates_driver_builder.call(from_date, from_date >> 12)
+          1.upto(MAX_YEARS) do |year|
+            holidays.concat(search_window(from_date, year, regions, opts))
+            break if holidays.size >= holidays_count
+          end
 
-          @definition_search
-            .call(dates_driver, regions, opts)
-            .sort_by { |a| a[:date] }
-            .each do |holiday|
-              if holiday[:date] >= from_date
-                holidays << holiday
-                holidays_count -= 1
-                break if holidays_count == 0
-              end
-            end
-
-          holidays.sort_by { |a| a[:date] }
+          holidays.first(holidays_count)
         end
 
         private
 
+        # Windows are contiguous: each starts the day after the previous one ended. The
+        # search only looks at the months around a window (plus month 0, which covers the
+        # whole year), so dates past the window end are incomplete. They are discarded here
+        # and found by the next window instead.
+        def search_window(from_date, year, regions, opts)
+          window_start = year == 1 ? from_date : (from_date >> 12 * (year - 1)) + 1
+          window_end = from_date >> 12 * year
+
+          dates_driver = @dates_driver_builder.call(window_start, window_end)
+
+          @definition_search
+            .call(dates_driver, regions, opts)
+            .select { |holiday| (window_start..window_end).cover?(holiday[:date]) }
+            .sort_by { |holiday| holiday[:date] }
+        end
+
         def validate!(holidays_count, from_date)
           raise ArgumentError unless holidays_count
           raise ArgumentError if holidays_count <= 0

data/lib/holidays/version.rb

@@ -1,3 +1,3 @@
 module Holidays
-  VERSION = '11.5.0'
+  VERSION = '11.7.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holidays
 version: !ruby/object:Gem::Version
-  version: 11.5.0
+  version: 11.7.0
 platform: ruby
 authors:
 - Alex Dunae
@@ -197,6 +197,7 @@ files:
 - lib/holidays/core_extensions/time.rb
 - lib/holidays/date_calculator/day_of_month.rb
 - lib/holidays/date_calculator/easter.rb
+- lib/holidays/date_calculator/hijri_date.rb
 - lib/holidays/date_calculator/lunar_date.rb
 - lib/holidays/date_calculator/weekend_modifier.rb
 - lib/holidays/definition/context/function_processor.rb
@@ -218,6 +219,8 @@ files:
 - lib/holidays/definition/custom_methods/jp.rb
 - lib/holidays/definition/custom_methods/kr.rb
 - lib/holidays/definition/custom_methods/lv.rb
+- lib/holidays/definition/custom_methods/ma.rb
+- lib/holidays/definition/custom_methods/my.rb
 - lib/holidays/definition/custom_methods/nz.rb
 - lib/holidays/definition/custom_methods/ph.rb
 - lib/holidays/definition/custom_methods/registry.rb