holidays 4.6.0 → 4.7.0

data/test/{test_multiple_regions.rb → integration/test_multiple_regions.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__)) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 require "#{Holidays::DEFINITIONS_PATH}/gb"
 require "#{Holidays::DEFINITIONS_PATH}/ie"
 

data/test/test_helper.rb

@@ -1,5 +1,4 @@
-require 'coveralls'
-Coveralls.wear!
+require 'coverage_report'
 
 $:.unshift(File.expand_path(File.dirname(__FILE__) + '../../lib/'))
 
@@ -20,7 +19,7 @@ end
 
 class Time
   include Holidays::CoreExtensions::Time
-end 
+end
 
 module Holidays
   # Test region used for generating a holiday on Date.today
@@ -35,4 +34,4 @@ module Holidays
   end
 end
 
-Holidays::DefinitionFactory.merger.call(Holidays::Test::DEFINED_REGIONS, Holidays::Test::HOLIDAYS_BY_MONTH, Holidays::Test::CUSTOM_METHODS)
+Holidays::Factory::Definition.merger.call(Holidays::Test::DEFINED_REGIONS, Holidays::Test::HOLIDAYS_BY_MONTH, Holidays::Test::CUSTOM_METHODS)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holidays
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.7.0
 platform: ruby
 authors:
 - Alex Dunae
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,10 +108,10 @@ files:
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
+- Makefile
 - README.md
 - REFERENCES
 - Rakefile
-- benchmark.rb
 - bin/console
 - bin/setup
 - definitions/README.md
@@ -144,10 +144,13 @@ files:
 - definitions/is.yaml
 - definitions/it.yaml
 - definitions/jp.yaml
+- definitions/kr.yaml
 - definitions/li.yaml
 - definitions/lt.yaml
+- definitions/lu.yaml
 - definitions/ma.yaml
 - definitions/mx.yaml
+- definitions/my.yaml
 - definitions/nerc.yaml
 - definitions/nl.yaml
 - definitions/no.yaml
@@ -202,10 +205,13 @@ files:
 - lib/generated_definitions/is.rb
 - lib/generated_definitions/it.rb
 - lib/generated_definitions/jp.rb
+- lib/generated_definitions/kr.rb
 - lib/generated_definitions/li.rb
 - lib/generated_definitions/lt.rb
+- lib/generated_definitions/lu.rb
 - lib/generated_definitions/ma.rb
 - lib/generated_definitions/mx.rb
+- lib/generated_definitions/my.rb
 - lib/generated_definitions/nerc.rb
 - lib/generated_definitions/nl.rb
 - lib/generated_definitions/no.rb
@@ -234,7 +240,7 @@ files:
 - lib/holidays/date_calculator/day_of_month.rb
 - lib/holidays/date_calculator/easter.rb
 - lib/holidays/date_calculator/weekend_modifier.rb
-- lib/holidays/date_calculator_factory.rb
+- lib/holidays/definition/context/function_processor.rb
 - lib/holidays/definition/context/generator.rb
 - lib/holidays/definition/context/merger.rb
 - lib/holidays/definition/decorator/custom_method_proc.rb
@@ -248,18 +254,21 @@ files:
 - lib/holidays/definition/repository/regions.rb
 - lib/holidays/definition/validator/custom_method.rb
 - lib/holidays/definition/validator/region.rb
-- lib/holidays/definition_factory.rb
 - lib/holidays/errors.rb
+- lib/holidays/factory/date_calculator.rb
+- lib/holidays/factory/definition.rb
+- lib/holidays/factory/finder.rb
+- lib/holidays/finder/context/between.rb
+- lib/holidays/finder/context/dates_driver_builder.rb
+- lib/holidays/finder/context/next_holiday.rb
+- lib/holidays/finder/context/parse_options.rb
+- lib/holidays/finder/context/search.rb
+- lib/holidays/finder/context/year_holiday.rb
+- lib/holidays/finder/rules/in_region.rb
+- lib/holidays/finder/rules/year_range.rb
 - lib/holidays/load_all_definitions.rb
