ae_bank_days 1.2.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06f9983d00ce48e33b4a934f726e456d1eb37daec1355aad31cf605f9c5ef0bd
-  data.tar.gz: e3b17132d6696f57e38e2a1addac13d1ae4daa49fcb788dae5e553b66cec463f
+  metadata.gz: afad1460d6fb8acce458d2ad2dfabb29843d1a630162bd5043c5eb897b841d86
+  data.tar.gz: 54bdb02650c7a97a1161a357435c3d33fceb6f4286edb2b4a804a4267b3c97ef
 SHA512:
-  metadata.gz: f43ac398011e018ece5207f6db467339a3b9255451627cad5cd5e970b3d08512d38c3ae9d09604ddf09d177a30febdbf98d7e5e5ba6ef8329c9122aea7424e8b
-  data.tar.gz: b0e66f75d0ea3c5ac6d39a7240e3a284af57968292e69a5b14dbfb1753273bc21a425ab9b67e0b8f5bcedffd8bc87a7d77cca0959b6944d0a3d75105087a4c00
+  metadata.gz: b4acb7565fd8647e9f9a705b29fe7ccd4a76ae943f54945a04c3a02028a5fe93e4ac559b0ab895208c6104f0641d45869ca8e7d87a684b0ac04de89be93b2414
+  data.tar.gz: cf0fd6a295074b5b53f3b25590d614cc0e9f2d97a7e5612b2857667e48215a6da755b29066a3a7e6ce834619591ecda515f735910d0c60b4c3d5878fdbeee005

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2019-2020 AppFolio inc
+Copyright (c) 2019-2022 AppFolio, Inc
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/ae_bank_days.gemspec

@@ -1,31 +1,22 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'ae_bank_days/version'
+require_relative 'lib/ae_bank_days/version'
 
 Gem::Specification.new do |spec|
   spec.name                  = 'ae_bank_days'
   spec.version               = AeBankDays::VERSION
   spec.platform              = Gem::Platform::RUBY
-  spec.authors               = ['AppFolio']
-  spec.email                 = ['dev@appfolio.com']
-  spec.summary               = 'Gem for finding the next banking date'
-  spec.description           = spec.summary
-  spec.homepage              = 'http://github.com/appfolio/ae_bank_days'
-  spec.required_ruby_version = ['>= 2.3.3', '< 2.7']
-  spec.licenses              = ['MIT']
-  spec.files                 = Dir['**/*'].reject { |f| f[%r{^log/}] || f[%r{^pkg/}] }
-  spec.test_files            = spec.files.grep(%r{^(test)/})
+  spec.author                = 'AppFolio'
+  spec.email                 = 'opensource@appfolio.com'
+  spec.description           = 'Gem for finding the next banking date.'
+  spec.summary               = spec.description
+  spec.homepage              = 'https://github.com/appfolio/ae_bank_days'
+  spec.license               = 'MIT'
+  spec.files                 = Dir['**/*'].select { |f| f[%r{^(lib/|LICENSE.txt|.*gemspec)}] }
   spec.require_paths         = ['lib']
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.6.3')
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
-  spec.add_dependency('holidays', '~> 8.3')
-
-  spec.add_development_dependency('bundler', ['>= 1.10.4', '< 3'])
-  spec.add_development_dependency('minitest', '>= 5.8')
-  spec.add_development_dependency('minitest-reporters', '>= 1.3')
-  spec.add_development_dependency('mocha', '>= 1.1')
-  spec.add_development_dependency('rake', '>= 12.0')
+  spec.add_dependency('holidays', ['>= 8.3', '< 9'])
 end

data/lib/ae_bank_days/bank_day_helper.rb

@@ -11,23 +11,37 @@ module AeBankDays
       end
 
       def next_banking_day(date, number_of_days: 0)
-        banking_day = date
+        banking_day = date.to_date
+        banking_day += 1
         number_of_days.times do
-          banking_day += 1 until bank_day?(banking_day)
+          banking_day = current_or_next_banking_day(banking_day)
           banking_day += 1
         end
-        banking_day += 1 until bank_day?(banking_day)
-        banking_day
+
+        current_or_next_banking_day(banking_day)
       end
 
       def previous_banking_day(date, number_of_days: 0)
-        banking_day = date
+        banking_day = date.to_date
+        banking_day -= 1
         number_of_days.times do
-          banking_day -= 1 until bank_day?(banking_day)
+          banking_day = current_or_previous_banking_day(banking_day)
           banking_day -= 1
         end
-        banking_day -= 1 until bank_day?(banking_day)
-        banking_day
+
+        current_or_previous_banking_day(banking_day)
+      end
+
+      def current_or_previous_banking_day(day)
+        date = day.to_date
+        date -= 1 until bank_day?(date)
+        date
+      end
+
+      def current_or_next_banking_day(day)
+        date = day.to_date
+        date += 1 until bank_day?(date)
+        date
       end
 
       private

