holidays 3.3.0 → 4.0.0

data/test/holidays/test_definition_factory.rb

@@ -27,8 +27,23 @@ class DefinitionFactoryTests < Test::Unit::TestCase
     assert Holidays::DefinitionFactory.cache_repository.is_a?(Holidays::Definition::Repository::Cache)
   end
 
-  def test_proc_cache_repository
-    assert Holidays::DefinitionFactory.proc_cache_repository.is_a?(Holidays::Definition::Repository::ProcCache)
+  def test_proc_result_cache_repository
+    assert Holidays::DefinitionFactory.proc_result_cache_repository.is_a?(Holidays::Definition::Repository::ProcResultCache)
   end
 
+  def test_custom_method_parser
+    assert Holidays::DefinitionFactory.custom_method_parser.is_a?(Holidays::Definition::Parser::CustomMethod)
+  end
+
+  def test_custom_method_source_decorator
+    assert Holidays::DefinitionFactory.custom_method_source_decorator.is_a?(Holidays::Definition::Decorator::CustomMethodSource)
+  end
+
+  def test_custom_method_validator
+    assert Holidays::DefinitionFactory.custom_method_validator.is_a?(Holidays::Definition::Validator::CustomMethod)
+  end
+
+  def test_region_validator
+    assert Holidays::DefinitionFactory.region_validator.is_a?(Holidays::Definition::Validator::Region)
+  end
 end

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

@@ -9,11 +9,13 @@ class BetweenTests < Test::Unit::TestCase
   def setup
     @holidays_by_month_repo = mock()
     @day_of_month_calculator = mock()
+    @custom_method_repo = mock()
     @proc_cache_repo = mock()
 
     @subject = Holidays::UseCase::Context::Between.new(
       @holidays_by_month_repo,
       @day_of_month_calculator,
+      @custom_method_repo,
       @proc_cache_repo,
     )
 

data/test/test_all_regions.rb

@@ -1,60 +1,23 @@
 require File.expand_path(File.dirname(__FILE__)) + '/test_helper'
 
 class MultipleRegionsTests < Test::Unit::TestCase
+  def setup
+    Holidays::LoadAllDefinitions.call
+  end
 
   def test_definition_dir
     assert File.directory?(Holidays::FULL_DEFINITIONS_PATH)
   end
 
-  def test_getting_available_paths
-    defs = Holidays.available(true)
-    assert_equal def_count, defs.size
+  def test_show_available_regions
+    regions = Holidays.available_regions
 
-    defs.each do |f|
-      assert f.kind_of?(String)
-      assert File.exist?(f)
-    end
-  end
-
-  def test_getting_available_symbols
-    defs = Holidays.available(false)
-    assert_equal def_count, defs.size
-
-    defs.each { |f| assert f.kind_of?(Symbol) }
-
-    # some spot checks
-    assert defs.include?(:ca)
-    assert defs.include?(:united_nations)
-  end
-
-  def test_loading_all
-    Holidays.load_all
-    holidays = Holidays.on(Date.civil(2011, 5, 1), :any)
-
-    # at least 15 now, but there could be more in the future
-    assert holidays.size > 15
-
-    # some spot checks
-    assert holidays.any? { |h| h[:name] == 'Staatsfeiertag' }  # :at
-    assert holidays.any? { |h| h[:name] == 'Dia do Trabalho' } # :br
-    assert holidays.any? { |h| h[:name] == 'Vappu' }           # :fi
-  end
-
-  def test_getting_regions
-    Holidays.load_all
-    regions = Holidays.regions
-
-    assert regions.size > 30
-
-    assert regions.include? :nyse
-    assert regions.include? :united_nations
+    assert_equal regions.size, Holidays::REGIONS.size
+    assert_equal regions, Holidays::REGIONS
   end
 
   def test_load_subregion
-    Holidays.send(:remove_const, :DE) #unload de module so that is has to be loaded again
-    Holidays.send(:class_variable_set, :@@regions, []) # reset regions
     holidays = Holidays.on(Date.civil(2014, 1, 1), :de_bb)
-
     assert holidays.any? { |h| h[:name] == 'Neujahrstag' }
   end
 
@@ -69,9 +32,4 @@ class MultipleRegionsTests < Test::Unit::TestCase
       Holidays.between(Date.civil(2014, 1, 1), Date.civil(2016, 1, 1), '../../../../../../../../../../../../tmp/profile_pic.jpg')
     end
   end
-
-private
-  def def_count
-    Dir.glob(Holidays::FULL_DEFINITIONS_PATH + '/*.rb').size
-  end
 end

data/test/test_custom_holidays.rb

@@ -7,11 +7,17 @@ class CustomHolidaysTest < Test::Unit::TestCase
       Holidays.on(Date.civil(2013,6,20), :custom_single_file)
     end
 
-    Holidays.load_custom('test/data/test_single_custom_holiday_defs.yaml')
+    loaded_holidays = Holidays.load_custom('test/data/test_single_custom_holiday_defs.yaml')
 
     assert_not_equal [], Holidays.on(Date.civil(2013,6,20), :custom_single_file)
   end
 
+  def test_load_custom_returns_loaded_holidays
+    expected_loaded_holidays = {6=>[{:mday=>20, :name=>"Company Founding", :regions=>[:custom_single_file]}]}
+
+    assert_equal expected_loaded_holidays, Holidays.load_custom('test/data/test_single_custom_holiday_defs.yaml')
+  end
+
   def test_custom_holidays_present_after_multiple_file_parsing
     assert_raises Holidays::UnknownRegionError do
       Holidays.on(Date.civil(2013, 10,5), :custom_multiple_files)
@@ -32,4 +38,4 @@ class CustomHolidaysTest < Test::Unit::TestCase
     assert_not_equal [], Holidays.on(Date.civil(2013,3,1), :custom_multiple_files_govt)
   end
 
-end
+end

data/test/test_helper.rb

@@ -10,7 +10,12 @@ require 'test/unit'
 require 'mocha/test_unit'
 require 'date'
 require 'holidays'
-require "#{Holidays::DEFINITIONS_PATH}/ca"
+require 'holidays/core_extensions/date'
+
+# Loads core extension for use in various definition tests as necessary
+class Date
+  include Holidays::CoreExtensions::Date
+end
 
 module Holidays
   # Test region used for generating a holiday on Date.today
@@ -20,7 +25,9 @@ module Holidays
     HOLIDAYS_BY_MONTH = {
       Date.today.mon => [{:mday => Date.today.mday, :name => "Test Holiday", :regions => [:test]}]
     }
+
+    CUSTOM_METHODS = {}
   end
 end
 
-Holidays.merge_defs(Holidays::Test::DEFINED_REGIONS, Holidays::Test::HOLIDAYS_BY_MONTH)
+Holidays::DefinitionFactory.merger.call(Holidays::Test::DEFINED_REGIONS, Holidays::Test::HOLIDAYS_BY_MONTH, Holidays::Test::CUSTOM_METHODS)

data/test/test_holidays.rb

@@ -19,27 +19,27 @@ class HolidaysTests < Test::Unit::TestCase
     assert_equal 0, holidays.length
   end
 
-  def test_full_week
+  def test_any_holidays_during_work_week
     ## Full weeks:
     # Try with a Monday
-    assert Holidays.full_week?(Date.civil(2012,1,23), :us)
+    assert Holidays.any_holidays_during_work_week?(Date.civil(2012,1,23), :us)
     # Try with a Wednesday
-    assert Holidays.full_week?(Date.civil(2012,1,25), :us)
+    assert Holidays.any_holidays_during_work_week?(Date.civil(2012,1,25), :us)
     # Try Sunday on a week going into a new month
-    assert Holidays.full_week?(Date.civil(2012,1,29), :us)
+    assert Holidays.any_holidays_during_work_week?(Date.civil(2012,1,29), :us)
     # Try Wednesday on a week going into a new month
-    assert Holidays.full_week?(Date.civil(2012,2,1), :us)
+    assert Holidays.any_holidays_during_work_week?(Date.civil(2012,2,1), :us)
 
     ## Weeks with holidays:
     # New Year's 2012 (on Sunday, observed Monday). Test from a Wednesday.
-    assert_equal(false, Holidays.full_week?(Date.civil(2012,1,4), :us))
+    assert_equal(false, Holidays.any_holidays_during_work_week?(Date.civil(2012,1,4), :us))
     # Ignore observed holidays with :no_observed
-    assert Holidays.full_week?(Date.civil(2012,1,4), :us, :no_observed)
+    assert Holidays.any_holidays_during_work_week?(Date.civil(2012,1,4), :us, :no_observed)
     # Labor Day 2012 should be Sept 3
-    assert_equal(false, Holidays.full_week?(Date.civil(2012,9,5), :us))
+    assert_equal(false, Holidays.any_holidays_during_work_week?(Date.civil(2012,9,5), :us))
     # Should be 10 non-full weeks in the year (in the US)
     weeks_in_2012 = Date.commercial(2013, -1).cweek
-    holidays_in_2012 = weeks_in_2012.times.count { |week| Holidays.full_week?(Date.commercial(2012,week+1), :us) == false }
+    holidays_in_2012 = weeks_in_2012.times.count { |week| Holidays.any_holidays_during_work_week?(Date.commercial(2012,week+1), :us) == false }
     assert_equal 10, holidays_in_2012
   end
 
@@ -104,26 +104,6 @@ class HolidaysTests < Test::Unit::TestCase
     assert_equal 2, holidays.length
   end
 
-  def test_easter_sunday
-    assert_equal '1800-04-13', Holidays.easter(1800).to_s
-    assert_equal '1899-04-02', Holidays.easter(1899).to_s
-    assert_equal '1900-04-15', Holidays.easter(1900).to_s
-    assert_equal '1999-04-04', Holidays.easter(1999).to_s
-    assert_equal '2000-04-23', Holidays.easter(2000).to_s
-    assert_equal '2025-04-20', Holidays.easter(2025).to_s
-    assert_equal '2035-03-25', Holidays.easter(2035).to_s
-    assert_equal '2067-04-03', Holidays.easter(2067).to_s
-    assert_equal '2099-04-12', Holidays.easter(2099).to_s
-  end
-
-  def test_orthodox_easter
-    assert_equal '2000-04-30', Holidays.orthodox_easter(2000).to_s
-    assert_equal '2008-04-27', Holidays.orthodox_easter(2008).to_s
-    assert_equal '2009-04-19', Holidays.orthodox_easter(2009).to_s
-    assert_equal '2011-04-24', Holidays.orthodox_easter(2011).to_s
-    assert_equal '2020-04-19', Holidays.orthodox_easter(2020).to_s
-  end
-
   def test_easter_lambda
     [Date.civil(1800,4,11), Date.civil(1899,3,31), Date.civil(1900,4,13),
      Date.civil(2008,3,21), Date.civil(2035,3,23)].each do |date|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holidays
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Alex Dunae
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-17 00:00:00.000000000 Z
+date: 2016-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,21 +81,36 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 description: A collection of Ruby methods to deal with statutory and other holidays.
   You deserve a holiday!
 email:
-- code@dunae.ca
 - holidaysgem@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
 - REFERENCES
 - Rakefile
+- benchmark.rb
 - bin/console
 - bin/setup
 - definitions/README.md
@@ -174,8 +189,8 @@ files:
 - lib/generated_definitions/el.rb
 - lib/generated_definitions/es.rb
 - lib/generated_definitions/europe.rb
-- lib/generated_definitions/fed_ex.rb
 - lib/generated_definitions/federal_reserve.rb
