holidays 7.1.0 → 8.4.0

data/test/defs/test_defs_ro.rb

@@ -7,6 +7,12 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class RoDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_ro
+    assert_nil (Holidays.on(Date.civil(2017, 4, 14), [:ro])[0] || {})[:name]
+
+    assert_equal "Paștele - Vinerea Mare", (Holidays.on(Date.civil(2018, 4, 6), [:ro], [:informal])[0] || {})[:name]
+
+    assert_equal "Paștele - Vinerea Mare", (Holidays.on(Date.civil(2019, 4, 26), [:ro], [:informal])[0] || {})[:name]
+
     assert_equal "Paștele - duminică", (Holidays.on(Date.civil(1961, 4, 9), [:ro], [:informal])[0] || {})[:name]
 
     assert_equal "Paștele - luni", (Holidays.on(Date.civil(1961, 4, 10), [:ro], [:informal])[0] || {})[:name]
@@ -33,8 +39,16 @@ class RoDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_equal "Anul nou", (Holidays.on(Date.civil(2014, 1, 2), [:ro], [:informal])[0] || {})[:name]
 
+    assert_equal "Unirea Principatelor Române", (Holidays.on(Date.civil(2017, 1, 24), [:ro], [:informal])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2016, 1, 24), [:ro])[0] || {})[:name]
+
     assert_equal "Ziua muncii", (Holidays.on(Date.civil(2009, 5, 1), [:ro], [:informal])[0] || {})[:name]
 
+    assert_equal "Ziua Copilului", (Holidays.on(Date.civil(2017, 6, 1), [:ro], [:informal])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2016, 6, 1), [:ro])[0] || {})[:name]
+
     assert_equal "Adormirea Maicii Domnului", (Holidays.on(Date.civil(2012, 8, 15), [:ro], [:informal])[0] || {})[:name]
 
     assert_equal "Sfântul Apostol Andrei", (Holidays.on(Date.civil(2013, 11, 30), [:ro], [:informal])[0] || {})[:name]

data/test/defs/test_defs_southamerica.rb

@@ -179,11 +179,11 @@ class SouthamericaDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_equal "Día de la Ascensión", (Holidays.on(Date.civil(2017, 5, 29), [:co])[0] || {})[:name]
 
-    assert_equal "Corpus Christi", (Holidays.on(Date.civil(2014, 6, 19), [:co])[0] || {})[:name]
+    assert_equal "Corpus Christi", (Holidays.on(Date.civil(2014, 6, 23), [:co])[0] || {})[:name]
 
-    assert_equal "Corpus Christi", (Holidays.on(Date.civil(2016, 5, 26), [:co])[0] || {})[:name]
+    assert_equal "Corpus Christi", (Holidays.on(Date.civil(2016, 5, 30), [:co])[0] || {})[:name]
 
-    assert_equal "Corpus Christi", (Holidays.on(Date.civil(2017, 6, 15), [:co])[0] || {})[:name]
+    assert_equal "Corpus Christi", (Holidays.on(Date.civil(2017, 6, 19), [:co])[0] || {})[:name]
 
     assert_equal "Sagrado Corazón", (Holidays.on(Date.civil(2014, 6, 30), [:co])[0] || {})[:name]
 

data/test/defs/test_defs_tr.rb

@@ -22,32 +22,39 @@ class TrDefinitionTests < Test::Unit::TestCase  # :nodoc:
     assert_equal "Ramazan Bayramı", (Holidays.on(Date.civil(2017, 6, 25), [:tr])[0] || {})[:name]
 assert_equal "Ramazan Bayramı", (Holidays.on(Date.civil(2018, 6, 15), [:tr])[0] || {})[:name]
 assert_equal "Ramazan Bayramı", (Holidays.on(Date.civil(2019, 6, 4), [:tr])[0] || {})[:name]
+assert_equal "Ramazan Bayramı", (Holidays.on(Date.civil(2020, 5, 24), [:tr])[0] || {})[:name]
 
     assert_equal "Ramazan Bayramı (ikinci tatil)", (Holidays.on(Date.civil(2017, 6, 26), [:tr])[0] || {})[:name]
 assert_equal "Ramazan Bayramı (ikinci tatil)", (Holidays.on(Date.civil(2018, 6, 16), [:tr])[0] || {})[:name]
 assert_equal "Ramazan Bayramı (ikinci tatil)", (Holidays.on(Date.civil(2019, 6, 5), [:tr])[0] || {})[:name]