-- lib/holidays/option/context/parse_options.rb
-- lib/holidays/option_factory.rb
-- lib/holidays/use_case/context/between.rb
-- lib/holidays/use_case/context/context_common.rb
-- lib/holidays/use_case/context/dates_driver_builder.rb
-- lib/holidays/use_case/context/next_holiday.rb
-- lib/holidays/use_case/context/year_holiday.rb
-- lib/holidays/use_case_factory.rb
 - lib/holidays/version.rb
+- test/coverage_report.rb
 - test/data/test_custom_govt_holiday_defs.yaml
 - test/data/test_custom_year_range_holiday_defs.yaml
 - test/data/test_multiple_custom_holiday_defs.yaml
@@ -295,10 +304,13 @@ files:
 - test/defs/test_defs_is.rb
 - test/defs/test_defs_it.rb
 - test/defs/test_defs_jp.rb
+- test/defs/test_defs_kr.rb
 - test/defs/test_defs_li.rb
 - test/defs/test_defs_lt.rb
+- test/defs/test_defs_lu.rb
 - test/defs/test_defs_ma.rb
 - test/defs/test_defs_mx.rb
+- test/defs/test_defs_my.rb
 - test/defs/test_defs_nerc.rb
 - test/defs/test_defs_nl.rb
 - test/defs/test_defs_no.rb
@@ -327,6 +339,7 @@ files:
 - test/holidays/date_calculator/test_easter_gregorian.rb
 - test/holidays/date_calculator/test_easter_julian.rb
 - test/holidays/date_calculator/test_weekend_modifier.rb
+- test/holidays/definition/context/test_function_processor.rb
 - test/holidays/definition/context/test_generator.rb
 - test/holidays/definition/context/test_merger.rb
 - test/holidays/definition/decorator/test_custom_method_proc.rb
@@ -339,20 +352,25 @@ files:
 - test/holidays/definition/repository/test_regions.rb
 - test/holidays/definition/validator/test_custom_method.rb
 - test/holidays/definition/validator/test_region.rb
-- test/holidays/option/context/test_parse_options.rb
-- test/holidays/test_date_calculator_factory.rb
-- test/holidays/test_definition_factory.rb
-- test/holidays/test_option_factory.rb
-- test/holidays/test_use_case_factory.rb
-- test/holidays/use_case/context/test_between.rb
-- test/holidays/use_case/context/test_dates_driver_builder.rb
-- test/test_all_regions.rb
-- test/test_custom_holidays.rb
-- test/test_custom_year_range_holidays.rb
+- test/holidays/factory/test_date_calculator.rb
+- test/holidays/factory/test_definition.rb
+- test/holidays/factory/test_finder.rb
+- test/holidays/finder/context/test_between.rb
+- test/holidays/finder/context/test_dates_driver_builder.rb
+- test/holidays/finder/context/test_next_holiday.rb
+- test/holidays/finder/context/test_parse_options.rb
+- test/holidays/finder/context/test_search.rb
+- test/holidays/finder/context/test_year_holiday.rb
+- test/holidays/finder/rules/test_in_region.rb
+- test/holidays/finder/rules/test_year_range.rb
+- test/integration/README.md
+- test/integration/test_all_regions.rb
+- test/integration/test_custom_holidays.rb
+- test/integration/test_custom_year_range_holidays.rb
+- test/integration/test_holidays.rb
+- test/integration/test_holidays_between.rb
+- test/integration/test_multiple_regions.rb
 - test/test_helper.rb
-- test/test_holidays.rb
-- test/test_holidays_between.rb
-- test/test_multiple_regions.rb
 homepage: https://github.com/holidays/holidays
 licenses:
 - MIT
@@ -378,6 +396,7 @@ signing_key:
 specification_version: 4
 summary: A collection of Ruby methods to deal with statutory and other holidays.
 test_files:
+- test/coverage_report.rb
 - test/data/test_custom_govt_holiday_defs.yaml
 - test/data/test_custom_year_range_holiday_defs.yaml
 - test/data/test_multiple_custom_holiday_defs.yaml
@@ -413,10 +432,13 @@ test_files:
 - test/defs/test_defs_is.rb
 - test/defs/test_defs_it.rb
 - test/defs/test_defs_jp.rb
+- test/defs/test_defs_kr.rb
 - test/defs/test_defs_li.rb
 - test/defs/test_defs_lt.rb
+- test/defs/test_defs_lu.rb
 - test/defs/test_defs_ma.rb
 - test/defs/test_defs_mx.rb
+- test/defs/test_defs_my.rb
 - test/defs/test_defs_nerc.rb
 - test/defs/test_defs_nl.rb
 - test/defs/test_defs_no.rb
@@ -445,6 +467,7 @@ test_files:
 - test/holidays/date_calculator/test_easter_gregorian.rb
 - test/holidays/date_calculator/test_easter_julian.rb
 - test/holidays/date_calculator/test_weekend_modifier.rb
+- test/holidays/definition/context/test_function_processor.rb
 - test/holidays/definition/context/test_generator.rb
 - test/holidays/definition/context/test_merger.rb
 - test/holidays/definition/decorator/test_custom_method_proc.rb
@@ -457,17 +480,22 @@ test_files:
 - test/holidays/definition/repository/test_regions.rb
 - test/holidays/definition/validator/test_custom_method.rb
 - test/holidays/definition/validator/test_region.rb
-- test/holidays/option/context/test_parse_options.rb
-- test/holidays/test_date_calculator_factory.rb
-- test/holidays/test_definition_factory.rb
-- test/holidays/test_option_factory.rb
-- test/holidays/test_use_case_factory.rb
-- test/holidays/use_case/context/test_between.rb
-- test/holidays/use_case/context/test_dates_driver_builder.rb
-- test/test_all_regions.rb
-- test/test_custom_holidays.rb
-- test/test_custom_year_range_holidays.rb
+- test/holidays/factory/test_date_calculator.rb
+- test/holidays/factory/test_definition.rb
+- test/holidays/factory/test_finder.rb
+- test/holidays/finder/context/test_between.rb
+- test/holidays/finder/context/test_dates_driver_builder.rb
+- test/holidays/finder/context/test_next_holiday.rb
+- test/holidays/finder/context/test_parse_options.rb
+- test/holidays/finder/context/test_search.rb
+- test/holidays/finder/context/test_year_holiday.rb
+- test/holidays/finder/rules/test_in_region.rb
+- test/holidays/finder/rules/test_year_range.rb
+- test/integration/README.md
+- test/integration/test_all_regions.rb
+- test/integration/test_custom_holidays.rb
+- test/integration/test_custom_year_range_holidays.rb
+- test/integration/test_holidays.rb
+- test/integration/test_holidays_between.rb
+- test/integration/test_multiple_regions.rb
 - test/test_helper.rb
-- test/test_holidays.rb
-- test/test_holidays_between.rb
-- test/test_multiple_regions.rb

data/benchmark.rb

@@ -1,8 +0,0 @@
-require 'benchmark'
-
-puts Benchmark.measure {
-  require 'holidays'
-  Holidays.between(
-    Date.civil(2016, 1, 1), Date.civil(2016, 12, 31), :us
-  )
-}

data/lib/holidays/date_calculator_factory.rb

@@ -1,35 +0,0 @@
-require 'holidays/date_calculator/easter'
-require 'holidays/date_calculator/weekend_modifier'
-require 'holidays/date_calculator/day_of_month'
-
-module Holidays
-  module DateCalculatorFactory
-    module Easter
-      module Gregorian
-        class << self
-          def easter_calculator
-            DateCalculator::Easter::Gregorian.new
-          end
-        end
-      end
-
-      module Julian
-        class << self
-          def easter_calculator
-            DateCalculator::Easter::Julian.new
-          end
-        end
-      end
-    end
-
-    class << self
-      def weekend_modifier
-        DateCalculator::WeekendModifier.new
-      end
-
-      def day_of_month_calculator
-        DateCalculator::DayOfMonth.new
-      end
-    end
-  end
-end

data/lib/holidays/definition_factory.rb

@@ -1,86 +0,0 @@
-require 'holidays/definition/context/generator'
-require 'holidays/definition/context/merger'
-require 'holidays/definition/decorator/custom_method_proc'
-require 'holidays/definition/decorator/custom_method_source'
-require 'holidays/definition/parser/custom_method'
-require 'holidays/definition/repository/holidays_by_month'
-require 'holidays/definition/repository/regions'
-require 'holidays/definition/repository/cache'
-require 'holidays/definition/repository/proc_result_cache'
-require 'holidays/definition/repository/custom_methods'
-require 'holidays/definition/validator/custom_method'
-require 'holidays/definition/validator/region'
-
-module Holidays
-  module DefinitionFactory
-    class << self
-      def file_parser
-        Definition::Context::Generator.new(
-          custom_method_parser,
-          custom_method_source_decorator,
-          custom_methods_repository,
-        )
-      end
-
-      def source_generator
-        Definition::Context::Generator.new(
-          custom_method_parser,
-          custom_method_source_decorator,
-          custom_methods_repository,
-        )
-      end
-
-      def merger
-        Definition::Context::Merger.new(
-          holidays_by_month_repository,
-          regions_repository,
-          custom_methods_repository,
-        )
-      end
-
-      def custom_method_parser
-        Definition::Parser::CustomMethod.new(
-          custom_method_validator,
-        )
-      end
-
-      def custom_method_proc_decorator
-        Definition::Decorator::CustomMethodProc.new
-      end
-
-      def custom_method_source_decorator
-        Definition::Decorator::CustomMethodSource.new
-      end
-
-      def region_validator
-        Definition::Validator::Region.new(
-          regions_repository
-        )
-      end
-
-      def custom_method_validator
-        Definition::Validator::CustomMethod.new
-      end
-
-      def holidays_by_month_repository
-        @holidays_repo ||= Definition::Repository::HolidaysByMonth.new
-      end
-
-      def regions_repository
-        @regions_repo ||= Definition::Repository::Regions.new
-      end
-
-      def cache_repository
-        @cache_repo ||= Definition::Repository::Cache.new
-      end
-
-      def proc_result_cache_repository
-        @proc_result_cache_repo ||= Definition::Repository::ProcResultCache.new
-      end
-
-      def custom_methods_repository
-        @custom_methods_repository ||= Definition::Repository::CustomMethods.new
-      end
-    end
-  end
-end

data/lib/holidays/option_factory.rb

@@ -1,15 +0,0 @@
-require 'holidays/option/context/parse_options'
-
-module Holidays
-  module OptionFactory
-    class << self
-      def parse_options
-        Option::Context::ParseOptions.new(
-          DefinitionFactory.regions_repository,
-          DefinitionFactory.region_validator,
-          DefinitionFactory.merger,
-        )
-      end
-    end
-  end
-end

data/lib/holidays/use_case/context/between.rb

@@ -1,45 +0,0 @@
-module Holidays
-  module UseCase
-    module Context
-      class Between
-        include ContextCommon
-
-        def initialize(holidays_by_month_repo, day_of_month_calculator, custom_methods_repo, proc_result_cache_repo)
-          @holidays_by_month_repo = holidays_by_month_repo
-          @day_of_month_calculator = day_of_month_calculator
-          @custom_methods_repo = custom_methods_repo
-          @proc_result_cache_repo = proc_result_cache_repo
-        end
-
-        def call(start_date, end_date, dates_driver, regions, observed, informal)
-          validate!(start_date, end_date, dates_driver, regions)
-
-          holidays = []
-          holidays = make_date_array(dates_driver, regions, observed, informal)
-          holidays = holidays.select{|holiday|holiday[:date].between?(start_date, end_date)}
-          holidays.sort{|a, b| a[:date] <=> b[:date] }
-        end
-
-        private
-
-        attr_reader :holidays_by_month_repo,
-                    :day_of_month_calculator,
-                    :custom_methods_repo,
-                    :proc_result_cache_repo
-
-        def validate!(start_date, end_date, dates_driver, regions)
-          raise ArgumentError unless start_date
-          raise ArgumentError unless end_date
-
-          raise ArgumentError if dates_driver.nil? || dates_driver.empty?
-
-          dates_driver.each do |year, months|
-            raise ArgumentError if months.nil? || months.empty?
-          end
-
-          raise ArgumentError if regions.nil? || regions.empty?
-        end
-      end
-    end
-  end
-end

data/lib/holidays/use_case/context/context_common.rb

