fat_core 4.11.0 → 4.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8607195b8f5ef6d04df1f438fbd59d3a22ca3a730d0d5bb9430ff37166d07174
-  data.tar.gz: e86aedc2aafebf6fc02efdf6f3f35f39ad93059b08a8bc4e635190e5964f2942
+  metadata.gz: 293a92293691aebd9771c017fa1dfeb9f9935bbb3832a19ec3494df49a75a176
+  data.tar.gz: 273ca4995d0e8b5d95cb5103ce520643f5aca983a0d855b083deb7d052033b63
 SHA512:
-  metadata.gz: 94983a4893c2c4882b360236f488c3a741ea8927488a69785ae4a7cc8f93612e11aa1f6899b359fcc2bb25742d6f062d3c76f5cbd75dfc64c24edba44be45755
-  data.tar.gz: 9700b48e6c73ec9ec49ed7da22679b4ea90676be71011b4c4c912cb4b53c2d613bb1712b8c59f440990570a33ffe12ab51ec0986ace906638408b3bab85f59d9
+  metadata.gz: b6f8fe6dc824a53d5087a2565a16bda84f7c311514346b3c0dcc58d9822b3dc84b3a93f9070dc1d27fce4aba90841556a3251a3e72d065f92b78f82402e9f73a
+  data.tar.gz: 2aab09471276331aa009b76250e9dd163ca1512b135170495bd5d899cd46d575d3aa0c29d14a923781ee99606ebffb4a7d434a37c47d10be73c8dba363f254d0

data/lib/fat_core/date.rb

@@ -119,6 +119,17 @@ module FatCore
 
     # :category: Queries
 
+    # Number of days in self's month
+    # @return [Integer]
+    def days_in_month
+      self.class.days_in_month(year, month)
+    end
+
+    # :category: Queries
+    # @group Queries
+
+    # :category: Queries
+
     # Self's calendar "half" by analogy to calendar quarters: 1 or 2, depending
     # on whether the date falls in the first or second half of the calendar
     # year.
@@ -357,10 +368,30 @@ module FatCore
     # @param from_date [::Date] the middle of the six-month range
     # @return [Boolean]
     def within_6mos_of?(from_date)
-      # ::Date 6 calendar months before self
-      start_date = self - 6.months + 2.days
-      end_date = self + 6.months - 2.days
-      (start_date..end_date).cover?(from_date)
+      from_date = Date.parse(from_date) unless from_date.is_a?(Date)
+      from_day = from_date.day
+      if [28, 29, 30, 31].include?(from_day)
+        # Near the end of the month, we need to make sure that when we go
+        # forward or backwards 6 months, we do not go past the end of the
+        # destination month when finding the "corresponding" day in that
+        # month, per Stella v. Graham Page Motors.  This refinement was
+        # endorsed in the Jammies International case.  After we find the
+        # corresponding day in the target month, then add two days (for the
+        # month six months before the from_date) or subtract two days (for the
+        # month six months after the from_date) to get the first and last days
+        # of the "within a period of less than six months" date range.
+        start_month = from_date.beginning_of_month - 6.months
+        start_days = start_month.days_in_month
+        start_date = ::Date.new(start_month.year, start_month.month, [start_days, from_day].min) + 2.days
+        end_month = from_date.beginning_of_month + 6.months
+        end_days = end_month.days_in_month
+        end_date = ::Date.new(end_month.year, end_month.month, [end_days, from_day].min) - 2.days
+      else
+        # ::Date 6 calendar months before self
+        start_date = from_date - 6.months + 2.days
+        end_date = from_date + 6.months - 2.days
+      end
+      (start_date..end_date).cover?(self)
     end
 
     # Return whether this date is Easter Sunday for the year in which it falls
@@ -1002,6 +1033,9 @@ module FatCore
       if mon == 1 && mday == 1
         # New Years (January 1),
         true
+      elsif mon == 6 && mday == 19 && year >= 2021
+        # Juneteenth,
+        true
       elsif mon == 7 && mday == 4
         # Independence Day (July 4),
         true

data/lib/fat_core/version.rb

@@ -2,7 +2,7 @@
 
 module FatCore
   MAJOR = 4
-  MINOR = 11
+  MINOR = 12
   PATCH = 0
 
   # FatCore version number

data/spec/lib/date_spec.rb

@@ -837,6 +837,65 @@ describe Date do
         expect(Date.parse('2014-01-12'))
           .to be_within_6mos_of(Date.parse('2014-07-10'))
       end
