fat_core 7.0.1 → 7.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e8f4f5a7755b961eefa799f5450586a9e3f008110c6dc179fd90e56a12557f3
-  data.tar.gz: fe9a35502b6f1453f5d0f2afdf8b83f91b3a43b4bf0f19b00baae2e38eac37e0
+  metadata.gz: e41b6857fb2c0b81125ed588ea89a53fa65d794e462336d96186692de9f369b3
+  data.tar.gz: 3ab1379a55487b58400c971dd81eb81d08aafe2500e4743e9402b646a6daddab
 SHA512:
-  metadata.gz: 9ae1381cbb8d46700dc0258dd6eabcc68f50949d7ca7f878bb4013939ca43c88d365bebbb9c32f232f030c2baf7a962a69b7df1579836425ad748c07e9617dab
-  data.tar.gz: c76f9b88fb4f5d705091c8f0d5aeb206ef89efafebaabff067b6421cf957f58695c6c8d3a670f6fdaad0aaa5a2260683fcb7b7bc509810c62f3269326d3e5aa7
+  metadata.gz: 9da3d3dd996a3ffe907e618ee9f4ee550c3e720b8a27e8790d4f027c5e11b187417832e41bfe3d6d3c513c2315482302ed784dd61c87c98a2647483f838ea953
+  data.tar.gz: e5862ca6b225780f8152611064e2c4af9550a7351f2fc44a4aae20c991d6802fc4261c605afbb5d8b99f6c3790934330571219a60ef4c7f93bf613935d83cc71

data/CHANGELOG.org

@@ -1,3 +1,15 @@
+* Version 7.1.1
+** String
+- =String#fuzzy_match= make period, comma, asterisk, and apostrophes optional
+  in matcher instead of just deleting them and in the subject string replace
+  periods and commas with spaces so they still act as word separators.
+
+  Before ='WWW.WOLFRAM.COM'.fuzzy_match('www:wolfram')= would not match because
+  the periods were just eliminated so the matcher was looking for a word
+  starting with 'wolfram' but the subject string was converted to
+  'WWWWOLFRAMCOM' so no match.  Now it is converted to 'WWW WOLFRAM COM' so
+  the match succeeds.
+
 * Version 7.0.0 from Version 6.0.0
 ** Enumerable
 - Remove =#groups_of= as duplicative of =each_slice=

data/README.org

@@ -801,22 +801,26 @@ matcher both the space and colon ':' have special meaning as shown below.
 
 1. Remove leading and trailing whitespace in the subject and the matcher
    and collapse its internal whitespace to a single space,
-2. Remove all periods, commas, apostrophes, and asterisks (the
-   punctuation characters) from both self and `matcher`,
-3. Treat internal ':stuff' or ' :stuff' in the matcher as the equivalent
+2. In the subject string replace periods and commas with a space (so
+   they still act as word separators) but remove apostrophes, and
+   asterisks so the user need not remember whether they were used when
+   forming the matcher.
+3. In the matcher, make any period, comma, asterisk, or apostrophe
+   optional for the same reason.
+4. Treat internal ':stuff' or ' :stuff' in the matcher as the equivalent
    of /\bstuff.*/ in a regular expression, that is, match any word
    starting with stuff in self,
-4. Treat internal 'stuff: ' in the matcher as the equivalent of /.*stuff\b/ in
+5. Treat internal 'stuff: ' in the matcher as the equivalent of /.*stuff\b/ in
    a regular expression, that is, match any word ending with stuff in self,
-5. A colon with no spaces around it is treated as belonging to the
+6. A colon with no spaces around it is treated as belonging to the
    following word, requiring it to start with it, so 'some:stuff'
    requires 'some' anywhere followed by a word beginning with 'stuff',
    i.e., /some.*\bstuff/i,
-6. Treat leading ':' in the matcher as anchoring the match to the
+7. Treat leading ':' in the matcher as anchoring the match to the
    beginning of the target string,
-7. Treat ending ':' in the matcher as anchoring the match to the
+8. Treat ending ':' in the matcher as anchoring the match to the
    end of the target string,
-8. Require each component to match some part of self, and
+9. Require each component to match some part of self, and
 
 #+begin_src ruby
   require_relative './lib/fat_core/string'
