fat_core 4.10.0 → 4.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3860db07c85484c1d82e2fafa18d730e7dedb991f33868b21c2c11d3e56c7fde
-  data.tar.gz: 524ca9b2ecdd017b5f14d8ff70e787d550bdf0a3eb4769be6442c3df914f965c
+  metadata.gz: 293a92293691aebd9771c017fa1dfeb9f9935bbb3832a19ec3494df49a75a176
+  data.tar.gz: 273ca4995d0e8b5d95cb5103ce520643f5aca983a0d855b083deb7d052033b63
 SHA512:
-  metadata.gz: fda77f07f98048d111fdf752b115595f1b3b79e8f2c6b1d73482edfcb9e89ad45f6d46331fca04b3cabab3f1ab2f4da91675de5b8c4965943aa12d4902501839
-  data.tar.gz: 37a9824e50cdc58880d081007c70b9e5b4d6c338f381139ad178e936d68da24e19a6b188298072da9df7444b88eacfa9ed362bcb2767092abdb6f532e93e7089
+  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/string.rb

@@ -245,28 +245,44 @@ module FatCore
     #
     # 1. Remove all periods, commas, apostrophes, and asterisks (the punctuation
     #    characters) from both self and `matcher`,
-    # 2. Treat ':' in the matcher as the equivalent of '.*' in a regular
-    #    expression, that is, match anything in self,
-    # 3. Require each component to match the beginning of a word boundary
-    # 4. Ignore case in the match
+    # 2. Treat internal ':' in the matcher as the equivalent of '.*' in a
+    #    regular expression, that is, match anything in self,
+    # 3. Treat leading ':' in the matcher as anchoring the match to the
+    #    beginning of the target string,
+    # 4. Treat ending ':' in the matcher as anchoring the match to the
+    #    end of the target string,
+    # 5. Require each component to match the beginning of a word boundary
+    # 6. Ignore case in the match
     #
     # @example
     #   "St. Luke's Hospital".fuzzy_match('st lukes') #=> 'St Lukes'
     #   "St. Luke's Hospital".fuzzy_match('luk:hosp') #=> 'Lukes Hosp'
     #   "St. Luke's Hospital".fuzzy_match('st:spital') #=> 'St Lukes Hospital'
     #   "St. Luke's Hospital".fuzzy_match('st:laks') #=> nil
+    #   "St. Luke's Hospital".fuzzy_match(':lukes') #=> nil
+    #   "St. Luke's Hospital".fuzzy_match('lukes:hospital:') #=> 'Lukes Hospital'
     #
     # @param matcher [String] pattern to test against where ':' is wildcard
     # @return [String] the unpunctuated part of self that matched
     # @return [nil] if self did not match matcher
     def fuzzy_match(matcher)
       # Remove periods, asterisks, commas, and apostrophes
-      matcher = matcher.gsub(/[\*.,']/, '')
+      matcher = matcher.strip.gsub(/[\*.,']/, '')
+      if matcher.start_with?(':')
+        begin_anchor = true
+        matcher.sub!(/\A:/, '')
+      end
+      if matcher.end_with?(':')
+        end_anchor = true
+        matcher.sub!(/:\z/, '')
+      end
       target = gsub(/[\*.,']/, '')
       matchers = matcher.split(/[: ]+/)
       regexp_string = matchers.map { |m| ".*?\\b#{Regexp.escape(m)}.*?" }.join('[: ]')
       regexp_string.sub!(/^\.\*\?/, '')
       regexp_string.sub!(/\.\*\?$/, '')
+      regexp_string.sub!(/\A/, '\\A') if begin_anchor
+      regexp_string.sub!(/\z/, '\\z') if end_anchor
       regexp = /#{regexp_string}/i
       matched_text =
         if (match = regexp.match(target))

data/lib/fat_core/version.rb

@@ -2,7 +2,7 @@
 
 module FatCore
   MAJOR = 4
-  MINOR = 10
+  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

data/spec/lib/string_spec.rb

@@ -269,6 +269,21 @@ the people, for the people, shall not perish from the earth."
         expect('Hello:world'.fuzzy_match('hel:ox')).to be_falsy
       end
 
+      it 'requires end-anchor for ending colon' do
+        expect('Hello, to the world'.fuzzy_match('hel:world:')).to eq('Hello to the world')
+        expect('Hello, to the world today'.fuzzy_match('to:world:')).to be_nil
+      end
+
+      it 'requires start-anchor for leading colon' do
+        expect('Hello, to the world'.fuzzy_match(':hel:the')).to eq('Hello to the')
+        expect('Hello, to the world today'.fuzzy_match(':world:today')).to be_nil
+      end
+
+      it 'requires start-anchor and end-anchor for leading and ending colon' do
+        expect('Hello, to the world'.fuzzy_match(':hel:world:')).to eq('Hello to the world')
+        expect('Hello, to the world today'.fuzzy_match('hel:world:')).to be_falsy
+      end
+
       it 'should return the matched text' do
         expect('Hello:world'.fuzzy_match('hel')).to eq('Hel')
         expect('Hello:world'.fuzzy_match('hel:wor')).to eq('Hello:wor')
@@ -280,6 +295,9 @@ the people, for the people, shall not perish from the earth."
         expect('St Lukes'.fuzzy_match('st. luke\'s')).to eq('St Lukes')
         expect('St Lukes, Inc.'.fuzzy_match('st luke inc')).to eq('St Lukes Inc')
         expect('E*TRADE'.fuzzy_match('etrade')).to eq('ETRADE')
+        # Does not recognize non-alphanumerics as start of string.
+        expect('The 1 Dollar Store'.fuzzy_match('1 stor')).to be_truthy
+        expect('The $1 Dollar Store'.fuzzy_match('$1 stor')).to be_falsy
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_core
 version: !ruby/object:Gem::Version
-  version: 4.10.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: