us_bank_holidays 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ee3cf09af1f0d5b0b2379476f041fb77b11359e
-  data.tar.gz: 8d5c8f34faea3644b419f6648a267646436d3bfc
+  metadata.gz: d44603e174d94f3058f71f7bdf030e762c350f78
+  data.tar.gz: b8ad012d2c75fd2b29270980bfa0e53dd0de04d3
 SHA512:
-  metadata.gz: 71fe95c8e28a99f36cbd69987b13e01e23c4f3e7b45e4091cb768459cf1ac073b8a728ca92416921c44ac17495ea9c24f606216d3fa8db105d44d5cb3c4f0238
-  data.tar.gz: cb80c0d4fe13b5a6e216d714e8c62f8fb9c0a2d05a75bf6749f5403fee39f600fde26d4bf14fde2b038dc4f80a1a7ea8e48e97d8b0f417a7520aaace032b8390
+  metadata.gz: 90647b055da3c2ee6c1e2853e2c4ae0b6f054034421b7ad051154383b792408c0dec52969f899d37237b3826002ae3573ad227930e95f2161596e4e8d6636c63
+  data.tar.gz: 3a63bd609a2f63b53f030a495a4030ac40d752a87b81dd94a4d4567c349be4157b635a71fb06739280e13e55ec896f207ce330d5af3e2ff8caaf39c7a672287b

data/.travis.yml

@@ -1,9 +1,10 @@
 language: ruby
 script: 'bundle exec rake spec'
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3
   - jruby
   - rbx
 matrix:

data/lib/us_bank_holidays.rb

@@ -14,6 +14,8 @@ module UsBankHolidays
   # Returns true if the given date is a bank holiday, false otherwise.
   # Pass the optional 'include_weekends' to control whether weekends should count as
   # bank holidays (default is true).
+  # If include_weekends is set to false but the date is a Federal bank holiday,
+  # returns true (Ex: 4th of July, 2015, Christmas Day 2016)
   def self.bank_holiday?(date, include_weekends = true)
     if include_weekends && weekend?(date)
       true
@@ -44,6 +46,12 @@ module UsBankHolidays
     end
   end
 
+  # If enabled (ENV["NO_FRIDAY_HOLIDAY_ACH"]), a Friday that falls a day before
+  # a Saturday that's a bank holiday is considered a bank holiday
+  def self.saturday_holiday_date_rolling?
+    !!ENV["NO_FRIDAY_HOLIDAY_ACH"]
+  end
+
   # Instance methods to be injected into the Date class
   module DateMethods
 
@@ -55,6 +63,8 @@ module UsBankHolidays
     # Returns true if the date is a bank holiday, false otherwise.
     # Pass the optional 'include_weekends' to control whether weekends should count as
     # bank holidays (default is true).
+    # If include_weekends is set to false but the date is a Federal bank holiday,
+    # returns true (Ex: 4th of July, 2015, Christmas Day 2016)
     def bank_holiday?(include_weekends = true)
       ::UsBankHolidays.bank_holiday? self, include_weekends
     end

data/lib/us_bank_holidays/holiday_year.rb

@@ -26,8 +26,7 @@ module UsBankHolidays
     end
 
     # Returns the federal holidays for the given year on the dates they will actually
