fullname-matcher 1.0.5 → 1.0.8

data/lib/fullname/matcher/core.rb

@@ -144,17 +144,27 @@ module Fullname::Matcher
     private
   
     def match_first_last_and_suffix(name)
-      conditions  = []
-      queries     = []
+      conditions        = []
+      queries           = []
+      firstname_filter  = nil
       conditions << '(' + @condition + ')' if @condition
       queries    << '(placeholder)'
-      conditions << "(#{@mapping[:first]} = ? OR #{@mapping[:first]} REGEXP ?)"
-      queries    << name[:first]
-      queries    << '^' + name[:first][0].chr + '([.]?' + (name[:first] =~ /^[a-z]\.?$/i ? '|[a-z]+' : '') + ')$'
       conditions << "#{@mapping[:last]} = ?"
       queries    << name[:last]
+      # if first name is abbreviation, fetch all firstnames then filter with Ruby regexp
+      if name[:first] =~ /^[a-z]\.?$/i
+        firstname_filter = %r{^#{name[:first][0].chr}.*}i
+      # otherwise search directly in database, because search with regexp in DB won't use indexer
+      else
+        conditions << "(#{@mapping[:first]} IN (?, ?, ?))"
+        queries    << name[:first]
+        queries    << name[:first][0].chr
+        queries    << name[:first][0].chr + '.'
+      end
       queries[0] = conditions.join(' AND ')
-      matched_list = @table.all(:conditions => queries)
+      matched_list = @table.all(:conditions => queries)     
+      matched_list.delete_if{|r| r.send(@mapping[:first]) !~ firstname_filter} if firstname_filter
+
       unless @options[:skip_match_suffix]
         
         # exactly match suffix

data/lib/fullname/matcher/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullname-matcher
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fullname-parser