holidays 11.6.0 → 11.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da70f535239a93f75537c181226438b44640775167e06f141e70622f5108ec66
-  data.tar.gz: 604b4dfc18dfe5e4c031069445c9c7b2261f3459091c04ab9d64e085838b1448
+  metadata.gz: a0cce6439fbf9b7dafb577ae8ea715393556a6304fd312ac626c944a1c0ba6da
+  data.tar.gz: 9f177f9d50d4c98d74df77f95eed42b3de5f91f1ea52e10c8252ec0f3bf0569f
 SHA512:
-  metadata.gz: a66c1b9df1b5f51e90f8905b044bb5d4bbf181f3f8ee6c30e9905e4d61d41145d4500ae618123718f905028808fc4fc6ce6a42855346da91c4213d485d396953
-  data.tar.gz: b82030d3894bba76b7883bd936b83c726a98b9106b50620c4b19bca40526b1b62854dde49a15fac8f23587582e492a780c5f4512e2a07475a62dafb31cbfaa06
+  metadata.gz: 23b54b4312a073ef3eab2ee4eb3948ebd91a9b7e6cf33706a1b3105eeb9b3112660649027fce7b6253d17f6a149954b456ab78aac8b8855a08268b2ed739a6eb
+  data.tar.gz: 7cc582e293f9d6b2ce9b5b92c715c2e0294eef6986ac04133be3a75cda4bb7fdd0912739794ce0361ab04d29af968983e1bdd14f777e2c85d39e56eb036a4de6

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # 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.

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/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,12 +48,16 @@ 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,

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.6.0'
+  VERSION = '11.7.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holidays
 version: !ruby/object:Gem::Version
-  version: 11.6.0
+  version: 11.7.0
 platform: ruby
 authors:
 - Alex Dunae
@@ -219,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