fullname-matcher 1.0.0 → 1.0.5

data/fullname-matcher.gemspec

@@ -6,12 +6,12 @@ Gem::Specification.new do |s|
   s.version     = Fullname::Matcher::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["xiaohui"]
-  s.email       = ['wesley@zhangxh.net']
+  s.email       = ['xiaohui@zhangxh.net']
   s.summary     = "Match fullname in database"
   s.description = "Provide fullname, search in database with proper conditions"
   s.homepage    = 'https://github.com/xiaohui-zhangxh/fullname-matcher'
 
   s.files        = `git ls-files`.split("\n")
   s.require_path = 'lib'
-  s.add_runtime_dependency(%q<fullname-parser>, ["~> 1.0.0"])
+  s.add_runtime_dependency(%q<fullname-parser>, [">= 1.0.3"])
 end

data/lib/fullname/matcher/core.rb

@@ -71,11 +71,10 @@ module Fullname::Matcher
       
       if match_list.size > 0
         # 1. exactly match
-        match_list_with_middlename = match_list.select do |r|
-          r_middle_name = r.send(@mapping[:middle])
-          r_middle_name.to_s.downcase.strip == name[:middle].to_s.downcase.strip
+        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 match_list_with_middlename if match_list_with_middlename.size > 0
+        return exact_match_list if exact_match_list.size > 0
         
         # 2. if name[:middle] is not NULL, regexp match
         if name[:middle]
@@ -88,9 +87,11 @@ module Fullname::Matcher
           # 2.1 fuzzy match: if middlename in DB is NULL, it matches
           match_list_with_middlename = match_list.select{ |r| r.send(@mapping[:middle]).nil? }
           return match_list_with_middlename if match_list_with_middlename.size > 0
+          # clear match list if don't match middlename
+          match_list = []
         else
           # 2.2 fuzzy match: assume all matches since name[:middle] is NULL
-          return match_list if match_list.size > 0
+          return match_list
         end        
       end
       
@@ -125,7 +126,7 @@ module Fullname::Matcher
       unless @options[:skip_match_suffix]
         s1 = n1.suffix
         s2 = n2.suffix
-        return false  if s1 && s2 && s1.gsub('.', '').downcase.strip != s2.gsub('.', '').downcase.strip
+        return false  if s1 && s2 && compare_without_dot(s1, s2) == false
       end
       
       return false if !abbr_match?(f1, f2)
@@ -156,24 +157,22 @@ module Fullname::Matcher
       matched_list = @table.all(:conditions => queries)
       unless @options[:skip_match_suffix]
         
-        suffix = name[:suffix] ? name[:suffix].gsub('.', '').downcase.strip : nil
-        
         # exactly match suffix
-        matched_list_with_suffix = matched_list.select{|r|
-          r_suffix = r.send(@mapping[:suffix])
-          r_suffix.to_s.downcase.strip == suffix.to_s
-        }
-        return matched_list_with_suffix if matched_list_with_suffix.size > 0
+        if name[:suffix].present?
+          matched_list_with_suffix = matched_list.select{|r| compare_without_dot(r.send(@mapping[:suffix]), name[:suffix]) }
+          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_suffix = r.send(@mapping[:suffix])
-          r_suffix.nil? || suffix.nil? || suffix == r_suffix.gsub('.', '').downcase.strip
-        }
+        return matched_list.select{|r| r.send(@mapping[:suffix]).to_s.strip.empty? || name[:suffix].nil? }
         
       end
       return matched_list
     end
+
+    def compare_without_dot(str1, str2)
+      [str1, str2].map{|s| s.to_s.gsub('.', '').downcase.strip}.uniq.size == 1
+    end
   
     def build_middlename_regexp(middlename)
       middle_arr  = middlename.split(/[. ]+/)

data/lib/fullname/matcher/version.rb

@@ -1,5 +1,5 @@
 module Fullname
   module Matcher
-    VERSION = '1.0.0'
+    VERSION = '1.0.5'
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullname-matcher
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fullname-parser
-  requirement: &11930540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *11930540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.3
 description: Provide fullname, search in database with proper conditions
 email:
-- wesley@zhangxh.net
+- xiaohui@zhangxh.net
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -58,8 +63,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Match fullname in database
 test_files: []
+has_rdoc: