holidays 7.1.0 → 8.4.0

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]}]
       }
@@ -38,7 +38,8 @@ begin_of_ramadan_feast = {
     '2016' => Date.civil(2016, 7, 5),
     '2017' => Date.civil(2017, 6, 25),
     '2018' => Date.civil(2018, 6, 15),
-    '2019' => Date.civil(2019, 6, 4)
+    '2019' => Date.civil(2019, 6, 4),
+    '2020' => Date.civil(2020, 5, 24)
 }
 begin_of_ramadan_feast[year.to_s]
 },
@@ -50,7 +51,8 @@ begin_of_sacrifice_feast = {
     '2016' => Date.civil(2016, 9, 12),
     '2017' => Date.civil(2017, 9, 1),
     '2018' => Date.civil(2018, 8, 21),
-    '2019' => Date.civil(2019, 8, 11)
+    '2019' => Date.civil(2019, 8, 11),
+    '2020' => Date.civil(2020, 7, 31)
 }
 begin_of_sacrifice_feast[year.to_s]
 },

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]

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

@@ -41,7 +41,15 @@ module Holidays
         private
 
         def definition_exists?(existing_def, target_def)
-          existing_def[:name] == target_def[:name] && existing_def[:wday] == target_def[:wday] && existing_def[:mday] == target_def[:mday] && existing_def[:week] == target_def[:week] && existing_def[:function] == target_def[:function] && existing_def[:type] == target_def[:type] && existing_def[:observed] == target_def[:observed] && existing_def[:year_ranges] == target_def[:year_ranges]
+          existing_def[:name] == target_def[:name] &&
+          existing_def[:wday] == target_def[:wday] &&
+          existing_def[:mday] == target_def[:mday] &&
+          existing_def[:week] == target_def[:week] &&
+          existing_def[:function] == target_def[:function] &&
+          existing_def[:function_modifier] == target_def[:function_modifier] &&
+          existing_def[:type] == target_def[:type] &&
+          existing_def[:observed] == target_def[:observed] &&
+          existing_def[:year_ranges] == target_def[:year_ranges]
         end
       end
     end

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

@@ -24,39 +24,11 @@ module Holidays
                   next unless @rules[:year_range].call(year, h[:year_ranges])
                 end
 
-                current_month = month
-                current_day = h[:mday]
-
-                if h[:function]
-                  result = @custom_method_processor.call(
-                    build_custom_method_input(year, current_month, current_day, h[:regions]),
-                    h[:function], h[:function_arguments], h[:function_modifier],
-                  )
-
-                  #FIXME The result should always be present, see https://github.com/holidays/holidays/issues/204 for more information
-                  if result
-                    current_month = result.month
-                    current_day = result.mday
-                  else
-                    current_month = nil
-                    current_day = nil
-                  end
-                else
-                  current_day = h[:mday] || @day_of_month_calculator.call(year, current_month, h[:week], h[:wday])
-                end
-
-                # Silently skip bad mdays
-                #TODO Should we be doing something different here? We have no concept of logging right now. Maybe we should add it?
-                begin
-                  date = Date.civil(year, current_month, current_day)
-                rescue; next; end
+                date = build_date(year, month, h)
+                next unless date
 
                 if observed_set?(options) && h[:observed]
-                  date = @custom_method_processor.call(
-                    build_custom_method_input(date.year, date.month, date.day, regions),
-                    h[:observed],
-                    [:date],
-                  )
+                  date = build_observed_date(date, regions, h)
                 end
 
                 holidays << {:date => date, :name => h[:name], :regions => h[:regions]}
@@ -93,6 +65,29 @@ module Holidays
           options && options.include?(:observed) == true
         end
 
+        def build_date(year, month, h)
+          if h[:function]
+            holiday = custom_holiday(year, month, h)
+            #FIXME The result should always be present, see https://github.com/holidays/holidays/issues/204 for more information
+            current_month = holiday&.month
+            current_day = holiday&.mday
+          else
+            current_month = month
+            current_day = h[:mday] || @day_of_month_calculator.call(year, month, h[:week], h[:wday])
+          end
+
+          # Silently skip bad mdays
+          #TODO Should we be doing something different here? We have no concept of logging right now. Maybe we should add it?
+          Date.civil(year, current_month, current_day) rescue nil
+        end
+
+        def custom_holiday(year, month, h)
+          @custom_method_processor.call(
+            build_custom_method_input(year, month, h[:mday], h[:regions]),
+            h[:function], h[:function_arguments], h[:function_modifier],
+          )
+        end
+
         def build_custom_method_input(year, month, day, regions)
           {
             year: year,
@@ -101,6 +96,14 @@ module Holidays
             region: regions.first, #FIXME This isn't ideal but will work for our current use case...
           }
         end
