Skip to content

Commit

Permalink
Added middle name flag to primary_name_parts
Browse files Browse the repository at this point in the history
  • Loading branch information
Alison Rowland committed Apr 11, 2012
1 parent 94be246 commit 67a4eaf
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
7 changes: 5 additions & 2 deletions name_cleaver/name_cleaver.py
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,11 @@ def capitalize_and_punctuate_initials(self, name_part):
else:
return name_part

def primary_name_parts(self):
return [ self.first, self.last ]
def primary_name_parts(self, include_middle=False):
if include_middle:
return [ self.first, self.middle, self.last ]
else:
return [ self.first, self.last ]



Expand Down
7 changes: 7 additions & 0 deletions name_cleaver/test_name_cleaver.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@ def test_handles_empty_names(self):
def test_capitalize_irish_names(self):
self.assertEqual('Sean O\'Leary', str(PoliticianNameCleaver('SEAN O\'LEARY').parse()))

def test_primary_name_parts(self):
self.assertEqual(['Robert', 'Geoff', 'Smith'], PoliticianNameCleaver('Smith, Robert Geoff').parse().primary_name_parts(include_middle=True))
self.assertEqual(['Robert', 'Smith'], PoliticianNameCleaver('Smith, Robert Geoff').parse().primary_name_parts())



class TestOrganizationNameCleaver(unittest.TestCase):
Expand Down Expand Up @@ -203,6 +207,9 @@ def test_unfazed_by_weird_cop_cont_parenthetical_phrases(self):
def test_mr_and_mrs(self):
self.assertEqual('Kenneth L Lay', str(IndividualNameCleaver('LAY, KENNETH L MR & MRS').parse()))

def test_primary_name_parts(self):
self.assertEqual(['Robert', 'Geoff', 'Smith'], IndividualNameCleaver('Smith, Robert Geoff').parse().primary_name_parts(include_middle=True))
self.assertEqual(['Robert', 'Smith'], IndividualNameCleaver('Smith, Robert Geoff').parse().primary_name_parts())


class TestCapitalization(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

setup(
name='name-cleaver',
version='0.2.9',
version='0.2.10',
description='Name parser and formatter (for politicians, individuals, and organizations)',
long_description=readme,
author='Alison Rowland',
Expand Down

0 comments on commit 67a4eaf

Please sign in to comment.