fat_core 4.11.0 → 4.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8607195b8f5ef6d04df1f438fbd59d3a22ca3a730d0d5bb9430ff37166d07174
-  data.tar.gz: e86aedc2aafebf6fc02efdf6f3f35f39ad93059b08a8bc4e635190e5964f2942
+  metadata.gz: a4634231d8dd0ed3baf9fd4d232e3e40adb777008b6b8299a5b5574466e10637
+  data.tar.gz: 4d8a1e46fa3e5ebb1014dedd75b801210921aa87ba1e01dba779cc62b4d01ca2
 SHA512:
-  metadata.gz: 94983a4893c2c4882b360236f488c3a741ea8927488a69785ae4a7cc8f93612e11aa1f6899b359fcc2bb25742d6f062d3c76f5cbd75dfc64c24edba44be45755
-  data.tar.gz: 9700b48e6c73ec9ec49ed7da22679b4ea90676be71011b4c4c912cb4b53c2d613bb1712b8c59f440990570a33ffe12ab51ec0986ace906638408b3bab85f59d9
+  metadata.gz: 0d83fd2e04a0c1a466ae1ba75fcb888621a76ddfc9fa9f1cb78c1d05d3f1493bd347fd21e96f9f94ce14c8ddf9886ca98bbc32efc7c3f72200e9920a1dce4f49
+  data.tar.gz: 8de95683c4f0f969b7778dfce4e1235b2cd9838ebab6125880a3bdd099c631274f7f23e98a4e82696cb8ac50da8071383fc4d5eea5d4ce749c38a79ae399e2da

data/.rubocop.yml

@@ -1,19 +1,25 @@
-inherit_gem:
-    rubocop-shopify: rubocop.yml
+inherit_from:
+  - ~/.rubocop.yml
 
-AllCops:
-  TargetRubyVersion: 2.7
-  Exclude:
-    - 'test/tmp/**/*'
-    - 'vendor/bundle/**/*'
+# inherit_gem:
+#     rubocop-shopify: rubocop.yml
 
-Style/MethodCallWithArgsParentheses:
-  Exclude:
-    - '**/Gemfile'
+# require:
+#   - rubocop-rspec
 
-Style/ClassAndModuleChildren:
-  Exclude:
-    - 'test/**/*'
+# AllCops:
+#   TargetRubyVersion: 2.7
+#   Exclude:
+#     - 'test/tmp/**/*'
+#     - 'vendor/bundle/**/*'
 
-Style/StringLiterals:
-  Enabled: false
+# Style/MethodCallWithArgsParentheses:
+#   Exclude:
+#     - '**/Gemfile'
+
+# Style/ClassAndModuleChildren:
+#   Exclude:
+#     - 'test/**/*'
+
+# Style/StringLiterals:
+#   Enabled: false

data/fat_core.gemspec

@@ -1,16 +1,20 @@
 # coding: utf-8
 
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'fat_core/version'
+require_relative 'lib/fat_core/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'fat_core'
   spec.version       = FatCore::VERSION
   spec.authors       = ['Daniel E. Doherty']
   spec.email         = ['ded@ddoherty.net']
-  spec.summary       = 'fat_core provides some useful core extensions'
-  spec.description   = 'Useful extensions to Date, String, Range and other classes'
+  spec.summary       = 'some useful core extensions'
+  spec.description   = <<~DESC
+     Useful extensions to Date, String, Range and other classes
+     including useful Date extensions for dealing with US Federal
+     and New York Stock Exchange holidays and working days, a useful
+     Enumerable#each_with_flags for flagging first and last items in the
+     iteration, (also for Hash), set operations on Ranges
+  DESC
   spec.homepage      = 'https://github.com/ddoherty03/fat_core.git'
   spec.license       = 'MIT'
   spec.required_ruby_version = '>= 2.2.2'

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

@@ -4,6 +4,7 @@ require 'bigdecimal'
 require 'fat_core/patches'
 require 'damerau-levenshtein'
 require 'active_support/core_ext/regexp'
+require_relative 'numeric'
 
 module FatCore
   module String
@@ -245,8 +246,9 @@ module FatCore
     #
     # 1. Remove all periods, commas, apostrophes, and asterisks (the punctuation
     #    characters) from both self and `matcher`,
-    # 2. Treat internal ':' in the matcher as the equivalent of '.*' in a
-    #    regular expression, that is, match anything in self,
+    # 2. Treat internal ':stuff' in the matcher as the equivalent of
+    #    '\bstuff.*?\b' in a regular expression, that is, match any word
+    #    starting with stuff 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
@@ -278,7 +280,7 @@ module FatCore
       end
       target = gsub(/[\*.,']/, '')
       matchers = matcher.split(/[: ]+/)
-      regexp_string = matchers.map { |m| ".*?\\b#{Regexp.escape(m)}.*?" }.join('[: ]')
+      regexp_string = matchers.map { |m| ".*?\\b#{Regexp.escape(m)}.*?" }.join('\\b')
       regexp_string.sub!(/^\.\*\?/, '')
       regexp_string.sub!(/\.\*\?$/, '')
       regexp_string.sub!(/\A/, '\\A') if begin_anchor
@@ -364,70 +366,7 @@ module FatCore
       numeric_re = /\A([-+])?([\d_]*)((\.)?([\d_]*))?([eE][+-]?[\d_]+)?\z/
       return self unless clean =~ numeric_re
 
-      sig = $1 || ''
-      whole = $2 ? $2.delete('_') : ''
-      frac = $5 || ''
-      exp = $6 || ''
-
-      # Round frac or whole if places given.  For positve places, round fraction
-      # to that many places; for negative, round the whole-number part to the
-      # absolute value of places left of the decimal.
-      if places
-        new_frac = frac.dup
-        new_whole = whole.dup
-        if places.zero?
-          new_frac = ''
-        elsif places.positive? && places < frac.length
-          new_frac = frac[0...places - 1]
-          new_frac[places - 1] =
-            if frac[places].to_i >= 5
-              (frac[places - 1].to_i + 1).to_s
-            else
-              frac[places - 1]
-            end
-        elsif places >= frac.length
-          new_frac = frac + '0' * (places - frac.length)
-        else
-          # Negative places, round whole to places.abs from decimal
-          places = places.abs
-          if places > whole.length
-            lead = whole[0].to_i >= 5 ? '1' : '0'
-            new_whole[0] = places == whole.length + 1 ? lead : '0'
-            new_whole[1..-1] = '0' * (places - 1)
-            new_frac = ''
-          elsif places > 1
-            target = whole.length - places
-            new_whole[target] =
-              if whole[target + 1].to_i >= 5
-                (whole[target].to_i + 1).to_s
-              else
-                whole[target]
-              end
-            new_whole[target + 1..whole.length - 1] =
-              '0' * (whole.length - target - 1)
-            new_frac = ''
-          else
-            # Rounding to 1 place, therefore, no rounding
-            new_frac = ''
-            new_whole = whole
-          end
-        end
-        frac = new_frac
-        whole = new_whole
-      end
-
-      # Place the commas in the whole part only
-      whole = whole.reverse
-      whole.gsub!(/([0-9]{3})/, '\\1,')
-      whole.gsub!(/,$/, '')
-      whole.reverse!
-
-      # Reassemble
-      if frac.blank?
-        sig + whole + exp
-      else
-        sig + whole + '.' + frac + exp
-      end
+      to_f.commas(places)
     end
 
     module ClassMethods

data/lib/fat_core/version.rb

@@ -2,8 +2,8 @@
 
 module FatCore
   MAJOR = 4
-  MINOR = 11
-  PATCH = 0
+  MINOR = 12
+  PATCH = 1
 
   # FatCore version number
   VERSION = [MAJOR, MINOR, PATCH].compact.join('.')

data/spec/lib/array_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 require 'fat_core/array'
 
 describe Array do
-  it 'should be able to report its last index' do
+  it 'reports its last index' do
     letters = ('a'..'z').to_a
     expect(letters.last_i).to eq(25)
   end

data/spec/lib/bigdecimal_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'fat_core/bigdecimal'
 
 describe BigDecimal do
-  it 'should provide a human-readable inspect for BigDecimal' do
+  it 'provides a human-readable inspect for BigDecimal' do
     expect(BigDecimal('33.45').inspect).to eq '33.45'
   end
 end