+
+        def build_observed_date(date, regions, h)
+          @custom_method_processor.call(
+            build_custom_method_input(date.year, date.month, date.day, regions),
+            h[:observed],
+            [:date],
+          )
+        end
       end
     end
   end

data/lib/holidays/finder/rules/year_range.rb

@@ -1,49 +1,30 @@
-# Please note that only one condition needs to match in order for `call` to return `true.
-# See the test file for this class for specific examples.
 module Holidays
   module Finder
     module Rules
       class YearRange
         class << self
-          BEFORE = :before
-          AFTER = :after
+          UNTIL = :until
+          FROM = :from
           LIMITED = :limited
           BETWEEN = :between
 
-          #TODO Can we just accept symbols here? Why accept strings?
-          VALID_OPERATORS = [
-            BEFORE, BEFORE.to_s,
-            AFTER, AFTER.to_s,
-            LIMITED, LIMITED.to_s,
-            BETWEEN, BETWEEN.to_s
-          ]
-
-          def call(target_year, year_range_definitions)
-            validate!(target_year, year_range_definitions)
-
-            matched = false
-            year_range_definitions.each do |range_defs|
-              next unless range_defs.is_a?(Hash) && range_defs.length == 1
-
-              operator = range_defs.keys.first
-              year_range = range_defs.values.first
-
-              case operator
-              when BEFORE, BEFORE.to_s
-                matched = target_year <= year_range
-              when AFTER, AFTER.to_s
-                matched = target_year >= year_range
-              when LIMITED, LIMITED.to_s
-                if year_range.is_a?(Array)
-                  matched = year_range.include?(target_year)
-                else
-                  matched = year_range == target_year
-                end
-              when BETWEEN, BETWEEN.to_s
-                matched = year_range.cover?(target_year)
-              end
-
-              break if matched == true
+          def call(target_year, year_range_defs)
+            validate!(target_year, year_range_defs)
+
+            operator = year_range_defs.keys.first
+            rule_value = year_range_defs[operator]
+
+            case operator
+            when UNTIL
+              matched = target_year <= rule_value
+            when FROM
+              matched = target_year >= rule_value
+            when LIMITED
+              matched = rule_value.include?(target_year)
+            when BETWEEN
+              matched = rule_value.cover?(target_year)
+            else
+              matched = false
             end
 
             matched
@@ -54,25 +35,20 @@ module Holidays
           def validate!(target_year, year_ranges)
             raise ArgumentError.new("target_year must be a number") unless target_year.is_a?(Integer)
             raise ArgumentError.new("year_ranges cannot be missing") if year_ranges.nil? || year_ranges.empty?
+            raise ArgumentError.new("year_ranges must contain a hash with a single operator") unless year_ranges.is_a?(Hash) && year_ranges.size == 1
 
-            year_ranges.each do |range|
-              raise ArgumentError.new("year_ranges must include only hashes") unless range.is_a?(Hash)
-              raise ArgumentError.new("year_ranges cannot include empty hashes") if range.empty?
-              raise ArgumentError.new("year_ranges entries can only include one operator") unless range.count == 1
-
-              operator = range.keys.first
-              range = range.values.first
+            operator = year_ranges.keys.first
+            value = year_ranges[operator]
 
-              raise ArgumentError.new("Invalid operator found: '#{operator}'") unless VALID_OPERATORS.include?(operator)
+            raise ArgumentError.new("Invalid operator found: '#{operator}'") unless [UNTIL, FROM, LIMITED, BETWEEN].include?(operator)
 
-              case operator
-              when BEFORE, BEFORE.to_s, AFTER, AFTER.to_s
-                raise ArgumentError.new(":before and :after operator value must be a number, received: '#{range}'") unless range.is_a?(Integer)
-              when LIMITED, LIMITED.to_s
-                raise ArgumentError.new(":limited operator value must be an array, received: '#{range}'") unless range.is_a?(Array) || range.is_a?(Integer)
-              when BETWEEN, BETWEEN.to_s
-                raise ArgumentError.new(":between operator value must be a range, received: '#{range}'") unless range.is_a?(Range)
-              end
+            case operator
+            when UNTIL, FROM
+              raise ArgumentError.new("#{UNTIL} and #{FROM} operator value must be a number, received: '#{value}'") unless value.is_a?(Integer)
+            when LIMITED
+              raise ArgumentError.new(":limited operator value must be an array containing at least one integer value, received: '#{value}'") unless value.is_a?(Array) && value.size >= 1 && value.all? { |v| v.is_a?(Integer) }
+            when BETWEEN
+              raise ArgumentError.new(":between operator value must be a range, received: '#{value}'") unless value.is_a?(Range)
             end
           end
         end

data/lib/holidays/version.rb

@@ -1,3 +1,3 @@
 module Holidays
-  VERSION = '7.1.0'
+  VERSION = '8.4.0'
 end