holidays 9.1.1 → 9.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48de71e88e1ad86816570c37ed6758acb2cbfa7cdd7572c6d7f887db8ab1e97c
-  data.tar.gz: fd1ad6a19f5dded4fc5b9bcee63d67049229f51047c20d1e629dddee2bf27810
+  metadata.gz: c5df9d7c9191d51eb57d3d62573ea4ad0b606d8edf9e0d8f0c8e77ad980c69cc
+  data.tar.gz: c78ba3585823a7ec2ec21634216c39d8b3eb6170d9209131664c6a0f169ff61b
 SHA512:
-  metadata.gz: bf87b687e2927731071a1bae0e128a19cd484a5ce919a7e9d5de6041be63fe4b23e8c7089d94fae37132d322ca206dc32b5c3f3cba59242aac5190e1289550f4
-  data.tar.gz: 3f4a6fb07d8ee2e6546ab25d311bf7f0307c2c94e80da6ae24ba53d0dba1d009a1fdcd651d23c1b69fdbb7d285040f88c01fe0dcbee68d44a67974b94334a63e
+  metadata.gz: 0a2960e5d509413c28be78a5d21e42d06176d2311577604673b5f9465efb8d13c86a05df2d39ed0d51207d1178d23f1c3e3c865b85693720c5f95ef073d487f5
+  data.tar.gz: f436525c1aa5d8230ef1a88ab29c09addc15e5f68e55fe8ba735b3129bd1296bdc6bd67913cd5e77bbe2efd89f1fd544f3b0a7e725da67dbdd7851916c82b38f

data/.github/workflows/ruby.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['3.2', '3.3', '3.4', 'ruby-head', '4.0']
+        ruby-version: ['3.2', '3.3', '3.4', '4.0', 'ruby-head', 'jruby-10.0.4.0']
     env:
       BUNDLER_NO_OLD_RUBYGEMS_WARNING: true
     steps:
@@ -20,6 +20,7 @@ jobs:
       uses: ruby/setup-ruby@3ff19f5e2baf30647122352b96108b1fbe250c64 #v1.299.0
       with:
         ruby-version: ${{ matrix.ruby-version }}
+        bundler: latest
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - name: Run tests
       run: make test

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Ruby Holidays Gem CHANGELOG
 
+## 9.2.0
+
+* Update to [v6.1.1 definitions](https://github.com/holidays/definitions/releases/tag/v6.1.1). Please see the changelog for the definition details.
+* Add `test:contract` rake task and `make test-contract` target combining smoke and generated definition tests for use as a downstream contract check
+* Set coverage minimum to 90% and skip for ruby-head builds
+
+## 9.1.2
+
+* Fix bug ([#344](https://github.com/holidays/holidays/issues/344)) where holidays with the same name and function but different implementations across regions would return incorrect results depending on region load order. When multiple regions are queried simultaneously, each region's function implementation is now evaluated independently and all matching results are returned.
+
 ## 9.1.1
 
 * Update to [v6.0.1 definitions](https://github.com/holidays/definitions/releases/tag/v6.0.1). Please see the changelog for the definition details.

data/Gemfile

@@ -1,3 +1,8 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :development do
+  gem 'irb'
+  gem 'rdoc'
+end

data/Makefile

@@ -1,4 +1,3 @@
-default: test
 
 setup: update-defs
 	bundle install
@@ -7,8 +6,21 @@ generate:
 	bundle exec rake generate
 
 test:
+	rm -rf reports
 	bundle exec rake test
 
+test-smoke:
+	bundle exec rake test:smoke
+
+test-contract:
+	bundle exec rake test:contract
+
+test-integration:
+	bundle exec rake test:integration
+
+test-e2e:
+	bundle exec rake test:e2e
+
 console:
 	bundle exec rake console
 
@@ -32,6 +44,9 @@ point-to-defs-branch:
 point-to-defs-master:
 	git submodule add https://github.com/holidays/definitions definitions/
 
+reset-defs-to-master:
+	git -C definitions checkout $$(git ls-tree origin/master -- definitions | awk '{print $$3}')
+
 clean-defs:
 	git rm -f definitions
 	rm -rf .git/modules/definitions
@@ -42,4 +57,4 @@ clean:
 	rm -rf reports
 	rm -rf coverage
 
-.PHONY: setup test generate console build push update-defs test-region clean-defs point-to-defs-master point-to-defs-branch clean definitions
+.PHONY: setup test test-smoke test-contract test-integration test-e2e generate console build push update-defs test-region reset-defs-to-master clean-defs point-to-defs-master point-to-defs-branch clean definitions

data/README.md

@@ -18,8 +18,7 @@ This gem is tested with the following ruby versions:
   * 3.3
   * 3.4
   * 4.0
-  * JRuby 9.2.21.0
-  * JRuby 9.4.2.0
+  * JRuby 10.0.4.0
 
 ## Semver
 

data/Rakefile

@@ -15,6 +15,34 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/test_*.rb']
 end
 
+task 'test:smoke' do
+  ENV['SMOKE_TEST'] = '1'
+end
+
+Rake::TestTask.new('test:smoke') do |t|
+  t.libs << 'test'
+  t.test_files = FileList['test/smoke/test_*.rb']
+end
+
+task 'test:contract' do
+  ENV['CONTRACT_TEST'] = '1'
+end
+
+Rake::TestTask.new('test:contract') do |t|
+  t.libs << 'test'
+  t.test_files = FileList['test/smoke/test_*.rb'] + FileList['test/defs/test_*.rb']
+end
+
+Rake::TestTask.new('test:integration') do |t|
+  t.libs << 'test'
+  t.test_files = FileList['test/integration/test_*.rb']
+end
+
+Rake::TestTask.new('test:e2e') do |t|
+  t.libs << 'test'
+  t.test_files = FileList['test/e2e/test_*.rb']
+end
+
 task :default => :test
 
 desc "Run tests for only a single region. Do not provide sub regions. Example (without quotes): 'rake test_region jp'"

data/holidays.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.licenses      = ['MIT']
   gem.required_ruby_version = '>= 3.2'
-  gem.add_development_dependency 'bundler', '>= 2'
+  gem.add_development_dependency 'bundler', '>= 4'
   gem.add_development_dependency 'rake', '~> 13'
   gem.add_development_dependency 'simplecov', '~> 0.16'
   gem.add_development_dependency 'test-unit', '~> 3'
-  gem.add_development_dependency 'mocha', '~> 2'
-  gem.add_development_dependency 'pry', '~> 0.12'
+  gem.add_development_dependency 'mocha', '~> 3'
+  gem.add_development_dependency 'pry', '~> 0.16'
 end

data/lib/generated_definitions/MANIFEST

@@ -36,6 +36,7 @@ The following definition files are included in this installation:
 * generated_definitions/hr
 * generated_definitions/hu
 * generated_definitions/ie
+* generated_definitions/il
 * generated_definitions/in
 * generated_definitions/is
 * generated_definitions/it
@@ -48,6 +49,7 @@ The following definition files are included in this installation:
 * generated_definitions/lu
 * generated_definitions/lv
 * generated_definitions/ma
+* generated_definitions/mc
 * generated_definitions/mt_en
 * generated_definitions/mt_mt
 * generated_definitions/mx

data/lib/generated_definitions/REGIONS.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Holidays
-  REGIONS = [:ar, :at, :au, :au_nsw, :au_vic, :au_qld, :au_nt, :au_act, :au_sa, :au_wa, :au_tas, :au_tas_south, :au_qld_cairns, :au_qld_brisbane, :au_tas_north, :au_vic_melbourne, :be_fr, :be_nl, :br, :bg_en, :bg_bg, :ca, :ca_qc, :ca_ab, :ca_sk, :ca_on, :ca_bc, :ca_nb, :ca_mb, :ca_ns, :ca_pe, :ca_nl, :ca_nt, :ca_nu, :ca_yt, :us, :ch_zh, :ch_be, :ch_lu, :ch_ur, :ch_sz, :ch_ow, :ch_nw, :ch_gl, :ch_zg, :ch_fr, :ch_so, :ch_bs, :ch_bl, :ch_sh, :ch_ar, :ch_ai, :ch_sg, :ch_gr, :ch_ag, :ch_tg, :ch_ti, :ch_vd, :ch_ne, :ch_ge, :ch_ju, :ch_vs, :ch, :cl, :co, :cr, :cy, :cz, :dk, :de, :de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn_sorbian, :de_th_cath, :de_sn, :de_st, :de_be, :de_mv, :de_by_cath, :de_by_augsburg, :de_th, :de_bb, :de_hb, :de_hh, :de_ni, :de_sh, :ecbtarget, :ee, :es_pv, :es_na, :es_an, :es_ib, :es_cm, :es_mu, :es_m, :es_ar, :es_cl, :es_cn, :es_lo, :es_ga, :es_ce, :es_o, :es_ex, :es, :es_ct, :es_v, :es_vc, :federalreserve, :federalreservebanks, :fedex, :fi, :fr_a, :fr_m, :fr, :gb, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :je, :gb_jsy, :gg, :gb_gsy, :gb_sct, :gb_con, :im, :gb_iom, :ge, :gr, :hr, :hk, :hu, :ie, :in, :in_wb, :in_od, :in_tr, :in_mh, :in_ar, :in_mz, :in_br, :in_hp, :in_gj, :in_sk, :in_ts, :in_jh, :in_py, :in_kl, :in_ka, :in_jk, :in_ap, :in_cg, :in_hr, :in_mp, :in_pb, :in_nl, :in_as, :in_ga, :is, :it, :it_ve, :it_tv, :it_vr, :it_pd, :it_fi, :it_ge, :it_to, :it_rm, :it_vi, :it_bl, :it_ro, :ke, :kr, :kz, :li, :lt, :lv, :ma, :mt_mt, :mt_en, :mx, :mx_pue, :nerc, :nl, :lu, :no, :nyse, :nz, :nz_sl, :nz_we, :nz_ak, :nz_nl, :nz_ne, :nz_ot, :nz_ta, :nz_sc, :nz_hb, :nz_mb, :nz_ca, :nz_ch, :nz_wl, :pe, :ph, :pl, :pt, :pt_li, :pt_po, :ro, :rs_cyrl, :rs_la, :ru, :se, :tn, :tr, :tsx, :ua, :us_fl, :us_al, :us_la, :us_ct, :us_de, :us_gu, :us_hi, :us_in, :us_ky, :us_nj, :us_nc, :us_nd, :us_pa, :us_pr, :us_tn, :us_ms, :us_id, :us_ar, :us_tx, :us_dc, :us_md, :us_va, :us_vt, :us_ak, :us_ca, :us_me, :us_ma, :us_ga, :us_ne, :us_mo, :us_sc, :us_wv, :us_vi, :us_ut, :us_ri, :us_az, :us_co, :us_il, :us_mt, :us_nm, :us_ny, :us_oh, :us_mi, :us_mn, :us_nv, :us_or, :us_sd, :us_wa, :us_wi, :us_wy, :us_ia, :us_ks, :us_nh, :us_ok, :unitednations, :ups, :za, :ve, :sk, :si, :jp, :vi, :sg, :my, :th, :ng]
+  REGIONS = [:ar, :at, :au, :au_nsw, :au_vic, :au_qld, :au_nt, :au_act, :au_sa, :au_wa, :au_tas, :au_tas_south, :au_qld_cairns, :au_qld_brisbane, :au_tas_north, :au_vic_melbourne, :be_fr, :be_nl, :br, :bg_en, :bg_bg, :ca, :ca_qc, :ca_ab, :ca_sk, :ca_on, :ca_bc, :ca_nb, :ca_mb, :ca_ns, :ca_pe, :ca_nl, :ca_nt, :ca_nu, :ca_yt, :us, :ch_zh, :ch_be, :ch_lu, :ch_ur, :ch_sz, :ch_ow, :ch_nw, :ch_gl, :ch_zg, :ch_fr, :ch_so, :ch_bs, :ch_bl, :ch_sh, :ch_ar, :ch_ai, :ch_sg, :ch_gr, :ch_ag, :ch_tg, :ch_ti, :ch_vd, :ch_ne, :ch_ge, :ch_ju, :ch_vs, :ch, :cl, :co, :cr, :cy, :cz, :dk, :de, :de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn_sorbian, :de_th_cath, :de_sn, :de_st, :de_be, :de_mv, :de_by_cath, :de_by_augsburg, :de_th, :de_bb, :de_hb, :de_hh, :de_ni, :de_sh, :ecbtarget, :ee, :es_pv, :es_na, :es_an, :es_ib, :es_cm, :es_mu, :es_m, :es_ar, :es_cl, :es_cn, :es_lo, :es_ga, :es_ce, :es_o, :es_ex, :es, :es_ct, :es_v, :es_vc, :federalreserve, :federalreservebanks, :fedex, :fi, :fr_a, :fr_m, :fr, :gb, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :gb_con, :je, :gb_jsy, :gg, :gb_gsy, :gb_sct, :im, :gb_iom, :ge, :gr, :hr, :hk, :hu, :ie, :il, :in, :in_wb, :in_od, :in_tr, :in_mh, :in_ar, :in_mz, :in_br, :in_hp, :in_gj, :in_sk, :in_ts, :in_jh, :in_py, :in_kl, :in_ka, :in_jk, :in_ap, :in_cg, :in_hr, :in_mp, :in_pb, :in_nl, :in_as, :in_ga, :is, :it, :it_ve, :it_tv, :it_vr, :it_pd, :it_fi, :it_ge, :it_to, :it_rm, :it_vi, :it_bl, :it_ro, :ke, :kr, :kz, :li, :lt, :lv, :ma, :mc, :mt_mt, :mt_en, :mx, :mx_pue, :nerc, :nl, :lu, :no, :nyse, :nz, :nz_sl, :nz_we, :nz_ak, :nz_nl, :nz_ne, :nz_ot, :nz_ta, :nz_sc, :nz_hb, :nz_mb, :nz_ca, :nz_ch, :nz_wl, :pe, :ph, :pl, :pt, :pt_li, :pt_po, :ro, :rs_cyrl, :rs_la, :ru, :se, :tn, :tr, :tsx, :ua, :us_fl, :us_al, :us_la, :us_ct, :us_de, :us_gu, :us_hi, :us_in, :us_ky, :us_nj, :us_nc, :us_nd, :us_pa, :us_pr, :us_tn, :us_ga, :us_ms, :us_id, :us_ar, :us_tx, :us_dc, :us_md, :us_va, :us_vt, :us_ak, :us_ca, :us_me, :us_ma, :us_ne, :us_mo, :us_sc, :us_wv, :us_vi, :us_ut, :us_ri, :us_az, :us_co, :us_il, :us_mt, :us_nm, :us_ny, :us_oh, :us_mi, :us_mn, :us_nv, :us_or, :us_sd, :us_wa, :us_wi, :us_wy, :us_ia, :us_ks, :us_nh, :us_ok, :unitednations, :ups, :za, :ve, :sk, :si, :jp, :vi, :sg, :my, :th, :ng]
 
-  PARENT_REGION_LOOKUP = {ar: :ar, at: :at, au: :au, au_nsw: :au, au_vic: :au, au_qld: :au, au_nt: :au, au_act: :au, au_sa: :au, au_wa: :au, au_tas: :au, au_tas_south: :au, au_qld_cairns: :au, au_qld_brisbane: :au, au_tas_north: :au, au_vic_melbourne: :au, be_fr: :be_fr, be_nl: :be_nl, br: :br, bg_en: :bg, bg_bg: :bg, ca: :ca, ca_qc: :ca, ca_ab: :ca, ca_sk: :ca, ca_on: :ca, ca_bc: :ca, ca_nb: :ca, ca_mb: :ca, ca_ns: :ca, ca_pe: :ca, ca_nl: :ca, ca_nt: :ca, ca_nu: :ca, ca_yt: :ca, us: :us, ch_zh: :ch, ch_be: :ch, ch_lu: :ch, ch_ur: :ch, ch_sz: :ch, ch_ow: :ch, ch_nw: :ch, ch_gl: :ch, ch_zg: :ch, ch_fr: :ch, ch_so: :ch, ch_bs: :ch, ch_bl: :ch, ch_sh: :ch, ch_ar: :ch, ch_ai: :ch, ch_sg: :ch, ch_gr: :ch, ch_ag: :ch, ch_tg: :ch, ch_ti: :ch, ch_vd: :ch, ch_ne: :ch, ch_ge: :ch, ch_ju: :ch, ch_vs: :ch, ch: :ch, cl: :cl, co: :co, cr: :cr, cy: :cy, cz: :cz, dk: :dk, de: :de, de_bw: :de, de_by: :de, de_he: :de, de_nw: :de, de_rp: :de, de_sl: :de, de_sn_sorbian: :de, de_th_cath: :de, de_sn: :de, de_st: :de, de_be: :de, de_mv: :de, de_by_cath: :de, de_by_augsburg: :de, de_th: :de, de_bb: :de, de_hb: :de, de_hh: :de, de_ni: :de, de_sh: :de, ecbtarget: :ecbtarget, ee: :ee, es_pv: :es, es_na: :es, es_an: :es, es_ib: :es, es_cm: :es, es_mu: :es, es_m: :es, es_ar: :es, es_cl: :es, es_cn: :es, es_lo: :es, es_ga: :es, es_ce: :es, es_o: :es, es_ex: :es, es: :es, es_ct: :es, es_v: :es, es_vc: :es, federalreserve: :federalreserve, federalreservebanks: :federalreservebanks, fedex: :fedex, fi: :fi, fr_a: :fr, fr_m: :fr, fr: :fr, gb: :gb, gb_eng: :gb, gb_wls: :gb, gb_eaw: :gb, gb_nir: :gb, je: :gb, gb_jsy: :gb, gg: :gb, gb_gsy: :gb, gb_sct: :gb, gb_con: :gb, im: :gb, gb_iom: :gb, ge: :ge, gr: :gr, hr: :hr, hk: :hk, hu: :hu, ie: :ie, in: :in, in_wb: :in, in_od: :in, in_tr: :in, in_mh: :in, in_ar: :in, in_mz: :in, in_br: :in, in_hp: :in, in_gj: :in, in_sk: :in, in_ts: :in, in_jh: :in, in_py: :in, in_kl: :in, in_ka: :in, in_jk: :in, in_ap: :in, in_cg: :in, in_hr: :in, in_mp: :in, in_pb: :in, in_nl: :in, in_as: :in, in_ga: :in, is: :is, it: :it, it_ve: :it, it_tv: :it, it_vr: :it, it_pd: :it, it_fi: :it, it_ge: :it, it_to: :it, it_rm: :it, it_vi: :it, it_bl: :it, it_ro: :it, ke: :ke, kr: :kr, kz: :kz, li: :li, lt: :lt, lv: :lv, ma: :ma, mt_mt: :mt_mt, mt_en: :mt_en, mx: :mx, mx_pue: :mx, nerc: :nerc, nl: :nl, lu: :lu, no: :no, nyse: :nyse, nz: :nz, nz_sl: :nz, nz_we: :nz, nz_ak: :nz, nz_nl: :nz, nz_ne: :nz, nz_ot: :nz, nz_ta: :nz, nz_sc: :nz, nz_hb: :nz, nz_mb: :nz, nz_ca: :nz, nz_ch: :nz, nz_wl: :nz, pe: :pe, ph: :ph, pl: :pl, pt: :pt, pt_li: :pt, pt_po: :pt, ro: :ro, rs_cyrl: :rs_cyrl, rs_la: :rs_la, ru: :ru, se: :se, tn: :tn, tr: :tr, tsx: :tsx, ua: :ua, us_fl: :us, us_al: :us, us_la: :us, us_ct: :us, us_de: :us, us_gu: :us, us_hi: :us, us_in: :us, us_ky: :us, us_nj: :us, us_nc: :us, us_nd: :us, us_pa: :us, us_pr: :us, us_tn: :us, us_ms: :us, us_id: :us, us_ar: :us, us_tx: :us, us_dc: :us, us_md: :us, us_va: :us, us_vt: :us, us_ak: :us, us_ca: :us, us_me: :us, us_ma: :us, us_ga: :us, us_ne: :us, us_mo: :us, us_sc: :us, us_wv: :us, us_vi: :us, us_ut: :us, us_ri: :us, us_az: :us, us_co: :us, us_il: :us, us_mt: :us, us_nm: :us, us_ny: :us, us_oh: :us, us_mi: :us, us_mn: :us, us_nv: :us, us_or: :us, us_sd: :us, us_wa: :us, us_wi: :us, us_wy: :us, us_ia: :us, us_ks: :us, us_nh: :us, us_ok: :us, unitednations: :unitednations, ups: :ups, za: :za, ve: :southamerica, sk: :europe, si: :europe, jp: :jp, vi: :vi, sg: :sg, my: :my, th: :th, ng: :ng}
+  PARENT_REGION_LOOKUP = {ar: :ar, at: :at, au: :au, au_nsw: :au, au_vic: :au, au_qld: :au, au_nt: :au, au_act: :au, au_sa: :au, au_wa: :au, au_tas: :au, au_tas_south: :au, au_qld_cairns: :au, au_qld_brisbane: :au, au_tas_north: :au, au_vic_melbourne: :au, be_fr: :be_fr, be_nl: :be_nl, br: :br, bg_en: :bg, bg_bg: :bg, ca: :ca, ca_qc: :ca, ca_ab: :ca, ca_sk: :ca, ca_on: :ca, ca_bc: :ca, ca_nb: :ca, ca_mb: :ca, ca_ns: :ca, ca_pe: :ca, ca_nl: :ca, ca_nt: :ca, ca_nu: :ca, ca_yt: :ca, us: :us, ch_zh: :ch, ch_be: :ch, ch_lu: :ch, ch_ur: :ch, ch_sz: :ch, ch_ow: :ch, ch_nw: :ch, ch_gl: :ch, ch_zg: :ch, ch_fr: :ch, ch_so: :ch, ch_bs: :ch, ch_bl: :ch, ch_sh: :ch, ch_ar: :ch, ch_ai: :ch, ch_sg: :ch, ch_gr: :ch, ch_ag: :ch, ch_tg: :ch, ch_ti: :ch, ch_vd: :ch, ch_ne: :ch, ch_ge: :ch, ch_ju: :ch, ch_vs: :ch, ch: :ch, cl: :cl, co: :co, cr: :cr, cy: :cy, cz: :cz, dk: :dk, de: :de, de_bw: :de, de_by: :de, de_he: :de, de_nw: :de, de_rp: :de, de_sl: :de, de_sn_sorbian: :de, de_th_cath: :de, de_sn: :de, de_st: :de, de_be: :de, de_mv: :de, de_by_cath: :de, de_by_augsburg: :de, de_th: :de, de_bb: :de, de_hb: :de, de_hh: :de, de_ni: :de, de_sh: :de, ecbtarget: :ecbtarget, ee: :ee, es_pv: :es, es_na: :es, es_an: :es, es_ib: :es, es_cm: :es, es_mu: :es, es_m: :es, es_ar: :es, es_cl: :es, es_cn: :es, es_lo: :es, es_ga: :es, es_ce: :es, es_o: :es, es_ex: :es, es: :es, es_ct: :es, es_v: :es, es_vc: :es, federalreserve: :federalreserve, federalreservebanks: :federalreservebanks, fedex: :fedex, fi: :fi, fr_a: :fr, fr_m: :fr, fr: :fr, gb: :gb, gb_eng: :gb, gb_wls: :gb, gb_eaw: :gb, gb_nir: :gb, gb_con: :gb, je: :gb, gb_jsy: :gb, gg: :gb, gb_gsy: :gb, gb_sct: :gb, im: :gb, gb_iom: :gb, ge: :ge, gr: :gr, hr: :hr, hk: :hk, hu: :hu, ie: :ie, il: :il, in: :in, in_wb: :in, in_od: :in, in_tr: :in, in_mh: :in, in_ar: :in, in_mz: :in, in_br: :in, in_hp: :in, in_gj: :in, in_sk: :in, in_ts: :in, in_jh: :in, in_py: :in, in_kl: :in, in_ka: :in, in_jk: :in, in_ap: :in, in_cg: :in, in_hr: :in, in_mp: :in, in_pb: :in, in_nl: :in, in_as: :in, in_ga: :in, is: :is, it: :it, it_ve: :it, it_tv: :it, it_vr: :it, it_pd: :it, it_fi: :it, it_ge: :it, it_to: :it, it_rm: :it, it_vi: :it, it_bl: :it, it_ro: :it, ke: :ke, kr: :kr, kz: :kz, li: :li, lt: :lt, lv: :lv, ma: :ma, mc: :mc, mt_mt: :mt_mt, mt_en: :mt_en, mx: :mx, mx_pue: :mx, nerc: :nerc, nl: :nl, lu: :lu, no: :no, nyse: :nyse, nz: :nz, nz_sl: :nz, nz_we: :nz, nz_ak: :nz, nz_nl: :nz, nz_ne: :nz, nz_ot: :nz, nz_ta: :nz, nz_sc: :nz, nz_hb: :nz, nz_mb: :nz, nz_ca: :nz, nz_ch: :nz, nz_wl: :nz, pe: :pe, ph: :ph, pl: :pl, pt: :pt, pt_li: :pt, pt_po: :pt, ro: :ro, rs_cyrl: :rs_cyrl, rs_la: :rs_la, ru: :ru, se: :se, tn: :tn, tr: :tr, tsx: :tsx, ua: :ua, us_fl: :us, us_al: :us, us_la: :us, us_ct: :us, us_de: :us, us_gu: :us, us_hi: :us, us_in: :us, us_ky: :us, us_nj: :us, us_nc: :us, us_nd: :us, us_pa: :us, us_pr: :us, us_tn: :us, us_ga: :us, us_ms: :us, us_id: :us, us_ar: :us, us_tx: :us, us_dc: :us, us_md: :us, us_va: :us, us_vt: :us, us_ak: :us, us_ca: :us, us_me: :us, us_ma: :us, us_ne: :us, us_mo: :us, us_sc: :us, us_wv: :us, us_vi: :us, us_ut: :us, us_ri: :us, us_az: :us, us_co: :us, us_il: :us, us_mt: :us, us_nm: :us, us_ny: :us, us_oh: :us, us_mi: :us, us_mn: :us, us_nv: :us, us_or: :us, us_sd: :us, us_wa: :us, us_wi: :us, us_wy: :us, us_ia: :us, us_ks: :us, us_nh: :us, us_ok: :us, unitednations: :unitednations, ups: :ups, za: :za, ve: :southamerica, sk: :europe, si: :europe, jp: :jp, vi: :vi, sg: :sg, my: :my, th: :th, ng: :ng}
 end

data/lib/generated_definitions/europe.rb

@@ -7,7 +7,7 @@ module Holidays
   # All the definitions are available at https://github.com/holidays/holidays
   module EUROPE # :nodoc:
     def self.defined_regions
-      [:at, :be_fr, :be_nl, :ch_zh, :ch_be, :ch_lu, :ch_ur, :ch_sz, :ch_ow, :ch_nw, :ch_gl, :ch_zg, :ch_fr, :ch_so, :ch_bs, :ch_bl, :ch_sh, :ch_ar, :ch_ai, :ch_sg, :ch_gr, :ch_ag, :ch_tg, :ch_ti, :ch_vd, :ch_ne, :ch_ge, :ch_ju, :ch_vs, :ch, :cz, :dk, :de, :de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn_sorbian, :de_th_cath, :de_sn, :de_st, :de_be, :de_mv, :de_by_cath, :de_by_augsburg, :de_th, :de_bb, :de_hb, :de_hh, :de_ni, :de_sh, :es_pv, :es_na, :es_an, :es_ib, :es_cm, :es_mu, :es_m, :es_ar, :es_cl, :es_cn, :es_lo, :es_ga, :es_ce, :es_o, :es_ex, :es, :es_ct, :es_v, :es_vc, :fr_a, :fr_m, :fr, :gb, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :je, :gb_jsy, :gg, :gb_gsy, :gb_sct, :gb_con, :im, :gb_iom, :gr, :hr, :hu, :ie, :is, :it, :it_ve, :it_tv, :it_vr, :it_pd, :it_fi, :it_ge, :it_to, :it_rm, :it_vi, :it_bl, :it_ro, :li, :lt, :lv, :nl, :no, :pl, :pt, :pt_li, :pt_po, :ro, :sk, :si, :bg_en, :bg_bg, :ua]
+      [:at, :be_fr, :be_nl, :ch_zh, :ch_be, :ch_lu, :ch_ur, :ch_sz, :ch_ow, :ch_nw, :ch_gl, :ch_zg, :ch_fr, :ch_so, :ch_bs, :ch_bl, :ch_sh, :ch_ar, :ch_ai, :ch_sg, :ch_gr, :ch_ag, :ch_tg, :ch_ti, :ch_vd, :ch_ne, :ch_ge, :ch_ju, :ch_vs, :ch, :cz, :dk, :de, :de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn_sorbian, :de_th_cath, :de_sn, :de_st, :de_be, :de_mv, :de_by_cath, :de_by_augsburg, :de_th, :de_bb, :de_hb, :de_hh, :de_ni, :de_sh, :es_pv, :es_na, :es_an, :es_ib, :es_cm, :es_mu, :es_m, :es_ar, :es_cl, :es_cn, :es_lo, :es_ga, :es_ce, :es_o, :es_ex, :es, :es_ct, :es_v, :es_vc, :fr_a, :fr_m, :fr, :gb, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :gb_con, :je, :gb_jsy, :gg, :gb_gsy, :gb_sct, :im, :gb_iom, :gr, :hr, :hu, :ie, :is, :it, :it_ve, :it_tv, :it_vr, :it_pd, :it_fi, :it_ge, :it_to, :it_rm, :it_vi, :it_bl, :it_ro, :li, :lt, :lv, :nl, :no, :pl, :pt, :pt_li, :pt_po, :ro, :sk, :si, :bg_en, :bg_bg, :ua]
     end
 
     def self.holidays_by_month
@@ -63,12 +63,12 @@ module Holidays
             {:function => "easter(year)", :function_arguments => [:year], :type => :informal, :name => "Pâques", :regions => [:fr]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Lundi de Pâques", :regions => [:fr]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 39, :name => "Ascension", :regions => [:fr]},
-            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 49, :name => "Pentecôte", :regions => [:fr]},
-            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :type => :informal, :name => "Lundi de Pentecôte", :regions => [:fr]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 49, :type => :informal, :name => "Pentecôte", :regions => [:fr]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :name => "Lundi de Pentecôte", :regions => [:fr]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -21, :type => :informal, :name => "Mothering Sunday", :regions => [:gb]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Good Friday", :regions => [:gb]},
             {:function => "easter(year)", :function_arguments => [:year], :name => "Easter Sunday", :regions => [:gb]},
-            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Easter Monday", :regions => [:gb_eng, :gb_wls, :gb_eaw, :gb_nir, :je, :gb_jsy, :gg, :gb_gsy]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Easter Monday", :regions => [:gb_eng, :gb_wls, :gb_eaw, :gb_nir, :gb_con, :je, :gb_jsy, :gg, :gb_gsy]},
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Μεγάλη Παρασκευή", :regions => [:gr]},
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => -1, :name => "Μεγάλο Σάββατο", :regions => [:gr]},
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :name => "Κυριακή του Πάσχα", :regions => [:gr]},
@@ -282,7 +282,7 @@ module Holidays
             {:mday => 15, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Asunción", :regions => [:es]},
             {:mday => 15, :name => "Assomption", :regions => [:fr]},
             {:wday => 1, :week => 1, :name => "Bank Holiday", :regions => [:gb_sct]},
-            {:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:gb_eng, :gb_wls, :gb_eaw, :gb_nir, :je, :gb_jsy, :gg, :gb_gsy]},
+            {:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:gb_eng, :gb_wls, :gb_eaw, :gb_nir, :gb_con, :je, :gb_jsy, :gg, :gb_gsy]},
             {:mday => 15, :name => "Κοίμηση της Θεοτόκου", :regions => [:gr]},
             {:mday => 5, :name => "Dan pobjede i domovinske zahvalnosti i Dan hrvatskih branitelja", :regions => [:hr]},
             {:mday => 15, :name => "Velika Gospa", :regions => [:hr]},

