banking_calendar 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb51632a085695d1691c98c6cb374298d267d49395058f8a0796be41a298a761
-  data.tar.gz: 2b863ad87135df45c0b3bd13040bdd43399bfcea6af2d745fd1b28a7c0275a05
+  metadata.gz: 6fe25c53a1e7a771f43de415ee1195c06ff985a47ed297cd1e438688d64dbe06
+  data.tar.gz: ba475f817892c882ff8372c83e54c2df30a1df1c691cd1fec9ad3ed90c9eb0bf
 SHA512:
-  metadata.gz: c359e64cbe4156d9824401039ce59d7cd72a74f9a1e34bfbdcec3ff77adfa7381bb59083b90567100b6b3755626d6dac36424758a2cbc5dca39daa50c06fce20
-  data.tar.gz: 12a24e0a24314394b2eb20a6e4782a954fcb1b65f2f3155373e439bf31942d68f419e6a059be5a0131e08b0ce4aebba3a98e774ec4aaf2caf28d93f05e47897b
+  metadata.gz: 492881d3f120a304143e02a8cf491a74440470956944019e6bd4273196b33172cdfc348d10c8738ec3df0af1232625d7fb8e6cab9c59aa3fbab52353ddda6c00
+  data.tar.gz: be84c832399d0806fd4a4af9831eb30f2300eae20d79815dcca2cf9914d72e014089f6fc5bd8de41be03b2fd7570b896ee1a23b877d22b87a148a492ceb18625

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+# v0.0.1 - May 8, 2020
+
+- Initial release
+
+# v0.1.0 - May 19, 2020
+
+- Adds support for banking time and normalization of banking days
+- Includes banking time in rollover calculations, if provided
+- Extended default calendar library to include 2021 bank holidays

data/README.md

@@ -1,11 +1,25 @@
 # Banking Calendar
 
