fat_core 4.10.0 → 4.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3860db07c85484c1d82e2fafa18d730e7dedb991f33868b21c2c11d3e56c7fde
-  data.tar.gz: 524ca9b2ecdd017b5f14d8ff70e787d550bdf0a3eb4769be6442c3df914f965c
+  metadata.gz: 8607195b8f5ef6d04df1f438fbd59d3a22ca3a730d0d5bb9430ff37166d07174
+  data.tar.gz: e86aedc2aafebf6fc02efdf6f3f35f39ad93059b08a8bc4e635190e5964f2942
 SHA512:
-  metadata.gz: fda77f07f98048d111fdf752b115595f1b3b79e8f2c6b1d73482edfcb9e89ad45f6d46331fca04b3cabab3f1ab2f4da91675de5b8c4965943aa12d4902501839
-  data.tar.gz: 37a9824e50cdc58880d081007c70b9e5b4d6c338f381139ad178e936d68da24e19a6b188298072da9df7444b88eacfa9ed362bcb2767092abdb6f532e93e7089
+  metadata.gz: 94983a4893c2c4882b360236f488c3a741ea8927488a69785ae4a7cc8f93612e11aa1f6899b359fcc2bb25742d6f062d3c76f5cbd75dfc64c24edba44be45755
+  data.tar.gz: 9700b48e6c73ec9ec49ed7da22679b4ea90676be71011b4c4c912cb4b53c2d613bb1712b8c59f440990570a33ffe12ab51ec0986ace906638408b3bab85f59d9

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 = 11
   PATCH = 0
 
   # FatCore version number

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fat_core
 version: !ruby/object:Gem::Version
-  version: 4.10.0
+  version: 4.11.0
 platform: ruby
 authors:
 - Daniel E. Doherty