fix #3, handle suffix in last name part of last name comma format

Author: derek73

docs/conf.py

@@ -58,7 +58,7 @@
 # The short X.Y version.
 version = nameparser.__version__
 # The full version, including alpha/beta/rc tags.
-release = '0.3.2'
+release = '0.3.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/index.rst

@@ -29,7 +29,7 @@ approach. It's not perfect, but it gets you pretty far.
 Supports 3 different comma placement variations in the input string.
 
 * Title Firstname "Nickname" Middle Middle Lastname Suffix
-* Lastname, Title Firstname (Nickname) Middle Middle[,] Suffix [, Suffix]
+* Lastname [Suffix], Title Firstname (Nickname) Middle Middle[,] Suffix [, Suffix]
 * Title Firstname M Lastname [Suffix], Suffix [, Suffix]
 
 When there is ambiguity that cannot be resolved by a rule-based approach,

nameparser/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (0, 3, 2)
+VERSION = (0, 3, 3)
 __version__ = '.'.join(map(str, VERSION))
 __author__ = "Derek Gulbranson"
 __author_email__ = '[email protected]'

nameparser/parser.py

@@ -2,11 +2,11 @@
 from __future__ import unicode_literals
 
 import logging
-from nameparser.util import u
-from nameparser.util import text_type
-from nameparser.util import lc
-from nameparser.config import CONSTANTS
-from nameparser.config import Constants
+from .util import u
+from .util import text_type
+from .util import lc
+from .config import CONSTANTS
+from .config import Constants
 
 # http://code.google.com/p/python-nameparser/issues/detail?id=10
 log = logging.getLogger('HumanName')
@@ -374,6 +374,7 @@ def parse_full_name(self):
         if len(parts) == 1:
 
             # no commas, title first middle middle middle last suffix
+            #            part[0]
 
             pieces = self.parse_pieces(parts)
 
@@ -403,6 +404,7 @@ def parse_full_name(self):
             if self.is_suffix(parts[1]):
 
                 # suffix comma: title first middle last [suffix], suffix [, suffix]
+                #               parts[0],                         parts[1:...]
 
                 self.suffix_list += parts[1:]
 
@@ -431,12 +433,20 @@ def parse_full_name(self):
                     self.middle_list.append(piece)
             else:
 
-                # lastname comma: last, title first middles[,] suffix [,suffix]
+                # lastname comma: last [suffix], title first middles[,] suffix [,suffix]
+                #                 parts[0],      parts[1],              parts[2:...]
                 pieces = self.parse_pieces(parts[1].split(' '), 1)
 
                 log.debug("pieces: {0}".format(u(pieces)))
 
-                self.last_list.append(parts[0])
+                # lastname part may have suffixes in it
+                lastname_pieces = self.parse_pieces(parts[0].split(' '), 1)
+                for piece in lastname_pieces:
+                    if self.is_suffix(piece):
+                        self.suffix_list.append(piece)
+                    else:
+                        self.last_list.append(piece)
+                
                 for i, piece in enumerate(pieces):
                     try:
                         nxt = pieces[i + 1]

tests.py

@@ -156,7 +156,13 @@ def test_assume_suffix_title_and_one_other_name_is_last_name(self):
         hn = HumanName("Andrews, M.D.")
         self.m(hn.suffix, "M.D.", hn)
         self.m(hn.last, "Andrews", hn)
-        
+    
+    def test_suffix_in_lastname_part_of_lastname_comma_format(self):
+        hn = HumanName("Smith Jr., John")
+        self.m(hn.last, "Smith", hn)
+        self.m(hn.first, "John", hn)
+        self.m(hn.suffix, "Jr.", hn)
+
     def test_sir_exception_to_first_name_rule(self):
         hn = HumanName("Sir Gerald")
         self.m(hn.title, "Sir", hn)