cijef-fullname-matcher 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9646dbbebcb213f077c80bfe00b1963f6a52e675
-  data.tar.gz: c314c6567c47e03a5f321e4cf1a54fc617b07b14
+  metadata.gz: 52ca7d5a38684258b4a0751f38ef97c28b480f21
+  data.tar.gz: 6df28e86affd0ade3cdfb1c9fe2f13a6348234e8
 SHA512:
-  metadata.gz: '084f921b2461829b5aad9d6d809e3d21d56b47fb03dd739e47c244013f31c806251753202a712002e9b6f12700d3be264ebd981daab9bd1384a03f0a6d9501fa'
-  data.tar.gz: 707c846e6e1f1e5865feab68524cbf7419c0a673679c29bd0718bb95a590a30a4ee69d049ea9dc9f879f91ce53c31fb9c9f372efc4f7ea432eeb4ff3dd0c53e1
+  metadata.gz: 99b2cfc7a3cb4e519921725743316e422de294120587891ce3b9bd0d02833540312311bb575c8fef37526fa4e25221e50c34804cc662c19cbc702cd28c7f77b6
+  data.tar.gz: 1ca0631e8fce8d6a2f24080527cf838b60657358b7672085f7ba8f0fcd1604a0ce90ce9dfb273cec426e14fd1d944b2dd33f16beba7078171c50556f37745685

data/lib/fullname/matcher/core.rb

@@ -32,7 +32,8 @@ module Fullname::Matcher
     DEFAULT_OPTIONS = {
       :skip_match_middle_name => false, # skip match middle name if middle name not provided.
       :null_middle_name_match_allowed => false,
-      :skip_match_suffix => false      # skip match suffix if suffix not provided or no column suffix in database.
+      :skip_match_suffix => false,     # skip match suffix if suffix not provided or no column suffix in database.
+      :null_suffix_match_allowed => false
     }
 
     class Error < StandardError ; end
@@ -75,7 +76,7 @@ module Fullname::Matcher
         exact_match_list = match_list.select do |r|
           compare_without_dot(r.send(@mapping[:middle]), name[:middle]) && compare_without_dot(r.send(@mapping[:suffix]), name[:suffix])
         end
-        return exact_match_list if exact_match_list.size > 0 && @options[:null_middle_name_match_allowed] == false
+        #return exact_match_list if exact_match_list.size > 0 && @options[:null_middle_name_match_allowed] == false && @options[:null_suffix_match_allowed] == false
         
         # 2. if name[:middle] is not NULL, regexp match
         if name[:middle]
@@ -92,7 +93,7 @@ module Fullname::Matcher
           match_list = []
         else
           # 2.2 fuzzy match: assume all matches since name[:middle] is NULL
-          return match_list
+          return (@options[:null_middle_name_match_allowed] == false && @options[:null_suffix_match_allowed] == false) ? exact_match_list : match_list
         end        
       end
       
@@ -170,12 +171,12 @@ module Fullname::Matcher
         
         # exactly match suffix
         if name[:suffix].present?
-          matched_list_with_suffix = matched_list.select{|r| compare_without_dot(r.send(@mapping[:suffix]), name[:suffix]) }
+          matched_list_with_suffix = matched_list.select{|r| (compare_without_dot(r.send(@mapping[:suffix]), name[:suffix]) || (r.send(@mapping[:suffix]).blank? && @options[:null_suffix_match_allowed])) }
           return matched_list_with_suffix if matched_list_with_suffix.size > 0
         end
         
         # fuzzy match suffix( NULL matches NON-NULL )
-        return matched_list.select{|r| r.send(@mapping[:suffix]).to_s.strip.empty? || name[:suffix].nil? }
+        # return matched_list.select{|r| r.send(@mapping[:suffix]).to_s.strip.empty? || name[:suffix].nil? }
         
       end
       return matched_list

data/lib/fullname/matcher/version.rb

@@ -1,5 +1,5 @@
 module Fullname
   module Matcher
-    VERSION = '2.1.0'
+    VERSION = '2.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cijef-fullname-matcher
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - yegang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-27 00:00:00.000000000 Z
+date: 2019-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fullname-parser