data/lib/generated_definitions/fr.rb

@@ -16,8 +16,8 @@ module Holidays
             {:function => "easter(year)", :function_arguments => [:year], :type => :informal, :name => "Pâques", :regions => [:fr]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Lundi de Pâques", :regions => [:fr]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 39, :name => "Ascension", :regions => [:fr]},
-            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 49, :name => "Pentecôte", :regions => [:fr]},
-            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :type => :informal, :name => "Lundi de Pentecôte", :regions => [:fr]}],
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 49, :type => :informal, :name => "Pentecôte", :regions => [:fr]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :name => "Lundi de Pentecôte", :regions => [:fr]}],
       1 => [{:mday => 1, :name => "Jour de l'an", :regions => [:fr]}],
       5 => [{:mday => 1, :name => "Fête du travail", :regions => [:fr]},
             {:mday => 8, :name => "Victoire 1945", :regions => [:fr]}],

data/lib/generated_definitions/gb.rb

@@ -7,7 +7,7 @@ module Holidays
   # All the definitions are available at https://github.com/holidays/holidays
   module GB # :nodoc:
     def self.defined_regions
-      [:gb, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :je, :gb_jsy, :gg, :gb_gsy, :gb_sct, :gb_con, :im, :gb_iom]
+      [:gb, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :gb_con, :je, :gb_jsy, :gg, :gb_gsy, :gb_sct, :im, :gb_iom]
     end
 
     def self.holidays_by_month
@@ -15,7 +15,7 @@ module Holidays
                 0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -21, :type => :informal, :name => "Mothering Sunday", :regions => [:gb]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Good Friday", :regions => [:gb]},
             {:function => "easter(year)", :function_arguments => [:year], :name => "Easter Sunday", :regions => [:gb]},
-            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Easter Monday", :regions => [:gb_eng, :gb_wls, :gb_eaw, :gb_nir, :je, :gb_jsy, :gg, :gb_gsy]}],
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Easter Monday", :regions => [:gb_eng, :gb_wls, :gb_eaw, :gb_nir, :gb_con, :je, :gb_jsy, :gg, :gb_gsy]}],
       1 => [{:mday => 1, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "New Year's Day", :regions => [:gb]},
             {:mday => 2, :observed => "to_weekday_if_boxing_weekend(date)", :observed_arguments => [:date], :name => "2nd January", :regions => [:gb_sct]}],
       3 => [{:mday => 5, :name => "St. Piran's Day", :regions => [:gb_con]},
@@ -32,7 +32,7 @@ module Holidays
       7 => [{:mday => 5, :name => "Tynwald Day", :regions => [:im, :gb_iom]},
             {:mday => 12, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Battle of the Boyne", :regions => [:gb_nir]}],
       8 => [{:wday => 1, :week => 1, :name => "Bank Holiday", :regions => [:gb_sct]},
-            {:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:gb_eng, :gb_wls, :gb_eaw, :gb_nir, :je, :gb_jsy, :gg, :gb_gsy]}],
+            {:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:gb_eng, :gb_wls, :gb_eaw, :gb_nir, :gb_con, :je, :gb_jsy, :gg, :gb_gsy]}],
       9 => [{:mday => 19, :year_ranges => { :limited => [2022] },:name => "Bank Holiday for the State Funeral of Queen Elizabeth II", :regions => [:gb]}],
       11 => [{:mday => 5, :type => :informal, :name => "Guy Fawkes Day", :regions => [:gb]},
             {:mday => 30, :year_ranges => { :until => 2006 },:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :type => :informal, :name => "St. Andrew's Day", :regions => [:gb_sct]},

data/lib/generated_definitions/il.rb

@@ -0,0 +1,74 @@
+# encoding: utf-8
+module Holidays
+  # This file is generated by the Ruby Holidays gem.
+  #
+  # Definitions loaded: definitions/il.yaml
+  #
+  # All the definitions are available at https://github.com/holidays/holidays
+  module IL # :nodoc:
+    def self.defined_regions
+      [:il]
+    end
+
+    def self.holidays_by_month
+      {
+                3 => [{:mday => 16, :year_ranges => { :limited => [2022] },:name => "Exodus from Egypt", :regions => [:il]},
+            {:mday => 6, :year_ranges => { :limited => [2023] },:name => "Exodus from Egypt", :regions => [:il]},
+            {:mday => 23, :year_ranges => { :limited => [2024] },:name => "Exodus from Egypt", :regions => [:il]},
+            {:mday => 13, :year_ranges => { :limited => [2025] },:name => "Exodus from Egypt", :regions => [:il]},
+            {:mday => 2, :year_ranges => { :limited => [2026] },:name => "Exodus from Egypt", :regions => [:il]},
+            {:mday => 22, :year_ranges => { :limited => [2022] },:name => "Exodus from Egypt (day 7)", :regions => [:il]},
+            {:mday => 12, :year_ranges => { :limited => [2023] },:name => "Exodus from Egypt (day 7)", :regions => [:il]},
+            {:mday => 29, :year_ranges => { :limited => [2024] },:name => "Exodus from Egypt (day 7)", :regions => [:il]},
+            {:mday => 19, :year_ranges => { :limited => [2025] },:name => "Exodus from Egypt (day 7)", :regions => [:il]},
+            {:mday => 8, :year_ranges => { :limited => [2026] },:name => "Exodus from Egypt (day 7)", :regions => [:il]},
+            {:mday => 24, :year_ranges => { :limited => [2023] },:name => "Independence Day", :regions => [:il]},
+            {:mday => 20, :year_ranges => { :limited => [2026] },:name => "Independence Day", :regions => [:il]}],
+      4 => [{:mday => 4, :year_ranges => { :limited => [2022] },:name => "Independence Day", :regions => [:il]},
+            {:mday => 11, :year_ranges => { :limited => [2024] },:name => "Independence Day", :regions => [:il]},
+            {:mday => 1, :year_ranges => { :limited => [2025] },:name => "Independence Day", :regions => [:il]},
+            {:mday => 26, :year_ranges => { :limited => [2023] },:name => "Thanksgiving", :regions => [:il]},
+            {:mday => 22, :year_ranges => { :limited => [2026] },:name => "Thanksgiving", :regions => [:il]},
+            {:mday => 27, :year_ranges => { :limited => [2023] },:name => "Thanksgiving (day 2)", :regions => [:il]},
+            {:mday => 23, :year_ranges => { :limited => [2026] },:name => "Thanksgiving (day 2)", :regions => [:il]}],
+      5 => [{:mday => 5, :year_ranges => { :limited => [2022] },:name => "Thanksgiving", :regions => [:il]},
+            {:mday => 12, :year_ranges => { :limited => [2024] },:name => "Thanksgiving", :regions => [:il]},
+            {:mday => 2, :year_ranges => { :limited => [2025] },:name => "Thanksgiving", :regions => [:il]},
+            {:mday => 6, :year_ranges => { :limited => [2022] },:name => "Thanksgiving (day 2)", :regions => [:il]},
+            {:mday => 13, :year_ranges => { :limited => [2024] },:name => "Thanksgiving (day 2)", :regions => [:il]},
+            {:mday => 3, :year_ranges => { :limited => [2025] },:name => "Thanksgiving (day 2)", :regions => [:il]}],
+      9 => [{:mday => 26, :year_ranges => { :limited => [2022] },:name => "Jewish New Year", :regions => [:il]},
+            {:mday => 16, :year_ranges => { :limited => [2023] },:name => "Jewish New Year", :regions => [:il]},
+            {:mday => 23, :year_ranges => { :limited => [2025] },:name => "Jewish New Year", :regions => [:il]},
+            {:mday => 12, :year_ranges => { :limited => [2026] },:name => "Jewish New Year", :regions => [:il]},
+            {:mday => 27, :year_ranges => { :limited => [2022] },:name => "2nd New Year's Day", :regions => [:il]},
+            {:mday => 17, :year_ranges => { :limited => [2023] },:name => "2nd New Year's Day", :regions => [:il]},
+            {:mday => 24, :year_ranges => { :limited => [2025] },:name => "2nd New Year's Day", :regions => [:il]},
+            {:mday => 13, :year_ranges => { :limited => [2026] },:name => "2nd New Year's Day", :regions => [:il]},
+            {:mday => 25, :year_ranges => { :limited => [2023] },:name => "Day of Atonement", :regions => [:il]},
+            {:mday => 21, :year_ranges => { :limited => [2026] },:name => "Day of Atonement", :regions => [:il]},
+            {:mday => 30, :year_ranges => { :limited => [2023] },:name => "Feast of Tabernacles", :regions => [:il]},
+            {:mday => 26, :year_ranges => { :limited => [2026] },:name => "Feast of Tabernacles", :regions => [:il]}],
+      10 => [{:mday => 3, :year_ranges => { :limited => [2024] },:name => "Jewish New Year", :regions => [:il]},
+            {:mday => 4, :year_ranges => { :limited => [2024] },:name => "2nd New Year's Day", :regions => [:il]},
+            {:mday => 5, :year_ranges => { :limited => [2022] },:name => "Day of Atonement", :regions => [:il]},
+            {:mday => 12, :year_ranges => { :limited => [2024] },:name => "Day of Atonement", :regions => [:il]},
+            {:mday => 2, :year_ranges => { :limited => [2025] },:name => "Day of Atonement", :regions => [:il]},
+            {:mday => 10, :year_ranges => { :limited => [2022] },:name => "Feast of Tabernacles", :regions => [:il]},
+            {:mday => 17, :year_ranges => { :limited => [2024] },:name => "Feast of Tabernacles", :regions => [:il]},
+            {:mday => 7, :year_ranges => { :limited => [2025] },:name => "Feast of Tabernacles", :regions => [:il]},
+            {:mday => 18, :year_ranges => { :limited => [2022] },:name => "Rejoicing of the Torah", :regions => [:il]},
+            {:mday => 8, :year_ranges => { :limited => [2023] },:name => "Rejoicing of the Torah", :regions => [:il]},
+            {:mday => 25, :year_ranges => { :limited => [2024] },:name => "Rejoicing of the Torah", :regions => [:il]},
+            {:mday => 15, :year_ranges => { :limited => [2025] },:name => "Rejoicing of the Torah", :regions => [:il]},
+            {:mday => 4, :year_ranges => { :limited => [2026] },:name => "Rejoicing of the Torah", :regions => [:il]}]
+      }
+    end
+
+    def self.custom_methods
+      {
+          
+      }
+    end
+  end
+end

data/lib/generated_definitions/mc.rb

@@ -0,0 +1,36 @@
+# encoding: utf-8
+module Holidays
+  # This file is generated by the Ruby Holidays gem.
+  #
+  # Definitions loaded: definitions/mc.yaml
+  #
+  # All the definitions are available at https://github.com/holidays/holidays
+  module MC # :nodoc:
+    def self.defined_regions
+      [:mc]
+    end
+
+    def self.holidays_by_month
+      {
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Lundi de Pâques", :regions => [:mc]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 39, :name => "Ascension", :regions => [:mc]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :name => "Lundi de Pentecôte", :regions => [:mc]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 60, :name => "Fête Dieu", :regions => [:mc]}],
+      1 => [{:mday => 1, :name => "Jour de l'an", :regions => [:mc]},
+            {:mday => 27, :name => "Sainte Dévote", :regions => [:mc]}],
+      5 => [{:mday => 1, :name => "Fête du Travail", :regions => [:mc]}],
+      8 => [{:mday => 15, :name => "Assomption", :regions => [:mc]}],
+      11 => [{:mday => 1, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Toussaint", :regions => [:mc]},
+            {:mday => 19, :name => "Fête du Prince", :regions => [:mc]}],
+      12 => [{:mday => 8, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Immaculée Conception", :regions => [:mc]},
+            {:mday => 25, :name => "Noël", :regions => [:mc]}]
+      }
+    end
+
+    def self.custom_methods
+      {
+          
+      }
+    end
+  end
+end

data/lib/generated_definitions/northamerica.rb

@@ -7,7 +7,7 @@ module Holidays
   # All the definitions are available at https://github.com/holidays/holidays
   module NORTHAMERICA # :nodoc:
     def self.defined_regions
-      [:ca, :ca_qc, :ca_ab, :ca_sk, :ca_on, :ca_bc, :ca_nb, :ca_mb, :ca_ns, :ca_pe, :ca_nl, :ca_nt, :ca_nu, :ca_yt, :mx, :mx_pue, :us_fl, :us_al, :us_la, :us, :us_ct, :us_de, :us_gu, :us_hi, :us_in, :us_ky, :us_nj, :us_nc, :us_nd, :us_pa, :us_pr, :us_tn, :us_ms, :us_id, :us_ar, :us_tx, :us_dc, :us_md, :us_va, :us_vt, :us_ak, :us_ca, :us_me, :us_ma, :us_ga, :us_ne, :us_mo, :us_sc, :us_wv, :us_vi, :us_ut, :us_ri, :us_az, :us_co, :us_il, :us_mt, :us_nm, :us_ny, :us_oh, :us_mi, :us_mn, :us_nv, :us_or, :us_sd, :us_wa, :us_wi, :us_wy, :us_ia, :us_ks, :us_nh, :us_ok]
+      [:ca, :ca_qc, :ca_ab, :ca_sk, :ca_on, :ca_bc, :ca_nb, :ca_mb, :ca_ns, :ca_pe, :ca_nl, :ca_nt, :ca_nu, :ca_yt, :mx, :mx_pue, :us_fl, :us_al, :us_la, :us, :us_ct, :us_de, :us_gu, :us_hi, :us_in, :us_ky, :us_nj, :us_nc, :us_nd, :us_pa, :us_pr, :us_tn, :us_ga, :us_ms, :us_id, :us_ar, :us_tx, :us_dc, :us_md, :us_va, :us_vt, :us_ak, :us_ca, :us_me, :us_ma, :us_ne, :us_mo, :us_sc, :us_wv, :us_vi, :us_ut, :us_ri, :us_az, :us_co, :us_il, :us_mt, :us_nm, :us_ny, :us_oh, :us_mi, :us_mn, :us_nv, :us_or, :us_sd, :us_wa, :us_wi, :us_wy, :us_ia, :us_ks, :us_nh, :us_ok]
     end
 
     def self.holidays_by_month
@@ -19,6 +19,7 @@ module Holidays
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -47, :name => "Mardi Gras Day", :regions => [:us_al, :us_la]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :type => :informal, :name => "Good Friday", :regions => [:us]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Good Friday", :regions => [:us_ct, :us_de, :us_gu, :us_hi, :us_in, :us_ky, :us_la, :us_nj, :us_nc, :us_nd, :us_pa, :us_pr, :us_tn]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :year_ranges => { :from => 2020 },:name => "State Holiday", :regions => [:us_ga]},
             {:function => "easter(year)", :function_arguments => [:year], :type => :informal, :name => "Easter Sunday", :regions => [:us]}],
       1 => [{:mday => 1, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "New Year's Day", :regions => [:ca]},
             {:mday => 2, :name => "New Year's", :regions => [:ca_qc]},
@@ -149,7 +150,7 @@ module Holidays
             {:wday => 1, :week => -1, :name => "Confederate Memorial Day", :regions => [:us_ms]},
             {:wday => 1, :week => 4, :name => "Confederate Memorial Day", :regions => [:us_al]},
             {:mday => 26, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Confederate Memorial Day", :regions => [:us_fl]},
-            {:function => "georgia_state_holiday(year, month)", :function_arguments => [:year, :month], :name => "State Holiday", :regions => [:us_ga]},
+            {:function => "georgia_state_holiday(year, month)", :function_arguments => [:year, :month], :year_ranges => { :until => 2019 },:name => "State Holiday", :regions => [:us_ga]},
             {:wday => 5, :week => -1, :name => "Arbor Day", :regions => [:us_ne]},
             {:mday => 1, :type => :informal, :name => "April Fool's Day", :regions => [:us, :ca]},
             {:mday => 22, :type => :informal, :name => "Earth Day", :regions => [:us, :ca]}]

data/lib/generated_definitions/us.rb

@@ -7,7 +7,7 @@ module Holidays
   # All the definitions are available at https://github.com/holidays/holidays
   module US # :nodoc:
     def self.defined_regions
-      [:us_fl, :us_al, :us_la, :us, :us_ct, :us_de, :us_gu, :us_hi, :us_in, :us_ky, :us_nj, :us_nc, :us_nd, :us_pa, :us_pr, :us_tn, :us_ms, :us_id, :us_ar, :us_tx, :us_dc, :us_md, :us_va, :us_vt, :us_ak, :us_ca, :us_me, :us_ma, :us_ga, :us_ne, :us_mo, :us_sc, :us_wv, :us_vi, :us_ut, :us_ri, :us_az, :us_co, :us_il, :us_mt, :us_nm, :us_ny, :us_oh, :us_mi, :us_mn, :us_nv, :us_or, :us_sd, :us_wa, :us_wi, :us_wy, :us_ia, :us_ks, :us_nh, :us_ok, :ca]
+      [:us_fl, :us_al, :us_la, :us, :us_ct, :us_de, :us_gu, :us_hi, :us_in, :us_ky, :us_nj, :us_nc, :us_nd, :us_pa, :us_pr, :us_tn, :us_ga, :us_ms, :us_id, :us_ar, :us_tx, :us_dc, :us_md, :us_va, :us_vt, :us_ak, :us_ca, :us_me, :us_ma, :us_ne, :us_mo, :us_sc, :us_wv, :us_vi, :us_ut, :us_ri, :us_az, :us_co, :us_il, :us_mt, :us_nm, :us_ny, :us_oh, :us_mi, :us_mn, :us_nv, :us_or, :us_sd, :us_wa, :us_wi, :us_wy, :us_ia, :us_ks, :us_nh, :us_ok, :ca]
     end
 
     def self.holidays_by_month
@@ -16,6 +16,7 @@ module Holidays
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -47, :name => "Mardi Gras Day", :regions => [:us_al, :us_la]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :type => :informal, :name => "Good Friday", :regions => [:us]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Good Friday", :regions => [:us_ct, :us_de, :us_gu, :us_hi, :us_in, :us_ky, :us_la, :us_nj, :us_nc, :us_nd, :us_pa, :us_pr, :us_tn]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :year_ranges => { :from => 2020 },:name => "State Holiday", :regions => [:us_ga]},
             {:function => "easter(year)", :function_arguments => [:year], :type => :informal, :name => "Easter Sunday", :regions => [:us]}],
       1 => [{:mday => 1, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "New Year's Day", :regions => [:us]},
             {:wday => 1, :week => 3, :name => "Martin Luther King's and Robert E. Lee's Birthdays", :regions => [:us_ms]},
@@ -40,7 +41,7 @@ module Holidays
             {:wday => 1, :week => -1, :name => "Confederate Memorial Day", :regions => [:us_ms]},
             {:wday => 1, :week => 4, :name => "Confederate Memorial Day", :regions => [:us_al]},
             {:mday => 26, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Confederate Memorial Day", :regions => [:us_fl]},
-            {:function => "georgia_state_holiday(year, month)", :function_arguments => [:year, :month], :name => "State Holiday", :regions => [:us_ga]},
+            {:function => "georgia_state_holiday(year, month)", :function_arguments => [:year, :month], :year_ranges => { :until => 2019 },:name => "State Holiday", :regions => [:us_ga]},
             {:wday => 5, :week => -1, :name => "Arbor Day", :regions => [:us_ne]},
             {:mday => 1, :type => :informal, :name => "April Fool's Day", :regions => [:us, :ca]},
             {:mday => 22, :type => :informal, :name => "Earth Day", :regions => [:us, :ca]}],

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

@@ -12,7 +12,7 @@ module Holidays
         def call(input, func_id, desired_func_args, func_modifier = nil)
           validate!(input, func_id, desired_func_args)
 
-          function = @custom_methods_repo.find(func_id)
+          function = @custom_methods_repo.find(func_id, input[:region])
           raise Holidays::FunctionNotFound.new("Unable to find function with id '#{func_id}'") if function.nil?
 
           calculate(input, function, parse_arguments(input, desired_func_args), func_modifier)

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

@@ -9,12 +9,28 @@ module Holidays
           @custom_methods_repo = custom_methods_repo
         end
 
-        def call(target_regions, target_holidays, target_custom_methods)
-          #FIXME Does this need to come in this exact order? God I hope not.
-          # If not then we should swap the order so it matches the init.
+        def call(target_regions, target_holidays, target_custom_methods, target_custom_method_sources = {})
           @regions_repo.add(target_regions)
           @holidays_repo.add(target_holidays)
-          @custom_methods_repo.add(target_custom_methods)
+          @custom_methods_repo.add(
+            target_custom_methods,
+            target_custom_method_sources,
+            derive_function_regions(target_holidays),
+          )
+        end
+
+        private
+
+        # Builds a map of {func_id => [regions]} from the holiday definitions
+        # so the custom_methods repo knows which regions each function belongs to.
+        def derive_function_regions(holidays_by_month)
+          holidays_by_month.each_with_object({}) do |(_, definitions), result|
+            definitions.each do |defn|
+              next unless defn[:function]
+              result[defn[:function]] ||= []
+              result[defn[:function]] |= Array(defn[:regions])
+            end
+          end
         end
       end
     end

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

@@ -4,21 +4,49 @@ module Holidays
       class CustomMethods
         def initialize
           @custom_methods = {}
+          @custom_method_sources = {}
+          @regional_overrides = {}
         end
 
-        # This performs a merge that overwrites any conflicts.
-        # While this is not ideal I'm leaving it as-is since I have no
-        # evidence of any current definitions that will cause an issue.
-        #
-        # FIXME: this should probably return an error if a method with the
-        # same ID already exists.
-        def add(new_custom_methods)
+        # When a conflict is detected the method is stored as a regional override keyed by its regions.
+        # find() then resolves the right implementation at lookup time using the queried region.
+        def add(new_custom_methods, new_sources = {}, function_regions = {})
           raise ArgumentError if new_custom_methods.nil?
-          @custom_methods.merge!(new_custom_methods)
+
+          new_custom_methods.each do |key, method|
+            new_source = new_sources[key]
+
+            if @custom_methods.key?(key)
+              existing_source = @custom_method_sources[key]
+
+              if new_source && existing_source && new_source != existing_source
+                regions = function_regions[key] || []
+                @regional_overrides[key] ||= []
+                @regional_overrides[key] << { regions: regions, proc: method }
+              else
+                @custom_methods[key] = method
+                @custom_method_sources[key] = new_source if new_source
+              end
+            else
+              @custom_methods[key] = method
+              @custom_method_sources[key] = new_source if new_source
+            end
+          end
         end
 
-        def find(method_id)
+        # Returns the proc for the given method_id.
+        #
+        # When a region is supplied, regional overrides are checked first so
+        # that conflicting methods with the same name but different logic each
+        # resolve to their own implementation.
+        def find(method_id, region = nil)
           raise ArgumentError if method_id.nil? || method_id.empty?
+
+          if region && @regional_overrides[method_id]
+            override = @regional_overrides[method_id].find { |o| o[:regions].include?(region) }
+            return override[:proc] if override
+          end
+
           @custom_methods[method_id]
         end
       end