holidays 11.4.0 → 11.6.0

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]},
@@ -82,7 +81,9 @@ module Holidays
             {:function => "day_after_thanksgiving(year)", :function_arguments => [:year], :name => "Presidents' Day", :regions => [:us_nm]},
             {:function => "day_after_thanksgiving(year)", :function_arguments => [:year], :name => "Lincoln's Birthday", :regions => [:us_in]},
             {:function => "day_after_thanksgiving(year)", :function_arguments => [:year], :name => "American Indian Heritage Day", :regions => [:us_md]},
-            {:function => "day_after_thanksgiving(year)", :function_arguments => [:year], :name => "Day after Thanksgiving (Black Friday)", :regions => [:us_ca, :us_de, :us_fl, :us_ia, :us_il, :us_ks, :us_ky, :us_me, :us_mi, :us_mn, :us_ms, :us_ne, :us_nh, :us_nc, :us_pa, :us_sc, :us_ok, :us_tn, :us_tx, :us_va, :us_wa, :us_wv]}],
+            {:function => "day_after_thanksgiving(year)", :function_arguments => [:year], :name => "Day after Thanksgiving (Black Friday)", :regions => [:us_ca, :us_de, :us_fl, :us_ia, :us_il, :us_ks, :us_ky, :us_me, :us_mi, :us_mn, :us_ms, :us_ne, :us_nh, :us_nc, :us_pa, :us_sc, :us_ok, :us_tn, :us_tx, :us_va, :us_wa, :us_wv]},
+            {:mday => 1, :type => :informal, :name => "Day of the Dead", :regions => [:us, :ca]},
+            {:mday => 2, :type => :informal, :name => "Day of the Dead", :regions => [:us, :ca]}],
       12 => [{:mday => 24, :name => "Christmas Eve", :regions => [:us_ar, :us_mi, :us_nc, :us_sc, :us_tx, :us_wi]},
             {:mday => 24, :function => "christmas_eve_holiday(date)", :function_arguments => [:date], :name => "Christmas Eve (Holiday)", :regions => [:us_mi, :us_sc, :us_va]},
             {:mday => 25, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:us]},
@@ -92,92 +93,7 @@ module Holidays
     end
 
     def self.custom_methods
-      {
-          "christmas_eve_holiday(date)" => Proc.new { |date|
-beginning_of_month = Date.civil(date.year, date.month, 1)
-(date.saturday? || date.sunday?) ? date.downto(beginning_of_month).find {|d| d if d.wday == 5} : date
-},
-
-"rosh_hashanah(year)" => Proc.new { |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]
-},
-
-"yom_kippur(year)" => Proc.new { |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]
-},
-
-"georgia_state_holiday(year, month)" => Proc.new { |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 }
-},
-
-"lee_jackson_day(year, month)" => Proc.new { |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 }
-},
-
-"juneteenth_national_independence_day(region, date)" => Proc.new { |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
-},
-
-"election_day(year)" => Proc.new { |year|
-Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 11, 1, 1) + 1
-},
-
-"even_year_election_day(year)" => Proc.new { |year|
-if year % 2 == 0
-  Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 11, 1, 1) + 1
-end
-},
-
-"us_inauguration_day(year)" => Proc.new { |year|
-year % 4 == 1 ? 20 : nil
-},
-
-"day_after_thanksgiving(year)" => Proc.new { |year|
-Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 11, 4, 4) + 1
-},
-
-
-      }
+      {}
     end
   end
 end

data/lib/generated_definitions/ve.rb

@@ -28,9 +28,7 @@ module Holidays
     end
 
     def self.custom_methods
-      {
-          
-      }
+      {}
     end
   end
 end

data/lib/generated_definitions/vn.rb

@@ -21,9 +21,7 @@ module Holidays
     end
 
     def self.custom_methods
-      {
-          
-      }
+      {}
     end
   end
 end

data/lib/generated_definitions/za.rb

@@ -28,9 +28,7 @@ module Holidays
     end
 
     def self.custom_methods
-      {
-          
-      }
+      {}
     end
   end
 end

data/lib/holidays/{load_all_definitions.rb → bootstrap.rb}

@@ -1,14 +1,16 @@
+require 'holidays/definition/custom_methods/registry'
+
 module Holidays
-  #TODO This file should be renamed. It's no longer about definitions, really.
-  class LoadAllDefinitions
+  # Runs once at require time (see the bottom of lib/holidays.rb). Despite the
+  # historical name of its alias, this does NOT load per-region holiday data;
+  # that happens lazily in Definition::Context::Load. What it does:
+  #   1. Register the built-in calculation procs (easter, weekend modifiers,
+  #      lunar_to_solar, calculate_day_of_month) into custom_methods_repository.
+  #   2. Register the native per-region custom methods (CustomMethods.all).
+  #   3. Require generated_definitions/REGIONS.rb (the region-name list only).
+  class Bootstrap
     class << self
       def call
-        #FIXME I need a better way to do this. I'm thinking of putting these 'common' methods
-        # into some kind of definition file so it can be loaded automatically but I'm afraid
-        # of making that big of a breaking API change since these are public. For the time
-        # being I'll load them manually like this.
-        #
-        # NOTE: These are no longer public! We can do whatever we want here!
         global_methods = {
           "easter(year)" => gregorian_easter.method(:calculate_easter_for).to_proc,
           "orthodox_easter(year)" => gregorian_easter.method(:calculate_orthodox_easter_for).to_proc,
@@ -29,6 +31,9 @@ module Holidays
 
         Factory::Definition.custom_methods_repository.add(global_methods)
 
+        # Native per-region custom methods (replaces the old YAML methods:/ruby: blocks).
+        Factory::Definition.custom_methods_repository.add(Holidays::Definition::CustomMethods.all)
+
         static_regions_definition = "#{Holidays::DEFINITIONS_PATH}/REGIONS.rb"
         require static_regions_definition
       end
@@ -56,4 +61,6 @@ module Holidays
       end
     end
   end
+
+  private_constant :Bootstrap
 end

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,
@@ -503,6 +503,7 @@ module Holidays
         vn: VIETNAMESE_LUNAR_YEAR_INFO,
         hk: CHINESE_LUNAR_YEAR_INFO,
         sg: CHINESE_LUNAR_YEAR_INFO,
+        cn: CHINESE_LUNAR_YEAR_INFO,
       }.freeze
 
       # Provides number of days per lunar month type.  Lunar months

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

@@ -132,6 +132,10 @@ module Holidays
                     rule[:function_arguments] = get_function_arguments(rule[:function], parsed_custom_methods)
                   end
 
+                  if rule[:observed]
+                    rule[:observed_arguments] = get_function_arguments(rule[:observed], parsed_custom_methods)
+                  end
+
                   rules_by_month[month] << rule
                 end
               end

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/ar.rb

@@ -0,0 +1,28 @@
+require 'date'
+
+module Holidays
+  module Definition
+    module CustomMethods
+      # ar custom holiday calculations, ported verbatim from the
+      # +methods:+ block in definitions/ar.yaml.
+      module AR
+        class << self
+          def to_nearest_monday(date)
+            case date.wday
+            when 5
+              date += 3
+            when 4
+              date += 4
+            when 3
+              date -= 2
+            when 2
+              date -= 1
+            end
+
+            date
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,96 @@
+require 'date'
+
+module Holidays
+  module Definition
+    module CustomMethods
+      # au custom holiday calculations, ported verbatim from the
+      # +methods:+ block in definitions/au.yaml.
+      module AU
+        class << self
+          def afl_grand_final(year)
+            case year
+            when 2015
+              Date.civil(2015, 10, 2)
+            when 2016
+              Date.civil(2016, 9, 30)
+            when 2017
+              Date.civil(2017, 9, 29)
+            when 2020
+              Date.civil(2020, 10, 23)
+            when 2022
+              Date.civil(2022, 9, 23)
+            else
+              # Friday before AFL Grand Final typically falls on the last Friday in September
+              # Override when falls on a different date
+              last_day = Date.civil(year, 9, -1)
+              last_friday = last_day - ((last_day.wday - 5) % 7)
+              last_friday
+            end
+          end
+
+          def qld_queens_bday_october(year)
+            Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 10, 1, 1)
+          end
+
+          def qld_kings_bday_october(year)
+            Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 10, 1, 1)
+          end
+
+          def qld_queens_birthday_june(year)
+            Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 6, 2, 1)
+          end
+
+          def qld_labour_day_may(year)
+            Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 5, 1, 1)
+          end
+
+          def qld_labour_day_october(year)
+            Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 10, 1, 1)
+          end
+
+          def hobart_show_day(year)
+            fourth_sat_in_oct = Date.civil(year, 10, Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 10, 4, :saturday))
+            fourth_sat_in_oct - 2 # the thursday before
+          end
+
+          def march_pub_hol_sa(year)
+            Date.civil(year, 3, Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 3, :second, :monday))
+          end
+
+          def may_pub_hol_sa(year)
+            Date.civil(year, 5, Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 5, :third, :monday))
+          end
+
+          def qld_brisbane_ekka_holiday(year)
+            first_friday = Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 8, :first, :friday)
+
+            if first_friday < 5
+              second_friday = Date.civil(year, 8, Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 8, :second, :friday))
+              second_friday + 5 # The next Wednesday
+            else
+              Date.civil(year, 8, first_friday) + 5
+            end
+          end
+
+          def to_nearest_monday_after(date)
+            case date.wday
+            when 6
+              date += 2
+            when 5
+              date += 3
+            when 4
+              date += 4
+            when 3
+              date += 5
+            when 2
+              date += 6
+            when 0
+              date += 1
+            end
+            date
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+require 'date'
+
+module Holidays
+  module Definition
+    module CustomMethods
+      # ca custom holiday calculations, ported verbatim from the
+      # +methods:+ block in definitions/ca.yaml.
+      module CA
+        class << self
+          def ca_victoria_day(year)
+            date = Date.civil(year,5,24)
+            if date.wday > 1
+              date -= (date.wday - 1)
+            elsif date.wday == 0
+              date -= 6
+            end
+            date
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,58 @@
+require 'date'
+
+module Holidays
+  module Definition
+    module CustomMethods
+      # ch custom holiday calculations, ported verbatim from the
+      # +methods:+ block in definitions/ch.yaml.
+      module CH
+        class << self
+          def ch_vd_lundi_du_jeune_federal(year)
+            date = Date.civil(year,9,1)
+            # Find the first Sunday of September
+            until date.wday.eql? 0 do
+              date += 1
+            end
+            # There are 15 days between the first Sunday
+            # and the Monday after the third Sunday
+            date + 15
+          end
+
+          def ch_ge_jeune_genevois(year)
+            date = Date.civil(year,9,1)
+            # Find the first Sunday of September
+            until date.wday.eql? 0 do
+              date += 1
+            end
+            # Thursday is four days after Sunday
+            date + 4
+          end
+
+          def ch_gl_naefelser_fahrt(year)
+            date = Date.civil(year,4,1)
+            # Find the first Thursday of April
+            until date.wday.eql? 4 do
+              date += 1
+            end
+
+            if date.eql?(Holidays::Factory::DateCalculator::Easter::Gregorian.easter_calculator.calculate_easter_for(year)-3)
+              date += 7
+            end
+            date
+          end
+
+          def ch_be_zibelemaerit(year)
+            date = Date.civil(year,11,1)
+            # Find the first Monday of November
+            until date.wday.eql? 1 do
+              date += 1
+            end
+            # There are 21 days between the first monday
+            # and the 4rth Monday after
+            date + 21
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+require 'date'
+
+module Holidays
+  module Definition
+    module CustomMethods
+      # cl custom holiday calculations, ported verbatim from the
+      # +methods:+ block in definitions/cl.yaml.
+      module CL
+        class << self
+          def st_peter_st_paul_cl(year)
+            date = Date.civil(year, 6, 29)
+            if [2,3,4].include?(date.wday)
+              date -= (date.wday - 1)
+            elsif date.wday == 5
+              date += 3
+            end
+            date
+          end
+
+          def columbus_day_cl(year)
+            date = Date.civil(year, 10, 12)
+            if [2,3,4].include?(date.wday)
+              date -= (date.wday - 1)
+            elsif date.wday == 5
+              date += 3
+            end
+            date
+          end
+
+          def other_churches_day_cl(year)
+            date = Date.civil(year, 10, 31)
+            if date.wday == 2
+              date -= 4
+            elsif date.wday == 3
+              date += 2
+            end
+            date
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+require 'date'
+
+module Holidays
+  module Definition
+    module CustomMethods
+      # cn custom holiday calculations, ported verbatim from the
+      # +methods:+ block in definitions/cn.yaml.
+      module CN
+        class << self
+          # Qingming falls when the sun reaches celestial longitude 15 degrees,
+          # which lands on 4 or 5 April. This is the standard solar-term
+          # approximation; the century constant shifts between the 20th and
+          # 21st centuries.
+          def cn_qingming(year)
+            constant =
+              case year
+              when 1900..1999
+                5.59
+              when 2000..2099
+                4.81
+              else
+                raise IndexError.new("Out of range")
+              end
+            y = year % 100
+            Date.civil(year, 4, (y * 0.2422 + constant).floor - (y / 4))
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+require 'date'
+
+module Holidays
+  module Definition
+    module CustomMethods
+      # co custom holiday calculations, ported verbatim from the
+      # +methods:+ block in definitions/co.yaml.
+      module CO
+        class << self
+          def to_following_monday_if_not_monday(date)
+            if date.wday > 1
+              date += ( 8 - date.wday )
+            elsif date.wday == 0
+              date += 1
+            end
+            date
+          end
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -0,0 +1,17 @@
+require 'date'
+
+module Holidays
+  module Definition
+    module CustomMethods
+      # fedex custom holiday calculations, ported verbatim from the
+      # +methods:+ block in definitions/fedex.yaml.
+      module FEDEX
+        class << self
+          def day_after_thanksgiving(year)
+            Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 11, 4, 4) + 1
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+require 'date'
+
+module Holidays
+  module Definition
+    module CustomMethods
+      # fi custom holiday calculations, ported verbatim from the
+      # +methods:+ block in definitions/fi.yaml.
+      module FI
+        class << self
+          def fi_juhannusaatto(year)
+            date = Date.civil(year,6,19)
+            if date.wday > 5 #if 19.6 is saturday
+              date += 6
+            else
+              date += (5 - date.wday)
+            end
+            date
+          end
+
+          def fi_juhannuspaiva(year)
+            date = Date.civil(year,6,20)
+            date += (6 - date.wday)
+            date
+          end
+
+          def fi_pyhainpaiva(year)
+            date = Date.civil(year,10,31)
+            date += (6 - date.wday)
+            date
+          end
+        end
+      end
+    end
+  end
+end