Fix #54 error for names that end with conjunction

Author: derek73

docs/release_log.rst

@@ -1,5 +1,7 @@
 Release Log
 ===========
+* 0.5.1 - August 12, 2016
+    - Fix error for names that end with conjunction (#54)
 * 0.5.0 - August 4, 2016
     - Refactor join_on_conjunctions(), fix #53
 * 0.4.1 - July 25, 2016

nameparser/__init__.py

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

nameparser/parser.py

@@ -607,7 +607,9 @@ def join_on_conjunctions(self, pieces, additional_parts_count=0):
         rootname_pieces = [p for p in pieces if self.is_rootname(p)]
         total_length= len(rootname_pieces) + additional_parts_count
 
-        # find all the conjunctions, join any conjunctions that are next to each other, then join those newly joined conjunctions and any single conjunctions to the piece before and after it
+        # find all the conjunctions, join any conjunctions that are next to each
+        # other, then join those newly joined conjunctions and any single
+        # conjunctions to the piece before and after it
         conj_index = [i for i, piece in enumerate(pieces) if self.is_conjunction(piece)]
 
         contiguous_conj_i = []
@@ -667,11 +669,17 @@ def join_on_conjunctions(self, pieces, additional_parts_count=0):
                     self.C.titles.add(new_piece)
                 pieces[i-1] = new_piece
                 pieces.pop(i)
-                pieces.pop(i)
-                # subtract 2 from the index of all the remaining conjunctions
+                rm_count = 2
+                try:
+                    pieces.pop(i)
+                except IndexError:
+                    rm_count = 1
+                    pass
+                # subtract the number of removed pieces from the index
+                # of all the remaining conjunctions
                 for j,val in enumerate(conj_index):
                     if val > i:
-                        conj_index[j]=val-2
+                        conj_index[j] = val - rm_count
 
 
         # join prefixes to following lastnames: ['de la Vega'], ['van Buren']

tests.py

@@ -1073,6 +1073,26 @@ def test_multiple_conjunctions(self):
     def test_multiple_conjunctions2(self):
         hn = HumanName("part1 of and The part2 of the part3 And part4")
         self.m(hn.first, "part1 of and The part2 of the part3 And part4", hn)
+    
+    def test_ends_with_conjunction(self):
+        hn = HumanName("Jon Dough and")
+        self.m(hn.first, "Jon", hn)
+        self.m(hn.last, "Dough and", hn)
+
+    def test_ends_with_two_conjunctions(self):
+        hn = HumanName("Jon Dough and of")
+        self.m(hn.first, "Jon", hn)
+        self.m(hn.last, "Dough and of", hn)
+
+    def test_starts_with_conjunction(self):
+        hn = HumanName("and Jon Dough")
+        self.m(hn.first, "and Jon", hn)
+        self.m(hn.last, "Dough", hn)
+
+    def test_starts_with_two_conjunctions(self):
+        hn = HumanName("the and Jon Dough")
+        self.m(hn.first, "the and Jon", hn)
+        self.m(hn.last, "Dough", hn)
 
     # Potential conjunction/prefix treated as initial (because uppercase)
     def test_uppercase_middle_initial_conflict_with_conjunction(self):