holidays 7.1.0 → 8.0.0

data/lib/generated_definitions/gb.rb

@@ -19,7 +19,9 @@ module Holidays
             {: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]},
             {:mday => 17, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "St. Patrick's Day", :regions => [:gb_nir]}],
-      5 => [{:wday => 1, :week => 1, :name => "May Day", :regions => [:gb]},
+      5 => [{:wday => 1, :week => 1, :year_ranges => { :until => 2019 },:name => "May Day", :regions => [:gb]},
+            {:mday => 8, :year_ranges => { :limited => [2020] },:name => "May Day", :regions => [:gb]},
+            {:wday => 1, :week => 1, :year_ranges => { :from => 2021 },:name => "May Day", :regions => [:gb]},
             {:mday => 9, :name => "Liberation Day", :regions => [:je, :gb_jsy, :gg, :gb_gsy]},
             {:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:gb]}],
       7 => [{:mday => 5, :name => "Tynwald Day", :regions => [:im, :gb_iom]},
@@ -27,8 +29,8 @@ module Holidays
       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]}],
       11 => [{:mday => 5, :type => :informal, :name => "Guy Fawkes Day", :regions => [:gb]},
-            {:mday => 30,  :year_ranges => [{:before => 2006}],:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :type => :informal, :name => "St. Andrew's Day", :regions => [:gb_sct]},
-            {:mday => 30,  :year_ranges => [{:after => 2007}],:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "St. Andrew's Day", :regions => [:gb_sct]}],
+            {: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]},
+            {:mday => 30, :year_ranges => { :from => 2007 },:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "St. Andrew's Day", :regions => [:gb_sct]}],
       12 => [{:mday => 25, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:gb]},
             {:mday => 26, :observed => "to_weekday_if_boxing_weekend(date)", :observed_arguments => [:date], :name => "Boxing Day", :regions => [:gb]}]
       }

data/lib/generated_definitions/hu.rb

@@ -12,8 +12,9 @@ module Holidays
 
     def self.holidays_by_month
       {
-                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Húsvét hétfő", :regions => [:hu]},
-            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :name => "Pünkösd hétfő", :regions => [:hu]}],
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :year_ranges => { :from => 2017 },:name => "Nagypéntek", :regions => [:hu]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Húsvéthétfő", :regions => [:hu]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :name => "Pünkösdhétfő", :regions => [:hu]}],
       1 => [{:mday => 1, :name => "Újév", :regions => [:hu]}],
       3 => [{:mday => 15, :name => "1848/49-es forradalom és szabadságharc ünnepe", :regions => [:hu]}],
       5 => [{:mday => 1, :name => "A munka ünnepe", :regions => [:hu]}],

data/lib/generated_definitions/it.rb

@@ -7,7 +7,7 @@ module Holidays
   # All the definitions are available at https://github.com/holidays/holidays
   module IT # :nodoc:
     def self.defined_regions
-      [:it]
+      [:it, :it_ve, :it_tv, :it_vr, :it_pd, :it_fi, :it_ge, :it_to, :it_rm, :it_vi, :it_bl, :it_ro]
     end
 
     def self.holidays_by_month
@@ -16,11 +16,20 @@ module Holidays
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Lunedì dell'Angelo", :regions => [:it]}],
       1 => [{:mday => 1, :name => "Capodanno", :regions => [:it]},
             {:mday => 6, :name => "Epifania", :regions => [:it]}],
-      4 => [{:mday => 25, :name => "Festa della Liberazione", :regions => [:it]}],
-      5 => [{:mday => 1, :name => "Festa dei Lavoratori", :regions => [:it]}],
-      6 => [{:mday => 2, :name => "Festa della Repubblica", :regions => [:it]}],
+      4 => [{:mday => 25, :name => "Festa della Liberazione", :regions => [:it]},
+            {:mday => 25, :name => "Festa di San Marco Evangelista", :regions => [:it_ve]},
+            {:mday => 27, :name => "Festa di San Liberale", :regions => [:it_tv]}],
+      5 => [{:mday => 1, :name => "Festa dei Lavoratori", :regions => [:it]},
+            {:mday => 21, :name => "Festa di San Zeno", :regions => [:it_vr]}],
+      6 => [{:mday => 2, :name => "Festa della Repubblica", :regions => [:it]},
+            {:mday => 13, :name => "Festa di Sant'Antonio di Padova", :regions => [:it_pd]},
+            {:mday => 24, :name => "Festa di San Giovanni Battista", :regions => [:it_fi, :it_ge, :it_to]},
+            {:mday => 29, :name => "Festa di San Pietro e Paolo", :regions => [:it_rm]}],
       8 => [{:mday => 15, :name => "Assunzione", :regions => [:it]}],
-      11 => [{:mday => 1, :name => "Ognissanti", :regions => [:it]}],
+      9 => [{:mday => 8, :name => "Festa della Madonna di Monte Berico", :regions => [:it_vi]}],
+      11 => [{:mday => 1, :name => "Ognissanti", :regions => [:it]},
+            {:mday => 11, :name => "Festa di San Martino", :regions => [:it_bl]},
+            {:mday => 26, :name => "Festa di San Bellino", :regions => [:it_ro]}],
       12 => [{:mday => 8, :name => "Immacolata Concezione", :regions => [:it]},
             {:mday => 25, :name => "Natale", :regions => [:it]},
             {:mday => 26, :name => "Santo Stefano", :regions => [:it]}]

data/lib/generated_definitions/jp.rb

@@ -17,46 +17,46 @@ module Holidays
             {:mday => 1, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day], :name => "振替休日", :regions => [:jp]}],
       2 => [{:mday => 11, :name => "建国記念の日", :regions => [:jp]},
             {:mday => 11, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day], :name => "振替休日", :regions => [:jp]},
-            {:mday => 23,  :year_ranges => [{:after => 2020}],:name => "天皇誕生日", :regions => [:jp]},
-            {:mday => 23, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day],  :year_ranges => [{:after => 2020}],:name => "振替休日", :regions => [:jp]}],
+            {:mday => 23, :year_ranges => { :from => 2020 },:name => "天皇誕生日", :regions => [:jp]},
+            {:mday => 23, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day], :year_ranges => { :from => 2020 },:name => "振替休日", :regions => [:jp]}],
       3 => [{:function => "jp_vernal_equinox_day(year)", :function_arguments => [:year], :name => "春分の日", :regions => [:jp]},
             {:function => "jp_vernal_equinox_day_substitute(year)", :function_arguments => [:year], :name => "振替休日", :regions => [:jp]}],
       4 => [{:mday => 29, :name => "昭和の日", :regions => [:jp]},
             {:mday => 29, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day], :name => "振替休日", :regions => [:jp]},
-            {:mday => 30,  :year_ranges => [{:limited => [2019]}],:name => "休日", :regions => [:jp]}],
-      5 => [{:mday => 1,  :year_ranges => [{:limited => [2019]}],:name => "天皇即位", :regions => [:jp]},
-            {:mday => 2,  :year_ranges => [{:limited => [2019]}],:name => "休日", :regions => [:jp]},
+            {:mday => 30, :year_ranges => { :limited => [2019] },:name => "休日", :regions => [:jp]}],
+      5 => [{:mday => 1, :year_ranges => { :limited => [2019] },:name => "天皇即位", :regions => [:jp]},
+            {:mday => 2, :year_ranges => { :limited => [2019] },:name => "休日", :regions => [:jp]},
             {:mday => 3, :name => "憲法記念日", :regions => [:jp]},
             {:mday => 4, :name => "みどりの日", :regions => [:jp]},
             {:mday => 5, :name => "こどもの日", :regions => [:jp]},
             {:mday => 3, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day], :name => "振替休日", :regions => [:jp]},
             {:mday => 4, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day], :name => "振替休日", :regions => [:jp]},
             {:mday => 5, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day], :name => "振替休日", :regions => [:jp]}],
-      7 => [{:mday => 20,  :year_ranges => [{:between => 1996..2002}],:name => "海の日", :regions => [:jp]},
-            {:wday => 1, :week => 3,  :year_ranges => [{:between => 2003..2019}],:name => "海の日", :regions => [:jp]},
-            {:mday => 23,  :year_ranges => [{:limited => [2020]}],:name => "海の日", :regions => [:jp]},
-            {:wday => 1, :week => 3,  :year_ranges => [{:after => 2021}],:name => "海の日", :regions => [:jp]},
-            {:function => "jp_marine_day_substitute(year)", :function_arguments => [:year],  :year_ranges => [{:between => 1996..2002}],:name => "振替休日", :regions => [:jp]},
-            {:mday => 24,  :year_ranges => [{:limited => [2020]}],:name => "スポーツの日", :regions => [:jp]}],
-      8 => [{:function => "jp_mountain_holiday(year)", :function_arguments => [:year],  :year_ranges => [{:between => 2016..2019}],:name => "山の日", :regions => [:jp]},
-            {:mday => 10,  :year_ranges => [{:limited => [2020]}],:name => "山の日", :regions => [:jp]},
-            {:function => "jp_mountain_holiday(year)", :function_arguments => [:year],  :year_ranges => [{:after => 2021}],:name => "山の日", :regions => [:jp]},
-            {:function => "jp_mountain_holiday_substitute(year)", :function_arguments => [:year],  :year_ranges => [{:after => 2016}],:name => "振替休日", :regions => [:jp]}],
+      7 => [{:mday => 20, :year_ranges => { :between => 1996..2002 },:name => "海の日", :regions => [:jp]},
+            {:wday => 1, :week => 3, :year_ranges => { :between => 2003..2019 },:name => "海の日", :regions => [:jp]},
+            {:mday => 23, :year_ranges => { :limited => [2020] },:name => "海の日", :regions => [:jp]},
+            {:wday => 1, :week => 3, :year_ranges => { :from => 2021 },:name => "海の日", :regions => [:jp]},
+            {:function => "jp_marine_day_substitute(year)", :function_arguments => [:year], :year_ranges => { :between => 1996..2002 },:name => "振替休日", :regions => [:jp]},
+            {:mday => 24, :year_ranges => { :limited => [2020] },:name => "スポーツの日", :regions => [:jp]}],
+      8 => [{:function => "jp_mountain_holiday(year)", :function_arguments => [:year], :year_ranges => { :between => 2016..2019 },:name => "山の日", :regions => [:jp]},
+            {:mday => 10, :year_ranges => { :limited => [2020] },:name => "山の日", :regions => [:jp]},
+            {:function => "jp_mountain_holiday(year)", :function_arguments => [:year], :year_ranges => { :from => 2021 },:name => "山の日", :regions => [:jp]},
+            {:function => "jp_mountain_holiday_substitute(year)", :function_arguments => [:year], :year_ranges => { :from => 2016 },:name => "振替休日", :regions => [:jp]}],
       9 => [{:wday => 1, :week => 3, :name => "敬老の日", :regions => [:jp]},
             {:function => "jp_respect_for_aged_holiday_substitute(year)", :function_arguments => [:year], :name => "振替休日", :regions => [:jp]},
-            {:function => "jp_citizens_holiday(year)", :function_arguments => [:year],  :year_ranges => [{:after => 2003}],:name => "国民の休日", :regions => [:jp]},
+            {:function => "jp_citizens_holiday(year)", :function_arguments => [:year], :year_ranges => { :from => 2003 },:name => "国民の休日", :regions => [:jp]},
             {:function => "jp_national_culture_day(year)", :function_arguments => [:year], :name => "秋分の日", :regions => [:jp]},
             {:function => "jp_national_culture_day_substitute(year)", :function_arguments => [:year], :name => "振替休日", :regions => [:jp]}],