-    # be observed. In the event that New Year's Day for the following year falls on a
-    # Saturday December 31 will also be included.
+    # be observed.
     def bank_holidays
       @bank_holidays ||= begin
         holidays = [ new_years_day,
@@ -107,11 +106,12 @@ module UsBankHolidays
         @christmas        = roll_nominal(Date.new(year, 12, 25))
       end
 
-      # Figures out where to roll the given nominal date. If it's a Saturday, assumes
-      # it's the day before (Friday), if Sunday it's the date after (Monday), otherwise
+      # Figures out where to roll the given nominal date. If it's a Saturday and
+      # Saturday holiday date rolling is enabled (see UsBankHolidays#saturday_holiday_date_rolling?),
+      # assumes it's the day before (Friday), if Sunday it's the date after (Monday), otherwise
       # just returns self.
       def roll_nominal(nominal)
-        if nominal.saturday?
+        if nominal.saturday? && ::UsBankHolidays.saturday_holiday_date_rolling?
           nominal - 1
         elsif nominal.sunday?
           nominal + 1

data/lib/us_bank_holidays/version.rb

@@ -1,3 +1,3 @@
 module UsBankHolidays
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

data/spec/functional/holiday_year_spec.rb

@@ -2,19 +2,51 @@ require 'spec_helper'
 
 describe UsBankHolidays::HolidayYear do
 
-  it 'should determine bank holidays' do
-    UsBankHolidays::HolidayYear.new(2017).bank_holidays.should == [
-      '2017-01-02', #New Year’s Day
-                                          '2017-01-16', #Birthday of Martin Luther King, Jr.
-                                          '2017-02-20', #Washington’s Birthday
-                                          '2017-05-29', #Memorial Day
-                                          '2017-07-04', #Independence Day
-                                          '2017-09-04', #Labor Day
-                                          '2017-10-09', #Columbus Day
-                                          '2017-11-10', #Veterans Day
-                                          '2017-11-23', #Thanksgiving Day
-                                          '2017-12-25' #Christmas Day
-    ].map{|d| Date.parse(d) }
+  context "should determine bank holidays" do
+
+    context "Force Saturday date rolling" do
+      before :each do
+        allow(::UsBankHolidays).to receive(:saturday_holiday_date_rolling?).and_return(true)
+      end
+
+      it 'should determine bank holidays' do
+        expect(UsBankHolidays::HolidayYear.new(2017).bank_holidays).to eq([
+                                                                            '2017-01-02', #New Year’s Day
+                                                                            '2017-01-16', #Birthday of Martin Luther King, Jr.
+                                                                            '2017-02-20', #Washington’s Birthday
+                                                                            '2017-05-29', #Memorial Day
+                                                                            '2017-07-04', #Independence Day
+                                                                            '2017-09-04', #Labor Day
+                                                                            '2017-10-09', #Columbus Day
+                                                                            '2017-11-10', #Veterans Day
+                                                                            '2017-11-23', #Thanksgiving Day
+                                                                            '2017-12-25' #Christmas Day
+                                                                          ].map {|d| Date.parse(d)}
+                                                                       )
+      end
+
+    end
+
+    context "No Saturday date rolling" do
+      it 'should determine bank holidays' do
+        expect(UsBankHolidays::HolidayYear.new(2017).bank_holidays).to eq([
+                                                                            '2017-01-02', #New Year’s Day
+                                                                            '2017-01-16', #Birthday of Martin Luther King, Jr.
+                                                                            '2017-02-20', #Washington’s Birthday
+                                                                            '2017-05-29', #Memorial Day
+                                                                            '2017-07-04', #Independence Day
+                                                                            '2017-09-04', #Labor Day
+                                                                            '2017-10-09', #Columbus Day
+                                                                            '2017-11-11', #Veterans Day
+                                                                            '2017-11-23', #Thanksgiving Day
+                                                                            '2017-12-25' #Christmas Day
+                                                                          ].map {|d| Date.parse(d)}
+                                                                       )
+      end
+
+    end
+
+
   end
 
   it 'should declare Dec. 31 a bank holiday if it falls on a Friday' do
@@ -39,7 +71,7 @@ describe UsBankHolidays::HolidayYear do
       :december  => 12
     }.each do |month_name, month_index|
       it "should respond to '#{month_name}' and return the right month" do
-        year.respond_to?(month_name).should be_true
+        expect(year.respond_to?(month_name)).to eq(true)
         month = year.send(month_name)
         month.year.should  == 2014
         month.month.should == month_index

data/spec/functional/month_spec.rb

@@ -23,19 +23,19 @@ describe UsBankHolidays::Month do
 
     it 'should return true if the month contains the given date' do
       (1..31).each do |mday|
-        january.contains?(Date.new(january.year, january.month, mday)).should be_true
+        january.contains?(Date.new(january.year, january.month, mday)).should eq(true)
       end
     end
 
     it 'should return false if the month is not the same' do
       (1..31).each do |mday|
-        january.contains?(Date.new(2014, 8, mday)).should be_false
+        january.contains?(Date.new(2014, 8, mday)).should eq(false)
       end
     end
 
     it 'should return false if the year is not the same' do
       (1..31).each do |mday|
-        january.contains?(Date.new(2015, 1, mday)).should be_false
+        january.contains?(Date.new(2015, 1, mday)).should eq(false)
       end
     end
   end
@@ -113,4 +113,4 @@ Su Mo Tu We Th Fr Sa
 
     end
   end
-end
+end

data/spec/functional/us_bank_holidays_spec.rb

@@ -86,31 +86,35 @@ describe UsBankHolidays do
 
   let(:sample_weekdays) { [3,  4,  5,  6,  7].map{|d| Date.new(2014, 2, d) } }
 
+  before :each do
+    allow(::UsBankHolidays).to receive(:saturday_holiday_date_rolling?).and_return(true)
+  end
+
   describe '.bank_holiday?' do
     it 'should determine bank holidays on the list' do
       sample_holidays.each { |holiday|
-        UsBankHolidays.bank_holiday?(holiday).should be_true
-        UsBankHolidays.banking_day?(holiday).should be_false
+        UsBankHolidays.bank_holiday?(holiday).should eq(true)
+        UsBankHolidays.banking_day?(holiday).should eq(false)
       }
     end
 
     it 'weekends should be bank holidays' do
       sample_weekends.each { |weekend|
-        UsBankHolidays.bank_holiday?(weekend).should be_true
-        UsBankHolidays.banking_day?(weekend).should be_false
+        UsBankHolidays.bank_holiday?(weekend).should eq(true)
+        UsBankHolidays.banking_day?(weekend).should eq(false)
       }
     end
 
     it 'should exclude weekends if the appropriate flag is passed' do
       sample_weekends.each { |weekend|
-        UsBankHolidays.bank_holiday?(weekend, false).should be_false
+        UsBankHolidays.bank_holiday?(weekend, false).should eq(false)
       }
     end
 
     it 'regular days should not be bank holidays' do
       sample_weekdays.each { |day|
-        UsBankHolidays.bank_holiday?(day).should be_false
-        UsBankHolidays.banking_day?(day).should be_true
+        UsBankHolidays.bank_holiday?(day).should eq(false)
+        UsBankHolidays.banking_day?(day).should eq(true)
       }
     end
   end