@@ -825,7 +829,7 @@ matcher both the space and colon ':' have special meaning as shown below.
   result << ['Self', 'Matcher', 'Match']
   result << nil
   subj = "St. Luke's Hospital"
-  matchers = ['st lukes', 'luk:hosp', 'st:spital', 'uk spital', 'st:laks', ':lukes', 's lukes', 'lukes:hospital']
+  matchers = ['st lukes', 'st. luke\'s', 'luk:hosp', 'st:spital', 'uk spital', 'st:laks', ':lukes', 's lukes', 'lukes:hospital']
   matchers.each do |m|
     result << [subj, m, subj.fuzzy_match(m)]
   end
@@ -836,6 +840,7 @@ matcher both the space and colon ':' have special meaning as shown below.
 | Self                | Matcher        | Match          |
 |---------------------+----------------+----------------|
 | St. Luke's Hospital | st lukes       | St Lukes       |
+| St. Luke's Hospital | st. luke's     | St Lukes       |
 | St. Luke's Hospital | luk:hosp       | Lukes Hosp     |
 | St. Luke's Hospital | st:spital      | nil            |
 | St. Luke's Hospital | uk spital      | ukes Hospital  |

data/Rakefile

@@ -21,7 +21,7 @@ YARD::Rake::YardocTask.new do |t|
 end
 
 RSpec::Core::RakeTask.new(:spec, :tag) do |t|
-  t.rspec_opts = '--tag ~online -f p'
+  t.rspec_opts = '--tag ~online -f d'
 end
 
 ########################################################################

data/fat_core.gemspec

@@ -10,15 +10,15 @@ Gem::Specification.new do |spec|
   spec.email         = ['ded@ddoherty.net']
   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
+    Useful extensions to Enumerable and String, Range and other classes. A
     Enumerable#each_with_flags for flagging first and last items in the
-    iteration, (also for Hash), set operations on Ranges
+    iteration, operations on Ranges for testing contiguity, gaps in sets of
+    Ranges, and performing set operations on Ranges.  String#fuzzy_match
+    for user-friendly matchers to test for matching.
   DESC
   spec.homepage      = 'https://github.com/ddoherty03/fat_core.git'
   spec.license       = 'MIT'
-  spec.required_ruby_version = '>= 2.2.2'
+  spec.required_ruby_version = '>= 3.2.2'
   spec.metadata['yard.run'] = 'yri' # use "yard" to build full HTML docs.
 
   spec.files = %x[git ls-files -z].split("\x0")

data/lib/fat_core/string.rb

@@ -243,24 +243,28 @@ module FatCore
     #
     # 1. Remove leading and trailing whitespace in the subject and the matcher
     #    and collapse its internal whitespace to a single space,
-    # 2. Remove all periods, commas, apostrophes, and asterisks (the
-    #    punctuation characters) from both self and `matcher`,
-    # 3. Treat internal ':stuff' or ' :stuff' in the matcher as the equivalent
+    # 2. In the subject string replace periods and commas with a space (so
+    #    they still act as word separators) but remove apostrophes, and
+    #    asterisks so the user need not remember whether they were used when
+    #    forming the matcher.
+    # 3. In the matcher, make any period, comma, asterisk, or apostrophe
+    #    optional for the same reason.
+    # 4. Treat internal ':stuff' or ' :stuff' in the matcher as the equivalent
     #    of /\bstuff.*/ in a regular expression, that is, match any word
     #    starting with stuff in self,
-    # 4. Treat internal 'stuff: ' in the matcher as the equivalent
+    # 5. Treat internal 'stuff: ' in the matcher as the equivalent
     #    of /.*stuff\b/ in a regular expression, that is, match any word
     #    ending with stuff in self,
-    # 5. A colon with no spaces around it is treated as belonging to the
+    # 6. A colon with no spaces around it is treated as belonging to the
     #    following word, requiring it to start with it, so 'some:stuff'
     #    requires 'some' anywhere followed by a word beginning with 'stuff',
     #    i.e., /some.*\bstuff/i,
-    # 6. Treat leading ':' in the matcher as anchoring the match to the
+    # 7. Treat leading ':' in the matcher as anchoring the match to the
     #    beginning of the target string,
-    # 7. Treat ending ':' in the matcher as anchoring the match to the
+    # 8. Treat ending ':' in the matcher as anchoring the match to the
     #    end of the target string,
-    # 8. Require each component to match some part of self, and
-    # 9. Ignore case in the match
+    # 9. Require each component to match some part of self, and
+    # 10. Ignore case in the match
     #
     # @example
     #   "St. Luke's Hospital".fuzzy_match('st lukes') #=> 'St Lukes'
@@ -275,9 +279,12 @@ module FatCore
     # @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.clean.strip.gsub(/[\*.,']/, '')
-      target = clean.gsub(/[\*.,']/, '')
+      # Make asterisks, periods, commas, and apostrophes optional
+      matcher = matcher.clean.gsub(/[\*.,']/, '\0?')
+      # Replace periods and commas with a space (so they are still word
+      # separators, e.g. 'WWW.WOLFRAM' -> 'WWW WOLFRAM' and 'AMZON,INC.' ->
+      # 'AMAZON INC') and remove asterisks and apostrophes
+      target = gsub(/[.,]/, ' ').gsub(/[\*']/, '').clean
       regexp_string =
         if matcher.match?(/[: ]/)
           matcher.sub(/\A:/, "\\A").sub(/:\z/, "\\z")

data/lib/fat_core/version.rb

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

data/spec/lib/string_spec.rb

@@ -261,9 +261,24 @@ the people, for the people, shall not perish from the earth."
         expect('Hello, world'.fuzzy_match('ox')).to be_falsy
       end
 
-      it 'fuzzy matches space-separated parts' do
+      it 'replaces periods and commas with a space so they are still word separators' do
+        expect('WWW.WOLFRAM.COM'.fuzzy_match('wolf')).to be_truthy
+        expect('AMAZON,INC'.fuzzy_match('amazon inc')).to be_truthy
+      end
+
+      it 'modifies self by removing asterisks and apostrophes' do
+        expect('WWW*WOLFRAM*COM'.fuzzy_match('wolf')).to be_truthy
+        expect('E*TRADE'.fuzzy_match('etrade')).to be_truthy
+        expect('WWW*WOLFRAM*COM'.fuzzy_match(':wolf')).to be_falsy
+        expect('WWW.WOLFRAM.COM'.fuzzy_match('wolf')).to be_truthy
+        expect('AMAZON,INC'.fuzzy_match('amazon inc')).to be_truthy
+      end
+
+      it 'treats internal space as dot-star' do
         expect('Hello world'.fuzzy_match('hel wor')).to be_truthy
+        expect('Hello, world'.fuzzy_match('el or')).to be_truthy
         expect('Hello, world'.fuzzy_match('hel ox')).to be_falsy
+        expect('Hello, what is with the world?'.fuzzy_match('at wi or')).to be_truthy
       end
 
       it 'fuzzy matches colon-separated parts' do
@@ -311,10 +326,12 @@ the people, for the people, shall not perish from the earth."
         expect('Hello:world'.matches_with('/^h.*r/')).to eq('Hello:wor')
       end
 
-      it 'ignores periods, commas, and apostrophes when matching' do
+      it 'make periods, commas, and apostrophes optional when matching' do
         expect("St. Luke's".fuzzy_match('st lukes')).to eq('St Lukes')
-        expect('St Lukes'.fuzzy_match('st. luke\'s')).to eq('St Lukes')
+        expect("St. Luke's".fuzzy_match('st. luke\'s')).to eq('St Lukes')
+        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('St Lukes, Inc.'.fuzzy_match('st lukes, 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_core
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.1.1
 platform: ruby
 authors:
 - Daniel E. Doherty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-25 00:00:00.000000000 Z
+date: 2025-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -67,11 +67,11 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.1.2
 description: |
-  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
+  Useful extensions to Enumerable and String, Range and other classes. A
   Enumerable#each_with_flags for flagging first and last items in the
-  iteration, (also for Hash), set operations on Ranges
+  iteration, operations on Ranges for testing contiguity, gaps in sets of
+  Ranges, and performing set operations on Ranges.  String#fuzzy_match
+  for user-friendly matchers to test for matching.
 email:
 - ded@ddoherty.net
 executables: []
@@ -131,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 3.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="