fat_core 4.9.2 → 4.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c90648dd1bf02d613aa456a276788456ad6db68c388c9d5b77299efcf873d701
-  data.tar.gz: 7e1db9a329844c017bbce95086f18b1417015776aedef20645c1b163f16326a7
+  metadata.gz: 8607195b8f5ef6d04df1f438fbd59d3a22ca3a730d0d5bb9430ff37166d07174
+  data.tar.gz: e86aedc2aafebf6fc02efdf6f3f35f39ad93059b08a8bc4e635190e5964f2942
 SHA512:
-  metadata.gz: 189ba88410e8af0b51da95eb3cf543183584fc692194e4d66838e13dacc927ced464093c9b6410b1dc66b0cad816bd357a38066b39b0389a8f7876dfeb75d5e7
-  data.tar.gz: 2cd18de337ca05bb40bfb2e39d1ce86d7ecb6fe476a0d8ce2d8d4a156f877a904afeabe5c57bddcf72eab43b199545289503a8aeeb3fa4e48139020dde832674
+  metadata.gz: 94983a4893c2c4882b360236f488c3a741ea8927488a69785ae4a7cc8f93612e11aa1f6899b359fcc2bb25742d6f062d3c76f5cbd75dfc64c24edba44be45755
+  data.tar.gz: 9700b48e6c73ec9ec49ed7da22679b4ea90676be71011b4c4c912cb4b53c2d613bb1712b8c59f440990570a33ffe12ab51ec0986ace906638408b3bab85f59d9

data/.rubocop.yml

@@ -14,3 +14,6 @@ Style/MethodCallWithArgsParentheses:
 Style/ClassAndModuleChildren:
   Exclude:
     - 'test/**/*'
+
+Style/StringLiterals:
+  Enabled: false

data/.simplecov

@@ -0,0 +1,18 @@
+# -*- mode: ruby -*-
+
+SimpleCov.start do
+  # any custom configs like groups and filters can be here at a central place
+  add_filter '/spec/'
+  add_filter '/tmp/'
+  add_group "Models", "lib/fat_core"
+  # add_group "Core Extension", "lib/ext"
+  # After this many seconds between runs, old coverage stats are thrown out,
+  # so 3600 => 1 hour
+  merge_timeout 3600
+  # Make this true to merge rspec and cucumber coverage together
+  use_merging false
+  command_name 'Rspec'
+  nocov_token 'no_cover'
+  # Branch coverage
+  enable_coverage :branch
+end

data/fat_core.gemspec

@@ -24,14 +24,14 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'debug', '>= 1.0.0'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-doc'
-  spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'redcarpet'
+  spec.add_development_dependency 'solargraph'
 
-  spec.add_runtime_dependency 'activesupport'
+  spec.add_runtime_dependency 'activesupport', '~>6.0'
   spec.add_runtime_dependency 'damerau-levenshtein'
 end

data/lib/fat_core/date.rb

@@ -48,6 +48,9 @@ require 'fat_core/patches'
 # the NYSE was closed for special reasons, such as the 9-11 attacks in 2001.
 module FatCore
   module Date
+    # Set the default beginning of week to Monday for commercial weeks.
+    ::Date.beginning_of_week = :monday
+
     # Constant for Beginning of Time (BOT) outside the range of what we would ever
     # want to find in commercial situations.
     BOT = ::Date.parse('1900-01-01')
@@ -70,7 +73,7 @@ module FatCore
     # Format date to TeX documents as ISO strings but with en-dashes
     # @return [String]
     def tex_quote
-      strftime('%Y--%m--%d')
+      strftime('%Y--%m--%d').tex_quote
     end
 
     # :category: Formatting

data/lib/fat_core/numeric.rb

@@ -148,7 +148,7 @@ module FatCore
     # Quote self for use in TeX documents.  Since number components are not
     # special to TeX, this just applies `#to_s`
     def tex_quote
-      to_s
+      to_s.tex_quote
     end
   end
 end

data/lib/fat_core/range.rb

@@ -193,7 +193,7 @@ module FatCore
     #
     # @return [String]
     def tex_quote
-      to_s
+      to_s.tex_quote
     end
 
     # @group Queries

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. Ignore case in the match
-    # 4. Match if any part of self matches `matcher`
+    # 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| ".*?#{Regexp.escape(m)}.*?" }.join('[: ]')
+      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,8 +2,8 @@
 
 module FatCore
   MAJOR = 4
-  MINOR = 9
-  PATCH = 2
+  MINOR = 11
+  PATCH = 0
 
   # FatCore version number
   VERSION = [MAJOR, MINOR, PATCH].compact.join('.')

data/lib/fat_core.rb

@@ -1,4 +1,5 @@
 require 'fat_core/version'
 require 'fat_core/patches'
+require 'active_support'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/deep_dup'

data/spec/lib/date_spec.rb

@@ -586,7 +586,7 @@ describe Date do
           .to be_end_of_semimonth
       end
 
-      it 'should know about biweeks' do
+      it 'knows about biweeks' do
         expect(Date.parse('2013-11-07').beginning_of_biweek)
           .to eq Date.parse('2013-11-04')
         expect(Date.parse('2013-11-07').end_of_biweek)
@@ -599,16 +599,23 @@ describe Date do
           .to eq Date.parse('2010-01-03')
       end
 
-      it 'should know about weeks' do
+      it 'knows that a Monday is the beginning of the week' do
+        # A Monday
         expect(Date.parse('2013-11-04')).to be_beginning_of_week
-        expect(Date.parse('2013-11-10')).to be_end_of_week
         expect(Date.parse('2013-12-02')).to be_beginning_of_week
-        expect(Date.parse('2013-12-08')).to be_end_of_week
+        # A Sunday
         expect(Date.parse('2013-10-13')).to_not be_beginning_of_week
+      end
+
+      it 'knows that a Sunday is the end of the week' do
+        # A Sunday
+        expect(Date.parse('2013-11-10')).to be_end_of_week
+        expect(Date.parse('2013-12-08')).to be_end_of_week
+        # A Saturday
         expect(Date.parse('2013-10-19')).to_not be_end_of_week
       end
 
-      it 'should know the beginning of chunks' do
+      it 'should know the beginning of non-week chunks' do
         expect(Date.parse('2013-11-04').beginning_of_chunk(:year))
           .to eq Date.parse('2013-01-01')
         expect(Date.parse('2013-11-04').beginning_of_chunk(:half))
@@ -623,10 +630,30 @@ describe Date do
           .to eq Date.parse('2013-11-01')
         expect(Date.parse('2013-11-24').beginning_of_chunk(:semimonth))
           .to eq Date.parse('2013-11-16')
+      end
+
+      it 'knows the beginning and end of bi-week-based chunks' do
+        # First Friday to prior Monday
         expect(Date.parse('2013-11-08').beginning_of_chunk(:biweek))
           .to eq Date.parse('2013-11-04')
+        # Second Wednesday to 2 prior Monday
+        expect(Date.parse('2013-11-13').beginning_of_chunk(:biweek))
+          .to eq Date.parse('2013-11-04')
+      end
+
+      it 'knows the beginning and end of week-based chunks' do
+        # A Friday to prior Monday
         expect(Date.parse('2013-11-08').beginning_of_chunk(:week))
           .to eq Date.parse('2013-11-04')
+        # A Friday to following Sunday
+        expect(Date.parse('2013-11-08').end_of_chunk(:week))
+          .to eq Date.parse('2013-11-10')
+        # A Sunday to prior Monday
+        expect(Date.parse('2013-11-10').beginning_of_chunk(:week))
+          .to eq Date.parse('2013-11-04')
+        # A Sunday to itself
+        expect(Date.parse('2013-11-10').end_of_chunk(:week))
+          .to eq Date.parse('2013-11-10')
         expect {
           Date.parse('2013-11-04').beginning_of_chunk(:wek)
         }.to raise_error(ArgumentError)

data/spec/lib/string_spec.rb

@@ -245,7 +245,7 @@ the people, for the people, shall not perish from the earth."
 
     describe 'Matching' do
       it 'should be able to fuzzy match with another string' do
-        expect('Hello, world'.fuzzy_match('or')).to be_truthy
+        expect('Hello, world'.fuzzy_match('wor')).to be_truthy
         expect('Hello, world'.fuzzy_match('ox')).to be_falsy
       end
 
@@ -255,23 +255,38 @@ the people, for the people, shall not perish from the earth."
       end
 
       it 'should be able to fuzzy match space-separated parts' do
-        expect('Hello world'.fuzzy_match('hel or')).to be_truthy
+        expect('Hello world'.fuzzy_match('hel wor')).to be_truthy
         expect('Hello, world'.fuzzy_match('hel ox')).to be_falsy
       end
 
       it 'should be able to fuzzy match colon-separated parts' do
-        expect('Hello:world'.fuzzy_match('hel:or')).to be_truthy
+        expect('Hello:world'.fuzzy_match('hel:wor')).to be_truthy
         expect('Hello:world'.fuzzy_match('hel:ox')).to be_falsy
       end
 
       it 'should be able to fuzzy match colon-separated parts' do
-        expect('Hello:world'.fuzzy_match('hel:or')).to be_truthy
+        expect('Hello:world'.fuzzy_match('hel:wor')).to be_truthy
         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:or')).to eq('Hello:wor')
+        expect('Hello:world'.fuzzy_match('hel:wor')).to eq('Hello:wor')
         expect('Hello:world'.matches_with('/^h.*r/')).to eq('Hello:wor')
       end
 
@@ -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

data/spec/spec_helper.rb

@@ -1,12 +1,11 @@
 require 'simplecov'
 SimpleCov.command_name 'Rspec'
-SimpleCov.start
 
 require 'bundler/setup'
 Bundler.setup
 
 require 'pry'
-require 'pry-byebug'
+require 'debug'
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_core
 version: !ruby/object:Gem::Version
-  version: 4.9.2
+  version: 4.11.0
 platform: ruby
 authors:
 - Daniel E. Doherty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-07 00:00:00.000000000 Z
+date: 2022-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
@@ -39,21 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: solargraph
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -140,16 +140,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: damerau-levenshtein
   requirement: !ruby/object:Gem::Requirement
@@ -175,6 +175,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".simplecov"
 - ".travis.yml"
 - ".yardopts"
 - Gemfile
@@ -233,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: fat_core provides some useful core extensions