@@ -118,13 +122,13 @@ describe UsBankHolidays do
   describe '.weekend?' do
     it 'should recognize weekends' do
       sample_weekends.each { |weekend|
-        UsBankHolidays.weekend?(weekend).should be_true
-        UsBankHolidays.banking_day?(weekend).should be_false
+        UsBankHolidays.weekend?(weekend).should eq(true)
+        UsBankHolidays.banking_day?(weekend).should eq(false)
       }
     end
 
     it 'weekdays should not be considered weekends' do
-      sample_weekdays.each { |day| UsBankHolidays.weekend?(day).should be_false }
+      sample_weekdays.each { |day| UsBankHolidays.weekend?(day).should eq(false) }
     end
   end
 
@@ -134,15 +138,15 @@ describe UsBankHolidays do
 
       it 'should recognize weekends' do
         sample_weekends.each { |weekend|
-          weekend.weekend?.should     be_true
-          weekend.banking_day?.should be_false
+          weekend.weekend?.should     eq(true)
+          weekend.banking_day?.should eq(false)
         }
       end
 
       it 'weekdays should not be considered weekends' do
         sample_weekdays.each { |day|
-          day.weekend?.should     be_false
-          day.banking_day?.should be_true
+          day.weekend?.should     eq(false)
+          day.banking_day?.should eq(true)
         }
       end
 
@@ -152,31 +156,31 @@ describe UsBankHolidays do
 
       it 'should recognize bank holidays' do
         sample_holidays.each { |holiday|
-          holiday.bank_holiday?.should be_true
-          holiday.banking_day?.should be_false
+          holiday.bank_holiday?.should eq(true)
+          holiday.banking_day?.should eq(false)
         }
       end
 
       it 'should treat weekends as bank holidays' do
-        sample_weekends.each { |weekend| weekend.bank_holiday?.should be_true }
+        sample_weekends.each { |weekend| weekend.bank_holiday?.should eq(true) }
       end
 
       it 'should exclude weekends if the appropriate flag is passed' do
         sample_weekends.each { |weekend|
-          weekend.weekend?.should be_true
-          weekend.bank_holiday?(false).should be_false
+          weekend.weekend?.should eq(true)
+          weekend.bank_holiday?(false).should eq(false)
         }
       end
 
       it 'should not treat regular weekdays as bank holidays' do
         sample_weekdays.each { |day|
-          day.bank_holiday?.should be_false
-          day.banking_day?.should be_true
+          day.bank_holiday?.should eq(false)
+          day.banking_day?.should eq(true)
         }
       end
 
       it 'if Jan. 1 falls on a Saturday, Dec. 31 of the previous year should be a bank holiday' do
-        Date.new(2021, 12, 31).bank_holiday?.should be_true
+        Date.new(2021, 12, 31).bank_holiday?.should eq(true)
       end
     end
 
@@ -220,21 +224,21 @@ describe UsBankHolidays do
 
     describe '.last_banking_day_of_month?' do
       it 'should determine if a date is the last banking day of the month' do
-        Date.new(2014, 1, 31).last_banking_day_of_month?.should be_true
-        Date.new(2014, 1, 30).last_banking_day_of_month?.should be_false
+        Date.new(2014, 1, 31).last_banking_day_of_month?.should eq(true)
+        Date.new(2014, 1, 30).last_banking_day_of_month?.should eq(false)
 
-        Date.new(2014, 11, 30).last_banking_day_of_month?.should be_false
-        Date.new(2014, 11, 28).last_banking_day_of_month?.should be_true
+        Date.new(2014, 11, 30).last_banking_day_of_month?.should eq(false)
+        Date.new(2014, 11, 28).last_banking_day_of_month?.should eq(true)
       end
     end
 
     describe '.first_banking_day_of_month?' do
       it 'should determine if the date if the first banking day of the month' do
-        Date.new(2014, 4, 1).first_banking_day_of_month?.should be_true
-        Date.new(2014, 4, 2).first_banking_day_of_month?.should be_false
+        Date.new(2014, 4, 1).first_banking_day_of_month?.should eq(true)
+        Date.new(2014, 4, 2).first_banking_day_of_month?.should eq(false)
 
-        Date.new(2014, 6, 1).first_banking_day_of_month?.should be_false
-        Date.new(2014, 6, 2).first_banking_day_of_month?.should be_true
+        Date.new(2014, 6, 1).first_banking_day_of_month?.should eq(false)
+        Date.new(2014, 6, 2).first_banking_day_of_month?.should eq(true)
       end
     end
   end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: us_bank_holidays
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Arthur Shagall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2017-12-03 00:00:00.000000000 Z
 dependencies:
 - !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
     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: rspec
   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: 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'
 description: Simplify working with US bank holidays.
@@ -73,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .travis.yml
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -97,17 +97,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Patches Date to add methods to make dealing with US bank holidays simpler.