data/lib/ae_bank_days/date_extensions.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 module AeBankDays
   module DateExtensions
     def bank_day?
       BankDayHelper.bank_day?(self)
     end
 
-    def next_banking_day(n = 0)
-      BankDayHelper.next_banking_day(self, number_of_days: n)
+    def next_banking_day(number_of_days = 0)
+      BankDayHelper.next_banking_day(self, number_of_days: number_of_days)
     end
 
-    def previous_banking_day(n = 0)
-      BankDayHelper.previous_banking_day(self, number_of_days: n)
+    def previous_banking_day(number_of_days = 0)
+      BankDayHelper.previous_banking_day(self, number_of_days: number_of_days)
     end
   end
 end

data/lib/ae_bank_days/version.rb

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

data/lib/ae_bank_days.rb

@@ -8,4 +8,4 @@ module AeBankDays
   autoload :DateExtensions, 'ae_bank_days/date_extensions'
 end
 
-Date.send :include, AeBankDays::DateExtensions
+Date.prepend(AeBankDays::DateExtensions)

metadata

@@ -1,127 +1,48 @@
 --- !ruby/object:Gem::Specification
 name: ae_bank_days
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.1.0
 platform: ruby
 authors:
 - AppFolio
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-14 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: holidays
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '8.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '8.3'
-- !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.4
+        version: '8.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
+        version: '9'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.4
+        version: '8.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.8'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  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: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '12.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '12.0'
-description: Gem for finding the next banking date
-email:
-- dev@appfolio.com
+        version: '9'
+description: Gem for finding the next banking date.
+email: opensource@appfolio.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
-- Gemfile.lock
 - LICENSE.txt
-- README.rdoc
-- Rakefile
 - ae_bank_days.gemspec
 - lib/ae_bank_days.rb
 - lib/ae_bank_days/bank_day_helper.rb
 - lib/ae_bank_days/date_extensions.rb
 - lib/ae_bank_days/version.rb
-- test/ae_bank_days/bank_day_helper_test.rb
-- test/ae_bank_days/date_extensions_test.rb
-- test/ae_bank_days_test.rb
-- test/test_helper.rb
-homepage: http://github.com/appfolio/ae_bank_days
+homepage: https://github.com/appfolio/ae_bank_days
 licenses:
 - MIT
 metadata:
@@ -134,22 +55,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.3
-  - - "<"
-    - !ruby/object:Gem::Version
-      version: '2.7'
+      version: 2.6.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
-summary: Gem for finding the next banking date
-test_files:
-- test/ae_bank_days/bank_day_helper_test.rb
-- test/ae_bank_days/date_extensions_test.rb
-- test/ae_bank_days_test.rb
-- test/test_helper.rb
+summary: Gem for finding the next banking date.
+test_files: []

data/Gemfile

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gemspec

data/Gemfile.lock

