holidays 4.6.0 → 4.7.0

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

@@ -37,7 +37,7 @@ class GeneratorTests < Test::Unit::TestCase
     files = ['test/data/test_single_custom_holiday_defs.yaml']
     @custom_method_parser.expects(:call).with(nil).returns({})
 
-    regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
+    regions = @generator.parse_definition_files(files)[0]
 
     assert_equal [:custom_single_file], regions
   end
@@ -46,7 +46,7 @@ class GeneratorTests < Test::Unit::TestCase
     files = ['test/data/test_single_custom_holiday_defs.yaml']
     @custom_method_parser.expects(:call).with(nil).returns({})
 
-    regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
+    rules_by_month = @generator.parse_definition_files(files)[1]
 
     expected_rules_by_month = {
       6 => [
@@ -65,7 +65,7 @@ class GeneratorTests < Test::Unit::TestCase
     files = ['test/data/test_single_custom_holiday_defs.yaml']
     @custom_method_parser.expects(:call).with(nil).returns({})
 
-    regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
+    custom_methods = @generator.parse_definition_files(files)[2]
 
     expected_custom_methods = {}
     assert_equal expected_custom_methods, custom_methods
@@ -75,7 +75,7 @@ class GeneratorTests < Test::Unit::TestCase
     files = ['test/data/test_single_custom_holiday_defs.yaml']
     @custom_method_parser.expects(:call).with(nil).returns({})
 
-    regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
+    tests = @generator.parse_definition_files(files)[3]
 
     expected_tests = [[
         "{Date.civil(2013,6,20) => 'Company Founding'}.each do |date, name|\n  assert_equal name, (Holidays.on(date, :custom_single_file)[0] || {})[:name]\nend"
@@ -89,7 +89,7 @@ class GeneratorTests < Test::Unit::TestCase
     @custom_method_parser.expects(:call).with(nil).returns({})
 
     regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
-    module_src, test_src = @generator.generate_definition_source("test", files, regions, rules_by_month, custom_methods, tests)
+    module_src = @generator.generate_definition_source("test", files, regions, rules_by_month, custom_methods, tests)[0]
 
     expected_module_src = "# encoding: utf-8\nmodule Holidays\n  # This file is generated by the Ruby Holidays gem.\n  #\n  # Definitions loaded: test/data/test_single_custom_holiday_defs.yaml\n  #\n  # To use the definitions in this file, load it right after you load the\n  # Holiday gem:\n  #\n  #   require 'holidays'\n  #   require 'generated_definitions/test'\n  #\n  # All the definitions are available at https://github.com/holidays/holidays\n  module TEST # :nodoc:\n    def self.defined_regions\n      [:custom_single_file]\n    end\n\n    def self.holidays_by_month\n      {\n              6 => [{:mday => 20, :name => \"Company Founding\", :regions => [:custom_single_file]}]\n      }\n    end\n\n    def self.custom_methods\n      {\n        \n      }\n    end\n  end\nend\n"
 
@@ -101,7 +101,7 @@ class GeneratorTests < Test::Unit::TestCase
     @custom_method_parser.expects(:call).with(nil).returns({})
 
     regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
-    module_src, test_src = @generator.generate_definition_source("test", files, regions, rules_by_month, custom_methods, tests)
+    test_src = @generator.generate_definition_source("test", files, regions, rules_by_month, custom_methods, tests)[1]
 
     expected_test_src = "# encoding: utf-8\nrequire File.expand_path(File.dirname(__FILE__)) + '/../test_helper'\n\n# This file is generated by the Ruby Holiday gem.\n#\n# Definitions loaded: test/data/test_single_custom_holiday_defs.yaml\nclass TestDefinitionTests < Test::Unit::TestCase  # :nodoc:\n\n  def test_test\n{Date.civil(2013,6,20) => 'Company Founding'}.each do |date, name|\n  assert_equal name, (Holidays.on(date, :custom_single_file)[0] || {})[:name]\nend\n  end\nend\n"
 
@@ -112,7 +112,7 @@ class GeneratorTests < Test::Unit::TestCase
     files = ['test/data/test_custom_year_range_holiday_defs.yaml']
     @custom_method_parser.expects(:call).with(nil).returns({})
 
-    regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
+    rules_by_month = @generator.parse_definition_files(files)[1]
 
     expected_rules_by_month = {
       6 => [
@@ -132,7 +132,7 @@ class GeneratorTests < Test::Unit::TestCase
           :name => "between_year",
           :regions => [:custom_year_range_file],
           :mday => 3,
-          :year_ranges => [{"between" => "2016..2018"}]
+          :year_ranges => [{"between" => 2016..2018}]
         },
         {
           :name => "limited_year",
@@ -157,7 +157,7 @@ class GeneratorTests < Test::Unit::TestCase
     @custom_method_parser.expects(:call).with(nil).returns({})
 
     regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
-    module_src, test_src = @generator.generate_definition_source("test", files, regions, rules_by_month, custom_methods, tests)
+    module_src = @generator.generate_definition_source("test", files, regions, rules_by_month, custom_methods, tests)[0]
     expected_module_src = "# encoding: utf-8\nmodule Holidays\n  # This file is generated by the Ruby Holidays gem.\n  #\n  # Definitions loaded: test/data/test_custom_year_range_holiday_defs.yaml\n  #\n  # To use the definitions in this file, load it right after you load the\n  # Holiday gem:\n  #\n  #   require 'holidays'\n  #   require 'generated_definitions/test'\n  #\n  # All the definitions are available at https://github.com/holidays/holidays\n  module TEST # :nodoc:\n    def self.defined_regions\n      [:custom_year_range_file]\n    end\n\n    def self.holidays_by_month\n      {\n              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]}]\n      }\n    end\n\n    def self.custom_methods\n      {\n        \n      }\n    end\n  end\nend\n"
 
     assert_equal expected_module_src, module_src
@@ -171,7 +171,7 @@ class GeneratorTests < Test::Unit::TestCase
     @custom_method_source_decorator.expects(:call).once.with(@parsed_custom_method).returns("\"custom_method(year, month)\" => Proc.new { |year, month|\nsource_stuff\n}")
 
     regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
-    module_src, test_src = @generator.generate_definition_source("test", files, regions, rules_by_month, custom_methods, tests)
+    module_src = @generator.generate_definition_source("test", files, regions, rules_by_month, custom_methods, tests)[0]
 
     expected_module_src = "# encoding: utf-8\nmodule Holidays\n  # This file is generated by the Ruby Holidays gem.\n  #\n  # Definitions loaded: test/data/test_single_custom_holiday_with_custom_procs.yaml\n  #\n  # To use the definitions in this file, load it right after you load the\n  # Holiday gem:\n  #\n  #   require 'holidays'\n  #   require 'generated_definitions/test'\n  #\n  # All the definitions are available at https://github.com/holidays/holidays\n  module TEST # :nodoc:\n    def self.defined_regions\n      [:custom_single_file]\n    end\n\n    def self.holidays_by_month\n      {\n              0 => [{:function => \"custom_method(year, month)\", :function_arguments => [:year, :month], :function_modifier => 5, :name => \"Custom Holiday\", :regions => [:custom_single_file]}],\n      6 => [{:mday => 20, :name => \"Company Founding\", :regions => [:custom_single_file]}]\n      }\n    end\n\n    def self.custom_methods\n      {\n        \"custom_method(year, month)\" => Proc.new { |year, month|\nsource_stuff\n},\n\n\n      }\n    end\n  end\nend\n"
 
@@ -186,10 +186,17 @@ class GeneratorTests < Test::Unit::TestCase
     @custom_method_source_decorator.expects(:call).once.with("method").returns("\"custom_method(year, month)\" => Proc.new { |year, month|\nsource_stuff\n}")
 
     regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
-    module_src, test_src = @generator.generate_definition_source("test", files, regions, rules_by_month, custom_methods, tests)
+    test_src = @generator.generate_definition_source("test", files, regions, rules_by_month, custom_methods, tests)[1]
 
     expected_test_src = "# encoding: utf-8\nrequire File.expand_path(File.dirname(__FILE__)) + '/../test_helper'\n\n# This file is generated by the Ruby Holiday gem.\n#\n# Definitions loaded: test/data/test_single_custom_holiday_with_custom_procs.yaml\nclass TestDefinitionTests < Test::Unit::TestCase  # :nodoc:\n\n  def test_test\n{Date.civil(2013,6,20) => 'Company Founding'}.each do |date, name|\n  assert_equal name, (Holidays.on(date, :custom_single_file)[0] || {})[:name]\nend\n\n{Date.civil(2015, 1, 1) => 'Custom Holiday'}.each do |date, name|\n  assert_equal name, (Holidays.on(date, :custom_single_file)[0] || {}[:name]\nend\n\n  end\nend\n"
 
     assert_equal expected_test_src, 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/parser/test_custom_method.rb

@@ -63,7 +63,7 @@ class ParserCustomMethodTests < Test::Unit::TestCase
     @validator.expects(:valid?).with({:name => "custom_method", :arguments => "year", :source => "d = Date.civil(year, 1, 1)\nd + 2\n"}).returns(false)
 
     assert_raises ArgumentError do
-      result = @parser.call(input)
+      @parser.call(input)
     end
   end
 
@@ -73,7 +73,7 @@ class ParserCustomMethodTests < Test::Unit::TestCase
     @validator.expects(:valid?).with({:name => "second_method", :arguments => "month", :source => "source"}).returns(false)
 
     assert_raises ArgumentError do
-      result = @parser.call(input)
+      @parser.call(input)
     end
   end
 end

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

@@ -76,7 +76,7 @@ class ProcResultCacheRepoTests < Test::Unit::TestCase
       @subject.lookup(function, function_argument)
     end
 
-    funtion_argument = Proc.new { |arg1| "arg1" + "something"}
+    function_argument = Proc.new { |arg1| "arg1" + "something"}
     assert_raise ArgumentError do
       @subject.lookup(function, function_argument)
     end

data/test/holidays/{test_date_calculator_factory.rb → factory/test_date_calculator.rb}

@@ -1,10 +1,10 @@
-require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
+require File.expand_path(File.dirname(__FILE__)) + '/../../test_helper'
 
-require 'holidays/date_calculator_factory'
+require 'holidays/factory/date_calculator'
 
 class DateCalculatorFactoryTests < Test::Unit::TestCase
   def setup
-    @subject = Holidays::DateCalculatorFactory
+    @subject = Holidays::Factory::DateCalculator
   end
 
   def test_day_of_month_calculator

data/test/holidays/factory/test_definition.rb

@@ -0,0 +1,53 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../../test_helper'
+
+require 'holidays/factory/definition'
+
+class DefinitionFactoryTests < Test::Unit::TestCase
+  def test_definition_file_parser
+    assert Holidays::Factory::Definition.file_parser.is_a?(Holidays::Definition::Context::Generator)
+  end
+
+  def test_definition_source_generator
+    assert Holidays::Factory::Definition.source_generator.is_a?(Holidays::Definition::Context::Generator)
+  end
+
+  def test_definition_merger
+    assert Holidays::Factory::Definition.merger.is_a?(Holidays::Definition::Context::Merger)
+  end
+
+  def test_holidays_by_month_repository
+    assert Holidays::Factory::Definition.holidays_by_month_repository.is_a?(Holidays::Definition::Repository::HolidaysByMonth)
+  end
+
+  def test_regions_repository
+    assert Holidays::Factory::Definition.regions_repository.is_a?(Holidays::Definition::Repository::Regions)
+  end
+
+  def test_cache_repository
+    assert Holidays::Factory::Definition.cache_repository.is_a?(Holidays::Definition::Repository::Cache)
+  end
+
+  def test_proc_result_cache_repository
+    assert Holidays::Factory::Definition.proc_result_cache_repository.is_a?(Holidays::Definition::Repository::ProcResultCache)
+  end
+
+  def test_custom_method_parser
+    assert Holidays::Factory::Definition.custom_method_parser.is_a?(Holidays::Definition::Parser::CustomMethod)
+  end
+
+  def test_custom_method_source_decorator
+    assert Holidays::Factory::Definition.custom_method_source_decorator.is_a?(Holidays::Definition::Decorator::CustomMethodSource)
+  end
+
+  def test_custom_method_validator
+    assert Holidays::Factory::Definition.custom_method_validator.is_a?(Holidays::Definition::Validator::CustomMethod)
+  end
+
+  def test_region_validator
+    assert Holidays::Factory::Definition.region_validator.is_a?(Holidays::Definition::Validator::Region)
+  end
+
+  def test_function_processor
+    assert Holidays::Factory::Definition.function_processor.is_a?(Holidays::Definition::Context::FunctionProcessor)
+  end
+end

data/test/holidays/factory/test_finder.rb

@@ -0,0 +1,25 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../../test_helper'
+
+require 'holidays/factory/finder'
+
+class FinderFactoryTests < Test::Unit::TestCase
+  def test_search
+    assert Holidays::Factory::Finder.search.is_a?(Holidays::Finder::Context::Search)
+  end
+
+  def test_between
+    assert Holidays::Factory::Finder.between.is_a?(Holidays::Finder::Context::Between)
+  end
+
+  def test_next_holiday
+    assert Holidays::Factory::Finder.next_holiday.is_a?(Holidays::Finder::Context::NextHoliday)
+  end
+
+  def test_year_holiday
+    assert Holidays::Factory::Finder.year_holiday.is_a?(Holidays::Finder::Context::YearHoliday)
+  end
+
+  def test_parse_options_factory
+    assert Holidays::Factory::Finder.parse_options.is_a?(Holidays::Finder::Context::ParseOptions)
+  end
+end

data/test/holidays/finder/context/test_between.rb

@@ -0,0 +1,172 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../../../test_helper'
+
+require 'holidays/finder/context/between'
+
+class BetweenTests < Test::Unit::TestCase
+  def setup
+    @regions = [:us]
+    @observed = false
+    @informal = false
+
+    @definition_search = mock()
+    @dates_driver_builder = mock()
+    @options_parser = mock()
+
+    @subject = Holidays::Finder::Context::Between.new(
+      @definition_search,
+      @dates_driver_builder,
+      @options_parser,
+    )
+
+    @start_date = Date.civil(2015, 1, 1)
+    @end_date = Date.civil(2015, 1, 1)
+    @dates_driver = {2015 => [0, 1, 2], 2014 => [0, 12]}
+    @options = [@regions, @observed, @informal]
+
+    @definition_search.expects(:call).at_most_once.with(
+      @dates_driver,
+      @regions,
+      [],
+    ).returns([{
+      :date => Date.civil(2015, 1, 1),
+      :name => "Test",
+      :regions => [:us],
+    }])
+
+    @dates_driver_builder.expects(:call).at_most_once.with(
+      @start_date, @end_date,
+    ).returns(
+      @dates_driver,
+    )
+
+    @options_parser.expects(:call).at_most_once.with(@options).returns(@options)
+  end
+
+  def test_returns_error_if_start_date_is_missing
+    assert_raise ArgumentError do
+      @subject.call(nil, @end_date, @options)
+    end
+  end
+
+  def test_returns_error_if_end_date_is_missing
+    assert_raise ArgumentError do
+      @subject.call(@start_date, nil, @options)
+    end
+  end
+
+  def test_returns_single_holiday
+    assert_equal(
+      [
+        {
+          :date => Date.civil(2015, 1, 1),
+          :name => "Test",
+          :regions => [:us],
+        }
+      ],
+      @subject.call(@start_date, @end_date, @options)
+    )
+  end
+
+  def test_returns_sorted_multiple_holidays
+    @start_date = Date.civil(2015, 1, 1)
+    @end_date = Date.civil(2016, 12, 31)
+
+    @definition_search.expects(:call).at_most_once.with(
+      @dates_driver,
+      @regions,
+      [],
+    ).returns([
+      {
+        :date => Date.civil(2015, 6, 1),
+        :name => "2015-June",
+        :regions => [:us],
+      },
+      {
+        :date => Date.civil(2015, 1, 1),
+        :name => "2015-Jan",
+        :regions => [:us],
+      },
+      {
+        :date => Date.civil(2016, 6, 1),
+        :name => "2016-June",
+        :regions => [:us],
+      },
+    ])
+
+    @dates_driver_builder.expects(:call).at_most_once.with(
+      @start_date, @end_date,
+    ).returns(
+      @dates_driver,
+    )
+
+    assert_equal(
+      [
+        {
+          :date => Date.civil(2015, 1, 1),
+          :name => "2015-Jan",
+          :regions => [:us],
+        },
+        {
+          :date => Date.civil(2015, 6, 1),
+          :name => "2015-June",
+          :regions => [:us],
+        },
+        {
+          :date => Date.civil(2016, 6, 1),
+          :name => "2016-June",
+          :regions => [:us],
+        },
+      ],
+      @subject.call(@start_date, @end_date, @options)
+    )
+  end
+
+  def test_filters_holidays_returned_by_search_if_not_in_date_range
+    @start_date = Date.civil(2015, 1, 1)
+    @end_date = Date.civil(2015, 12, 31)
+
+    @definition_search.expects(:call).at_most_once.with(
+      @dates_driver,
+      @regions,
+      [],
+    ).returns([
+      {
+        :date => Date.civil(2015, 6, 1),
+        :name => "2015-June",
+        :regions => [:us],
+      },
+      {
+        :date => Date.civil(2015, 1, 1),
+        :name => "2015-Jan",
+        :regions => [:us],
+      },
+      {
+        :date => Date.civil(2016, 6, 1),
+        :name => "2016-June",
+        :regions => [:us],
+      },
+    ])
+
+    @dates_driver_builder.expects(:call).at_most_once.with(
+      @start_date, @end_date,
+    ).returns(
+      @dates_driver,
+    )
+
+    assert_equal(
+      [
+        {
+          :date => Date.civil(2015, 1, 1),
+          :name => "2015-Jan",
+          :regions => [:us],
+        },
+        {
+          :date => Date.civil(2015, 6, 1),
+          :name => "2015-June",
+          :regions => [:us],
+        },
+      ],
+      @subject.call(@start_date, @end_date, @options)
+    )
+  end
+end

data/test/holidays/{use_case → finder}/context/test_dates_driver_builder.rb

@@ -1,10 +1,10 @@
 require File.expand_path(File.dirname(__FILE__)) + '/../../../test_helper'
 
-require 'holidays/use_case/context/dates_driver_builder'
+require 'holidays/finder/context/dates_driver_builder'
 
 class DatesDriverBuilderTests < Test::Unit::TestCase
   def setup
-    @subject = Holidays::UseCase::Context::DatesDriverBuilder.new
+    @subject = Holidays::Finder::Context::DatesDriverBuilder.new
   end
 
   def test_returns_appropriately_formatted_hash

data/test/holidays/finder/context/test_next_holiday.rb

@@ -0,0 +1,156 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../../../test_helper'
+
+require 'holidays/finder/context/next_holiday'
+
+class NextHolidayTests < Test::Unit::TestCase
+  def setup
+    @regions = [:us]
+    @observed = false
+    @informal = false
+
+    @definition_search = mock()
+    @dates_driver_builder = mock()
+    @options_parser = mock()
+
+    @subject = Holidays::Finder::Context::NextHoliday.new(
+      @definition_search,
+      @dates_driver_builder,
+      @options_parser,
+    )
+
+    @holiday_count = 1
+    @from_date= Date.civil(2015, 1, 1)
+    @dates_driver = {2015 => [0, 1, 2], 2014 => [0, 12]}
+    @options = [@regions, @observed, @informal]
+
+    @definition_search.expects(:call).at_most_once.with(
+      @dates_driver,
+      @regions,
+      [],
+    ).returns([{
+      :date => Date.civil(2015, 1, 1),
+      :name => "Test",
+      :regions => [:us],
+    }])
+
+    @dates_driver_builder.expects(:call).at_most_once.with(
+      @from_date, @from_date >> 12,
+    ).returns(
+      @dates_driver,
+    )
+
+    @options_parser.expects(:call).at_most_once.with(@options).returns(@options)
+  end
+
+  def test_returns_error_if_holidays_count_is_missing
+    assert_raise ArgumentError do
+      @subject.call(nil, @from_date, @options)
+    end
+  end
+
+  def test_returns_error_if_holidays_count_is_less_than_or_equal_to_zero
+    assert_raise ArgumentError do
+      @subject.call(0, @from_date, @options)
+    end
+  end
+
+  def test_returns_error_if_from_date_is_missing
+    assert_raise ArgumentError do
+      @subject.call(@holiday_count, nil, @options)
+    end
+  end
+
+  def test_returns_single_holiday
+    assert_equal(
+      [
+        {
+          :date => Date.civil(2015, 1, 1),
+          :name => "Test",
+          :regions => [:us],
+        }
+      ],
+      @subject.call(@holiday_count, @from_date, @options)
+    )
+  end
+
+  def test_returns_correct_holidays_based_on_holiday_count
+    @definition_search.expects(:call).at_most_once.with(
+      @dates_driver,
+      @regions,
+      [],
+    ).returns([
+      {
+        :date => Date.civil(2015, 1, 1),
+        :name => "Test",
+        :regions => [:us],
+      },
+      {
+        :date => Date.civil(2015, 2, 1),
+        :name => "Test",
+        :regions => [:us],
+      },
+      {
+        :date => Date.civil(2015, 12, 1),
+        :name => "Test",
+        :regions => [:us],
+      },
+      ])
+
+      assert_equal(
+        [
+          {
+            :date => Date.civil(2015, 1, 1),
+            :name => "Test",
+            :regions => [:us],
+          },
+          {
+            :date => Date.civil(2015, 2, 1),
+            :name => "Test",
+            :regions => [:us],
+          }
+        ],
+          @subject.call(2, @from_date, @options)
+      )
+  end
+
+  def test_returns_correctly_sorted_holidays_based_on_holiday_count_if_holidays_are_out_of_order
+    @definition_search.expects(:call).at_most_once.with(
+      @dates_driver,
+      @regions,
+      [],
+    ).returns([
+      {
+        :date => Date.civil(2015, 1, 1),
+        :name => "Test",
+        :regions => [:us],
+      },
+      {
+        :date => Date.civil(2015, 12, 1),
+        :name => "Test",
+        :regions => [:us],
+      },
+      {
+        :date => Date.civil(2015, 2, 1),
+        :name => "Test",
+        :regions => [:us],
+      },
+      ]
+    )
+
+    assert_equal(
+      [
+        {
+          :date => Date.civil(2015, 1, 1),
+          :name => "Test",
+          :regions => [:us],
+        },
+        {
+          :date => Date.civil(2015, 2, 1),
+          :name => "Test",
+          :regions => [:us],
+        }
+      ],
+        @subject.call(2, @from_date, @options)
+    )
+  end
+end