+assert_equal "Ramazan Bayramı (ikinci tatil)", (Holidays.on(Date.civil(2020, 5, 25), [:tr])[0] || {})[:name]
 
     assert_equal "Ramazan Bayramı (üçüncü tatil)", (Holidays.on(Date.civil(2017, 6, 27), [:tr])[0] || {})[:name]
 assert_equal "Ramazan Bayramı (üçüncü tatil)", (Holidays.on(Date.civil(2018, 6, 17), [:tr])[0] || {})[:name]
 assert_equal "Ramazan Bayramı (üçüncü tatil)", (Holidays.on(Date.civil(2019, 6, 6), [:tr])[0] || {})[:name]
+assert_equal "Ramazan Bayramı (üçüncü tatil)", (Holidays.on(Date.civil(2020, 5, 26), [:tr])[0] || {})[:name]
 
     assert_equal "Demokrasi ve Milli Birlik Günü", (Holidays.on(Date.civil(2017, 7, 15), [:tr])[0] || {})[:name]
 
     assert_equal "Kurban Bayramı", (Holidays.on(Date.civil(2017, 9, 1), [:tr])[0] || {})[:name]
 assert_equal "Kurban Bayramı", (Holidays.on(Date.civil(2018, 8, 21), [:tr])[0] || {})[:name]
 assert_equal "Kurban Bayramı", (Holidays.on(Date.civil(2019, 8, 11), [:tr])[0] || {})[:name]
+assert_equal "Kurban Bayramı", (Holidays.on(Date.civil(2020, 7, 31), [:tr])[0] || {})[:name]
 
     assert_equal "Kurban Bayramı (ikinci tatil)", (Holidays.on(Date.civil(2017, 9, 2), [:tr])[0] || {})[:name]
 assert_equal "Kurban Bayramı (ikinci tatil)", (Holidays.on(Date.civil(2018, 8, 22), [:tr])[0] || {})[:name]
 assert_equal "Kurban Bayramı (ikinci tatil)", (Holidays.on(Date.civil(2019, 8, 12), [:tr])[0] || {})[:name]
+assert_equal "Kurban Bayramı (ikinci tatil)", (Holidays.on(Date.civil(2020, 8, 1), [:tr])[0] || {})[:name]
 
     assert_equal "Kurban Bayramı (üçüncü tatil)", (Holidays.on(Date.civil(2017, 9, 3), [:tr])[0] || {})[:name]
 assert_equal "Kurban Bayramı (üçüncü tatil)", (Holidays.on(Date.civil(2018, 8, 23), [:tr])[0] || {})[:name]
 assert_equal "Kurban Bayramı (üçüncü tatil)", (Holidays.on(Date.civil(2019, 8, 13), [:tr])[0] || {})[:name]
+assert_equal "Kurban Bayramı (üçüncü tatil)", (Holidays.on(Date.civil(2020, 8, 2), [:tr])[0] || {})[:name]
 
     assert_equal "Kurban Bayramı (dördüncü tatil)", (Holidays.on(Date.civil(2017, 9, 4), [:tr])[0] || {})[:name]
 assert_equal "Kurban Bayramı (dördüncü tatil)", (Holidays.on(Date.civil(2018, 8, 24), [:tr])[0] || {})[:name]
 assert_equal "Kurban Bayramı (dördüncü tatil)", (Holidays.on(Date.civil(2019, 8, 14), [:tr])[0] || {})[:name]
+assert_equal "Kurban Bayramı (dördüncü tatil)", (Holidays.on(Date.civil(2020, 8, 3), [:tr])[0] || {})[:name]
 
   end
 end

data/test/defs/test_defs_us.rb

