fat_core 7.1.2 → 7.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e0583ab5a7550b3b4d7eef69e28a0b8cbd7f6fde9c15f294325ae37145e05b4
-  data.tar.gz: ff46db81c0e1754c39ef2e89fa0650f037e8f26831c092c669a40af03bc265c1
+  metadata.gz: 85d8ffad1ed87418cf2d6f2d05e2c08017b76a096d7c7fda5640cdb65f8aebcc
+  data.tar.gz: 44349fdd2663ada616693253dd9e382779cf4dcdeb8381ce1fe25bd021b02773
 SHA512:
-  metadata.gz: 846d6ae4fdb56cf089b30dc80cfe61d1fe2ffe1063e227ee323ed855aa63cbba4886da598ca354c5605608936962c8789ee02d2f30e2ee7aca7779b5b57175b0
-  data.tar.gz: b320b91c8e1893da4595a50830036bb6ddbde4fc9c381c38e1bece3c2c905db8e4e00452f11759d268d13dd8963907b748f8e7ca7711b2b7378ce93a059b193b
+  metadata.gz: db95df80a950888e53d2709c69529d30519604547232be544aec12da212459cd4a505dbc77221e4bd55760ce30ecc5665cac2301e317b7541b0714269c1ae092
+  data.tar.gz: da9bc4df559ff88f20e34b057a1bd9888193fdc5b316e01414139368f8f3b18816ff0296e335baf0655ece83c6f64a93841f540c1f2ffea2edecfa4ece6e4092

data/lib/fat_core/string.rb

@@ -215,32 +215,6 @@ module FatCore
       DamerauLevenshtein.distance(self, other.to_s, 1, 10)
     end
 
-    # Test whether self matches the `matcher` treating `matcher` as a
-    # case-insensitive regular expression if it is of the form '/.../' or as a
-    # string to #fuzzy_match against otherwise.
-    #
-    # @param matcher [String] regexp if looks like /.../; #fuzzy_match pattern otherwise
-    # @return [nil] if no match
-    # @return [String] the matched portion of self, with punctuation stripped in
-    #   case of #fuzzy_match
-    # @see #fuzzy_match #fuzzy_match for the specifics of string matching
-    # @see #as_regexp #as_regexp for conversion of `matcher` to regular expression
-    def matches_with(matcher)
-      # 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
-      if matcher.nil?
-        nil
-      elsif matcher.match?(%r{^\s*/})
-        re = matcher.as_regexp
-        md = target.match(re)
-        md[0] if md
-      else
-        to_s.fuzzy_match(matcher)
-      end
-    end
-
     # Return the matched portion of self, minus punctuation characters, if self
     # matches the string `matcher` using the following notion of matching:
     #
@@ -304,6 +278,28 @@ module FatCore
       matched_text
     end
 
+    # Test whether self matches the `matcher` treating `matcher` as a
+    # case-insensitive regular expression if it is of the form '/.../' or as a
+    # string to #fuzzy_match against otherwise.
+    #
+    # @param matcher [String] regexp if looks like /.../; #fuzzy_match pattern otherwise
+    # @return [nil] if no match
+    # @return [String] the matched portion of self, with punctuation stripped in
+    #   case of #fuzzy_match
+    # @see #fuzzy_match #fuzzy_match for the specifics of string matching
+    # @see #as_regexp #as_regexp for conversion of `matcher` to regular expression
+    def matches_with(matcher)
+      return if matcher.nil?
+
+      if matcher.match?(%r{^\s*/})
+        re = matcher.as_regexp
+        md = match(re)
+        md[0] if md
+      else
+        fuzzy_match(matcher)
+      end
+    end
+
     # Convert a string of the form '/.../Iixm' to a regular
     # expression. However, make the regular expression case-insensitive by
     # default and extend the modifier syntax to allow '/I' to indicate

data/lib/fat_core/version.rb

@@ -3,7 +3,7 @@
 module FatCore
   MAJOR = 7
   MINOR = 1
-  PATCH = 2
+  PATCH = 3
 
   # FatCore version number
   VERSION = [MAJOR, MINOR, PATCH].compact.join('.')

data/spec/lib/string_spec.rb

@@ -372,15 +372,22 @@ the people, for the people, shall not perish from the earth."
         expect("St. Luke's Hospital".matches_with('lukes:hospital')).to eq('Lukes Hospital')
       end
 
-      it 'performs examples in documentation with regexes' do
-        expect("St. Luke's".matches_with('/st\s*lukes/')).to eq('St Lukes')
-        expect("St. Luke's Hospital".matches_with('/st lukes/')).to eq('St Lukes')
-        expect("St. Luke's Hospital".matches_with('/luk.*\bhosp/')).to eq('Lukes Hosp')
-        expect("St. Luke's Hospital".matches_with('/st(.*)spital\z/')).to eq('St Lukes Hospital')
+      it 'does not pre-condition the subject when regexes' do
+        expect("St. Luke's Hospital".matches_with('st:lukes')).to eq('St Lukes')
+        expect("St. Luke's Hospital".matches_with('lukes')).to eq('Lukes')
+        expect("St. Luke's".matches_with('/st.*luke\'s/')).to eq('St. Luke\'s')
+        expect("St. Luke's Hospital".matches_with('/st\\. luke/')).to eq('St. Luke')
+        expect("St. Luke's Hospital".matches_with('/luk.*\bhosp/')).to eq('Luke\'s Hosp')
+        expect("St. Luke's Hospital".matches_with('/st(.*)spital\z/')).to eq('St. Luke\'s Hospital')
         expect("St. Luke's Hospital".matches_with('/st spital/')).to be_nil
         expect("St. Luke's Hospital".matches_with('/st.*laks/')).to be_nil
         expect("St. Luke's Hospital".matches_with('/\Alukes/')).to be_nil
-        expect("St. Luke's Hospital".matches_with('/lukes hospital/')).to eq('Lukes Hospital')
+        expect("St. Luke's Hospital".matches_with('/luke.*hospital/')).to eq('Luke\'s Hospital')
+      end
+
+      it 'makes the regex case insensitive unless option I given' do
+        expect("St. Luke's Hospital".matches_with('/LUKE/')).to eq('Luke')
+        expect("St. Luke's Hospital".matches_with('/LUKE/I')).to be_nil
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_core
 version: !ruby/object:Gem::Version
-  version: 7.1.2
+  version: 7.1.3
 platform: ruby
 authors:
 - Daniel E. Doherty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-27 00:00:00.000000000 Z
+date: 2025-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport