business_calendar 1.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7e437b2a3580ac2cac07f883e3acc42dfa39e0bd3506e95e1e46a1441d14f7d
-  data.tar.gz: 13769d2f539ae93f3579c1b46378c5da5708b039b63f186e910d9f528e4b5041
+  metadata.gz: beb100bc24dbbd90684a3c07a5201b9608534d9d2a3a26807e59d2b646eb4579
+  data.tar.gz: b456e4a40d119ebf60e822ecd2f07751c4971f5694e8dd0a2496fccc3226768b
 SHA512:
-  metadata.gz: 625699922d3aa15522193ab57de09fa8ac5c0d13623afd47bfdbda65b2e2b2798d623ea316c0db5570b3e0c4c69de18cb4a47793167bcacf458642c516a2e0af
-  data.tar.gz: de9860000e204fc1fb05a853c437277bda370033046cc2ff43d954af432b715d39bba09f8a9d085621876f2cf508e6434063ad8ea238e01cde8eea955b7b1f42
+  metadata.gz: 9b827ee58fe6bec07fc210d3928acea4f5aec538e059ad639cc07dc97dd969837b3c33f778c860a2a5445a89352bac2d706d3ecee6f1a2933016ddb460886ce5
+  data.tar.gz: abe89b5c64c4a84fa1aaa7b21533eed255983efa6da080ddc1911328cc45c83b8cf804dd71bf079a4c433195f3f0eb1665602ba6f9c46c9b3c5a1c0a8d759377

data/.github/workflows/ci.yml

@@ -0,0 +1,30 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      matrix:
+        ruby-version: [2.3.1, 2.7.0]
+        experimental: [false]
+        include:
+          - ruby-version: head
+            experimental: true
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rspec

data/.github/workflows/gem-push.yml

@@ -0,0 +1,29 @@
+name: Ruby Gem
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby 2.7
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # business_calendar changes by version
 
+2.0.0
+---------
+
+- Remove UK weekend holidays, replace with the actual observed holiday dates [#26]
+
+1.1.0
+---------
+
+- Cache parsed responses from API endpoints for TTL (Time to Live) duration.
+- Increase default TTL duration from 5 minutes to 1 day.
+  Holidays are not expected to frequently change.
+- Allow disabling cache clearing by setting `ttl` to `false`.
+- Set hard limit to size of memoized holidays cache,
+  since large quantities of user supplied dates could consume excessive memory / cause DoS.
+
 1.0.0
 ---------
 

data/Gemfile

@@ -1,6 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'coveralls'
-
 # Specify your gem's dependencies in business_calendar.gemspec
 gemspec

data/README.md

@@ -1,8 +1,6 @@
 # BusinessCalendar
 
 [![Gem Version](https://badge.fury.io/rb/business_calendar.svg)](https://rubygems.org/gems/business_calendar)
-[![Build Status](https://travis-ci.org/enova/business_calendar.svg)](https://travis-ci.org/enova/business_calendar)
-[![Coverage Status](https://coveralls.io/repos/github/enova/business_calendar/badge.svg?branch=master)](https://coveralls.io/github/enova/business_calendar?branch=master)
 [![Dependency Status](https://gemnasium.com/enova/business_calendar.svg)](https://gemnasium.com/enova/business_calendar)
 
 Need to know what days you can actually debit a customer on in excruciating detail? Fed up with singleton-based gems 
@@ -32,7 +30,7 @@ Instantiate a calendar object with:
 bc = BusinessCalendar.for(:US)
 ```
 
-This will automatically load holidays based on the US banking holiday schedule, as configured in `data/holidays.yml`. 
+This will automatically load holidays based on the US banking holiday schedule, as configured in `data/US.yml`.
 Currently, this gem supports `:GB` and `:US` regions.
 
 Now, you can use it:

data/business_calendar.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["rnubel@enova.com"]
   spec.description   = %q{Helper gem for dealing with business days and date adjustment in multiple countries.}
   spec.summary       = %q{Country-aware business-date logic and handling.}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/enova/business_calendar"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -18,15 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-
   spec.add_dependency "holidays", "~> 1.0"
   spec.add_dependency "faraday"
-  spec.add_dependency "faraday-conductivity"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.2"
   spec.add_development_dependency "webmock"
-  spec.add_development_dependency "simplecov"
   spec.add_development_dependency "pry"
 end

data/data/GB.yml

@@ -26,12 +26,12 @@ GB:
   - '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'
+  - '2020-12-28'
+  - '2021-12-27'
+  - '2021-12-28'
+  - '2022-01-03'
+  - '2022-12-27'
+  - '2023-01-02'
   removals:
   - '2002-05-28'
   - '2007-04-08'
@@ -44,9 +44,9 @@ GB:
   - '2013-03-31'
   - '2014-04-20'
   - '2015-12-28'
-  - '2020-12-28'
-  - '2021-12-27'
-  - '2021-12-28'
-  - '2022-01-03'
-  - '2022-12-27'
-  - '2023-01-02'
+  - '2020-12-26'
+  - '2021-12-25'
+  - '2021-12-26'
+  - '2022-01-01'
+  - '2022-12-25'
+  - '2023-01-01'

data/data/US.yml

@@ -182,7 +182,6 @@ US:
   - '2021-01-18'
   - '2021-02-15'
   - '2021-05-31'
-  - '2021-07-04'
   - '2021-07-05'
   - '2021-09-06'
   - '2021-10-11'
@@ -193,18 +192,18 @@ US:
   - '2022-01-17'
   - '2022-02-21'
   - '2022-05-30'
+  - '2022-06-20'
   - '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-06-19'
   - '2023-07-04'
   - '2023-09-04'
   - '2023-10-09'
@@ -215,6 +214,7 @@ US:
   - '2024-01-15'
   - '2024-02-19'
   - '2024-05-27'
+  - '2024-06-19'
   - '2024-07-04'
   - '2024-09-02'
   - '2024-10-14'
@@ -225,6 +225,7 @@ US:
   - '2025-01-20'
   - '2025-02-17'
   - '2025-05-26'
+  - '2025-06-19'
   - '2025-07-04'
   - '2025-09-01'
   - '2025-10-13'

data/gemfiles/ruby_1.9.3.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'json', '< 2.3.0'
+
+# Specify your gem's dependencies in business_calendar.gemspec
+gemspec :path => '../'

data/lib/business_calendar.rb

@@ -1,5 +1,4 @@
 require 'faraday'
-require 'faraday/conductivity'
 
 module BusinessCalendar
   CountryNotSupported = Class.new(StandardError)
@@ -18,8 +17,7 @@ module BusinessCalendar
     end
 
     def for_endpoint(additions, removals, options = {})
-      ttl = options["ttl"] || 300
-      Calendar.new(holiday_determiner_for_endpoint(additions, removals, options), options.merge({"ttl" => ttl}))
+      Calendar.new(holiday_determiner_for_endpoint(additions, removals, options), options)
     end
 
     private
@@ -46,18 +44,22 @@ module BusinessCalendar
          :additions_only  => cfg['additions_only'] )
     end
 
+    def holiday_dates_for_endpoint(client, endpoint)
+      Proc.new { JSON.parse(client.get(endpoint).body).fetch('holidays').map { |s| Date.parse s } }
+    end
+
     def holiday_determiner_for_endpoint(additions_endpoint, removals_endpoint, opts)
       client = Faraday.new do |conn|
-        conn.response :selective_errors
+        conn.response :raise_error
         conn.adapter :net_http
       end
 
       additions = if additions_endpoint
-                    Proc.new { JSON.parse(client.get(additions_endpoint).body).fetch('holidays').map { |s| Date.parse s } }
+                    holiday_dates_for_endpoint(client, additions_endpoint)
                   end
 
       removals = if removals_endpoint
-                   Proc.new { JSON.parse(client.get(removals_endpoint).body).fetch('holidays').map { |s| Date.parse s } }
+                   holiday_dates_for_endpoint(client, removals_endpoint)
                  end
 
       HolidayDeterminer.new(
@@ -65,7 +67,8 @@ module BusinessCalendar
         opts["holiday_names"] || [],
         :additions       => additions,
         :removals        => removals,
-        :additions_only  => opts["additions_only"] || []
+        :additions_only  => opts["additions_only"] || [],
+        :ttl => opts['ttl']
       )
     end
 

data/lib/business_calendar/calendar.rb

@@ -1,9 +1,12 @@
 class BusinessCalendar::Calendar
+  DEFAULT_TIME_TO_LIVE = 24 * 60 * 60
   attr_reader :holiday_determiner
 
   # @param [Proc[Date -> Boolean]] a proc which returns whether or not a date is a
   #                                holiday.
   def initialize(holiday_determiner, options = {})
+    ttl = options['ttl']
+    @time_to_live = ttl.nil? ? DEFAULT_TIME_TO_LIVE : ttl
     @options = options
     @holiday_cache = {}
     @holiday_determiner = holiday_determiner
@@ -14,7 +17,7 @@ class BusinessCalendar::Calendar
   def is_holiday?(date)
     date = date.send(:to_date) if date.respond_to?(:to_date, true)
 
-    clear_cache if @options["ttl"]
+    clear_cache if should_clear_cache?
 
     @holiday_cache[date] ||= holiday_determiner.call(date)
   end
@@ -22,7 +25,7 @@ class BusinessCalendar::Calendar
   # @param [Date]     date
   # @return [Boolean] Whether or not banking can be done on <date>.
   def is_business_day?(date)
-    return false if !@options["business_weekends"] && (date.saturday? || date.sunday?)
+    return false if !@options['business_weekends'] && (date.saturday? || date.sunday?)
     return false if is_holiday?(date)
     true
   end
@@ -108,6 +111,19 @@ class BusinessCalendar::Calendar
   end
 
   private
+
+  def should_clear_cache?
+    return false unless @time_to_live
+
+    # limit size using a heuristic, to prevent cache growing arbitrarily large
+    !@last_cleared || (Time.now - @last_cleared) >= @time_to_live || @holiday_cache.size > 365 * 3
+  end
+
+  def clear_cache
+    @last_cleared = Time.now
+    @holiday_cache = {}
+  end
+
   def with_one_or_many(thing_or_things)
     if thing_or_things.is_a? Enumerable
       thing_or_things.collect do |thing|
@@ -117,11 +133,4 @@ class BusinessCalendar::Calendar
       yield thing_or_things
     end
   end
-
-  def clear_cache
-    if !@issued_at || (Time.now - @issued_at) >= @options["ttl"]
-      @issued_at = Time.now
-      @holiday_cache = {}
-    end
-  end
 end

data/lib/business_calendar/holiday_determiner.rb

@@ -1,9 +1,12 @@
 require 'holidays'
 
 class BusinessCalendar::HolidayDeterminer
+  DEFAULT_TIME_TO_LIVE = 24 * 60 * 60
   attr_reader :regions, :holiday_names, :additions, :removals, :additions_only
 
   def initialize(regions, holiday_names, opts = {})
+    ttl = opts[:ttl]
+    @time_to_live = ttl.nil? ? DEFAULT_TIME_TO_LIVE : ttl
     @regions        = regions
     @holiday_names  = holiday_names
     @additions      = opts[:additions]      || []
@@ -12,6 +15,8 @@ class BusinessCalendar::HolidayDeterminer
   end
 
   def call(date)
+    clear_cache if should_clear_cache?
+
     if additions.include? date
       true
     elsif removals.include? date
@@ -23,11 +28,24 @@ class BusinessCalendar::HolidayDeterminer
   end
 
   private
+
+  def should_clear_cache?
+    return false unless @time_to_live
+
+    !@last_cleared || (Time.now - @last_cleared) >= @time_to_live
+  end
+
+  def clear_cache
+    @last_cleared = Time.now
+    @additions_cache = nil
+    @removals_cache = nil
+  end
+
   def additions
-    @additions.is_a?(Proc) ? @additions.call : @additions
+    @additions_cache ||= @additions.is_a?(Proc) ? @additions.call : @additions
   end
 
   def removals
-    @removals.is_a?(Proc) ? @removals.call : @removals
+    @removals_cache ||= @removals.is_a?(Proc) ? @removals.call : @removals
   end
 end

data/lib/business_calendar/version.rb

@@ -1,3 +1,3 @@
 module BusinessCalendar
-  VERSION = "1.0.0"
+  VERSION = "3.0.0"
 end

data/spec/acceptance_gb_spec.rb

@@ -20,12 +20,12 @@ describe "GB bank holidays" do
       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
+      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 |expected_holiday|
     it "treats #{expected_holiday} as a holiday" do
       expect(BusinessCalendar.for(:GB).is_holiday?(expected_holiday)).to be true
@@ -35,12 +35,12 @@ describe "GB bank holidays" do
   %w(
       2012-05-28
       2015-12-28
-      2020-12-28
-      2021-12-27
-      2021-12-28
-      2022-01-03
-      2022-12-27
-      2023-01-02
+      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 |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

@@ -175,7 +175,6 @@ describe "US holidays" do
     2021-01-18
     2021-02-15
     2021-05-31
-    2021-07-04
     2021-07-05
     2021-09-06
     2021-10-11
@@ -186,18 +185,18 @@ describe "US holidays" do
     2022-01-17
     2022-02-21
     2022-05-30
+    2022-06-20
     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-06-19
     2023-07-04
     2023-09-04
     2023-10-09
@@ -208,6 +207,7 @@ describe "US holidays" do
     2024-01-15
     2024-02-19
     2024-05-27
+    2024-06-19
     2024-07-04
     2024-09-02
     2024-10-14
@@ -218,6 +218,7 @@ describe "US holidays" do
     2025-01-20
     2025-02-17
     2025-05-26
+    2025-06-19
     2025-07-04
     2025-09-01
     2025-10-13

data/spec/business_calendar/holiday_determiner_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe BusinessCalendar::HolidayDeterminer do
   let(:regions) { [ :us ] }
-  let(:opts)    {{}}
+  let(:opts)    { {} }
   subject { BusinessCalendar::HolidayDeterminer.new(regions, ["Independence Day"], opts) }
 
   it "initializes with list of regions and a list of accepted holidays" do

data/spec/business_calendar_spec.rb

@@ -191,38 +191,182 @@ describe BusinessCalendar do
       it_behaves_like "weekends as business days"
     end
 
-    it 'hits the configured endpoint for each call to an addition or removal' do
+    it 'hits the configured endpoint and then reuses the cached result' do
+      subject.is_business_day?('2014-07-03'.to_date)
       subject.is_business_day?('2014-07-03'.to_date)
       subject.is_business_day?('2014-07-04'.to_date)
       subject.is_holiday?('2014-07-06'.to_date)
+      subject.is_holiday?('2014-07-06'.to_date)
       subject.is_holiday?('2014-12-24'.to_date)
 
-      expect(a_request(:get, additions)).to have_been_made.times(4)
-      expect(a_request(:get, removals)).to have_been_made.times(3)
+      expect(a_request(:get, additions)).to have_been_made.times(1)
+      expect(a_request(:get, removals)).to have_been_made.times(1)
     end
 
-    it 'caches holidays for 5 min' do
-      start = Time.now
+    context 'after 24 hours without specifying a Time to Live override' do
+      subject { BusinessCalendar.for_endpoint(additions, removals) }
+      let!(:start) { Time.now }
+      let!(:one_day) { 86400 }
 
-      allow(Time).to receive(:now) { start }
+      it 'expires the holidays cache' do
+        allow(Time).to receive(:now) { start }
 
-      subject.is_business_day?('2014-07-04'.to_date)
-      subject.is_business_day?('2014-07-04'.to_date)
+        subject.is_business_day?('2014-01-01'.to_date)
 
-      expect(a_request(:get, additions)).to have_been_made.times(1)
+        # initial request was made
+        expect(a_request(:get, additions)).to have_been_made.times(1)
 
-      allow(Time).to receive(:now) { start + 301 }
+        subject.is_business_day?('2014-07-04'.to_date)
+        subject.is_business_day?('2014-11-28'.to_date)
 
-      subject.is_business_day?('2014-07-04'.to_date)
+        # cache from initial request was still used
+        expect(a_request(:get, additions)).to have_been_made.times(1)
+
+        # 24 hours + 1 second have passed
+        # cache should be cleared and fresh API request made
+        allow(Time).to receive(:now) { start + one_day + 1 }
+
+        subject.is_business_day?('2014-01-01'.to_date)
+
+        # 2nd request was made
+        expect(a_request(:get, additions)).to have_been_made.times(2)
+
+        subject.is_business_day?('2014-07-04'.to_date)
+        subject.is_business_day?('2014-11-28'.to_date)
+
+        # 2nd request is now cached, so no new request should have been issued
+        expect(a_request(:get, additions)).to have_been_made.times(2)
+      end
+    end
+
+    context 'turning off Time to Live functionality' do
+      subject { BusinessCalendar.for_endpoint(additions, removals, {'ttl' => false}) }
+      let!(:start) { Time.now }
+      let!(:one_day) { 86400 }
+
+      it 'will never clear the cache' do
+        allow(Time).to receive(:now) { start }
+
+        subject.is_business_day?('2014-01-01'.to_date)
+        expect(a_request(:get, additions)).to have_been_made.times(1)
+
+        allow(Time).to receive(:now) { start + 301 }
+        subject.is_business_day?('2014-01-01'.to_date)
+        subject.is_business_day?('2014-07-04'.to_date)
+        subject.is_business_day?('2014-07-04'.to_date)
+        subject.is_business_day?('2014-11-28'.to_date)
+        expect(a_request(:get, additions)).to have_been_made.times(1)
+
+        allow(Time).to receive(:now) { start + one_day + 1 }
+        subject.is_business_day?('2014-01-01'.to_date)
+        subject.is_business_day?('2014-07-04'.to_date)
+        subject.is_business_day?('2014-11-28'.to_date)
+        expect(a_request(:get, additions)).to have_been_made.times(1)
+      end
+    end
+
+    context 'setting Time to Live override to zero' do
+      subject { BusinessCalendar.for_endpoint(additions, removals, {'ttl' => 0}) }
+      let!(:start) { Time.now }
+
+      it 'will always clear the cache' do
+        allow(Time).to receive(:now) { start }
+
+        subject.is_holiday?('2014-01-01'.to_date)
+        expect(a_request(:get, additions)).to have_been_made.times(1)
+
+        allow(Time).to receive(:now) { start + 301 }
+
+        subject.is_holiday?('2014-01-01'.to_date)
+        subject.is_holiday?('2014-07-04'.to_date)
+        subject.is_holiday?('2014-07-04'.to_date)
+        subject.is_holiday?('2014-11-28'.to_date)
+
+        expect(a_request(:get, additions)).to have_been_made.times(5)
+
+        subject.is_holiday?('2014-01-01'.to_date)
+        subject.is_holiday?('2014-01-01'.to_date)
+        subject.is_holiday?('2014-07-04'.to_date)
+        subject.is_holiday?('2014-11-28'.to_date)
+        expect(a_request(:get, additions)).to have_been_made.times(9)
+      end
+    end
 
-      expect(a_request(:get, additions)).to have_been_made.times(2)
+    context 'using a 5 minute Time to Live override' do
+      subject { BusinessCalendar.for_endpoint(additions, removals, {'ttl' => 300}) }
+      let!(:start) { Time.now }
+
+      it 'expires the holidays cache after the specified time has elapsed' do
+        allow(Time).to receive(:now) { start }
+
+        # initial request made and cached
+        subject.is_business_day?('2014-01-01'.to_date)
+        subject.is_business_day?('2014-07-04'.to_date)
+        subject.is_business_day?('2014-11-28'.to_date)
+        expect(a_request(:get, additions)).to have_been_made.times(1)
+
+        # 120 seconds pass, cache should still be used
+        allow(Time).to receive(:now) { start + 120 }
+        subject.is_business_day?('2014-01-01'.to_date)
+        subject.is_business_day?('2014-07-04'.to_date)
+        subject.is_business_day?('2014-11-28'.to_date)
+        expect(a_request(:get, additions)).to have_been_made.times(1)
+
+        # 301 seconds pass, cache is expired and 2nd request made
+        allow(Time).to receive(:now) { start + 301 }
+        subject.is_business_day?('2014-01-01'.to_date)
+        subject.is_business_day?('2014-07-04'.to_date)
+        subject.is_business_day?('2014-11-28'.to_date)
+        expect(a_request(:get, additions)).to have_been_made.times(2)
+
+        # 2nd request is now cached, so no new request should have been issued
+        subject.is_business_day?('2014-01-01'.to_date)
+        subject.is_business_day?('2014-07-04'.to_date)
+        subject.is_business_day?('2014-11-28'.to_date)
+        expect(a_request(:get, additions)).to have_been_made.times(2)
+      end
+    end
+
+    context 'with a few years in dates filling the cache' do
+      let!(:start) { Time.now }
+
+      # NOTE: this test cheats a bit to test class internals / implementation
+      it 'will clear out the holiday cache but keep the cached API result' do
+        allow(Time).to receive(:now) { start }
+        subject.is_business_day?('2014-07-04'.to_date)
+        expect(a_request(:get, additions)).to have_been_made.times(1)
+
+        expect(a_request(:get, additions)).to have_been_made.times(1)
+        (2014..2017).each do |year|
+          (1..12).each do |month|
+            (1..28).each do |day|
+              subject.is_business_day?("#{year}-#{month}-#{day}".to_date)
+            end
+          end
+        end
+
+        # about to reach cache size threshold
+        expect(subject.instance_variable_get('@holiday_cache').size).to be(960)
+
+        (1..7).each do |month|
+          (1..28).each do |day|
+            subject.is_business_day?("#2018-#{month}-#{day}".to_date)
+          end
+        end
+
+        # now holiday cache will have been cleared and should be small again
+        expect(subject.instance_variable_get('@holiday_cache').size).to be(4)
+
+        # and cached API response was still used
+        expect(a_request(:get, additions)).to have_been_made.times(1)
+      end
     end
 
     context 'http request fails' do
       before { stub_request(:get, additions).to_return(:status => 500) }
 
       it 'raises an error' do
-        expect { subject.is_business_day?('2014-07-04'.to_date) }.to raise_error Faraday::ClientError
+        expect { subject.is_business_day?('2014-07-04'.to_date) }.to raise_error Faraday::Error
       end
     end
 

data/spec/spec_helper.rb

@@ -1,8 +1,6 @@
 require 'bundler/setup'
 Bundler.setup
 
-require 'simplecov'
-
 require 'business_calendar'
 require 'date'
 require 'webmock/rspec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: business_calendar
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Robert Nubel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-12 00:00:00.000000000 Z
+date: 2021-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: holidays
@@ -38,34 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday-conductivity
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -144,10 +102,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
+- ".github/workflows/gem-push.yml"
 - ".gitignore"
 - ".rspec"
-- ".simplecov"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -160,6 +118,7 @@ files:
 - data/US.yml
 - data/org/captalys.yml
 - gemfiles/ree.gemfile
+- gemfiles/ruby_1.9.3.gemfile
 - lib/business_calendar.rb
 - lib/business_calendar/calendar.rb
 - lib/business_calendar/holiday_determiner.rb
@@ -173,7 +132,7 @@ files:
 - spec/business_calendar/holiday_determiner_spec.rb
 - spec/business_calendar_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/enova/business_calendar
 licenses:
 - MIT
 metadata: {}
@@ -192,8 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Country-aware business-date logic and handling.

data/.simplecov

@@ -1,8 +0,0 @@
-unless RUBY_VERSION == "1.8.7"
-  require 'coveralls'
-
-  Coveralls.wear! do
-    add_filter "version.rb"
-    add_filter "spec/"
-  end
-end

data/.travis.yml

@@ -1,25 +0,0 @@
-sudo: false
-language: ruby
-cache: bundler
-
-matrix:
-  include:
-    - rmv: ree
-      gemfile: gemfiles/ree.gemfile
-      script: bundle exec rspec
-    - rvm: 1.9.3
-      script: bundle exec rspec
-    - rvm: 2.3.1
-      script: bundle exec rspec
-
-env:
-  global:
-    secure: klQ3BQNdKkGIq3Zfv8Sr6oZqaMg9GHx+LGhynQ5xt7A6SGvxbMuoXJlE9wW4me6u+B9S2D+q+pdKgGPE/+fHsVt/d0zDXRnrjVyo1eexT220AMfpjiFDAtya8sAcuuAICLhw8AmzTjns8yAWInv5U5vC6oejkLA71FXtHU//210=
-
-deploy:
-  provider: rubygems
-  api_key:
-    secure: "c9QcNX+nk0Yzl22ZVknZtv+/G4fUeLph0TH9PS6hQ92zywM61wtXTJExZdBHulvKAaQbKaq20LcFjLw41qwJc6tvIEYXpOinfOaiemTKaGmKscDrIi3wUAxfjmTacXZAaTdEORQVqTOmppqsuKnP7cqmSNxTSI901Sz5Cy6Jpl0="
-  on:
-    tags: true
-    repo: enova/business_calendar