@@ -87,10 +87,6 @@ assert_equal "Presidents' Day", (Holidays.on(Date.civil(2018, 2, 19), [:us])[0]
 assert_nil (Holidays.on(Date.civil(2018, 3, 5), [:us])[0] || {})[:name]
 assert_nil (Holidays.on(Date.civil(2019, 3, 4), [:us])[0] || {})[:name]
 
-    assert_equal "Casimir Pulaski Day", (Holidays.on(Date.civil(2017, 3, 6), [:us_il])[0] || {})[:name]
-assert_equal "Casimir Pulaski Day", (Holidays.on(Date.civil(2018, 3, 5), [:us_il])[0] || {})[:name]
-assert_equal "Casimir Pulaski Day", (Holidays.on(Date.civil(2019, 3, 4), [:us_il])[0] || {})[:name]
-
     assert_nil (Holidays.on(Date.civil(2017, 3, 7), [:us])[0] || {})[:name]
 assert_nil (Holidays.on(Date.civil(2018, 3, 6), [:us])[0] || {})[:name]
 assert_nil (Holidays.on(Date.civil(2019, 3, 5), [:us])[0] || {})[:name]
@@ -127,7 +123,7 @@ assert_equal "Seward's Day", (Holidays.on(Date.civil(2019, 3, 25), [:us_ak])[0]
 assert_equal "Emancipation Day", (Holidays.on(Date.civil(2022, 4, 15), [:us_dc, :us_ca], [:observed])[0] || {})[:name]
 assert_equal "Emancipation Day", (Holidays.on(Date.civil(2028, 4, 17), [:us_dc, :us_ca], [:observed])[0] || {})[:name]
 
-    assert_equal "Emancipation Day", (Holidays.on(Date.civil(2017, 4, 16), [:us_dc, :us_ca])[0] || {})[:name]
+    assert_equal "Emancipation Day", (Holidays.on(Date.civil(2017, 4, 16), [:us_dc])[0] || {})[:name]
 
     assert_nil (Holidays.on(Date.civil(2017, 4, 17), [:us])[0] || {})[:name]
 assert_nil (Holidays.on(Date.civil(2018, 4, 16), [:us])[0] || {})[:name]
@@ -303,9 +299,9 @@ assert_equal "Nevada Day", (Holidays.on(Date.civil(2019, 10, 25), [:us_nv])[0] |
 assert_nil (Holidays.on(Date.civil(2018, 11, 6), [:us])[0] || {})[:name]
 assert_nil (Holidays.on(Date.civil(2021, 11, 2), [:us])[0] || {})[:name]
 
-    assert_equal "Election Day", (Holidays.on(Date.civil(2017, 11, 7), [:us_de, :us_hi, :us_il, :us_in, :us_mt, :us_nj, :us_ny, :us_pa, :us_ri])[0] || {})[:name]
-assert_equal "Election Day", (Holidays.on(Date.civil(2018, 11, 6), [:us_de, :us_hi, :us_il, :us_in, :us_mt, :us_nj, :us_ny, :us_pa, :us_ri])[0] || {})[:name]
-assert_equal "Election Day", (Holidays.on(Date.civil(2021, 11, 2), [:us_de, :us_hi, :us_il, :us_in, :us_mt, :us_nj, :us_ny, :us_pa, :us_ri])[0] || {})[:name]
+    assert_equal "Election Day", (Holidays.on(Date.civil(2017, 11, 7), [:us_de, :us_hi, :us_in, :us_mt, :us_nj, :us_ny, :us_pa, :us_ri])[0] || {})[:name]
+assert_equal "Election Day", (Holidays.on(Date.civil(2018, 11, 6), [:us_de, :us_hi, :us_in, :us_mt, :us_nj, :us_ny, :us_pa, :us_ri])[0] || {})[:name]
+assert_equal "Election Day", (Holidays.on(Date.civil(2021, 11, 2), [:us_de, :us_hi, :us_in, :us_mt, :us_nj, :us_ny, :us_pa, :us_ri])[0] || {})[:name]
 
     assert_equal "Veterans Day", (Holidays.on(Date.civil(2017, 11, 10), [:us], [:observed])[0] || {})[:name]
 assert_equal "Veterans Day", (Holidays.on(Date.civil(2018, 11, 12), [:us], [:observed])[0] || {})[:name]
@@ -355,9 +351,9 @@ assert_equal "Christmas Eve (Holiday)", (Holidays.on(Date.civil(2028, 12, 22), [
 assert_nil (Holidays.on(Date.civil(2022, 12, 26), [:us])[0] || {})[:name]
 assert_nil (Holidays.on(Date.civil(2027, 12, 27), [:us])[0] || {})[:name]
 
-    assert_equal "Christmas Day", (Holidays.on(Date.civil(2021, 12, 27), [:us], [:observed])[0] || {})[:name]
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2021, 12, 24), [:us], [:observed])[0] || {})[:name]
 assert_equal "Christmas Day", (Holidays.on(Date.civil(2022, 12, 26), [:us], [:observed])[0] || {})[:name]
-assert_equal "Christmas Day", (Holidays.on(Date.civil(2027, 12, 27), [:us], [:observed])[0] || {})[:name]
+assert_equal "Christmas Day", (Holidays.on(Date.civil(2027, 12, 24), [:us], [:observed])[0] || {})[:name]
 
     assert_equal "Christmas Day", (Holidays.on(Date.civil(2017, 12, 25), [:us])[0] || {})[:name]
 

data/test/holidays/core_extensions/test_date.rb

@@ -1,5 +1,6 @@
 require File.expand_path(File.dirname(__FILE__)) + '/../../test_helper'
 
+require 'date'
 require 'holidays/core_extensions/date'
 
 class Date
@@ -114,8 +115,8 @@ class CoreExtensionDateTests < Test::Unit::TestCase
 
   def test_datetime_holiday?
     # in situations with activesupport
-    assert DateTime.now.to_date.holiday?('test') if DateTime.now.respond_to?(:to_date)
-    assert DateTime.now.holiday?('test')
+    assert DateTime.civil(2008, 1, 1).to_date.holiday?('ca')
+    assert DateTime.civil(2008, 1, 1).holiday?('ca')
   end
 
 end

data/test/holidays/definition/context/test_generator.rb

@@ -143,31 +143,25 @@ class GeneratorTests < Test::Unit::TestCase
           :name => "after_year",
           :regions => [:custom_year_range_file],
           :mday => 1,
-          :year_ranges => [{"after" => 2016}]
+          :year_ranges => {:from => 2016}
         },
         {
           :name => "before_year",
           :regions => [:custom_year_range_file],
           :mday => 2,
-          :year_ranges => [{"before" => 2017}]
+          :year_ranges => {:until => 2017}
         },
         {
           :name => "between_year",
           :regions => [:custom_year_range_file],
           :mday => 3,
-          :year_ranges => [{"between" => 2016..2018}]
+          :year_ranges => {:between => 2016..2018 }
         },
         {
           :name => "limited_year",
           :regions => [:custom_year_range_file],
           :mday => 4,
-          :year_ranges => [{"limited" => [2016,2018,2019]}]
-        },
-        {
-          :name => "multiple_conditions",
-          :regions => [:custom_year_range_file],
-          :mday => 5,
-          :year_ranges => [{"before" => 2015}, {"after" => 2017}]
+          :year_ranges => {:limited => [2016,2018,2019]}
         }
       ]
     }