+- lib/generated_definitions/fedex.rb
 - lib/generated_definitions/fi.rb
 - lib/generated_definitions/fr.rb
 - lib/generated_definitions/gb.rb
@@ -218,12 +233,20 @@ files:
 - lib/holidays/date_calculator_factory.rb
 - lib/holidays/definition/context/generator.rb
 - lib/holidays/definition/context/merger.rb
+- lib/holidays/definition/decorator/custom_method_proc.rb
+- lib/holidays/definition/decorator/custom_method_source.rb
+- lib/holidays/definition/entity/custom_method.rb
+- lib/holidays/definition/parser/custom_method.rb
 - lib/holidays/definition/repository/cache.rb
+- lib/holidays/definition/repository/custom_methods.rb
 - lib/holidays/definition/repository/holidays_by_month.rb
-- lib/holidays/definition/repository/proc_cache.rb
+- lib/holidays/definition/repository/proc_result_cache.rb
 - 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/load_all_definitions.rb
 - lib/holidays/option/context/parse_options.rb
 - lib/holidays/option_factory.rb
 - lib/holidays/use_case/context/between.rb
@@ -234,6 +257,7 @@ files:
 - test/data/test_custom_year_range_holiday_defs.yaml
 - test/data/test_multiple_custom_holiday_defs.yaml
 - test/data/test_single_custom_holiday_defs.yaml
+- test/data/test_single_custom_holiday_with_custom_procs.yaml
 - test/defs/test_defs_ar.rb
 - test/defs/test_defs_at.rb
 - test/defs/test_defs_au.rb
@@ -254,6 +278,7 @@ files:
 - test/defs/test_defs_europe.rb
 - test/defs/test_defs_fed_ex.rb
 - test/defs/test_defs_federal_reserve.rb
+- test/defs/test_defs_fedex.rb
 - test/defs/test_defs_fi.rb
 - test/defs/test_defs_fr.rb
 - test/defs/test_defs_gb.rb
@@ -295,10 +320,15 @@ files:
 - test/holidays/date_calculator/test_weekend_modifier.rb
 - test/holidays/definition/context/test_generator.rb
 - test/holidays/definition/context/test_merger.rb
+- test/holidays/definition/decorator/test_custom_method_proc.rb
+- test/holidays/definition/decorator/test_custom_method_source.rb
+- test/holidays/definition/parser/test_custom_method.rb
 - test/holidays/definition/repository/test_cache.rb
+- test/holidays/definition/repository/test_custom_methods.rb
 - test/holidays/definition/repository/test_holidays_by_month.rb
-- test/holidays/definition/repository/test_proc_cache.rb
+- test/holidays/definition/repository/test_proc_result_cache.rb
 - 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
@@ -314,7 +344,6 @@ files:
 - test/test_holidays.rb
 - test/test_holidays_between.rb
 - test/test_multiple_regions.rb
-- test/test_parse_definitions.rb
 homepage: https://github.com/holidays/holidays
 licenses:
 - MIT
@@ -325,9 +354,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -344,6 +373,7 @@ test_files:
 - test/data/test_custom_year_range_holiday_defs.yaml
 - test/data/test_multiple_custom_holiday_defs.yaml
 - test/data/test_single_custom_holiday_defs.yaml
+- test/data/test_single_custom_holiday_with_custom_procs.yaml
 - test/defs/test_defs_ar.rb
 - test/defs/test_defs_at.rb
 - test/defs/test_defs_au.rb
@@ -364,6 +394,7 @@ test_files:
 - test/defs/test_defs_europe.rb
 - test/defs/test_defs_fed_ex.rb
 - test/defs/test_defs_federal_reserve.rb
+- test/defs/test_defs_fedex.rb
 - test/defs/test_defs_fi.rb
 - test/defs/test_defs_fr.rb
 - test/defs/test_defs_gb.rb