@@ -1,123 +0,0 @@
-module Holidays
-  module UseCase
-    module Context
-      module ContextCommon
-        def make_date_array(dates_driver, regions, observed, informal)
-          holidays = []
-          dates_driver.each do |year, months|
-            months.each do |month|
-              next unless hbm = holidays_by_month_repo.find_by_month(month)
-              hbm.each do |h|
-                next unless in_region?(regions, h[:regions])
-                next if h[:type] == :informal && !informal
-
-                # range check feature.
-                if h[:year_ranges]
-                  valid_range_year = false
-                  h[:year_ranges].each do |year_range|
-                    next unless year_range.is_a?(Hash) && year_range.length == 1
-                    next unless year_range.select{
-                      |operator,year|[:before,"before",:after,"after",:limited,"limited",:between,"between"].include?(operator)}.count > 0
-                    case year_range.keys.first
-                    when :before,"before"
-                      valid_range_year = true if year <= year_range[year_range.keys.first]
-                    when :after,"after"
-                      valid_range_year = true if year >= year_range[year_range.keys.first]
-                    when :limited,"limited"
-                      valid_range_year = true if year_range[year_range.keys.first].include?(year)
-                    when :between,"between"
-                      year_range[year_range.keys.first] = Range.new(*year_range[year_range.keys.first].split("..").map(&:to_i)) if year_range[year_range.keys.first].is_a?(String)
-                      valid_range_year = true if year_range[year_range.keys.first].cover?(year)
-                    end
-                    break if valid_range_year
-                  end
-                  next unless valid_range_year
-                end
-
-                #FIXME I don't like this entire if/else. If it's a function, do something, else do some
-                # weird mday logic? Bollocks. I think this should be a refactor target.
-                if h[:function]
-                  function_arguments = []
-
-                  #FIXME This is a refactor target. We should also allow 'date'. Right now these are the only
-                  # three things that we allow in. I think having a more testable, robust approach here is vital.
-                  if h[:function_arguments].include?(:year)
-                    function_arguments << year
-                  end
-
-                  if h[:function_arguments].include?(:month)
-                    function_arguments << month
-                  end
-
-                  if h[:function_arguments].include?(:day)
-                    function_arguments << h[:mday]
-                  end
-
-                  result = call_proc(h[:function], *function_arguments)
-
-                  #FIXME This is a dangerous assumption. We should raise an error or something
-                  #      if these procs return something unexpected.
-                  #
-                  # Procs may return either Date or an integer representing mday
-                  if result.kind_of?(Date)
-                    if h[:function_modifier]
-                      result = result + h[:function_modifier] # NOTE: This could be a positive OR negative number.
-                    end
-
-                    month = result.month
-                    mday = result.mday
-                  else
-                    mday = result
-                  end
-                else
-                  mday = h[:mday] || day_of_month_calculator.call(year, month, h[:week], h[:wday])
-                end
-
-                # Silently skip bad mdays
-                begin
-                  date = Date.civil(year, month, mday)
-                rescue; next; end
-
-                #FIXME We should be checking the function arguments and passing in what is specified.
-                # Right now all 'observed' functions require 'date' but that is by convention. Nothing
-                # is requiring that. We should be more explicit.
-                if observed && h[:observed]
-                  date = call_proc(h[:observed], date)
-                end
-
-                holidays << {:date => date, :name => h[:name], :regions => h[:regions]}
-              end
-            end
-          end
-          holidays
-        end
-
-        def call_proc(function_id, *arguments)
-          function = custom_methods_repo.find(function_id)
-          raise Holidays::FunctionNotFound.new("Unable to find function with id '#{function_id}'") if function.nil?
-
-          proc_result_cache_repo.lookup(function, *arguments)
-        end
-
-        # Check sub regions.
-        #
-        # When request :any, all holidays should be returned.
-        # When requesting :ca_bc, holidays in :ca or :ca_bc should be returned.
-        # When requesting :ca, holidays in :ca but not its subregions should be returned.
-        def in_region?(requested, available) # :nodoc:
-          return true if requested.include?(:any)
-
-          # When an underscore is encountered, derive the parent regions
-          # symbol and include both in the requested array.
-          requested = requested.collect do |r|
-            r.to_s =~ /_/ ? [r, r.to_s.gsub(/_[\w]*$/, '').to_sym] : r
-          end
-
-          requested = requested.flatten.uniq
-
-          available.any? { |avail| requested.include?(avail) }
-        end
-      end
-    end
-  end
-end