-      10 => [{:wday => 1, :week => 2,  :year_ranges => [{:before => 2019}],:name => "体育の日", :regions => [:jp]},
-            {:wday => 1, :week => 2,  :year_ranges => [{:after => 2021}],:name => "スポーツの日", :regions => [:jp]},
+      10 => [{:wday => 1, :week => 2, :year_ranges => { :until => 2019 },:name => "体育の日", :regions => [:jp]},
+            {:wday => 1, :week => 2, :year_ranges => { :from => 2021 },:name => "スポーツの日", :regions => [:jp]},
             {:function => "jp_health_sports_day_substitute(year)", :function_arguments => [:year], :name => "振替休日", :regions => [:jp]},
-            {:mday => 22,  :year_ranges => [{:limited => [2019]}],:name => "即位礼正殿の儀", :regions => [:jp]}],
+            {:mday => 22, :year_ranges => { :limited => [2019] },:name => "即位礼正殿の儀", :regions => [:jp]}],
       11 => [{:mday => 3, :name => "文化の日", :regions => [:jp]},
             {:mday => 3, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day], :name => "振替休日", :regions => [:jp]},
             {:mday => 23, :name => "勤労感謝の日", :regions => [:jp]},
             {:mday => 23, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day], :name => "振替休日", :regions => [:jp]}],
-      12 => [{:mday => 23,  :year_ranges => [{:before => 2018}],:name => "天皇誕生日", :regions => [:jp]},
-            {:mday => 23, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day],  :year_ranges => [{:before => 2018}],:name => "振替休日", :regions => [:jp]}]
+      12 => [{:mday => 23, :year_ranges => { :until => 2018 },:name => "天皇誕生日", :regions => [:jp]},
+            {:mday => 23, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day], :year_ranges => { :until => 2018 },:name => "振替休日", :regions => [:jp]}]
       }
     end
 

data/lib/generated_definitions/lv.rb