+[![Gem Version](https://badge.fury.io/rb/banking_calendar.svg)](https://badge.fury.io/rb/banking_calendar)
 [![CircleCI](https://circleci.com/gh/paymongo/banking_calendar.svg?style=svg)](https://circleci.com/gh/paymongo/banking_calendar)
 
-This Banking Calendar library provides a way to calculate days based on the banking calendar.
+This Banking Calendar library provides a way to calculate days based on the banking calendar. This library supports dates with or without the time component. If the time component is provided, e.g. using `Time` or `DateTime` objects, the returned calculated date will normalize to the end of banking day based on the provided banking hours.
 
 # How to use
 
+You may use the package by running:
+
+```sh
+gem install banking_calendar
+```
+
+If you are installing via the bundler, make sure to use the https rubygems source:
+
+```sh
+source 'https://rubygems.org'
+
+gem 'banking_calendar'
+```
 ## Basic usage
 
 You can create a banking calendar by creating an instance of the `Calendar` class and specifying
@@ -14,10 +28,13 @@ the `banking_days` and `bank_holidays`.
 ```ruby
 calendar = BankingCalendar::Calendar.new(
   banking_days: %w(monday tuesday wednesday thursday friday),
-  banking_holidays: %w(2020-01-01 2020-01-25)
+  banking_holidays: %w(2020-01-01 2020-01-25),
+  banking_hours: (9..16).to_a
 )
 ```
-If `banking_days` value is not provided, then the default used is Monday to Friday.
+If `banking_days` is not provided, then the default used is Monday to Friday.
+
+Note that `banking_hours` is a list of hours, in 24-hours time integers, from opening to closing. It is exclusive of the banking hour at bank closing time. For example, if the banking hours are from 9 a.m. to 5 p.m., the list of banking hours provided must be equivalent to `[9, 10, 11, 12, 13, 14, 15, 16]`. If `banking_hours` is not provided, the default used is from 9 a.m. to 5 p.m. on a regular banking day.
 
 ## Using default calendars
 
@@ -25,7 +42,7 @@ Some few calendar configurations are provided. You may use them by calling `load
 the name of the calendar you want to load. You may refer to the list of available calendars below.
 
 ```ruby
-  calendar = BankingCalendar::Calendar.load_calendar('bsp')
+calendar = BankingCalendar::Calendar.load_calendar('bsp')
 ```
 
 ## Useful methods
@@ -44,6 +61,8 @@ calendar.banking_day?(Date.parse('15 April 2020'))
 Given a `date`, this method returns the date after `interval` number of business days. If the given
 `date` falls on a non-banking day, the calculation starts at the next possible banking day.
 
+If banking hours are provided in the calendar configuration, the returned date and time will be normalized to the end of banking day. If given time falls after banking hours, counting starts from the next banking day.
+
 ```ruby
  # May 4, Monday is a banking day
 date = Date.parse('2020-05-04')
@@ -55,12 +74,22 @@ date = Date.parse('2020-05-01')
 # Next banking day is May 4, Monday
 calendar.banking_days_after(date, 2).strftime("%A, %B %d, %Y")
 # => Wednesday, May 06, 2020
+
+date = DateTime.parse('2020-05-04 11:00')
+calendar.banking_days_after(date, 2)
+# => May 6, 2020 at 5 p.m.
+
+date = DateTime.parse('2020-05-04 19:00')
+calendar.banking_days_after(date, 2)
+# => May 7, 2020 at 5 p.m.
 ```
 
 ### banking_days_before(date, interval)
 Given a `date`, this method returns the prior `interval` number of business days. If the given
 `date` falls on a non-banking day, the calculation starts at the first previous possible banking day.
 
+If banking hours are provided in the calendar configuration, the returned date and time will be normalized to the end of banking day. If given time does not falls before banking hours, counting starts from the previous banking day.
+
 ```ruby
  # May 22, 2020 Friday is a banking day
 date = Date.parse('2020-05-22')
@@ -70,8 +99,16 @@ calendar.banking_days_before(date, 4).strftime("%A, %B %d, %Y")
 # May 1, 2020 Friday is a bank holiday
 date = Date.parse('2020-05-01')
 # Previous banking day is April 30, 2020 Thursday
-calendar.banking_days_after(date, 2).strftime("%A, %B %d, %Y")
+calendar.banking_days_before(date, 2).strftime("%A, %B %d, %Y")
 # => Tuesday, April 28, 2020
+
+date = DateTime.parse('2020-05-06 11:00')
+calendar.banking_days_before(date, 2)
+# => May 4, 2020 at 5 p.m.
+
+date = DateTime.parse('2020-05-08 06:00')
+calendar.banking_days_before(date, 2)
+# => May 5, 2020 at 5 p.m.
 ```
 
 ### next_banking_day(date)

data/lib/banking_calendar/calendar.rb

@@ -41,7 +41,13 @@ module BankingCalendar
     end
 
     DEFAULT_BANKING_DAYS = %w[mon tue wed thu fri].freeze
-    VALID_CALENDAR_KEYS = %i[banking_days bank_holidays].freeze
+    DEFAULT_BANKING_HOURS = (9..16).to_a.freeze
+    VALID_CALENDAR_KEYS = %i[
+      banking_days
+      bank_holidays
+      banking_hours
+    ].freeze
+    VALID_BANKING_HOURS_KEYS = %i[start end].freeze
     VALID_DAYS = %w[sun mon tue wed thu fri sat].freeze
 
     @semaphore = Mutex.new
@@ -75,8 +81,18 @@ module BankingCalendar
       date
     end
 
+    # Given a date, add interval number of banking days.
+    #
+    # If the given date is not a banking day, counting starts from the
+    # next banking day.
+    #
+    # If banking hours are provided, returned date and time will be
+    # normalized to the end of banking day. If given date falls after
+    # banking hours, counting starts from the next banking day.
     def banking_days_after(date, interval)
+      date = normalize_date(date, :after) if with_banking_hours?
       date = next_banking_day(date) unless banking_day?(date)
+
       interval.times do
         date = next_banking_day(date)
       end
@@ -84,8 +100,18 @@ module BankingCalendar
       date
     end
 
+    # Given a date, subtract interval number of banking days.
+    #
+    # If the given date is not a banking day, counting starts from the
+    # previous banking day.
+    #
+    # If banking hours are provided, returned date and time will be
+    # normalized to the end of banking day. If given date falls before
+    # banking hours, counting starts from the prior banking day.
     def banking_days_before(date, interval)
+      date = normalize_date(date, :before) if with_banking_hours?
       date = previous_banking_day(date) unless banking_day?(date)
+
       interval.times do
         date = previous_banking_day(date)
       end
@@ -103,6 +129,41 @@ module BankingCalendar
       true
     end
 
+    def banking_hour?(date)
+      time_or_datetime?(date)
+
+      hour = date.hour
+
+      return false unless banking_day?(date)
+      return false unless banking_hours.include?(hour)
+
+      true
+    end
+
+    def before_banking_hours?(date)
+      time_or_datetime? date
+      return false unless banking_day?(date)
+
+      date.hour < banking_hours.min
+    end
+
+    def after_banking_hours?(date)
+      time_or_datetime? date
+      return true unless banking_day?(date)
+
+      date.hour > banking_hours.max
+    end
+
+    def end_of_banking_day(date)
+      date.class.new(
+        date.year,
+        date.month,
+        date.day,
+        banking_hours.max + 1,
+        0
+      )
+    end
+
     private
 
     def duration_for(date, interval = 1)
@@ -115,6 +176,54 @@ module BankingCalendar
       end
     end
 
+    def time_or_datetime?(date)
+      unless date.is_a?(Time) || date.is_a?(DateTime)
+        raise "#{date} is #{date.class}. " \
+          'Must be Time or DateTime if accounting for banking hours.'
+      end
+    end
+
+    def roll_forward(date)
+      if banking_day?(date) && after_banking_hours?(date)
+        date = next_banking_day(date)
+      end
+
+      date
+    end
+
+    def roll_backward(date)
+      if banking_day?(date) && before_banking_hours?(date)
+        date = previous_banking_day(date)
+      end
+
+      date
+    end
+
+    def normalize_date(date, rollover)
+      time_or_datetime? date
+
+      if rollover == :after
+        date = roll_forward(date)
+      elsif rollover == :before
+        date = roll_backward(date)
+      end
+      date = end_of_banking_day(date)
+
+      date
+    end
+
+    def banking_hours
+      @banking_hours ||= (@config[:banking_hours] || DEFAULT_BANKING_HOURS).map do |hour|
+        hour.tap do |h|
+          raise "#{h} is an invalid hour." if h > 24 || h.negative?
+        end
+      end
+    end
+
+    def with_banking_hours?
+      @config.key?(:banking_hours)
+    end
+
     def banking_days
       @banking_days ||= (@config[:banking_days] || DEFAULT_BANKING_DAYS).map do |day|
         day.downcase.strip[0..2].tap do |shortened_day|

data/lib/banking_calendar/data/bsp.yml

@@ -5,6 +5,16 @@ banking_days:
   - thursday
   - friday
 
+banking_hours:
+  - 9
+  - 10
+  - 11
+  - 12
+  - 13
+  - 14
+  - 15
+  - 16
+
 bank_holidays:
   - 2020-01-01
   - 2020-01-25
@@ -24,3 +34,23 @@ bank_holidays:
   - 2020-12-25
   - 2020-12-30
   - 2020-12-31
+  - 2021-01-01
+  - 2021-02-12
+  - 2021-02-25
+  - 2021-04-01
+  - 2021-04-02
+  - 2021-04-09
+  - 2021-05-01
+  - 2021-05-13
+  - 2021-06-12
+  - 2021-07-20
+  - 2021-08-21
+  - 2021-08-30
+  - 2021-11-01
+  - 2021-11-02
+  - 2021-11-30
+  - 2021-12-08
+  - 2021-12-24
+  - 2021-12-25
+  - 2021-12-30
+  - 2021-12-31

data/lib/banking_calendar/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BankingCalendar
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

data/spec/calendar_spec.rb

@@ -25,7 +25,7 @@ describe BankingCalendar::Calendar do
       subject { BankingCalendar::Calendar.load_calendar('invalid_calendar') }
       it 'raises an error' do
         expect { subject }.to raise_error(
-          'Only the following keys are valid: banking_days, bank_holidays'
+          'Only the following keys are valid: banking_days, bank_holidays, banking_hours'
         )
       end
     end
@@ -39,21 +39,6 @@ describe BankingCalendar::Calendar do
         )
       end
     end
-
-    context 'when calendar is from an additional directory' do
-      after { BankingCalendar::Calendar.additional_load_paths = nil }
-      subject { BankingCalendar::Calendar.load_calendar('valid_calendar') }
-
-      it { is_expected.to be_a BankingCalendar::Calendar }
-
-      context 'when also a default calendar' do
-        subject { BankingCalendar::Calendar.load_calendar('bsp') }
-
-        it 'uses the custom calendar' do
-          expect(subject.banking_day?(Date.parse('2020-01-01'))).to eq(true)
-        end
-      end
-    end
   end
 
   shared_examples 'shared' do
@@ -202,6 +187,382 @@ describe BankingCalendar::Calendar do
     end
   end
 
+  shared_examples 'with_time' do
+    context 'when providing date objects without time' do
+      let(:cal) do
+        BankingCalendar::Calendar.load_calendar('bsp')
+      end
+      subject { cal.banking_hour?(date) }
+
+      context 'when provided a valid date' do
+        let(:date) { date_class.parse('2020-01-10 10:00') }
+        it { is_expected.to be_truthy }
+      end
+
+      context 'when provided an invalid date' do
+        let(:date) { Date.parse('2020-01-10') }
+
+        it 'raises an error' do
+          expect { subject }.to raise_error(
+            '2020-01-10 is Date. ' \
+            'Must be Time or DateTime if accounting for banking hours.'
+          )
+        end
+      end
+    end
+
+    describe '#banking_hour?' do
+      let(:cal) do
+        BankingCalendar::Calendar.load_calendar('bsp')
+      end
+      subject { cal.banking_hour?(date) }
+
+      context 'when it is a banking hour' do
+        context 'when it is a banking day' do
+          let(:date) { date_class.parse('2020-01-10 10:00') }
+          it { is_expected.to be_truthy }
+        end
+
+        context 'when it is a non-banking day' do
+          let(:date) { date_class.parse('2020-01-01 13:12') }
+          it { is_expected.to be_falsey }
+        end
+      end
+
+      context 'when it is not a banking hour' do
+        context 'when it is a banking day' do
+          let(:date) { date_class.parse('2020-01-10 06:22') }
+          it { is_expected.to be_falsey }
+        end
+
+        context 'when it is a non-banking day' do
+          let(:date) { date_class.parse('2020-01-01 18:55') }
+          it { is_expected.to be_falsey }
+        end
+      end
+    end
+
+    describe '#before_banking_hours?' do
+      let(:cal) do
+        BankingCalendar::Calendar.load_calendar('bsp')
+      end
+      subject { cal.before_banking_hours?(date) }
+
+      context 'when it is a banking day' do
+        context 'given before banking hours' do
+          let(:date) { date_class.parse('2020-01-10 06:22') }
+          it { is_expected.to be_truthy }
+        end
+
+        context 'given during banking hours' do
+          let(:date) { date_class.parse('2020-01-10 14:14') }
+          it { is_expected.to be_falsey }
+        end
+
+        context 'given after banking hours' do
+          let(:date) { date_class.parse('2020-01-10 17:15') }
+          it { is_expected.to be_falsey }
+        end
+      end
+
+      context 'when it is a non-banking day' do
+        context 'given before banking hours' do
+          let(:date) { date_class.parse('2020-05-02 06:22') }
+          it { is_expected.to be_falsey }
+        end
+
+        context 'given during banking hours' do
+          let(:date) { date_class.parse('2020-05-02 14:14') }
+          it { is_expected.to be_falsey }
+        end
+
+        context 'given after banking hours' do
+          let(:date) { date_class.parse('2020-05-02 17:15') }
+          it { is_expected.to be_falsey }
+        end
+      end
+
+      context 'when it is a holiday' do
+        context 'given before banking hours' do
+          let(:date) { date_class.parse('2020-01-01 06:22') }
+          it { is_expected.to be_falsey }
+        end
+
+        context 'given during banking hours' do
+          let(:date) { date_class.parse('2020-01-01 14:14') }
+          it { is_expected.to be_falsey }
+        end
+
+        context 'given after banking hours' do
+          let(:date) { date_class.parse('2020-01-01 17:15') }
+          it { is_expected.to be_falsey }
+        end
+      end
+    end
+
+    describe '#after_banking_hours?' do
+      let(:cal) do
+        BankingCalendar::Calendar.load_calendar('bsp')
+      end
+      subject { cal.after_banking_hours?(date) }
+
+      context 'when it is a banking day' do
+        context 'given before banking hours' do
+          let(:date) { date_class.parse('2020-01-10 06:22') }
+          it { is_expected.to be_falsey }
+        end
+
+        context 'given during banking hours' do
+          let(:date) { date_class.parse('2020-01-10 14:14') }
+          it { is_expected.to be_falsey }
+        end
+
+        context 'given before banking hours' do
+          let(:date) { date_class.parse('2020-01-10 17:15') }
+          it { is_expected.to be_truthy }
+        end
+      end
+
+      context 'when it is a non-banking day' do
+        context 'given before banking hours' do
+          let(:date) { date_class.parse('2020-05-02 06:22') }
+          it { is_expected.to be_truthy }
+        end
+
+        context 'given during banking hours' do
+          let(:date) { date_class.parse('2020-05-02 14:14') }
+          it { is_expected.to be_truthy }
+        end
+
+        context 'given before banking hours' do
+          let(:date) { date_class.parse('2020-05-02 17:15') }
+          it { is_expected.to be_truthy }
+        end
+      end
+
+      context 'when it is a holiday' do
+        context 'given before banking hours' do
+          let(:date) { date_class.parse('2020-01-01 06:22') }
+          it { is_expected.to be_truthy }
+        end
+
+        context 'given during banking hours' do
+          let(:date) { date_class.parse('2020-01-01 14:14') }
+          it { is_expected.to be_truthy }
+        end
+
+        context 'given before banking hours' do
+          let(:date) { date_class.parse('2020-01-01 17:15') }
+          it { is_expected.to be_truthy }
+        end
+      end
+    end
+
+    describe '#banking_days_after' do
+      let(:cal) do
+        BankingCalendar::Calendar.load_calendar('bsp')
+      end
+      subject { cal.banking_days_after(date, delta) }
+
+      context 'when it is a banking day' do
+        context 'followed only by banking days' do
+          context 'when it is before banking hours' do
+            let(:date) { date_class.parse('2020-01-13 04:00') }
+            let(:delta) { 3 }
+            it { is_expected.to eq(cal.end_of_banking_day(date + delta * interval)) }
+          end
+
+          context 'when it is during banking hours' do
+            let(:date) { date_class.parse('2020-01-13 11:00') }
+            let(:delta) { 3 }
+            it { is_expected.to eq(cal.end_of_banking_day(date + delta * interval)) }
+          end
+
+          context 'when it is after banking hours' do
+            let(:date) { date_class.parse('2020-01-13 18:00') }
+            let(:delta) { 3 }
+            it { is_expected.to eq(cal.end_of_banking_day(date + (delta + 1) * interval)) }
+          end
+        end
+
+        context 'followed by a weekend' do
+          context 'when it is before banking hours' do
+            let(:date) { date_class.parse('2020-05-15 04:00') }
+            let(:delta) { 3 }
+            it { is_expected.to eq(cal.end_of_banking_day(date + (delta + 2) * interval)) }
+          end
+
+          context 'when it is during banking hours' do
+            let(:date) { date_class.parse('2020-05-15 13:00') }
+            let(:delta) { 3 }
+            it { is_expected.to eq(cal.end_of_banking_day(date + (delta + 2) * interval)) }
+          end
+
+          context 'when it is after banking hours' do
+            let(:date) { date_class.parse('2020-05-15 18:15') }
+            let(:delta) { 3 }
+            it { is_expected.to eq(cal.end_of_banking_day(date + (delta + 3) * interval)) }
+          end
+        end
+
+        context 'followed by a holiday' do
+          context 'when it is before banking hours' do
+            let(:date) { date_class.parse('2020-02-24 04:00') }
+            let(:delta) { 3 }
+            it { is_expected.to eq(cal.end_of_banking_day(date + (delta + 1) * interval)) }
+          end
+
+          context 'when it is during banking hours' do
+            let(:date) { date_class.parse('2020-02-24 13:00') }
+            let(:delta) { 3 }
+            it { is_expected.to eq(cal.end_of_banking_day(date + (delta + 1) * interval)) }
+          end
+
+          context 'when it is after banking hours' do
+            let(:date) { date_class.parse('2020-02-24 18:15') }
+            let(:delta) { 3 }
+            it { is_expected.to eq(cal.end_of_banking_day(date + (delta + 4) * interval)) }
+          end
+        end
+      end
+
+      context 'when it is a non-banking day' do
+        context 'followed only by banking days' do
+          context 'when time is before banking hours' do
+            let(:date) { date_class.parse('2020-05-10 04:00') }
+            let(:delta) { 3 }
+            it { is_expected.to eq(cal.end_of_banking_day(date + (delta + 1) * interval)) }
+          end
+
+          context 'when time is during banking hours' do
+            let(:date) { date_class.parse('2020-05-10 11:00') }
+            let(:delta) { 3 }
+            it { is_expected.to eq(cal.end_of_banking_day(date + (delta + 1) * interval)) }
+          end
+
+          context 'when time is after banking hours' do
+            let(:date) { date_class.parse('2020-05-10 19:00') }
+            let(:delta) { 3 }
+            it { is_expected.to eq(cal.end_of_banking_day(date + (delta + 1) * interval)) }
+          end
+        end
+
+        context 'followed by another non-banking day' do
+          context 'when time is before banking hours' do
+            let(:date) { date_class.parse('2020-05-16 04:00') }
+            let(:delta) { 3 }
+            it { is_expected.to eq(cal.end_of_banking_day(date + (delta + 2) * interval)) }
+          end
+
+          context 'when time is during banking hours' do
+            let(:date) { date_class.parse('2020-05-16 11:00') }
+            let(:delta) { 3 }
+            it { is_expected.to eq(cal.end_of_banking_day(date + (delta + 2) * interval)) }
+          end
+
+          context 'when time is after banking hours' do
+            let(:date) { date_class.parse('2020-05-16 19:00') }
+            let(:delta) { 3 }
+            it { is_expected.to eq(cal.end_of_banking_day(date + (delta + 2) * interval)) }
+          end
+        end
+
+        context 'followed by a holiday' do
+          context 'when time is before banking hours' do
+            let(:date) { date_class.parse('2020-08-30 04:00') }
+            let(:delta) { 3 }
+            it { is_expected.to eq(cal.end_of_banking_day(date + (delta + 2) * interval)) }
+          end
+
+          context 'when time is during banking hours' do
+            let(:date) { date_class.parse('2020-08-30 11:00') }
+            let(:delta) { 3 }
+            it { is_expected.to eq(cal.end_of_banking_day(date + (delta + 2) * interval)) }
+          end
+
+          context 'when time is after banking hours' do
+            let(:date) { date_class.parse('2020-08-30 19:00') }
+            let(:delta) { 3 }
+            it { is_expected.to eq(cal.end_of_banking_day(date + (delta + 2) * interval)) }
+          end
+        end
+      end
+    end
+
+    describe '#banking_days_before' do
+      let(:cal) do
+        BankingCalendar::Calendar.load_calendar('bsp')
+      end
+      subject { cal.banking_days_before(date, delta) }
+
+      context 'when it is a banking day' do
+        context 'preceded only by banking days' do
+          context 'when time is before banking hours' do
+            let(:date) { date_class.parse('2020-01-16 08:00') }
+            let(:delta) { 2 }
+            it { is_expected.to eq(cal.end_of_banking_day(date - (delta + 1) * interval)) }
+          end
+
+          context 'when time is during banking hours' do
+            let(:date) { date_class.parse('2020-01-16 09:00') }
+            let(:delta) { 2 }
+            it { is_expected.to eq(cal.end_of_banking_day(date - delta * interval)) }
+          end
+
+          context 'when time is after banking hours' do
+            let(:date) { date_class.parse('2020-01-16 18:00') }
+            let(:delta) { 2 }
+            it { is_expected.to eq(cal.end_of_banking_day(date - delta * interval)) }
+          end
+        end
+
+        context 'preceded by a weekend' do
+          context 'when time is before banking hours' do
+            let(:date) { date_class.parse('2020-05-11 08:00') }
+            let(:delta) { 2 }
+            it { is_expected.to eq(cal.end_of_banking_day(date - (delta + 3) * interval)) }
+          end
+
+          context 'when time is during banking hours' do
+            let(:date) { date_class.parse('2020-05-11 09:00') }
+            let(:delta) { 2 }
+            it { is_expected.to eq(cal.end_of_banking_day(date - (delta + 2) * interval)) }
+          end
+
+          context 'when time is after banking hours' do
+            let(:date) { date_class.parse('2020-05-11 18:00') }
+            let(:delta) { 2 }
+            it { is_expected.to eq(cal.end_of_banking_day(date - (delta + 2) * interval)) }
+          end
+        end
+
+        context 'preceded by banking days and non-banking days' do
+          context 'when time is before banking hours' do
+            let(:date) { date_class.parse('2020-05-19 08:00') }
+            let(:delta) { 2 }
+            it { is_expected.to eq(cal.end_of_banking_day(date - (delta + 3) * interval)) }
+          end
+
+          context 'when time is during banking hours' do
+            let(:date) { date_class.parse('2020-05-19 09:00') }
+            let(:delta) { 2 }
+            it { is_expected.to eq(cal.end_of_banking_day(date - (delta + 2) * interval)) }
+          end
+
+          context 'when time is after banking hours' do
+            let(:date) { date_class.parse('2020-05-19 18:00') }
+            let(:delta) { 2 }
+            it { is_expected.to eq(cal.end_of_banking_day(date - (delta + 2) * interval)) }
+          end
+        end
+      end
+
+      context 'when it is a non-banking day' do
+
+      end
+    end
+  end
+
   context 'when using Date objects' do
     let(:date_class) { Date }
     let(:interval) { 1 }
@@ -209,10 +570,19 @@ describe BankingCalendar::Calendar do
     it_behaves_like 'shared'
   end
 
+  context 'when using DateTime objects' do
+    let(:date_class) { DateTime }
+    let(:interval) { 1 }
+
+    it_behaves_like 'shared'
+    it_behaves_like 'with_time'
+  end
+
   context 'when using Time objects' do
     let(:date_class) { Time }
     let(:interval) { 3_600 * 24 }
 
     it_behaves_like 'shared'
+    it_behaves_like 'with_time'
   end
 end

data/spec/fixtures/calendars/bsp.yml

@@ -5,7 +5,18 @@ banking_days:
   - thursday
   - friday
 
+banking_hours:
+  - 9
+  - 10
+  - 11
+  - 12
+  - 13
+  - 14
+  - 15
+  - 16
+
 bank_holidays:
+  - 2020-01-01
   - 2020-01-25
   - 2020-02-25
   - 2020-04-09
@@ -17,6 +28,7 @@ bank_holidays:
   - 2020-08-31
   - 2020-11-01
   - 2020-11-02
+  - 2020-11-03
   - 2020-11-30
   - 2020-12-08
   - 2020-12-24

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: banking_calendar
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - PayMongo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-08 00:00:00.000000000 Z
+date: 2020-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec