ae_bank_days 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b352ad3a4d79adb79d0f9cbdfc6040cd4fe9a5a997d364d81b1a8cafbec27cb8
-  data.tar.gz: d08d58bacc6ba8b394e90714bcc012c7ea810f92b476bece48d61bcffdbadd4d
+  metadata.gz: 01e5531a35c63eae2105cf384eaa798054a373cb5c178ff4e7eed08689d6b473
+  data.tar.gz: 8e4a1ae4e93cfa286c4a1705b50f947c39febc33915ea63c9808472d290c477e
 SHA512:
-  metadata.gz: c2300eeb5b2ff561a1b2ea0bbdbfdc597b894e1dc35144ae293b2506fad1df7ebeceb4f5bb44d5acb348887323b5bf35210fc4042014f35fd8496d5b7e54bf7b
-  data.tar.gz: f02b5860c146c4d3d4590213a6465a898012f2355682f24c915e1bbcfece807e360443ec7d60fae88d19a3925c6f43cfaa70a1dbc565c39aadf9cb2ab1d1d84b
+  metadata.gz: 23e9526aa06096f527a363f269cb39df391cab9d233ca20407e41de0dbf8afeff89d1ebc727968e592dd6ec009770766ac8d95af7838c3c527a0b12a23afd9bd
+  data.tar.gz: c175d76b81a001be7a8b1b105d5c76a58bd4aa6b08e48ffd090aa91f9b7d2274597e8f2a4bd905d4457625d1a932c6311736967b2deb4007f0a2ae4550a0b41d

data/lib/ae_bank_days.rb

@@ -8,7 +8,6 @@ require 'active_support/core_ext/integer/time'
 
 module AeBankDays
   class BankDayHelper
-    # second * minutes * days * years
     ten_years_from_now = Time.now + 10.years
     HOLIDAYS = Holidays.between(Date.civil(2014, 1, 1), ten_years_from_now, :federalreserve, :observed).map do |holiday|
       holiday[:date]
@@ -20,12 +19,26 @@ module AeBankDays
         weekday?(date) && !HOLIDAYS.include?(date)
       end
 
-      def next_banking_day(date)
+      def next_banking_day(date, number_of_days: 0)
         banking_day = date
+        number_of_days.times do
+          banking_day += 1 until bank_day?(banking_day)
+          banking_day += 1
+        end
         banking_day += 1 until bank_day?(banking_day)
         banking_day
       end
 
+      def previous_banking_day(date, number_of_days: 0)
+        banking_day = date
+        number_of_days.times do
+          banking_day -= 1 until bank_day?(banking_day)
+          banking_day -= 1
+        end
+        banking_day -= 1 until bank_day?(banking_day)
+        banking_day
+      end
+
       private
 
       def weekday?(day)

data/lib/ae_bank_days/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AeBankDays
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/test/bank_day_helper_test.rb

@@ -29,14 +29,59 @@ module AeBankDays
       assert_equal Date.parse('2017-10-03'), AeBankDays::BankDayHelper.next_banking_day(time.to_date)
     end
 
+    def test_next_banking_day__weekday__extra_days
+      time = Time.parse('2017-10-03 14:30:45 -0500')
+      assert_equal Date.parse('2017-10-06'), AeBankDays::BankDayHelper.next_banking_day(time.to_date, number_of_days: 3)
+    end
+
     def test_next_banking_day__weekend
       time = Time.parse('2017-10-14 14:30:45 -0500')
       assert_equal Date.parse('2017-10-16'), AeBankDays::BankDayHelper.next_banking_day(time.to_date)
     end
 
+    def test_next_banking_day__weekend__extra_days
+      time = Time.parse('2017-10-14 14:30:45 -0500')
+      assert_equal Date.parse('2017-10-19'), AeBankDays::BankDayHelper.next_banking_day(time.to_date, number_of_days: 3)
+    end
+
     def test_next_banking_day__holiday
       time = Time.parse('2017-10-09 14:30:45 -0500')
       assert_equal Date.parse('2017-10-10'), AeBankDays::BankDayHelper.next_banking_day(time.to_date)
     end
+
+    def test_next_banking_day__holiday__extra_days
+      time = Time.parse('2017-10-09 14:30:45 -0500')
+      assert_equal Date.parse('2017-10-13'), AeBankDays::BankDayHelper.next_banking_day(time.to_date, number_of_days: 3)
+    end
+
+    def test_previous_banking_day__weekday
+      time = Time.parse('2017-10-03 14:30:45 -0500')
+      assert_equal Date.parse('2017-10-03'), AeBankDays::BankDayHelper.previous_banking_day(time.to_date)
+    end
+
+    def test_previous_banking_day__weekday__extra_days
+      time = Time.parse('2017-10-06 14:30:45 -0500')
+      assert_equal Date.parse('2017-10-03'), AeBankDays::BankDayHelper.previous_banking_day(time.to_date, number_of_days: 3)
+    end
+
+    def test_previous_banking_day__weekend
+      time = Time.parse('2017-10-14 14:30:45 -0500')
+      assert_equal Date.parse('2017-10-13'), AeBankDays::BankDayHelper.previous_banking_day(time.to_date)
+    end
+
+    def test_previous_banking_day__weekend__extra_days
+      time = Time.parse('2017-10-14 14:30:45 -0500')
+      assert_equal Date.parse('2017-10-10'), AeBankDays::BankDayHelper.previous_banking_day(time.to_date, number_of_days: 3)
+    end
+
+    def test_previous_banking_day__holiday
+      time = Time.parse('2017-10-09 14:30:45 -0500')
+      assert_equal Date.parse('2017-10-06'), AeBankDays::BankDayHelper.previous_banking_day(time.to_date)
+    end
+
+    def test_previous_banking_day__holiday__extra_days
+      time = Time.parse('2017-10-09 14:30:45 -0500')
+      assert_equal Date.parse('2017-10-03'), AeBankDays::BankDayHelper.previous_banking_day(time.to_date, number_of_days: 3)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ae_bank_days
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - AppFolio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-07 00:00:00.000000000 Z
+date: 2019-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -84,6 +84,7 @@ files:
 - LICENSE.txt
 - README.rdoc
 - Rakefile
+- ae_bank_days-1.0.0.gem
 - ae_bank_days.gemspec
 - lib/ae_bank_days.rb
 - lib/ae_bank_days/version.rb