holidays 5.4.0 → 5.5.0

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

@@ -24,30 +24,36 @@ 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(
-                    year, month, h[:mday],
+                    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
-                    month = result.month
-                    mday = result.mday
+                    current_month = result.month
+                    current_day = result.mday
+                  else
+                    current_month = nil
+                    current_day = nil
                   end
                 else
-                  mday = h[:mday] || @day_of_month_calculator.call(year, month, h[:week], h[:wday])
+                  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, month, mday)
+                  date = Date.civil(year, current_month, current_day)
                 rescue; next; end
 
                 if observed_set?(options) && h[:observed]
                   date = @custom_method_processor.call(
-                    date.year, date.month, date.day,
+                    build_custom_method_input(date.year, date.month, date.day, regions),
                     h[:observed],
                     [:date],
                   )
@@ -64,6 +70,8 @@ module Holidays
         private
 
         def validate!(dates_driver)
+          #FIXME This should give some kind of error message that indicates the
+          #      problem.
           raise ArgumentError if dates_driver.nil? || dates_driver.empty?
 
           dates_driver.each do |year, months|
@@ -80,6 +88,15 @@ module Holidays
         def observed_set?(options)
           options && options.include?(:observed) == true
         end
+
+        def build_custom_method_input(year, month, day, regions)
+          {
+            year: year,
+            month: month,
+            day: day,
+            region: regions.first, #FIXME This isn't ideal but will work for our current use case...
+          }
+        end
       end
     end
   end

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

@@ -11,7 +11,7 @@ module Holidays
             requested = requested.collect do |r|
               if r.to_s =~ /_/
                 chunks = r.to_s.split('_')
-                
+
                 chunks.length.downto(1).map do |num|
                   chunks[0..-num].join('_').to_sym
                 end

data/lib/holidays/load_all_definitions.rb

@@ -1,4 +1,5 @@
 module Holidays
+  #TODO This file should be renamed. It's no longer about definitions, really.
   class LoadAllDefinitions
     class << self
       def call
@@ -20,9 +21,13 @@ module Holidays
           "calculate_day_of_month(year, month, day, wday)" => day_of_month_calculator.method(:call).to_proc,
           "to_weekday_if_boxing_weekend_from_year_or_to_tuesday_if_monday(year)" => weekend_modifier.method(:to_weekday_if_boxing_weekend_from_year_or_to_tuesday_if_monday).to_proc,
           "to_tuesday_if_sunday_or_monday_if_saturday(date)" => weekend_modifier.method(:to_tuesday_if_sunday_or_monday_if_saturday).to_proc,
+          "lunar_to_solar(year, month, day, region)" => lunar_date.method(:to_solar).to_proc, 
         }
 
         Factory::Definition.custom_methods_repository.add(global_methods)
+
+        static_regions_definition = "#{Holidays::DEFINITIONS_PATH}/REGIONS.rb"
+        require static_regions_definition
       end
 
       private
@@ -42,6 +47,10 @@ module Holidays
       def day_of_month_calculator
         Factory::DateCalculator.day_of_month_calculator
       end
+
+      def lunar_date
+        Factory::DateCalculator.lunar_date
+      end
     end
   end
 end

data/lib/holidays/version.rb

@@ -1,3 +1,3 @@
 module Holidays
-  VERSION = '5.4.0'
+  VERSION = '5.5.0'
 end

data/test/data/test_invalid_region.rb

@@ -0,0 +1,15 @@
+module Holidays
+  module BAD_REGION_NAME
+    def self.defined_regions
+      [:test_region]
+    end
+
+    def self.holidays_by_month
+      {}
+    end
+
+    def self.custom_methods
+      {}
+    end
+  end
+end

data/test/data/test_region.rb

@@ -0,0 +1,15 @@
+module Holidays
+  module TEST_REGION
+    def self.defined_regions
+      [:test_region, :test_region2]
+    end
+
+    def self.holidays_by_month
+      {}
+    end
+
+    def self.custom_methods
+      {}
+    end
+  end
+end

data/test/defs/test_defs_au.rb

@@ -139,10 +139,20 @@ assert_equal "Christmas Day", Date.civil(2016, 12, 27).holidays(:au_vic, :observ
 assert_equal "Christmas Day", Date.civil(2016, 12, 27).holidays(:au_nt, :observed)[0][:name]
 
 # NEW YEAR'S DAY - observed on both 1st and 2nd of Jan for 2017
-regions = [:au_qld, :au_nsw, :au_act, :au_vic, :au_tas, :au_sa, :au_wa, :au_nt]
+regions = [:au, :au_qld, :au_nsw, :au_act, :au_vic, :au_sa, :au_wa, :au_nt]
 regions.each do |r|
   assert_equal "New Year's Day", Date.civil(2017, 1, 1).holidays(r)[0][:name]
   assert_equal "New Year's Day", Date.civil(2017, 1, 2).holidays(r, :observed)[0][:name]
 end
+
+# Tasmania is different
+#FIXME This commented test is valid but the current code in the ruby repo won't allow it
+#      to work. We need to discuss potential solutions but in the meantime I'm taking it out.
+#assert_equal [], Date.civil(2017,1,1).holidays(:au_tas)
+assert_equal "New Year's Day", Date.civil(2017, 1, 2).holidays(:au_tas)[0][:name]
+
+#QLD now celebrates Easter Sunday
+assert_equal "Easter Sunday", Date.civil(2017, 4, 16).holidays(:au_qld)[0][:name]
+
   end
 end

data/test/defs/test_defs_kr.rb

@@ -7,18 +7,21 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class KrDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_kr
-{Date.civil(2016,2,8) => "Korean New Year",
- Date.civil(2016,5,14) => "Buddah\'s Birthday",
- Date.civil(2016,9,12) => "Korean Thanksgiving",
- Date.civil(2016,1,1) => "New Year\'s Day",
- Date.civil(2016,3,1) => "Independence Movement Day",
- Date.civil(2016,5,5) => "Children\'s Day",
- Date.civil(2016,6,6) => "Memorial Day",
- Date.civil(2016,7,17) => "Constitution Day",
- Date.civil(2016,8,15) => "Liberation Day",
- Date.civil(2016,10,3) => "National Foundation Day",
- Date.civil(2016,10,9) => "Hangul Day",
- Date.civil(2016,12,25) => "Christmas Day"}.each do |date, name|
+{Date.civil(2016,2,8) => "설날",
+ Date.civil(2017,1,29) => "설날 연휴",
+ Date.civil(2016,5,14) => "석가탄신일",
+ Date.civil(2016,9,15) => "추석",
+ Date.civil(2016,1,1) => "신정",
+ Date.civil(2016,3,1) => "3·1절",
+ Date.civil(2016,5,5) => "어린이날",
+ Date.civil(2016,6,6) => "현충일",
+ Date.civil(2016,7,17) => "제헌절",
+ Date.civil(2016,8,15) => "광복절",
+ Date.civil(2016,10,3) => "개천절",
+ Date.civil(2016,10,9) => "한글날",
+ Date.civil(2016,12,25) => "크리스마스",
+ Date.civil(2017,1,28) => "설날"
+}.each do |date, name|
   assert_equal name, (Holidays.on(date, :kr, :informal)[0] || {})[:name]
 end
 

data/test/defs/test_defs_nyse.rb

@@ -19,5 +19,10 @@ class NyseDefinitionTests < Test::Unit::TestCase  # :nodoc:
   assert_equal name, (Holidays.on(date, :nyse)[0] || {})[:name]
 end
 
+# Test observed New Year
+[Date.civil(2017,1,2), Date.civil(2012,1,2), Date.civil(2011,1,1), Date.civil(2006,1,2)].each do |date|
+  assert_equal 'New Year\'s Day', (Holidays.on(date, :nyse, :observed)[0] || {})[:name]
+end
+
   end
 end

data/test/defs/test_defs_vi.rb

@@ -7,10 +7,12 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class ViDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_vi
-{Date.civil(2014,1,1) => 'New Year',
- Date.civil(2014,4,30) => 'Liberation Day',
- Date.civil(2014,5,1) => "International Workers' Day",
- Date.civil(2014,9,2) => 'National Day'}.each do |date, name|
+{Date.civil(2014,1,1) => 'Tết dương lịch',
+ Date.civil(2014,4,30) => 'Ngày Giải phóng miền Nam, thống nhất đất nước',
+ Date.civil(2014,5,1) => "Ngày Quốc tế Lao động",
+ Date.civil(2014,9,2) => 'Quốc khánh',
+ Date.civil(2017,4,6) => "Giỗ tổ Hùng Vương",
+ Date.civil(2018,3,27) => "Giỗ tổ Hùng Vương"}.each do |date, name|
   assert_equal name, (Holidays.on(date, :vi)[0] || {})[:name]
 end
 

data/test/holidays/date_calculator/test_lunar_date.rb

@@ -0,0 +1,89 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../../test_helper'
+
+require 'holidays/date_calculator/lunar_date.rb'
+
+class LunarHolidaysCalculatorTests < Test::Unit::TestCase
+  def setup
+    @subject = Holidays::DateCalculator::LunarDate.new
+  end
+
+  def test_korean_new_year_returns_expected_results
+    assert_equal '1994-02-10', @subject.to_solar(1994,1,1, :kr).to_s
+    assert_equal '1995-01-31', @subject.to_solar(1995,1,1, :kr).to_s
+    assert_equal '1999-02-16', @subject.to_solar(1999,1,1, :kr).to_s
+    assert_equal '2000-02-05', @subject.to_solar(2000,1,1, :kr).to_s
+    assert_equal '2001-01-24', @subject.to_solar(2001,1,1, :kr).to_s
+    assert_equal '2002-02-12', @subject.to_solar(2002,1,1, :kr).to_s
+    assert_equal '2008-02-07', @subject.to_solar(2008,1,1, :kr).to_s
+    assert_equal '2009-01-26', @subject.to_solar(2009,1,1, :kr).to_s
+    assert_equal '2010-02-14', @subject.to_solar(2010,1,1, :kr).to_s
+    assert_equal '2011-02-03', @subject.to_solar(2011,1,1, :kr).to_s
+    assert_equal '2012-01-23', @subject.to_solar(2012,1,1, :kr).to_s
+    assert_equal '2013-02-10', @subject.to_solar(2013,1,1, :kr).to_s
+    assert_equal '2014-01-31', @subject.to_solar(2014,1,1, :kr).to_s
+    assert_equal '2015-02-19', @subject.to_solar(2015,1,1, :kr).to_s
+    assert_equal '2016-02-08', @subject.to_solar(2016,1,1, :kr).to_s
+    assert_equal '2017-01-28', @subject.to_solar(2017,1,1, :kr).to_s
+    assert_equal '2018-02-16', @subject.to_solar(2018,1,1, :kr).to_s
+    assert_equal '2019-02-05', @subject.to_solar(2019,1,1, :kr).to_s
+    assert_equal '2020-01-25', @subject.to_solar(2020,1,1, :kr).to_s
+    assert_equal '2022-02-01', @subject.to_solar(2022,1,1, :kr).to_s
+    assert_equal '2025-01-29', @subject.to_solar(2025,1,1, :kr).to_s
+  end
+
+  def test_buddahs_birthday_returns_expected_results
+    assert_equal '1994-05-18', @subject.to_solar(1994,4,8, :kr).to_s
+    assert_equal '1995-05-07', @subject.to_solar(1995,4,8, :kr).to_s
+    assert_equal '1999-05-22', @subject.to_solar(1999,4,8, :kr).to_s
+    assert_equal '2000-05-11', @subject.to_solar(2000,4,8, :kr).to_s
+    assert_equal '2001-05-01', @subject.to_solar(2001,4,8, :kr).to_s
+    assert_equal '2002-05-19', @subject.to_solar(2002,4,8, :kr).to_s
+    assert_equal '2008-05-12', @subject.to_solar(2008,4,8, :kr).to_s
+    assert_equal '2009-05-02', @subject.to_solar(2009,4,8, :kr).to_s
+    assert_equal '2010-05-21', @subject.to_solar(2010,4,8, :kr).to_s
+    assert_equal '2011-05-10', @subject.to_solar(2011,4,8, :kr).to_s
+    assert_equal '2012-05-28', @subject.to_solar(2012,4,8, :kr).to_s
+    assert_equal '2013-05-17', @subject.to_solar(2013,4,8, :kr).to_s
+    assert_equal '2014-05-06', @subject.to_solar(2014,4,8, :kr).to_s
+    assert_equal '2015-05-25', @subject.to_solar(2015,4,8, :kr).to_s
+    assert_equal '2016-05-14', @subject.to_solar(2016,4,8, :kr).to_s
+    assert_equal '2017-05-03', @subject.to_solar(2017,4,8, :kr).to_s
+    assert_equal '2018-05-22', @subject.to_solar(2018,4,8, :kr).to_s
+    assert_equal '2019-05-12', @subject.to_solar(2019,4,8, :kr).to_s
+    assert_equal '2020-04-30', @subject.to_solar(2020,4,8, :kr).to_s
+    assert_equal '2022-05-08', @subject.to_solar(2022,4,8, :kr).to_s
+    assert_equal '2025-05-05', @subject.to_solar(2025,4,8, :kr).to_s
+  end
+
+  def test_korean_thanksgiving_returns_expected_results
+    assert_equal '1994-09-20', @subject.to_solar(1994,8,15, :kr).to_s
+    assert_equal '1995-09-09', @subject.to_solar(1995,8,15, :kr).to_s
+    assert_equal '1999-09-24', @subject.to_solar(1999,8,15, :kr).to_s
+    assert_equal '2000-09-12', @subject.to_solar(2000,8,15, :kr).to_s
+    assert_equal '2001-10-01', @subject.to_solar(2001,8,15, :kr).to_s
+    assert_equal '2002-09-21', @subject.to_solar(2002,8,15, :kr).to_s
+    assert_equal '2008-09-14', @subject.to_solar(2008,8,15, :kr).to_s
+    assert_equal '2009-10-03', @subject.to_solar(2009,8,15, :kr).to_s
+    assert_equal '2010-09-22', @subject.to_solar(2010,8,15, :kr).to_s
+    assert_equal '2011-09-12', @subject.to_solar(2011,8,15, :kr).to_s
+    assert_equal '2012-09-30', @subject.to_solar(2012,8,15, :kr).to_s
+    assert_equal '2013-09-19', @subject.to_solar(2013,8,15, :kr).to_s
+    assert_equal '2014-09-08', @subject.to_solar(2014,8,15, :kr).to_s
+    assert_equal '2015-09-27', @subject.to_solar(2015,8,15, :kr).to_s
+    assert_equal '2016-09-15', @subject.to_solar(2016,8,15, :kr).to_s
+    assert_equal '2017-10-04', @subject.to_solar(2017,8,15, :kr).to_s
+    assert_equal '2018-09-24', @subject.to_solar(2018,8,15, :kr).to_s
+    assert_equal '2019-09-13', @subject.to_solar(2019,8,15, :kr).to_s
+    assert_equal '2020-10-01', @subject.to_solar(2020,8,15, :kr).to_s
+    assert_equal '2022-09-10', @subject.to_solar(2022,8,15, :kr).to_s
+    assert_equal '2025-10-06', @subject.to_solar(2025,8,15, :kr).to_s
+  end
+
+  def test_hung_kings_festival_returns_expected_results
+    assert_equal '2014-04-09', @subject.to_solar(2014,3,10, :vi).to_s
+    assert_equal '2015-04-28', @subject.to_solar(2015,3,10, :vi).to_s
+    assert_equal '2016-04-16', @subject.to_solar(2016,3,10, :vi).to_s
+    assert_equal '2017-04-06', @subject.to_solar(2017,3,10, :vi).to_s
+    assert_equal '2018-03-27', @subject.to_solar(2018,3,10, :vi).to_s
+  end
+end

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

@@ -7,6 +7,9 @@ class FunctionProcessorTests < Test::Unit::TestCase
     @year = 2016
     @month = 1
     @day = 15
+    @region = :test
+    @input = { year: @year, month: @month, day: @day, region: @region }
+
     @func_id = "custom_function_id"
     @func_args = [:year]
     @func_modifier = 1
@@ -27,17 +30,17 @@ class FunctionProcessorTests < Test::Unit::TestCase
 
   def test_no_function_arguments_returns_error
     assert_raises ArgumentError do
-      @subject.call(@year, @month, @day, @func_id, nil, @func_modifier)
+      @subject.call(@input, @func_id, nil, @func_modifier)
     end
 
     assert_raises ArgumentError do
-      @subject.call(@year, @month, @day, @func_id, [], @func_modifier)
+      @subject.call(@input, @func_id, [], @func_modifier)
     end
   end
 
   def test_unknown_function_argument_returns_error
     assert_raises ArgumentError do
-      @subject.call(@year, @month, @day, @func_id, [:something], @func_modifier)
+      @subject.call(@input, @func_id, [:something], @func_modifier)
     end
   end
 
@@ -46,7 +49,7 @@ class FunctionProcessorTests < Test::Unit::TestCase
     @custom_methods_repo.expects(:find).at_most_once.with(bad_id).returns(nil)
 
     assert_raises Holidays::FunctionNotFound do
-      @subject.call(@year, @month, @day, bad_id, @func_args, @func_modifier)
+      @subject.call(@input, bad_id, @func_args, @func_modifier)
     end
   end
 
@@ -54,21 +57,21 @@ class FunctionProcessorTests < Test::Unit::TestCase
     @func_args = [:year]
     @proc_result_cache_repo.expects(:lookup).at_most_once.with(@custom_func, @year).returns(Date.civil(2016, 1, 15))
 
-    @subject.call(@year, @month, @day, @func_id, @func_args, @func_modifier)
+    @subject.call(@input, @func_id, @func_args, @func_modifier)
   end
 
   def test_month_arg_passed_to_func_call
     @func_args = [:month]
     @proc_result_cache_repo.expects(:lookup).at_most_once.with(@custom_func, @month).returns(Date.civil(2016, 1, 15))
 
-    @subject.call(@year, @month, @day, @func_id, @func_args, @func_modifier)
+    @subject.call(@input, @func_id, @func_args, @func_modifier)
   end
 
   def test_day_arg_passed_to_func_call
     @func_args = [:day]
     @proc_result_cache_repo.expects(:lookup).at_most_once.with(@custom_func, @day).returns(Date.civil(2016, 1, 15))
 
-    @subject.call(@year, @month, @day, @func_id, @func_args, @func_modifier)
+    @subject.call(@input, @func_id, @func_args, @func_modifier)
   end
 
   def test_date_arg_passed_to_func_call
@@ -76,28 +79,35 @@ class FunctionProcessorTests < Test::Unit::TestCase
     date = Date.civil(@year, @month, @day)
     @proc_result_cache_repo.expects(:lookup).at_most_once.with(@custom_func, date).returns(date)
 
-    @subject.call(@year, @month, @day, @func_id, @func_args, @func_modifier)
+    @subject.call(@input, @func_id, @func_args, @func_modifier)
   end
 
   def test_multiple_args_passed_to_func_call
     @func_args = [:month, :day]
     @proc_result_cache_repo.expects(:lookup).at_most_once.with(@custom_func, @month, @day).returns(Date.civil(2016, 1, 15))
 
-    @subject.call(@year, @month, @day, @func_id, @func_args, @func_modifier)
+    @subject.call(@input, @func_id, @func_args, @func_modifier)
+  end
+
+  def test_multiple_args_with_region_passed_to_func_call
+    @func_args = [:month, :day, :region]
+    @proc_result_cache_repo.expects(:lookup).at_most_once.with(@custom_func, @month, @day, @region).returns(Date.civil(2016, 1, 15))
+
+    @subject.call(@input, @func_id, @func_args, @func_modifier)
   end
 
   def test_call_returns_error_if_target_function_returns_unknown_value
     @proc_result_cache_repo.expects(:lookup).at_most_once.with(@custom_func, @year).returns("bad-response")
 
     assert_raises Holidays::InvalidFunctionResponse do
-      @subject.call(@year, @month, @day, @func_id, @func_args, @func_modifier)
+      @subject.call(@input, @func_id, @func_args, @func_modifier)
     end
   end
 
   def test_call_returns_date_with_modifier
     @proc_result_cache_repo.expects(:lookup).at_most_once.with(@custom_func, @year).returns(Date.civil(2016, 3, 10))
 
-    result = @subject.call(@year, @month, @day, @func_id, @func_args, @func_modifier)
+    result = @subject.call(@input, @func_id, @func_args, @func_modifier)
 
     assert_equal(Date.civil(2016, 3, 10) + @func_modifier, result)
   end
@@ -105,7 +115,7 @@ class FunctionProcessorTests < Test::Unit::TestCase
   def test_call_returns_date_no_modifier
     @proc_result_cache_repo.expects(:lookup).at_most_once.with(@custom_func, @year).returns(Date.civil(2016, 3, 10))
 
-    result = @subject.call(@year, @month, @day, @func_id, @func_args, nil)
+    result = @subject.call(@input, @func_id, @func_args, nil)
 
     assert_equal(Date.civil(2016, 3, 10), result)
   end
@@ -114,7 +124,7 @@ class FunctionProcessorTests < Test::Unit::TestCase
     @proc_result_cache_repo.expects(:lookup).at_most_once.with(@custom_func, @year).returns("bad")
 
     assert_raises Holidays::InvalidFunctionResponse do
-      @subject.call(@year, @month, @day, @func_id, @func_args, nil)
+      @subject.call(@input, @func_id, @func_args, nil)
     end
   end
 
@@ -122,54 +132,68 @@ class FunctionProcessorTests < Test::Unit::TestCase
     @proc_result_cache_repo.expects(:lookup).at_most_once.with(@custom_func, @year).returns(32)
 
     assert_raises Holidays::InvalidFunctionResponse do
-      @subject.call(@year, @month, @day, @func_id, @func_args, nil)
+      @subject.call(@input, @func_id, @func_args, nil)
     end
   end
 
   def test_call_returns_integer_returns_modified_date
     @proc_result_cache_repo.expects(:lookup).at_most_once.with(@custom_func, @year).returns(7)
 
-    result = @subject.call(@year, @month, @day, @func_id, @func_args, nil)
+    result = @subject.call(@input, @func_id, @func_args, nil)
 
     assert_equal(Date.civil(2016, 1, 7), result)
   end
 
   def test_func_modifier_not_required
-    result = @subject.call(@year, @month, @day, @func_id, @func_args)
+    result = @subject.call(@input, @func_id, @func_args)
     assert_equal(Date.civil(2016, 1, 15), result)
   end
 
   def test_validate_returns_error_if_year_not_a_number
+    @input[:year] = 'bad-year'
     assert_raises ArgumentError do
-      @subject.call("bad-year", @month, @day, @func_id, @func_args)
+      @subject.call(@input, @func_id, @func_args)
     end
   end
 
   def test_validate_returns_error_if_month_not_valid
+    @input[:month] = 'bad-month'
     assert_raises ArgumentError do
-      @subject.call(@year, "bad-month", @day, @func_id, [:month])
+      @subject.call(@input, @func_id, [:month])
     end
 
+    @input[:month] = -1
     assert_raises ArgumentError do
-      @subject.call(@year, -1, @day, @func_id, [:month])
+      @subject.call(@input, @func_id, [:month])
     end
 
+    @input[:month] = 13
     assert_raises ArgumentError do
-      @subject.call(@year, 13, @day, @func_id, [:month])
+      @subject.call(@input, @func_id, [:month])
     end
   end
 
   def test_validate_returns_error_if_day_is_not_valid
+    @input[:day] = 0
     assert_raises ArgumentError do
-      @subject.call(@year, @month, 0, @func_id, [:day])
+      @subject.call(@input, @func_id, [:day])
     end
 
+    @input[:day] = 32
     assert_raises ArgumentError do
-      @subject.call(@year, @month, 32, @func_id, [:day])
+      @subject.call(@input, @func_id, [:day])
     end
 
+    @input[:day] = 'bad-day'
+    assert_raises ArgumentError do
+      @subject.call(@input, @func_id, [:day])
+    end
+  end
+
+  def test_validate_returns_error_if_region_not_a_symbol
+    @input[:region] = 'blah'
     assert_raises ArgumentError do
-      @subject.call(@year, @month, "bad-day", @func_id, [:day])
+      @subject.call(@input, @func_id, [:region])
     end
   end
 end