@@ -183,7 +177,7 @@ class GeneratorTests < Test::Unit::TestCase
 
     @test_source_generator.expects(:call).with('test', ['test/data/test_custom_year_range_holiday_defs.yaml'], ['parsed tests']).returns('test source')
 
-    @module_source_generator.expects(:call).with("test", ["test/data/test_custom_year_range_holiday_defs.yaml"], [:custom_year_range_file], ["      6 => [{:mday => 1,  :year_ranges => [{:after => 2016}],:name => \"after_year\", :regions => [:custom_year_range_file]},\n            {:mday => 2,  :year_ranges => [{:before => 2017}],:name => \"before_year\", :regions => [:custom_year_range_file]},\n            {:mday => 3,  :year_ranges => [{:between => 2016..2018}],:name => \"between_year\", :regions => [:custom_year_range_file]},\n            {:mday => 4,  :year_ranges => [{:limited => [2016, 2018, 2019]}],:name => \"limited_year\", :regions => [:custom_year_range_file]},\n            {:mday => 5,  :year_ranges => [{:before => 2015},{:after => 2017}],:name => \"multiple_conditions\", :regions => [:custom_year_range_file]}]"], "").returns('module_source')
+    @module_source_generator.expects(:call).with("test", ["test/data/test_custom_year_range_holiday_defs.yaml"], [:custom_year_range_file], ["      6 => [{:mday => 1, :year_ranges => { :from => 2016 },:name => \"after_year\", :regions => [:custom_year_range_file]},\n            {:mday => 2, :year_ranges => { :until => 2017 },:name => \"before_year\", :regions => [:custom_year_range_file]},\n            {:mday => 3, :year_ranges => { :between => 2016..2018 },:name => \"between_year\", :regions => [:custom_year_range_file]},\n            {:mday => 4, :year_ranges => { :limited => [2016, 2018, 2019] },:name => \"limited_year\", :regions => [:custom_year_range_file]}]"], "").returns('module_source')
 
     regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
     module_src = @generator.generate_definition_source("test", files, regions, rules_by_month, custom_methods, tests)[0]
