holidays 11.2.0 → 11.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ddbd4a71c58985797a9d23c0915ab057dcc6c33955dd376c4d6bf666ebaf162
-  data.tar.gz: caff42a910a845239c211675f9f281d6eee616a701b890666638925ddf2bc4f5
+  metadata.gz: ecb3d48fdd2ac2ca954701f6835dc8a5176260ca0d1c39c539523dc28c9ed7f9
+  data.tar.gz: 3a0cee035b7bebdd3bb34a4bf938c3197911306a88d63b2099637f466357833b
 SHA512:
-  metadata.gz: 35817afac8beb46dba118b1919092d278a00281e8ef82819dbc55217520af2b3ccf27f64e84412a34d7826c7cd17002af310f42bcf94eb5423218de70a115bf0
-  data.tar.gz: 4bba40653e048451b4a02f1d360ba089c8211be3ce4d420f42b7f60ce57f82442ba1d77fe088978ec067af89506bf8aee71cfc0a1865e9534c16b6dea6c7f3c1
+  metadata.gz: '09bd24e6e1cd39da887cdd02705ba433a79ca9a83c820ed56047ffe72af747116a68f295205b228c9fad539ba6b850e248122e24c63256fe2368cc7a70152ab0'
+  data.tar.gz: c5189a7c4c2c08793abb53bca23477e91a8ecf8d38f16527a3bd7abb19eff55c907dce2ca4ab4179692bb2d389c8bd40229936fecad1cf5e341826e9b1c18ed8

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Ruby Holidays Gem CHANGELOG
 
+## 11.3.0
+
+* Update to [v8.1.0 definitions](https://github.com/holidays/definitions/releases/tag/v8.1.0). Please see the changelog for the definition details.
+* Pass a custom method's declared arguments to `observed` methods, and supply all custom method arguments in the order the definition declares them ([#433](https://github.com/holidays/holidays/issues/433)). Previously `observed` methods only ever received `date`, and arguments were supplied in a fixed order regardless of the declared order, so a definition declaring anything else bound values to the wrong parameters.
+* Add `us_ut` Juneteenth observance, observed on June 19 when that is a Monday, the preceding Monday when June 19 is Tuesday through Friday, and the following Monday when it is a weekend. Callers querying `us_ut` with the `:observed` option will see a different date from the rest of `us`.
+* Add `ie` St Brigid's Day, the first Monday in February or 1 February when that day is a Friday, a public holiday from 2023
+* Restore `sk` Deň Ústavy Slovenskej republiky and Deň boja za slobodu a demokraciu, which remain state holidays in Slovak law. Both are formal up to the year each stopped being a day of rest, 2024 and 2025 respectively, and informal from then on, so they no longer appear in default results for those later years
+
 ## 11.2.0
 
 * Update to [v8.0.2 definitions](https://github.com/holidays/definitions/releases/tag/v8.0.2). Please see the changelog for the definition details.

data/lib/generated_definitions/europe.rb

@@ -354,6 +354,8 @@ module Holidays
             {:mday => 1, :name => "Dia de Todos-os-Santos", :regions => [:pt]},
             {:mday => 30, :name => "Sfântul Apostol Andrei", :regions => [:ro]},
             {:mday => 1, :name => "Sviatok všetkých svätých", :regions => [:sk]},
+            {:mday => 17, :year_ranges => { :until => 2024 },:name => "Deň boja za slobodu a demokraciu", :regions => [:sk]},
+            {:mday => 17, :year_ranges => { :from => 2025 },:type => :informal, :name => "Deň boja za slobodu a demokraciu", :regions => [:sk]},
             {:mday => 1, :name => "dan spomina na mrtve", :regions => [:si]},
             {:mday => 1, :name => "Revival Leader's Day", :regions => [:bg_en]},
             {:mday => 1, :name => "Ден на Народните будители", :regions => [:bg_bg]}],
@@ -534,12 +536,15 @@ module Holidays
             {:mday => 8, :name => "Maria Geburt", :regions => [:li]},
             {:mday => 24, :year_ranges => { :limited => [2018] },:name => "Viņa Svētības pāvesta Franciska pastorālās vizītes Latvijā diena", :regions => [:lv]},
             {:mday => 30, :type => :informal, :name => "Dzień Chłopaka", :regions => [:pl]},
+            {:mday => 1, :year_ranges => { :until => 2023 },:name => "Deň Ústavy Slovenskej republiky", :regions => [:sk]},
+            {:mday => 1, :year_ranges => { :from => 2024 },:type => :informal, :name => "Deň Ústavy Slovenskej republiky", :regions => [:sk]},
             {:mday => 15, :name => "Sedembolestná Panna Mária", :regions => [:sk]},
             {:mday => 6, :name => "Unification Day", :regions => [:bg_en]},
             {:mday => 6, :name => "Ден на Съединението", :regions => [:bg_bg]},
             {:mday => 22, :name => "The Independence Day", :regions => [:bg_en]},
             {:mday => 22, :name => "Ден на Независимостта", :regions => [:bg_bg]}],
       2 => [{:mday => 28, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Día de Andalucía", :regions => [:es_an]},
+            {:function => "ie_st_brigids_day(year)", :function_arguments => [:year], :year_ranges => { :from => 2023 },:name => "St Brigid's Day", :regions => [:ie]},
             {:mday => 18, :type => :informal, :name => "Konudagur", :regions => [:is]},
             {:mday => 2, :name => "Maria Lichtmess", :regions => [:li]},
             {:mday => 16, :name => "Valstybės atkūrimo diena", :regions => [:lt]},
@@ -606,6 +611,15 @@ end
 date
 },
 
+"ie_st_brigids_day(year)" => Proc.new { |year|
+date = Date.civil(year, 2, 1)
+if date.wday == 5
+  date
+else
+  date + ((1 - date.wday) % 7)
+end
+},
+
 "is_sumardagurinn_fyrsti(year)" => Proc.new { |year|
 date = Date.civil(year,4,18)
 if date.wday < 4

data/lib/generated_definitions/ie.rb

@@ -14,6 +14,7 @@ module Holidays
       {
                 0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Easter Monday", :regions => [:ie]}],
       1 => [{:mday => 1, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "New Year's Day", :regions => [:ie]}],
+      2 => [{:function => "ie_st_brigids_day(year)", :function_arguments => [:year], :year_ranges => { :from => 2023 },:name => "St Brigid's Day", :regions => [:ie]}],
       3 => [{:mday => 17, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "St. Patrick's Day", :regions => [:ie]}],
       5 => [{:wday => 1, :week => 1, :name => "May Day", :regions => [:ie]}],
       6 => [{:wday => 1, :week => 1, :name => "June Bank Holiday", :regions => [:ie]}],
@@ -26,7 +27,16 @@ module Holidays
 
     def self.custom_methods
       {
-          
+          "ie_st_brigids_day(year)" => Proc.new { |year|
+date = Date.civil(year, 2, 1)
+if date.wday == 5
+  date
+else
+  date + ((1 - date.wday) % 7)
+end
+},
+
+
       }
     end
   end

data/lib/generated_definitions/northamerica.rb

@@ -75,7 +75,7 @@ module Holidays
             {:wday => 1, :week => 1, :name => "Jefferson Davis' Birthday", :regions => [:us_al]},
             {:mday => 3, :name => "Birthday of Jefferson Davis", :regions => [:us_fl]},
             {:mday => 11, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "King Kamehameha I Day", :regions => [:us_hi]},
-            {:mday => 19, :year_ranges => { :from => 2021 },:observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Juneteenth National Independence Day", :regions => [:us]},
+            {:mday => 19, :year_ranges => { :from => 2021 },:observed => "juneteenth_national_independence_day(region, date)", :observed_arguments => [:region, :date], :name => "Juneteenth National Independence Day", :regions => [:us]},
             {:mday => 19, :name => "Emancipation Day in Texas", :regions => [:us_tx]},
             {: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]}],
@@ -213,6 +213,27 @@ 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
 },

data/lib/generated_definitions/sk.rb

@@ -20,8 +20,12 @@ module Holidays
             {:mday => 8, :name => "Deň víťazstva nad fašizmom", :regions => [:sk]}],
       7 => [{:mday => 5, :name => "Sviatok svätého Cyrila a svätého Metoda", :regions => [:sk]}],
       8 => [{:mday => 29, :name => "Výročie Slovenského národného povstania", :regions => [:sk]}],
