lib/namor/namor.rb in namor-0.5.0 vs lib/namor/namor.rb in namor-0.5.1

@@ -39,13 +39,13 @@
   end
 
   def demaiden(lastname)
     return [nil,nil] unless lastname && !lastname.empty?
     if lastname =~ /\-/
-      [lastname.gsub(/ /, ''), lastname.split(/\-/).last.gsub(/ /, '')]
+      [lastname.upcase.gsub(/ /, ''), lastname.split(/\-/).last.gsub(/ /, '')]
     else
-      [lastname.gsub(/ /, ''), lastname.split(/ /).last]
+      [lastname.upcase.gsub(/ /, ''), lastname.split(/ /).last]
     end
   end
 
   def final_cleaning(name)
     if name && !name.empty?
@@ -60,10 +60,11 @@
     middlename = final_cleaning(middlename)
     lastname = final_cleaning(lastname)
     de_maidened_last = final_cleaning(de_maidened_last)
 
     fm = [firstname, middlename].compact.join(' ')
+    fm = nil if fm.empty?
     fullname = [lastname, fm].compact.join(',')
     nee_fullname = [de_maidened_last, fm].compact.join(',')
 
     [firstname, middlename, lastname, fullname, nee_fullname]
   end
@@ -117,11 +118,11 @@
 
   def extract_from_pieces_with_cluster(hash)
     ary = assemble(
       scrub(hash[:first]),
       scrub(hash[:middle]),
-      scrub(hash[:last].upcase),
-      scrub(demaiden(hash[:last].upcase).last)
+      scrub(hash[:last]),
+      scrub(demaiden(hash[:last]).last)
     )
     ary << ary[3].gsub(/\W/, '_')
     ary << ary[4].gsub(/\W/, '_')
   end