@@ -229,11 +223,4 @@ class GeneratorTests < Test::Unit::TestCase
 
     assert_equal 'test source', test_src
   end
-
-  #TODO Missing test scenarios. Adding here so I don't forget when I split this
-  #     apart into smaller components.
-  #
-  #     1) If a year_range contains empty entries then we should blow up.
-  #     2) If year_range contains invalid (i.e. too many types per entry) then
-  #        we should blow up
 end

data/test/holidays/definition/repository/test_holidays_by_month.rb

@@ -109,7 +109,7 @@ class HolidaysByMonthRepoTests < Test::Unit::TestCase
     assert_equal(expected, @subject.all)
   end
 
-  def test_add_is_successful_and_updates_regions_to_existing_matching_definitions
+  def test_add_is_successful_if_only_region_is_different_and_updates_regions_to_existing_matching_definitions
     target_holidays = {0 => [:mday => 1, :name => "Test", :regions => [:test2]]}
 
     @subject.add(@existing_holidays_by_month)
@@ -152,4 +152,124 @@ class HolidaysByMonthRepoTests < Test::Unit::TestCase
       @subject.find_by_month(-1)
     end
   end
+
+  def test_add_is_successful_if_only_function_is_different
+    initial_holidays = {0=> [{:mday => 1, :name=>"Test", :regions=>[:test], :function=>"easter(year)", :function_arguments=>[:year]}]}
+
+    @subject.add(initial_holidays)
+
+    second_holidays = {0=> [{:mday => 1, :name=>"Test", :regions=>[:test2], :function=>"orthodox_easter(year)", :function_arguments=>[:year]}]}
+    @subject.add(second_holidays)
+
+    expected = {
+      0 => [
+        {
+          :function=>"easter(year)",
+          :function_arguments=>[:year],
+          :mday=>1,
+          :name=>"Test",
+          :regions=>[:test]
+        },
+        {
+          :function=>"orthodox_easter(year)",
+          :function_arguments=>[:year],
+          :mday=>1,
+          :name=>"Test",
+          :regions=>[:test2]
+        }
+      ]
+    }
+
+    assert_equal(expected, @subject.all)
+  end
+
+  def test_add_is_successful_if_only_function_modifier_is_different
+    initial_holidays = {0=> [{:mday => 1, :name=>"Test", :regions=>[:test], :function=>"easter(year)", :function_modifier=>1, :function_arguments=>[:year]}]}
+
+    @subject.add(initial_holidays)
+
+    second_holidays = {0=> [{:mday => 1, :name=>"Test", :regions=>[:test2], :function=>"easter(year)", :function_modifier=>2, :function_arguments=>[:year]}]}
+    @subject.add(second_holidays)
+
+    expected = {
+      0 => [
+        {
+          :function=>"easter(year)",
+          :function_arguments=>[:year],
+          :function_modifier=>1,
+          :mday=>1,
+          :name=>"Test",
+          :regions=>[:test]
+        },
+        {
+          :function=>"easter(year)",
+          :function_arguments=>[:year],
+          :function_modifier=>2,
+          :mday=>1,
+          :name=>"Test",
+          :regions=>[:test2]
+        }
+      ]
+    }
+
+    assert_equal(expected, @subject.all)
+  end
+
+  def test_add_is_successful_if_only_observed_is_different
+    initial_holidays = {0=> [{:mday => 1, :name=>"Test", :regions=>[:test], :observed=>"to_weekday_if_weekend(year)", :function_arguments=>[:year]}]}
+
+    @subject.add(initial_holidays)
+
+    second_holidays = {0=> [{:mday => 1, :name=>"Test", :regions=>[:test2], :observed =>"to_friday_if_saturday(year)", :function_arguments=>[:year]}]}
+    @subject.add(second_holidays)
+
+    expected = {
+      0 => [
+        {
+          :observed =>"to_weekday_if_weekend(year)",
+          :function_arguments=>[:year],
+          :mday=>1,
+          :name=>"Test",
+          :regions=>[:test]
+        },
+        {
+          :observed =>"to_friday_if_saturday(year)",
+          :function_arguments=>[:year],
+          :mday=>1,
+          :name=>"Test",
+          :regions=>[:test2]
+        }
+      ]
+    }
+
+    assert_equal(expected, @subject.all)
+  end
+
+  def test_add_is_successful_if_only_year_ranges_is_different
+    initial_holidays = {0=> [{:mday => 1, :name=>"Test", :regions=>[:test], :year_ranges => {:from => 1990}}]}
+
+    @subject.add(initial_holidays)
+
+    second_holidays = {0=> [{:mday => 1, :name=>"Test", :regions=>[:test2], :year_ranges => {:until => 2002}}]}
+    @subject.add(second_holidays)
+
+    expected = {
+      0 => [
+        {
+          :mday=>1,
+          :name=>"Test",
+          :regions=>[:test],
+          :year_ranges => {:from => 1990}
+        },
+        {
+          :mday=>1,
+          :name=>"Test",
+          :regions=>[:test2],
+          :year_ranges => {:until => 2002}
+        }
+      ]
+    }
+
+    assert_equal(expected, @subject.all)
+  end
 end