-      9 => [{:mday => 15, :name => "Sedembolestná Panna Mária", :regions => [:sk]}],
-      11 => [{:mday => 1, :name => "Sviatok všetkých svätých", :regions => [:sk]}],
+      9 => [{:mday => 1, :year_ranges => { :until => 2023 },:name => "Deň Ústavy Slovenskej republiky", :regions => [:sk]},
+            {:mday => 1, :year_ranges => { :from => 2024 },:type => :informal, :name => "Deň Ústavy Slovenskej republiky", :regions => [:sk]},
+            {:mday => 15, :name => "Sedembolestná Panna Mária", :regions => [:sk]}],
+      11 => [{:mday => 1, :name => "Sviatok všetkých svätých", :regions => [:sk]},
+            {:mday => 17, :year_ranges => { :until => 2024 },:name => "Deň boja za slobodu a demokraciu", :regions => [:sk]},
+            {:mday => 17, :year_ranges => { :from => 2025 },:type => :informal, :name => "Deň boja za slobodu a demokraciu", :regions => [:sk]}],
       12 => [{:mday => 24, :name => "Štedrý deň", :regions => [:sk]},
             {:mday => 25, :name => "1. sviatok vianočný", :regions => [:sk]},
             {:mday => 26, :name => "2. sviatok vianočný", :regions => [:sk]}]

data/lib/generated_definitions/us.rb

@@ -53,7 +53,7 @@ module Holidays
       6 => [{:wday => 1, :week => 1, :name => "Jefferson Davis' Birthday", :regions => [:us_al]},
             {:mday => 3, :name => "Birthday of Jefferson Davis", :regions => [:us_fl]},
             {:mday => 11, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "King Kamehameha I Day", :regions => [:us_hi]},
-            {:mday => 19, :year_ranges => { :from => 2021 },:observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Juneteenth National Independence Day", :regions => [:us]},
+            {:mday => 19, :year_ranges => { :from => 2021 },:observed => "juneteenth_national_independence_day(region, date)", :observed_arguments => [:region, :date], :name => "Juneteenth National Independence Day", :regions => [:us]},
             {:mday => 19, :name => "Emancipation Day in Texas", :regions => [:us_tx]},
             {: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]}],
@@ -137,6 +137,27 @@ 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
 },

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

@@ -35,30 +35,19 @@ module Holidays
           raise ArgumentError if desired_func_args.include?(:region) && !input[:region].is_a?(Symbol)
         end
 
+        # Arguments are supplied in the order the definition declares them. The proc
+        # is built with that same declared order, so anything else silently binds
+        # values to the wrong parameters.
         def parse_arguments(input, target_args)
-          args = []
-
-          if target_args.include?(:year)
-            args << input[:year]
-          end
-
-          if target_args.include?(:month)
-            args << input[:month]
-          end
-
-          if target_args.include?(:day)
-            args << input[:day]
-          end
-
-          if target_args.include?(:date)
-            args << Date.civil(input[:year], input[:month], input[:day])
-          end
-
-          if target_args.include?(:region)
-            args << input[:region]
+          target_args.map do |arg|
+            case arg
+            when :year   then input[:year]
+            when :month  then input[:month]
+            when :day    then input[:day]
+            when :date   then Date.civil(input[:year], input[:month], input[:day])
+            when :region then input[:region]
+            end
           end
-
-          args
         end
 
         def calculate(input, id, args, modifier)

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

@@ -120,11 +120,14 @@ module Holidays
           }
         end
 
+        # Observed methods default to taking only a date, but they may declare
+        # additional arguments such as :region so that a single definition shared
+        # across regions can observe differently in one of them.
         def build_observed_date(date, regions, h)
           @custom_method_processor.call(
             build_custom_method_input(date.year, date.month, date.day, regions),
             h[:observed],
-            [:date],
+            h[:observed_arguments] || [:date],
           )
         end
       end

data/lib/holidays/version.rb

@@ -1,3 +1,3 @@
 module Holidays
-  VERSION = '11.2.0'
+  VERSION = '11.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holidays
 version: !ruby/object:Gem::Version
-  version: 11.2.0
+  version: 11.3.0
 platform: ruby
 authors:
 - Alex Dunae