@@ -0,0 +1,52 @@
+# encoding: utf-8
+module Holidays
+  # This file is generated by the Ruby Holidays gem.
+  #
+  # Definitions loaded: definitions/lv.yaml
+  #
+  # All the definitions are available at https://github.com/holidays/holidays
+  module LV # :nodoc:
+    def self.defined_regions
+      [:lv]
+    end
+
+    def self.holidays_by_month
+      {
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Lielā Piektdiena", :regions => [:lv]},
+            {:function => "easter(year)", :function_arguments => [:year], :name => "Pirmās Lieldienas", :regions => [:lv]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Otrās Lieldienas", :regions => [:lv]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 49, :name => "Vasarsvētki", :regions => [:lv]},
+            {:function => "lv_song_and_dance_festival_end_date(year)", :function_arguments => [:year], :year_ranges => { :from => 2018 },:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Vispārējo latviešu Dziesmu un deju svētku noslēguma diena", :regions => [:lv]}],
+      1 => [{:mday => 1, :name => "Jaungada diena", :regions => [:lv]}],
+      5 => [{:mday => 1, :name => "Darba svētki, Latvijas Republikas Satversmes sapulces sasaukšanas diena", :regions => [:lv]},
+            {:mday => 4, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Latvijas Republikas Neatkarības atjaunošanas diena", :regions => [:lv]},
+            {:wday => 0, :week => 2, :name => "Mātes diena", :regions => [:lv]}],
+      6 => [{:mday => 23, :name => "Līgo diena", :regions => [:lv]},
+            {:mday => 24, :name => "Jāņu diena", :regions => [:lv]}],
+      9 => [{:mday => 24, :year_ranges => { :limited => [2018] },:name => "Viņa Svētības pāvesta Franciska pastorālās vizītes Latvijā diena", :regions => [:lv]}],
+      11 => [{:mday => 18, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Latvijas Republikas Proklamēšanas diena", :regions => [:lv]}],
+      12 => [{:mday => 24, :name => "Ziemassvētku vakars", :regions => [:lv]},
+            {:mday => 25, :name => "Pirmie Ziemassvētki", :regions => [:lv]},
+            {:mday => 26, :name => "Otrie Ziemassvētki", :regions => [:lv]},
+            {:mday => 31, :name => "Vecgada diena", :regions => [:lv]}]
+      }
+    end
+
+    def self.custom_methods
+      {
+          "lv_song_and_dance_festival_end_date(year)" => Proc.new { |year|
+case year
+when 2018
+  # https://likumi.lv/ta/id/281541 (Ministru kabineta rīkojums Nr. 252 "Par XXVI Vispārējo latviešu dziesmu un XVI Deju svētku norises laiku")
+  Date.new(2018, 7, 8)
+when 2023
+  # Event's period/next year is known, but precise dates aren't.
+  # Previously, dates were announced 2 years ahead, so at ~2021-05 this method would need to be revisited.
+end
+},
+
+
+      }
+    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_la, :us, :us_ct, :us_de, :us_gu, :us_hi, :us_in, :us_ky, :us_nj, :us_nc, :us_nd, :us_pr, :us_tn, :us_ms, :us_id, :us_ar, :us_tx, :us_dc, :us_md, :us_va, :us_il, :us_vt, :us_ak, :us_ca, :us_me, :us_ma, :us_al, :us_ga, :us_ne, :us_mo, :us_sc, :us_wv, :us_vi, :us_ut, :us_ri, :us_az, :us_co, :us_mt, :us_nm, :us_ny, :us_oh, :us_pa, :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_la, :us, :us_ct, :us_de, :us_gu, :us_hi, :us_in, :us_ky, :us_nj, :us_nc, :us_nd, :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_al, :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_pa, :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
@@ -32,22 +32,22 @@ module Holidays
             {:function => "us_inauguration_day(year)", :function_arguments => [:year], :name => "Inauguration Day", :regions => [:us_tx, :us_dc, :us_la, :us_md, :us_va]},
             {:function => "lee_jackson_day(year, month)", :function_arguments => [:year, :month], :name => "Lee-Jackson Day", :regions => [:us_va]},
             {:mday => 19, :name => "Confederate Heroes Day", :regions => [:us_tx]}],
-      2 => [{:wday => 1, :week => 3,  :year_ranges => [{:after => 1990}],:name => "Family Day", :regions => [:ca_ab]},
-            {:wday => 1, :week => 3,  :year_ranges => [{:after => 2007}],:name => "Family Day", :regions => [:ca_sk]},
-            {:wday => 1, :week => 3,  :year_ranges => [{:after => 2008}],:name => "Family Day", :regions => [:ca_on]},
-            {:wday => 1, :week => 2,  :year_ranges => [{:between => 2013..2018}],:name => "Family Day", :regions => [:ca_bc]},
-            {:wday => 1, :week => 3,  :year_ranges => [{:after => 2019}],:name => "Family Day", :regions => [:ca_bc]},
-            {:wday => 1, :week => 3,  :year_ranges => [{:after => 2018}],:name => "Family Day", :regions => [:ca_nb]},
+      2 => [{:wday => 1, :week => 3, :year_ranges => { :from => 1990 },:name => "Family Day", :regions => [:ca_ab]},
+            {:wday => 1, :week => 3, :year_ranges => { :from => 2007 },:name => "Family Day", :regions => [:ca_sk]},
+            {:wday => 1, :week => 3, :year_ranges => { :from => 2008 },:name => "Family Day", :regions => [:ca_on]},
+            {:wday => 1, :week => 2, :year_ranges => { :between => 2013..2018 },:name => "Family Day", :regions => [:ca_bc]},
+            {:wday => 1, :week => 3, :year_ranges => { :from => 2019 },:name => "Family Day", :regions => [:ca_bc]},
+            {:wday => 1, :week => 3, :year_ranges => { :from => 2018 },:name => "Family Day", :regions => [:ca_nb]},
             {:wday => 1, :week => 3, :name => "Louis Riel Day", :regions => [:ca_mb]},
-            {:wday => 1, :week => 3,  :year_ranges => [{:after => 2015}],:name => "Nova Scotia Heritage Day", :regions => [:ca_ns]},
+            {:wday => 1, :week => 3, :year_ranges => { :from => 2015 },:name => "Nova Scotia Heritage Day", :regions => [:ca_ns]},
             {:wday => 1, :week => 3, :name => "Islander Day", :regions => [:ca_pe]},
             {:wday => 1, :week => 1, :name => "Día de la Constitución", :regions => [:mx]},
             {:wday => 1, :week => 3, :name => "Presidents' Day", :regions => [:us]},
             {:mday => 2, :type => :informal, :name => "Groundhog Day", :regions => [:us, :ca]},
             {:mday => 14, :type => :informal, :name => "Valentine's Day", :regions => [:us, :ca]}],
-      3 => [{:mday => 23, :type => :informal, :name => "St. George's Day", :regions => [:ca_nl]},
+      3 => [{:mday => 17, :type => :informal, :name => "St. Patrick's Day", :regions => [:ca_nl]},
+            {:mday => 23, :type => :informal, :name => "St. George's Day", :regions => [:ca_nl]},
             {:wday => 1, :week => 3, :name => "Natalicio de Benito Juárez", :regions => [:mx]},
-            {:wday => 1, :week => 1, :name => "Casimir Pulaski Day", :regions => [:us_il]},
             {:wday => 2, :week => 1, :name => "Town Meeting Day", :regions => [:us_vt]},
             {:mday => 2, :name => "Texas Independence Day", :regions => [:us_tx]},
             {:mday => 26, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Prince Jonah Kuhio Kalanianaole Day", :regions => [:us_hi]},
@@ -69,7 +69,7 @@ module Holidays
       6 => [{:mday => 24, :type => :informal, :name => "Discovery Day", :regions => [:ca_nl]},
             {:mday => 24, :name => "Fête Nationale", :regions => [:ca_qc]},
             {:mday => 21, :name => "National Aboriginal Day", :regions => [:ca_nt]},
-            {:mday => 21,  :year_ranges => [{:after => 2017}],:name => "National Aboriginal Day", :regions => [:ca_yt]},
+            {:mday => 21, :year_ranges => { :from => 2017 },:name => "National Aboriginal Day", :regions => [:ca_yt]},
             {:wday => 0, :week => 3, :type => :informal, :name => "Día del Padre", :regions => [:mx]},
             {:wday => 1, :week => 1, :name => "Jefferson Davis' Birthday", :regions => [:us_al]},
             {:mday => 3, :name => "Birthday of Jefferson Davis", :regions => [:us_fl]},
@@ -114,7 +114,7 @@ module Holidays
             {:mday => 1, :type => :informal, :name => "Todos los Santos", :regions => [:mx]},
             {:mday => 2, :type => :informal, :name => "Los Fieles Difuntos", :regions => [:mx]},
             {:wday => 1, :week => 3, :name => "Día de la Revolución", :regions => [:mx]},
-            {:function => "election_day(year)", :function_arguments => [:year], :name => "Election Day", :regions => [:us_de, :us_hi, :us_il, :us_in, :us_mt, :us_nj, :us_ny, :us_pa, :us_ri]},
+            {:function => "election_day(year)", :function_arguments => [:year], :name => "Election Day", :regions => [:us_de, :us_hi, :us_in, :us_mt, :us_nj, :us_ny, :us_pa, :us_ri]},
             {:mday => 11, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Veterans Day", :regions => [:us]},
             {:wday => 4, :week => 4, :name => "Thanksgiving", :regions => [:us]},
             {:function => "day_after_thanksgiving(year)", :function_arguments => [:year], :name => "Family Day", :regions => [:us_nv]},
@@ -123,7 +123,7 @@ module Holidays
             {: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]}],
-      12 => [{:mday => 25, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:ca]},
+      12 => [{:mday => 25, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:ca]},
             {:mday => 26, :observed => "to_weekday_if_boxing_weekend(date)", :observed_arguments => [:date], :name => "Boxing Day", :regions => [:ca_on]},
             {:mday => 26, :observed => "to_weekday_if_boxing_weekend(date)", :observed_arguments => [:date], :type => :informal, :name => "Boxing Day", :regions => [:ca_ab, :ca_bc, :ca_mb, :ca_nb, :ca_nl, :ca_nt, :ca_ns, :ca_nu, :ca_pe, :ca_sk, :ca_yt]},
             {:mday => 12, :type => :informal, :name => "Día de la Virgen de Guadalupe", :regions => [:mx]},
@@ -132,11 +132,11 @@ module Holidays
             {:mday => 28, :name => "Los Santos Inocentes", :regions => [:mx]},
             {: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_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:us]},
+            {:mday => 25, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:us]},
             {:mday => 26, :name => "Day after Christmas", :regions => [:us_ar, :us_nc, :us_ok, :us_sc, :us_tn, :us_tx]},
             {:mday => 31, :name => "New Year's Eve", :regions => [:us_mi, :us_wi]}],
       4 => [{:mday => 30, :type => :informal, :name => "Día del Niño", :regions => [:mx]},
-            {:mday => 16, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Emancipation Day", :regions => [:us_dc, :us_ca]},
+            {:mday => 16, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Emancipation Day", :regions => [:us_dc]},
             {:wday => 1, :week => 3, :name => "Patriots' Day", :regions => [:us_me, :us_ma]},
             {:mday => 21, :name => "San Jacinto Day", :regions => [:us_tx]},
             {:wday => 1, :week => -1, :name => "Confederate Memorial Day", :regions => [:us_al, :us_ms]},

data/lib/generated_definitions/ro.rb

@@ -12,13 +12,16 @@ module Holidays
 
     def self.holidays_by_month
       {
-                0 => [{:function => "orthodox_easter(year)", :function_arguments => [:year], :name => "Paștele - duminică", :regions => [:ro]},
+                0 => [{:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => -2, :year_ranges => { :from => 2018 },:name => "Paștele - Vinerea Mare", :regions => [:ro]},
+            {:function => "orthodox_easter(year)", :function_arguments => [:year], :name => "Paștele - duminică", :regions => [:ro]},
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Paștele - luni", :regions => [:ro]},
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => 49, :name => "Rusaliile - 50", :regions => [:ro]},
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => 50, :name => "Rusaliile - 51", :regions => [:ro]}],
       1 => [{:mday => 1, :name => "Anul nou", :regions => [:ro]},
-            {:mday => 2, :name => "Anul nou", :regions => [:ro]}],
+            {:mday => 2, :name => "Anul nou", :regions => [:ro]},
+            {:mday => 24, :year_ranges => { :from => 2017 },:name => "Unirea Principatelor Române", :regions => [:ro]}],
       5 => [{:mday => 1, :name => "Ziua muncii", :regions => [:ro]}],
+      6 => [{:mday => 1, :year_ranges => { :from => 2017 },:name => "Ziua Copilului", :regions => [:ro]}],
       8 => [{:mday => 15, :name => "Adormirea Maicii Domnului", :regions => [:ro]}],
       11 => [{:mday => 30, :name => "Sfântul Apostol Andrei", :regions => [:ro]}],
       12 => [{:mday => 1, :name => "Ziua Națională", :regions => [:ro]},

data/lib/generated_definitions/southamerica.rb

@@ -21,8 +21,8 @@ module Holidays
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 60, :name => "Corpus Christi", :regions => [:br]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Viernes Santo", :regions => [:cl]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -1, :name => "Sábado Santo", :regions => [:cl]},
-            {:function => "st_peter_st_paul_cl(year)", :function_arguments => [:year],  :year_ranges => [{:after => 2000}],:name => "San Pedro y San Pablo", :regions => [:cl]},
-            {:function => "other_churches_day_cl(year)", :function_arguments => [:year],  :year_ranges => [{:after => 2008}],:name => "Día de las Iglesias Evangélicas y Protestantes", :regions => [:cl]},
+            {:function => "st_peter_st_paul_cl(year)", :function_arguments => [:year], :year_ranges => { :from => 2000 },:name => "San Pedro y San Pablo", :regions => [:cl]},
+            {:function => "other_churches_day_cl(year)", :function_arguments => [:year], :year_ranges => { :from => 2008 },:name => "Día de las Iglesias Evangélicas y Protestantes", :regions => [:cl]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -3, :name => "Jueves Santo", :regions => [:co]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Viernes Santo", :regions => [:co]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 43, :name => "Día de la Ascensión", :regions => [:co]},
@@ -58,7 +58,7 @@ module Holidays
             {:wday => 0, :week => 2, :type => :informal, :name => "Día de la Madre", :regions => [:pe]},
             {:mday => 1, :name => "Día del Trabajador", :regions => [:ve]}],
       6 => [{:mday => 20, :name => "Día de la Bandera", :regions => [:ar]},
-            {:mday => 29,  :year_ranges => [{:before => 1999}],:name => "San Pedro y San Pablo", :regions => [:cl]},
+            {:mday => 29, :year_ranges => { :until => 1999 },:name => "San Pedro y San Pablo", :regions => [:cl]},
             {:function => "saint_peter_and_saint_paul(year)", :function_arguments => [:year], :name => "San Pedro y San Pablo", :regions => [:co]},
             {:mday => 7, :type => :informal, :name => "Día de la Bandera", :regions => [:pe]},
             {:wday => 0, :week => 3, :type => :informal, :name => "Día del Padre", :regions => [:pe]},
@@ -80,8 +80,8 @@ module Holidays
             {:mday => 30, :name => "Santa Rosa de Lima", :regions => [:pe]}],
       10 => [{:mday => 12, :name => "Día del Respeto a la Diversidad Cultural", :regions => [:ar]},
             {:mday => 12, :name => "Dia de Nossa Senhora Aparecida", :regions => [:br]},
-            {:mday => 12,  :year_ranges => [{:before => 1999}],:name => "Encuentro de Dos Mundos", :regions => [:cl]},
-            {:function => "columbus_day_cl(year)", :function_arguments => [:year],  :year_ranges => [{:after => 2000}],:name => "Encuentro de Dos Mundos", :regions => [:cl]},
+            {:mday => 12, :year_ranges => { :until => 1999 },:name => "Encuentro de Dos Mundos", :regions => [:cl]},
+            {:function => "columbus_day_cl(year)", :function_arguments => [:year], :year_ranges => { :from => 2000 },:name => "Encuentro de Dos Mundos", :regions => [:cl]},
             {:function => "columbus_day(year)", :function_arguments => [:year], :name => "Día de la Raza", :regions => [:co]},
             {:mday => 8, :name => "Batalla de Angamos", :regions => [:pe]},
             {:mday => 12, :name => "Día de la Resistencia Indígena", :regions => [:ve]}],

data/lib/generated_definitions/tr.rb

@@ -23,7 +23,7 @@ module Holidays
       4 => [{:mday => 23, :name => "Ulusal Egemenlik ve Çocuk Bayramı", :regions => [:tr]}],
       5 => [{:mday => 1, :name => "Emek ve Dayanışma Günü", :regions => [:tr]},
             {:mday => 19, :name => "Atatürk'ü Anma Gençlik ve Spor Bayramı", :regions => [:tr]}],
-      7 => [{:mday => 15,  :year_ranges => [{:after => 2016}],:name => "Demokrasi ve Milli Birlik Günü", :regions => [:tr]}],
+      7 => [{:mday => 15, :year_ranges => { :from => 2016 },:name => "Demokrasi ve Milli Birlik Günü", :regions => [:tr]}],
       8 => [{:mday => 30, :name => "Zafer Bayramı", :regions => [:tr]}],
       10 => [{:mday => 29, :name => "Cumhuriyet Bayramı", :regions => [:tr]}]
       }

data/lib/generated_definitions/ua.rb

@@ -18,13 +18,13 @@ module Holidays
             {:mday => 7, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Різдво Христове", :regions => [:ua]}],
       3 => [{:mday => 8, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Міжнародний жіночий день", :regions => [:ua]}],
       5 => [{:mday => 1, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "День праці", :regions => [:ua]},
-            {:mday => 2,  :year_ranges => [{:before => 2017}],:name => "День міжнародної солідарності трудящих", :regions => [:ua]},
+            {:mday => 2, :year_ranges => { :until => 2017 },:name => "День міжнародної солідарності трудящих", :regions => [:ua]},
             {:mday => 9, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "День перемоги над нацизмом у Другій світовій війні", :regions => [:ua]}],
-      6 => [{:mday => 28,  :year_ranges => [{:after => 1997}],:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "День Конституції", :regions => [:ua]}],
-      7 => [{:mday => 16,  :year_ranges => [{:limited => [1991]}],:name => "День Незалежності України", :regions => [:ua]}],
-      8 => [{:mday => 24,  :year_ranges => [{:after => 1992}],:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "День Незалежності", :regions => [:ua]}],
-      10 => [{:mday => 14,  :year_ranges => [{:after => 2015}],:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "День захисника України", :regions => [:ua]}],
-      12 => [{:mday => 25,  :year_ranges => [{:after => 2017}],:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Різдво Христове", :regions => [:ua]}]
+      6 => [{:mday => 28, :year_ranges => { :from => 1997 },:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "День Конституції", :regions => [:ua]}],
+      7 => [{:mday => 16, :year_ranges => { :limited => [1991] },:name => "День Незалежності України", :regions => [:ua]}],
+      8 => [{:mday => 24, :year_ranges => { :from => 1992 },:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "День Незалежності", :regions => [:ua]}],
+      10 => [{:mday => 14, :year_ranges => { :from => 2015 },:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "День захисника України", :regions => [:ua]}],
+      12 => [{:mday => 25, :year_ranges => { :from => 2017 },:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Різдво Христове", :regions => [:ua]}]
       }
     end
 

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_la, :us, :us_ct, :us_de, :us_gu, :us_hi, :us_in, :us_ky, :us_nj, :us_nc, :us_nd, :us_pr, :us_tn, :us_ms, :us_id, :us_ar, :us_tx, :us_dc, :us_md, :us_va, :us_il, :us_vt, :us_ak, :us_ca, :us_me, :us_ma, :us_al, :us_ga, :us_ne, :us_mo, :us_sc, :us_wv, :us_vi, :us_ut, :us_ri, :us_az, :us_co, :us_mt, :us_nm, :us_ny, :us_oh, :us_pa, :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_la, :us, :us_ct, :us_de, :us_gu, :us_hi, :us_in, :us_ky, :us_nj, :us_nc, :us_nd, :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_al, :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_pa, :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
@@ -28,14 +28,13 @@ module Holidays
       2 => [{:wday => 1, :week => 3, :name => "Presidents' Day", :regions => [:us]},
             {:mday => 2, :type => :informal, :name => "Groundhog Day", :regions => [:us, :ca]},
             {:mday => 14, :type => :informal, :name => "Valentine's Day", :regions => [:us, :ca]}],
-      3 => [{:wday => 1, :week => 1, :name => "Casimir Pulaski Day", :regions => [:us_il]},
-            {:wday => 2, :week => 1, :name => "Town Meeting Day", :regions => [:us_vt]},
+      3 => [{:wday => 2, :week => 1, :name => "Town Meeting Day", :regions => [:us_vt]},
             {:mday => 2, :name => "Texas Independence Day", :regions => [:us_tx]},
             {:mday => 26, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Prince Jonah Kuhio Kalanianaole Day", :regions => [:us_hi]},
             {:wday => 1, :week => -1, :name => "Seward's Day", :regions => [:us_ak]},
             {:mday => 31, :name => "César Chávez Day", :regions => [:us_ca]},
             {:mday => 17, :type => :informal, :name => "St. Patrick's Day", :regions => [:us, :ca]}],
-      4 => [{:mday => 16, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Emancipation Day", :regions => [:us_dc, :us_ca]},
+      4 => [{:mday => 16, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Emancipation Day", :regions => [:us_dc]},
             {:wday => 1, :week => 3, :name => "Patriots' Day", :regions => [:us_me, :us_ma]},
             {:mday => 21, :name => "San Jacinto Day", :regions => [:us_tx]},
             {:wday => 1, :week => -1, :name => "Confederate Memorial Day", :regions => [:us_al, :us_ms]},
@@ -71,7 +70,7 @@ module Holidays
             {:mday => 18, :name => "Alaska Day", :regions => [:us_ak]},
             {:wday => 5, :week => -1, :name => "Nevada Day", :regions => [:us_nv]},
             {:mday => 31, :type => :informal, :name => "Halloween", :regions => [:us, :ca]}],
-      11 => [{:function => "election_day(year)", :function_arguments => [:year], :name => "Election Day", :regions => [:us_de, :us_hi, :us_il, :us_in, :us_mt, :us_nj, :us_ny, :us_pa, :us_ri]},
+      11 => [{:function => "election_day(year)", :function_arguments => [:year], :name => "Election Day", :regions => [:us_de, :us_hi, :us_in, :us_mt, :us_nj, :us_ny, :us_pa, :us_ri]},
             {:mday => 11, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Veterans Day", :regions => [:us]},
             {:wday => 4, :week => 4, :name => "Thanksgiving", :regions => [:us]},
             {:function => "day_after_thanksgiving(year)", :function_arguments => [:year], :name => "Family Day", :regions => [:us_nv]},
@@ -82,7 +81,7 @@ module Holidays
             {: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]}],
       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_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:us]},
+            {:mday => 25, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:us]},
             {:mday => 26, :name => "Day after Christmas", :regions => [:us_ar, :us_nc, :us_ok, :us_sc, :us_tn, :us_tx]},
             {:mday => 31, :name => "New Year's Eve", :regions => [:us_mi, :us_wi]}]
       }

data/lib/holidays.rb

@@ -40,6 +40,8 @@ module Holidays
 
       start_date, end_date = get_date(start_date), get_date(end_date)
 
+      raise ArgumentError if end_date < start_date
+
       if cached_holidays = Factory::Definition.cache_repository.find(start_date, end_date, options)
         return cached_holidays
       end

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

@@ -87,16 +87,27 @@ module Holidays
                 rule = {}
 
                 definition.each do |key, val|
+                  # Ruby 2.4 doesn't have the `transform_keys` method. Once we drop 2.4 support we can
+                  # use `val.transform_keys!(&:to_sym) if val.is_a?(Hash)` instead of this `if` statement.
+                  if val.is_a?(Hash)
+                    val = val.keys.each_with_object({}) do |k, result|
+                      result[k.to_sym] = val[k]
+                    end
+                  end
+
                   rule[key.to_sym] = val
                 end
 
-                rule[:regions] = rule[:regions].collect { |r| r.to_sym }
-                regions << rule[:regions]
+                if rule[:year_ranges] && rule[:year_ranges].key?(:between)
+                  start_year = rule[:year_ranges][:between]["start"].to_i
+                  end_year = rule[:year_ranges][:between]["end"].to_i
 
-                if rule[:year_ranges]
-                  rule[:year_ranges] = clean_year_ranges(rule[:year_ranges])
+                  rule[:year_ranges][:between] = Range.new(start_year, end_year)
                 end
 
+                rule[:regions] = rule[:regions].collect { |r| r.to_sym }
+                regions << rule[:regions]
+
                 exists = false
                 rules_by_month[month].each do |ex|
                   if ex[:name] == rule[:name] and ex[:wday] == rule[:wday] and ex[:mday] == rule[:mday] and ex[:week] == rule[:week] and ex[:type] == rule[:type] and ex[:function] == rule[:function] and ex[:observed] == rule[:observed] and ex[:year_ranges] == rule[:year_ranges]
@@ -121,23 +132,6 @@ module Holidays
           [regions, rules_by_month]
         end
 
-        # In this case we end up parsing a range as "2006..2008" a string. This is codifying
-        # what we already do...today we parse as a string but when writing out to our final
-        # generated files it comes out as a range that Ruby interprets. This just puts it in stone
-        # what we want to do.
-        def clean_year_ranges(year_ranges)
-          year_ranges.collect do |year_range|
-            if year_range["between"]
-              range = year_range["between"]
-              if range.is_a?(String)
-                year_range["between"] = Range.new(*range.split("..").map(&:to_i))
-              end
-            end
-
-            year_range
-          end
-        end
-
         #FIXME This should really be split out and tested with its own unit tests.
         def generate_month_definition_strings(rules_by_month, parsed_custom_methods)
           month_strings = []
@@ -170,19 +164,11 @@ module Holidays
                 string << ":wday => #{rule[:wday]}, :week => #{rule[:week]}, "
               end
 
-              #FIXME I think this should be split out into its own file.
-              if rule[:year_ranges] && rule[:year_ranges].kind_of?(Array)
-                year_string = " :year_ranges => ["
-                len = rule[:year_ranges].length
-                rule[:year_ranges].each_with_index do |year,index|
-                  year_string << "{:#{year.keys.first} => #{year.values.first}}"
-                  if len == index + 1
-                    year_string << "],"
-                  else
-                    year_string << ","
-                  end
-                end
-                string << year_string
+              if rule[:year_ranges] && rule[:year_ranges].is_a?(Hash)
+                selector = rule[:year_ranges].keys.first
+                value = rule[:year_ranges][selector]
+
+                string << ":year_ranges => { :#{selector} => #{value} },"
               end
 
               if rule[:observed]