data/test/holidays/finder/rules/test_year_range.rb

@@ -5,7 +5,7 @@ require 'holidays/finder/rules/year_range'
 class FinderRulesYearRangeTests < Test::Unit::TestCase
   def setup
     @year = 2015
-    @year_ranges = [{between: 1996..2002}]
+    @year_ranges = {between: 1996..2002}
     @subject = Holidays::Finder::Rules::YearRange
   end
 
@@ -29,13 +29,13 @@ class FinderRulesYearRangeTests < Test::Unit::TestCase
   end
 
   def test_returns_error_if_year_ranges_contains_only_non_hash
-    @year_ranges = [:test]
+    @year_ranges = :test
     assert_raises ArgumentError do
       @subject.call(@year, @year_ranges)
     end
   end
 
-  def test_returns_error_if_year_ranges_contains_only_empty_hashes
+  def test_returns_error_if_year_ranges_is_empty
     @year_ranges = [{}, {}]
     assert_raises ArgumentError do
       @subject.call(@year, @year_ranges)
@@ -43,128 +43,124 @@ class FinderRulesYearRangeTests < Test::Unit::TestCase
   end
 
   def test_returns_error_if_year_range_contains_a_hash_with_multiple_entries
-    @year_ranges = [{:between => 1996..2002, :after => 2002}]
+    @year_ranges = {:between => 1996..2002, :after => 2002}
     assert_raises ArgumentError do
       @subject.call(@year, @year_ranges)
     end
   end
 
   def test_returns_error_if_year_range_contains_unrecognized_operator
-    @year_ranges = [{:what => 2002}]
+    @year_ranges = {:what => 2002}
     assert_raises ArgumentError do
       @subject.call(@year, @year_ranges)
     end
   end
 
-  def test_returns_error_if_before_operator_and_value_is_not_a_number
-    @year_ranges = [{before: "bad"}]
+  def test_returns_error_if_until_operator_and_value_is_not_a_number
+    @year_ranges = {until: "bad"}
     assert_raises ArgumentError do
       @subject.call(@year, @year_ranges)
     end
   end
 
-  def test_returns_true_if_before_operator_and_target_is_before
-    @year_ranges = [{before: 2000}]
+  def test_returns_true_if_until_operator_and_target_is_until
+    @year_ranges = {until: 2000}
     assert_equal(true, @subject.call(1999, @year_ranges))
   end
 
-  def test_returns_true_if_before_operator_and_target_is_equal
-    @year_ranges = [{before: 2000}]
+  def test_returns_true_if_until_operator_and_target_is_equal
+    @year_ranges = {until: 2000}
     assert_equal(true, @subject.call(2000, @year_ranges))
   end
 
-  def test_returns_false_if_before_operator_and_target_is_after
-    @year_ranges = [{before: 2000}]
+  def test_returns_false_if_until_operator_and_target_is_after
+    @year_ranges = {until: 2000}
     assert_equal(false, @subject.call(2001, @year_ranges))
   end
 
-  def test_returns_error_if_after_operator_with_bad_value
-    @year_ranges = [{after: "bad"}]
+  def test_returns_error_if_from_operator_with_bad_value
+    @year_ranges = {from: "bad"}
     assert_raises ArgumentError do
       @subject.call(@year, @year_ranges)
     end
   end
 
-  def test_returns_false_if_after_operator_and_target_is_before
-    @year_ranges = [{after: 2000}]
+  def test_returns_false_if_from_operator_and_target_is_before
+    @year_ranges = {from: 2000}
     assert_equal(false, @subject.call(1999, @year_ranges))
   end
 
