Tweak to NameParser

CountCulture · Jun 25, 2009 · 61ecd9f · 61ecd9f
1 parent d4c8bc2
commit 61ecd9f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/name_parser.rb b/lib/name_parser.rb
@@ -7,7 +7,7 @@ module NameParser
 
   def parse(fn)
     titles, qualifications, result_hash = [], [], {}
-    names = fn.sub(/Councillor|Cllr/, '').gsub(/([.,])/, '').gsub(/\(\w+\)/, '').gsub(/[A-Z]{3,}/, '').split(" ")
+    names = fn.sub(/Councillor|Cllr/, '').gsub(/([.,])/, '').gsub(/\([\w ]+\)/, '').gsub(/[A-Z]{3,}/, '').split(" ")
     names.delete_if{ |n| Titles.include?(n) ? titles << n : (Qualifications.include?(n) ? qualifications << n : false)}
     result_hash[:first_name] = names[0..-2].join(" ")
     result_hash[:last_name] = names.last

diff --git a/test/unit/name_parser_test.rb b/test/unit/name_parser_test.rb
@@ -21,7 +21,8 @@ class NameParserTest < Test::Unit::TestCase
     "Professor Fred H. Flintstone" => {:name_title => "Professor", :first_name => "Fred H", :last_name => "Flintstone"},
     "Fred Flintstone BSc" => {:first_name => "Fred", :last_name => "Flintstone", :qualifications => "BSc"},
     "Fred Flintstone BSc, PhD" => {:first_name => "Fred", :last_name => "Flintstone", :qualifications => "BSc PhD"},  
-    "Fred Flintstone BSc, MRTPI(Rtd)" => {:first_name => "Fred", :last_name => "Flintstone", :qualifications => "BSc"}    
+    "Fred Flintstone BSc, MRTPI(Rtd)" => {:first_name => "Fred", :last_name => "Flintstone", :qualifications => "BSc"},  
+    "Jane Annabel Wilson (nee Allen)" => {:first_name => "Jane Annabel", :last_name => "Wilson"}    
 
   }