@@ -405,10 +436,15 @@ test_files:
 - test/holidays/date_calculator/test_weekend_modifier.rb
 - test/holidays/definition/context/test_generator.rb
 - test/holidays/definition/context/test_merger.rb
+- test/holidays/definition/decorator/test_custom_method_proc.rb
+- test/holidays/definition/decorator/test_custom_method_source.rb
+- test/holidays/definition/parser/test_custom_method.rb
 - test/holidays/definition/repository/test_cache.rb
+- test/holidays/definition/repository/test_custom_methods.rb
 - test/holidays/definition/repository/test_holidays_by_month.rb
-- test/holidays/definition/repository/test_proc_cache.rb
+- test/holidays/definition/repository/test_proc_result_cache.rb
 - 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
@@ -424,4 +460,3 @@ test_files:
 - test/test_holidays.rb
 - test/test_holidays_between.rb
 - test/test_multiple_regions.rb
-- test/test_parse_definitions.rb

data/lib/generated_definitions/fed_ex.rb

@@ -1,41 +0,0 @@
-# encoding: utf-8
-module Holidays
-  # This file is generated by the Ruby Holidays gem.
-  #
-  # Definitions loaded: definitions/fedex.yaml
-  #
-  # To use the definitions in this file, load it right after you load the
-  # Holiday gem:
-  #
-  #   require 'holidays'
-  #   require 'generated_definitions/fed_ex'
-  #
-  # All the definitions are available at https://github.com/alexdunae/holidays
-  module FED_EX # :nodoc:
-    def self.defined_regions
-      [:fedex]
-    end
-
-    def self.holidays_by_month
-      {
-              1 => [{:mday => 1, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "New Year's Day", :regions => [:fedex]}],
-      5 => [{:wday => 1, :week => -1, :name => "Memorial Day", :regions => [:fedex]}],
-      7 => [{:mday => 4, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Independence Day", :regions => [:fedex]}],
-      9 => [{:wday => 1, :week => 1, :name => "Labor Day", :regions => [:fedex]}],
-      11 => [{:wday => 4, :week => 4, :name => "Thanksgiving", :regions => [:fedex]},
-            {:function => lambda { |year| Holidays.day_after_thanksgiving(year) }, :function_id => "day_after_thanksgiving(year)", :name => "Day After Thanksgiving", :regions => [:fedex]}],
-      12 => [{:mday => 25, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Christmas Day", :regions => [:fedex]},
-            {:mday => 31, :name => "New Year's Eve", :regions => [:fedex]}]
-      }
-    end
-  end
-
-def self.day_after_thanksgiving(year)
-  Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 11, 4, 4) + 1
-end
-
-
-
-end
-
-Holidays.merge_defs(Holidays::FED_EX.defined_regions, Holidays::FED_EX.holidays_by_month)

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

@@ -1,29 +0,0 @@
-require File.expand_path(File.dirname(__FILE__)) + '/../../../test_helper'
-
-require 'holidays/definition/repository/proc_cache'
-
-class ProcCacheRepoTests < Test::Unit::TestCase
-  def setup
-    @subject = Holidays::Definition::Repository::ProcCache.new
-  end
-
-  def test_lookup_stores_and_returns_result_of_function_if_it_is_not_present
-    function = lambda { |year| Date.civil(year, 2, 1) - 1 }
-    year = 2015
-
-    assert_equal(Date.civil(year, 1, 31), @subject.lookup(function, year))
-  end
-
-  #FIXME This test stinks. I don't know how to show that the second invocation
-  #      doesn't call the function. In rspec I could just do an expect().not_to
-  #      but it doesn't seem like Mocha can do that? I'm punting.
-  def test_lookup_simply_returns_result_of_cache_if_present_after_first_call
-    function = lambda { |year| Date.civil(year, 2, 1) - 1 }
-    year = 2015
-
-    @subject.lookup(function, year)
-
-    assert_equal(Date.civil(year, 1, 31), @subject.lookup(function, year))
-  end
-end
-