-  def test_returns_true_if_after_operator_and_target_is_equal
-    @year_ranges = [{after: 2000}]
+  def test_returns_true_if_from_operator_and_target_is_equal
+    @year_ranges = {from: 2000}
     assert_equal(true, @subject.call(2000, @year_ranges))
   end
 
-  def test_returns_true_if_after_operator_and_target_is_after
-    @year_ranges = [{after: 2000}]
+  def test_returns_true_if_from_operator_and_target_is_after
+    @year_ranges = {from: 2000}
     assert_equal(true, @subject.call(2001, @year_ranges))
   end
 
   def test_returns_error_if_limited_operator_and_bad_value
-    @year_ranges = [{limited: "bad"}]
+    @year_ranges = {limited: "bad"}
+    assert_raises ArgumentError do
+      @subject.call(@year, @year_ranges)
+    end
+  end
+
+  def test_returns_error_if_limited_operator_with_empty_array
+    @year_ranges = {limited: []}
+    assert_raises ArgumentError do
+      @subject.call(@year, @year_ranges)
+    end
+  end
+
+  def test_returns_error_if_limited_operator_with_array_containing_non_integer_value
+    @year_ranges = {limited: ["bad"]}
     assert_raises ArgumentError do
       @subject.call(@year, @year_ranges)
     end
   end
 
   def test_returns_true_if_limited_operator_and_value_is_number_that_matches_target
-    @year_ranges = [{limited: 2002}]
+    @year_ranges = {limited: [2002]}
     assert_equal(true, @subject.call(2002, @year_ranges))
   end
 
   def test_returns_false_if_limited_operator_and_target_is_not_included
-    @year_ranges = [{limited: [1998,2000]}]
+    @year_ranges = {limited: [1998,2000]}
     assert_equal(false, @subject.call(1997, @year_ranges))
     assert_equal(false, @subject.call(1999, @year_ranges))
     assert_equal(false, @subject.call(2002, @year_ranges))
   end
 
   def test_returns_true_if_limited_operator_and_target_is_included
-    @year_ranges = [{limited: [1998, 2000, 2002]}]
+    @year_ranges = {limited: [1998, 2000, 2002]}
     assert_equal(true, @subject.call(1998, @year_ranges))
     assert_equal(true, @subject.call(2000, @year_ranges))
     assert_equal(true, @subject.call(2002, @year_ranges))
   end
 
   def test_returns_error_if_between_operator_and_value_not_a_range
-    @year_ranges = [{between: 2000}]
+    @year_ranges = {between: 2000}
     assert_raises ArgumentError do
       @subject.call(2003, @year_ranges)
     end
   end
 
   def test_returns_false_if_between_operator_and_target_is_before
-    @year_ranges = [{between: 1998..2002}]
+    @year_ranges = {between: 1998..2002}
     assert_equal(false, @subject.call(1997, @year_ranges))
   end
 
   def test_returns_true_if_between_operator_and_target_is_covered
-    @year_ranges = [{between: 1998..2002}]
+    @year_ranges = {between: 1998..2002}
     assert_equal(true, @subject.call(1998, @year_ranges))
     assert_equal(true, @subject.call(2000, @year_ranges))
     assert_equal(true, @subject.call(2002, @year_ranges))
   end
 
   def test_returns_false_if_between_operator_and_target_is_after
-    @year_ranges = [{between: 1998..2002}]
+    @year_ranges = {between: 1998..2002}
     assert_equal(false, @subject.call(2003, @year_ranges))
   end
-
-  def test_returns_false_multiple_nonmatching_operators
-    @year_ranges = [{between: 1998..2002}, {:after => 2005}]
-    assert_equal(false, @subject.call(2003, @year_ranges))
-
-    @year_ranges = [{before: 1995}, {:limited => [1990, 1991, 1992]}]
-    assert_equal(false, @subject.call(1996, @year_ranges))
-  end
-
-  def test_returns_true_multiple_operators_all_matching
-    @year_ranges = [{between: 1998..2002}, {:limited=> [2000, 2001]}]
-    assert_equal(true, @subject.call(2001, @year_ranges))
-  end
-
-  def test_returns_true_if_multiple_operators_and_only_one_matches
-    @year_ranges = [{before: 2015}, {:after=> 2017}]
-    assert_equal(true, @subject.call(2001, @year_ranges))
-  end
 end