Extend name parsing

gedcom/__init__.py

@@ -422,11 +422,20 @@ def name(self):
                 # malformed line
                 raise Exception
             elif len(vals) == 3:
-                # Normal
-                first, last, dud = vals
-
+                first, last, first_tail = vals
                 first = first.strip()
                 last = last.strip()
+                first_tail = first_tail.strip()
+
+                if not first:
+                    # only last name
+                    first = None
+                elif first_tail:
+                    # last name embedded in first name(s)
+                    first = " ".join([first, first_tail])
+
+            elif len(vals) > 3:
+                raise Exception("Malformed NAME field: " + preferred_name.value)
 
         return first, last
 
@@ -591,7 +600,6 @@ def wives(self):
         return self.get_list("WIFE")
 
 
-
 class Spouse(Element):
     """Generic base class for HUSB/WIFE."""
 

tests.py

@@ -188,6 +188,18 @@ def testSupportNameInOneWithSlashes(self):
         gedcomfile = gedcom.parse_string("0 HEAD\n0 @I1@ INDI\n1 NAME Bob /Cox/\n\n0 TRLR")
         self.assertEqual(gedcomfile['@I1@'].name, ('Bob', 'Cox'))
 
+    def testSupportNameWithOnlyFirstName(self):
+        gedcomfile = gedcom.parse_string("0 HEAD\n0 @I1@ INDI\n1 NAME William\n\n0 TRLR")
+        self.assertEqual(gedcomfile['@I1@'].name, ('William', None))
+
+    def testSupportNameWithOnlyLastName(self):
+        gedcomfile = gedcom.parse_string("0 HEAD\n0 @I1@ INDI\n1 NAME /Cox/\n\n0 TRLR")
+        self.assertEqual(gedcomfile['@I1@'].name, (None, 'Cox'))
+
+    def testSupportNameWithEmbeddedLastName(self):
+        gedcomfile = gedcom.parse_string("0 HEAD\n0 @I1@ INDI\n1 NAME Bob /Cox/ James\n\n0 TRLR")
+        self.assertEqual(gedcomfile['@I1@'].name, ('Bob James', 'Cox'))
+
     def testSaveFile(self):
         gedcomfile = gedcom.parse_string(GEDCOM_FILE)
         outputfile = tempfile.NamedTemporaryFile()
@@ -283,6 +295,10 @@ def testInvalidNames(self):
         gedcomfile = gedcom.parse_string("0 HEAD\n0 @I1@ INDI\n1 NAME Bob /Russel\n0 TRLR")
         self.assertRaises(Exception, lambda : list(gedcomfile.individuals)[0].name)
 
+    def testNameWithTooManySlashes(self):
+        gedcomfile = gedcom.parse_string("0 HEAD\n0 @I1@ INDI\n1 NAME Bob/Robert /Russel/\n\n0 TRLR")
+        self.assertRaises(Exception, lambda : list(gedcomfile.individuals)[0].name)
+
     def testDashInID(self):
         gedcomfile = gedcom.parse_string("0 HEAD\n0 @I1-123@ INDI\n1 NAME\n2 GIVN Bob\n0 TRLR")
         self.assertEqual(list(gedcomfile.individuals)[0].name, ('Bob', None))