+
+      it "knows if it's within 6 months of another date if it's near end of month" do
+        # This tests for the Jammies Interntional twist where there is no
+        # corresponding day in the sixth month before or after the given date.
+
+        # Looking backward to Feb
+        expect(Date.parse('2014-02-28'))
+          .not_to be_within_6mos_of(Date.parse('2014-08-31'))
+        expect(Date.parse('2014-03-01'))
+          .not_to be_within_6mos_of(Date.parse('2014-08-31'))
+        expect(Date.parse('2014-03-02'))
+          .to be_within_6mos_of(Date.parse('2014-08-31'))
+        # Looking forward to Feb
+        expect(Date.parse('2015-02-28'))
+          .not_to be_within_6mos_of(Date.parse('2014-08-31'))
+        expect(Date.parse('2015-02-27'))
+          .not_to be_within_6mos_of(Date.parse('2014-08-31'))
+        expect(Date.parse('2015-02-26'))
+          .to be_within_6mos_of(Date.parse('2014-08-31'))
+        # Same in a leap year, backward
+        expect(Date.parse('2012-02-29'))
+          .not_to be_within_6mos_of(Date.parse('2012-08-31'))
+        expect(Date.parse('2012-03-01'))
+          .not_to be_within_6mos_of(Date.parse('2012-08-31'))
+        expect(Date.parse('2012-03-02'))
+          .to be_within_6mos_of(Date.parse('2012-08-31'))
+        # Same in a leap year, forward
+        expect(Date.parse('2012-02-29'))
+          .not_to be_within_6mos_of(Date.parse('2011-08-31'))
+        expect(Date.parse('2012-02-28'))
+          .not_to be_within_6mos_of(Date.parse('2011-08-31'))
+        expect(Date.parse('2012-02-27'))
+          .to be_within_6mos_of(Date.parse('2011-08-31'))
+
+        # Now try from October to April, as 31->30 test.
+        expect(Date.parse('2012-04-30'))
+          .not_to be_within_6mos_of(Date.parse('2012-10-31'))
+        expect(Date.parse('2012-05-01'))
+          .not_to be_within_6mos_of(Date.parse('2012-10-31'))
+        expect(Date.parse('2012-05-02'))
+          .to be_within_6mos_of(Date.parse('2012-10-31'))
+        # And forward
+        expect(Date.parse('2013-04-30'))
+          .not_to be_within_6mos_of(Date.parse('2012-10-31'))
+        expect(Date.parse('2013-04-29'))
+          .not_to be_within_6mos_of(Date.parse('2012-10-31'))
+        expect(Date.parse('2013-04-28'))
+          .to be_within_6mos_of(Date.parse('2012-10-31'))
+
+        # It's not symmetrical: notice the second example here is within six
+        # months if measured from April, but not if measured from October.
+        expect(Date.parse('2012-10-31'))
+          .not_to be_within_6mos_of(Date.parse('2013-04-30'))
+        expect(Date.parse('2012-10-31'))
+          .to be_within_6mos_of(Date.parse('2013-04-29'))
+        expect(Date.parse('2012-10-31'))
+          .to be_within_6mos_of(Date.parse('2013-04-28'))
+
+      end
     end
 
     describe 'holidays' do
@@ -948,6 +1007,18 @@ describe Date do
         expect(Date.parse('2014-11-23')).to be_fed_holiday
       end
 
+      it 'knows that Juneteenth is a federal holiday from 2021' do
+        expect(Date.parse('2020-06-19')).not_to be_fed_holiday
+        # Saturday
+        expect(Date.parse('2021-06-19')).to be_fed_holiday
+        # Observed Friday
+        expect(Date.parse('2021-06-18')).to be_fed_holiday
+        # Sunday
+        expect(Date.parse('2022-06-19')).to be_fed_holiday
+        # Observed Monday
+        expect(Date.parse('2022-06-20')).to be_fed_holiday
+      end
+
       it 'should know if its an NYSE holiday' do
         #################  2014         2015       2016
         # New Year's Day  January 1   January 1   January 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_core
 version: !ruby/object:Gem::Version
-  version: 4.11.0
+  version: 4.12.0
 platform: ruby
 authors:
 - Daniel E. Doherty
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-05 00:00:00.000000000 Z
+date: 2022-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
@@ -219,7 +219,7 @@ licenses:
 - MIT
 metadata:
   yard.run: yri
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -234,8 +234,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 3.3.7
+signing_key: 
 specification_version: 4
 summary: fat_core provides some useful core extensions
 test_files: