business_calendar 0.0.7 → 0.0.13

data/lib/business_calendar.rb

@@ -1,28 +1,37 @@
 module BusinessCalendar
   CountryNotSupported = Class.new(StandardError)
+  class << self
+    def for(country)
+      Calendar.new(holiday_determiner(country))
+    end
 
-  def self.for(country)
-    Calendar.new(holiday_determiner(country))
-  end
+    private
 
-  private
-  def self.holiday_determiner(country)
-    cfg = config(country) or raise CountryNotSupported.new(country.inspect)
-    @holiday_procs ||= {}
-    @holiday_procs[country] ||= HolidayDeterminer.new(
-       cfg["regions"], 
-       cfg["holiday_names"],
-       :additions       => (cfg["additions"] || []).map { |s| Date.parse s },
-       :removals        => (cfg["removals"]  || []).map { |s| Date.parse s },
-       :additions_only  => cfg['additions_only'] )
-  end
+    def holiday_determiner(country)
+      cfg = config(country) or raise CountryNotSupported.new(country.inspect)
+      @holiday_procs ||= {}
+      @holiday_procs[country] ||= HolidayDeterminer.new(
+         cfg["regions"],
+         cfg["holiday_names"],
+         :additions       => (cfg["additions"] || []).map { |s| Date.parse s },
+         :removals        => (cfg["removals"]  || []).map { |s| Date.parse s },
+         :additions_only  => cfg['additions_only'] )
+    end
+
+    def config(country)
+      @config ||= load_config
+      @config[country.to_s]
+    end
+
+    def load_config
+      files = Dir[File.join(File.dirname(File.expand_path(__FILE__)), '../data/*.yml')]
 
-  def self.config(country)
-    @config ||= YAML.load_file(File.join(File.dirname(File.expand_path(__FILE__)), '../data/holidays.yml'))
-    @config[country.to_s]
+      files.reduce({}) { |hash, file| hash.merge! YAML.load_file(file) }
+    end
   end
 end
 
 require 'yaml'
+require 'business_calendar/ruby18_shim' if RUBY_VERSION == '1.8.7'
 require 'business_calendar/calendar'
 require 'business_calendar/holiday_determiner'

data/spec/acceptance_cn_spec.rb

@@ -54,24 +54,24 @@ describe "CN holidays" do
     2016-01-01
     2016-01-02
     2016-01-03
-    2016-02-18
-    2016-02-19
-    2016-02-20
-    2016-02-21
-    2016-02-22
-    2016-02-23
-    2016-02-24
-    2016-04-05
-    2016-04-06
+    2016-02-07
+    2016-02-08
+    2016-02-09
+    2016-02-10
+    2016-02-11
+    2016-02-12
+    2016-02-13
+    2016-04-03
+    2016-04-04
+    2016-04-30
     2016-05-01
     2016-05-02
-    2016-05-03
-    2016-06-20
-    2016-06-21
-    2016-06-22
-    2016-09-27
-    2016-09-28
-    2016-09-29
+    2016-06-09
+    2016-06-10
+    2016-06-11
+    2016-09-15
+    2016-09-16
+    2016-09-17
     2016-10-01
     2016-10-02
     2016-10-03
@@ -79,6 +79,34 @@ describe "CN holidays" do
     2016-10-05
     2016-10-06
     2016-10-07
+    2017-01-01
+    2017-01-02
+    2017-01-03
+    2017-02-07
+    2017-02-08
+    2017-02-09
+    2017-02-10
+    2017-02-11
+    2017-02-12
+    2017-02-13
+    2017-04-03
+    2017-04-04
+    2017-04-30
+    2017-05-01
+    2017-05-02
+    2017-06-09
+    2017-06-10
+    2017-06-11
+    2017-09-15
+    2017-09-16
+    2017-09-17
+    2017-10-01
+    2017-10-02
+    2017-10-03
+    2017-10-04
+    2017-10-05
+    2017-10-06
+    2017-10-07
   ).map { |x| Date.parse x }.each do |expected_holiday|
     it "treats #{expected_holiday} as a holiday" do
       expect(BusinessCalendar.for(:CN).is_holiday?(expected_holiday)).to be true

data/spec/acceptance_gb_spec.rb

@@ -17,7 +17,15 @@ describe "GB bank holidays" do
       2015-05-25
       2015-08-31
       2015-12-25
-      2015-12-28
+      2015-12-26
+      2016-12-25
+      2017-01-01
+      2020-12-26
+      2021-12-25
+      2021-12-26
+      2022-01-01
+      2022-12-25
+      2023-01-01
     ).map { |x| Date.parse x }.each do |expected_holiday|
     it "treats #{expected_holiday} as a holiday" do
       expect(BusinessCalendar.for(:GB).is_holiday?(expected_holiday)).to be true
@@ -26,6 +34,15 @@ describe "GB bank holidays" do
 
   %w(
       2012-05-28
+      2015-12-28
+      2016-12-27
+      2017-01-02
+      2020-12-28
+      2021-12-27
+      2021-12-28
+      2022-01-03
+      2022-12-27
+      2023-01-02
     ).map { |x| Date.parse x }.each do |date|
     it "treats #{date} as not a holiday" do
       expect(BusinessCalendar.for(:GB).is_holiday?(date)).to be false

data/spec/acceptance_us_spec.rb

@@ -2,45 +2,232 @@ require 'spec_helper'
 
 describe "US holidays" do
   %w(
-      2014-05-26
-      2014-07-04
-      2014-09-01
-      2014-10-13
-      2014-11-11
-      2014-11-27
-      2014-12-25
-      2015-01-01
-      2015-01-19
-      2015-02-16
-      2015-05-25
-      2015-07-03
-      2015-09-07
-      2015-10-12
-      2015-11-11
-      2015-11-26
-      2015-12-25
-      2016-01-01
-      2016-01-18
-      2016-02-15
-      2016-05-30
-      2016-07-04
-      2016-09-05
-      2016-10-10
-      2016-11-11
-      2016-11-24
-      2016-12-26
-      2017-01-02
-      2017-01-16
-      2017-02-20
-      2017-05-29
-      2017-07-04
-      2017-09-04
-      2017-10-09
-      2017-11-10
-      2017-11-23
-      2017-12-25
-      2018-01-01
-    ).map { |x| Date.parse x }.each do |expected_holiday|
+    2004-01-01
+    2004-01-19
+    2004-02-16
+    2004-05-31
+    2004-07-05
+    2004-09-06
+    2004-10-11
+    2004-11-11
+    2004-11-25
+    2004-12-25
+    2005-01-01
+    2005-01-17
+    2005-02-21
+    2005-05-30
+    2005-07-04
+    2005-09-05
+    2005-10-10
+    2005-11-11
+    2005-11-24
+    2005-12-26
+    2006-01-02
+    2006-01-16
+    2006-02-20
+    2006-05-29
+    2006-07-04
+    2006-09-04
+    2006-10-09
+    2006-11-11
+    2006-11-23
+    2006-12-25
+    2007-01-01
+    2007-01-15
+    2007-02-19
+    2007-05-28
+    2007-07-04
+    2007-09-03
+    2007-10-08
+    2007-11-12
+    2007-11-22
+    2007-12-25
+    2008-01-01
+    2008-01-21
+    2008-02-18
+    2008-05-26
+    2008-07-04
+    2008-09-01
+    2008-10-13
+    2008-11-11
+    2008-11-27
+    2008-12-25
+    2009-01-01
+    2009-01-19
+    2009-02-16
+    2009-05-25
+    2009-09-07
+    2009-10-12
+    2009-11-11
+    2009-11-26
+    2009-12-25
+    2010-01-01
+    2010-01-18
+    2010-02-15
+    2010-05-31
+    2010-07-05
+    2010-09-06
+    2010-10-11
+    2010-11-11
+    2010-11-25
+    2010-12-25
+    2011-01-01
+    2011-01-17
+    2011-02-21
+    2011-05-30
+    2011-07-04
+    2011-09-05
+    2011-10-10
+    2011-11-11
+    2011-11-24
+    2011-12-26
+    2012-01-02
+    2012-01-16
+    2012-02-20
+    2012-05-28
+    2012-07-04
+    2012-09-03
+    2012-10-08
+    2012-11-12
+    2012-11-22
+    2012-12-25
+    2013-01-01
+    2013-01-21
+    2013-02-18
+    2013-05-27
+    2013-07-04
+    2013-09-02
+    2013-10-14
+    2013-11-11
+    2013-11-28
+    2013-12-25
+    2014-01-01
+    2014-01-20
+    2014-02-17
+    2014-05-26
+    2014-07-04
+    2014-09-01
+    2014-10-13
+    2014-11-11
+    2014-11-27
+    2014-12-25
+    2015-01-01
+    2015-01-19
+    2015-02-16
+    2015-05-25
+    2015-07-04
+    2015-09-07
+    2015-10-12
+    2015-11-11
+    2015-11-26
+    2015-12-25
+    2016-01-01
+    2016-01-18
+    2016-02-15
+    2016-05-30
+    2016-07-04
+    2016-09-05
+    2016-10-10
+    2016-11-11
+    2016-11-24
+    2016-12-25
+    2016-12-26
+    2017-01-01
+    2017-01-02
+    2017-01-16
+    2017-02-20
+    2017-05-29
+    2017-07-04
+    2017-09-04
+    2017-10-09
+    2017-11-11
+    2017-11-23
+    2017-12-25
+    2018-01-01
+    2018-01-15
+    2018-02-19
+    2018-05-28
+    2018-07-04
+    2018-09-03
+    2018-10-08
+    2018-11-11
+    2018-11-12
+    2018-11-22
+    2018-12-25
+    2019-01-01
+    2019-01-21
+    2019-02-18
+    2019-05-27
+    2019-07-04
+    2019-09-02
+    2019-10-14
+    2019-11-11
+    2019-11-28
+    2019-12-25
+    2020-01-01
+    2020-01-20
+    2020-02-17
+    2020-05-25
+    2020-07-04
+    2020-09-07
+    2020-10-12
+    2020-11-11
+    2020-11-26
+    2020-12-25
+    2021-01-01
+    2021-01-18
+    2021-02-15
+    2021-05-31
+    2021-07-04
+    2021-07-05
+    2021-09-06
+    2021-10-11
+    2021-11-11
+    2021-11-25
+    2021-12-25
+    2022-01-01
+    2022-01-17
+    2022-02-21
+    2022-05-30
+    2022-07-04
+    2022-09-05
+    2022-10-10
+    2022-11-11
+    2022-11-24
+    2022-12-25
+    2022-12-26
+    2023-01-01
+    2023-01-02
+    2023-01-16
+    2023-02-20
+    2023-05-29
+    2023-07-04
+    2023-09-04
+    2023-10-09
+    2023-11-11
+    2023-11-23
+    2023-12-25
+    2024-01-01
+    2024-01-15
+    2024-02-19
+    2024-05-27
+    2024-07-04
+    2024-09-02
+    2024-10-14
+    2024-11-11
+    2024-11-28
+    2024-12-25
+    2025-01-01
+    2025-01-20
+    2025-02-17
+    2025-05-26
+    2025-07-04
+    2025-09-01
+    2025-10-13
+    2025-11-11
+    2025-11-27
+    2025-12-25
+  ).map { |x| Date.parse x }.each do |expected_holiday|
     it "treats #{expected_holiday} as a holiday" do
       expect(BusinessCalendar.for(:US).is_holiday?(expected_holiday)).to be true
     end

data/spec/business_calendar_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe BusinessCalendar do
-  before { Timecop.freeze('2014-04-28'.to_date) }
+  before { allow(Date).to receive(:today).and_return('2014-04-28'.to_date) }
   subject { BusinessCalendar.for(country) }
 
   shared_examples_for "standard business time" do
@@ -83,6 +83,10 @@ describe BusinessCalendar do
     specify "American Independence Day is not a business day" do
       expect(subject.is_business_day?('2014-07-04'.to_date)).to be false
     end
+
+    specify 'a time is converted to a date' do
+      expect(subject.is_holiday?(Time.parse('2014-07-04'))).to be true
+    end
   end
 
   context "in the UK" do
@@ -94,8 +98,8 @@ describe BusinessCalendar do
       expect(subject.is_business_day?('2014-07-04'.to_date)).to be true
     end
 
-    specify 'Boxing Day is observed on a weekday' do
-      expect(subject.is_business_day?('2015-12-28'.to_date)).to be false
+    specify 'Boxing Day is not observed on the next weekday' do
+      expect(subject.is_business_day?('2015-12-28'.to_date)).to be true
     end
   end
 

data/spec/spec_helper.rb

@@ -1,9 +1,12 @@
 require 'bundler/setup'
 Bundler.setup
 
+require 'simplecov'
+
 require 'business_calendar'
 require 'date'
-require 'timecop'
+require 'pry'
+
 
 # I'm not depending on ActiveSupport just for this.
 class String

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: business_calendar
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease: 
+  version: 0.0.13
 platform: ruby
 authors:
 - Robert Nubel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: holidays
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,31 +48,27 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: pry-debugger
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,31 +76,13 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: timecop
+  name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -133,15 +104,22 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .simplecov
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - business_calendar.gemspec
-- data/holidays.yml
+- data/BR.yml
+- data/CN.yml
+- data/GB.yml
+- data/US.yml
+- gemfiles/ree.gemfile
 - lib/business_calendar.rb
 - lib/business_calendar/calendar.rb
 - lib/business_calendar/holiday_determiner.rb
+- lib/business_calendar/ruby18_shim.rb
 - lib/business_calendar/version.rb
 - spec/acceptance_br_spec.rb
 - spec/acceptance_cn_spec.rb
@@ -153,33 +131,26 @@ files:
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -788360373610172520
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -788360373610172520
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Country-aware business-date logic and handling.
 test_files:
 - spec/acceptance_br_spec.rb