@@ -1,35 +0,0 @@
-PATH
-  remote: .
-  specs:
-    ae_bank_days (1.2.0)
-      holidays (~> 8.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ansi (1.5.0)
-    builder (3.2.4)
-    holidays (8.3.0)
-    minitest (5.11.3)
-    minitest-reporters (1.3.0)
-      ansi
-      builder
-      minitest (>= 5.0)
-      ruby-progressbar
-    mocha (1.11.2)
-    rake (12.3.3)
-    ruby-progressbar (1.10.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  ae_bank_days!
-  bundler (>= 1.10.4, < 3)
-  minitest (>= 5.8)
-  minitest-reporters (>= 1.3)
-  mocha (>= 1.1)
-  rake (>= 12.0)
-
-BUNDLED WITH
-   2.1.4

data/README.rdoc

@@ -1,17 +0,0 @@
-= ae_bank_days
-
-Simple utility to find the next banking day
-
-== Contributing to ae_bank_days
-
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
-* Fork the project.
-* Start a feature/bugfix branch.
-* Commit and push until you are happy with your contribution.
-* Make sure to add tests for it. This is important so it doesn't break in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so it can be cherry-picked around.
-
-== Copyright
-
-Copyright © 2019-2020 AppFolio.

data/Rakefile

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'rubygems'
-require 'bundler'
-
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  warn e.message
-  warn 'Run `bundle install` to install missing gems'
-  exit e.status_code
-end
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
-end
-
-task default: :test

data/test/ae_bank_days/bank_day_helper_test.rb

@@ -1,75 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-module AeBankDays
-  class BankDayHelperTest < Minitest::Test
-    def test_bank_day__weekday
-      assert BankDayHelper.bank_day?(Date.civil(2017, 10, 3))
-    end
-
-    def test_bank_day__weekend
-      refute BankDayHelper.bank_day?(Date.civil(2017, 10, 14))
-    end
-
-    def test_bank_day__holiday
-      refute BankDayHelper.bank_day?(Date.civil(2017, 10, 9))
-    end
-
-    def test_bank_day__saturday_holiday_is_not_observed_on_friday
-      # The federal bank does not observe holidays that fall on Saturday on the preceding Friday as is common.
-      # This test makes sure that these dates are not accidentally marked as holidays.
-      # July 4, 2020 fell on a Saturday. The day before was a generally observed federal holiday, but it was still
-      # a banking day due to the federal banks holiday rules.
-      assert BankDayHelper.bank_day?(Date.civil(2020, 6, 3))
-    end
-
-    def test_next_banking_day__weekday
-      assert_equal Date.civil(2017, 10, 3), BankDayHelper.next_banking_day(Date.civil(2017, 10, 3))
-    end
-
-    def test_next_banking_day__weekday__extra_days
-      assert_equal Date.civil(2017, 10, 6), BankDayHelper.next_banking_day(Date.civil(2017, 10, 3), number_of_days: 3)
-    end
-
-    def test_next_banking_day__weekend
-      assert_equal Date.civil(2017, 10, 16), BankDayHelper.next_banking_day(Date.civil(2017, 10, 14))
-    end
-
-    def test_next_banking_day__weekend__extra_days
-      assert_equal Date.civil(2017, 10, 19), BankDayHelper.next_banking_day(Date.civil(2017, 10, 14), number_of_days: 3)
-    end
-
-    def test_next_banking_day__holiday
-      assert_equal Date.civil(2017, 10, 10), BankDayHelper.next_banking_day(Date.civil(2017, 10, 9))
-    end
-
-    def test_next_banking_day__holiday__extra_days
-      assert_equal Date.civil(2017, 10, 13), BankDayHelper.next_banking_day(Date.civil(2017, 10, 9), number_of_days: 3)
-    end
-
-    def test_previous_banking_day__weekday
-      assert_equal Date.civil(2017, 10, 3), BankDayHelper.previous_banking_day(Date.civil(2017, 10, 3))
-    end
-
-    def test_previous_banking_day__weekday__extra_days
-      assert_equal Date.civil(2017, 10, 3), BankDayHelper.previous_banking_day(Date.civil(2017, 10, 6), number_of_days: 3)
-    end
-
-    def test_previous_banking_day__weekend
-      assert_equal Date.civil(2017, 10, 13), BankDayHelper.previous_banking_day(Date.civil(2017, 10, 14))
-    end
-
-    def test_previous_banking_day__weekend__extra_days
-      assert_equal Date.civil(2017, 10, 10), BankDayHelper.previous_banking_day(Date.civil(2017, 10, 14), number_of_days: 3)
-    end
-
-    def test_previous_banking_day__holiday
-      assert_equal Date.civil(2017, 10, 6), BankDayHelper.previous_banking_day(Date.civil(2017, 10, 9))
-    end
-
-    def test_previous_banking_day__holiday__extra_days
-      assert_equal Date.civil(2017, 10, 3), BankDayHelper.previous_banking_day(Date.civil(2017, 10, 9), number_of_days: 3)
-    end
-  end
-end

data/test/ae_bank_days/date_extensions_test.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-module AeBankDays
-  class DateExtensionsTest < Minitest::Test
-    def test_bank_day
-      date = Date.today
-      BankDayHelper.expects(:bank_day?).with(date).returns(true)
-
-      assert date.bank_day?
-    end
-
-    def test_next_banking_day
-      date = Date.today
-      new_date = date + 2
-      BankDayHelper.expects(:next_banking_day).with(date, number_of_days: 2).returns(new_date)
-
-      assert_equal new_date, date.next_banking_day(2)
-    end
-
-    def test_next_banking_day__default
-      date = Date.today
-      new_date = date + 2
-      BankDayHelper.expects(:next_banking_day).with(date, number_of_days: 0).returns(new_date)
-
-      assert_equal new_date, date.next_banking_day
-    end
-
-    def test_previous_banking_day
-      date = Date.today
-      new_date = date + 2
-      BankDayHelper.expects(:previous_banking_day).with(date, number_of_days: 2).returns(new_date)
-
-      assert_equal new_date, date.previous_banking_day(2)
-    end
-
-    def test_previous_banking_day__default
-      date = Date.today
-      new_date = date + 2
-      BankDayHelper.expects(:previous_banking_day).with(date, number_of_days: 0).returns(new_date)
-
-      assert_equal new_date, date.previous_banking_day
-    end
-  end
-end

data/test/ae_bank_days_test.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-class AeBankDaysTest < Minitest::Test
-  def test_that_it_has_a_version_number
-    refute_nil ::AeBankDays::VERSION
-  end
-end

data/test/test_helper.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require 'rubygems'
-require 'bundler'
-
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  warn e.message
-  warn 'Run `bundle install` to install missing gems'
-  exit e.status_code
-end
-
-require 'ae_bank_days'
-require 'minitest/autorun'
-require 'minitest/reporters'
-require 'mocha/setup'
-require 'time'
-
-MiniTest::Reporters.use!