add ability to handle multiple suffixes

NEWS

@@ -1,5 +1,13 @@
 Version 0.1.0 [WIP]
 -------------------------------------------------------------------------
 
+FEATURES
+* parse_names can now handle names with multiple suffixes accurately
+
 BUG FIXES
 * Fixed a segfault reported by Pavel Kirjanas, with the assistance of Bob Rudis
+
+Version 0.0.1
+-------------------------------------------------------------------------
+
+* Initial (prototype) release

src/human_parse.cpp

@@ -83,18 +83,26 @@ std::vector < std::string > human_parse::parse_single(std::string name){
     split_name.pop_front();
   }
 
-  // If there is still > 1 element and we find a suffix, pop those two elements. Otherwise just one.
-  if(split_name.size() > 1 && match_component(split_name[split_name.size() - 1], suffixes)){
-    output[4] = split_name[split_name.size() - 1];
-    split_name.pop_back();
-    output[3] = split_name[split_name.size() - 1];
-    split_name.pop_back();
-  } else if(split_name.size() > 0){
+  // If there's still > 1 elemenent, what about suffixes?
+  if(split_name.size() > 1){
+    while(split_name.size() > 1 && match_component(split_name[split_name.size() - 1], suffixes)){
+      if(output[4] == ""){
+        output[4] = split_name[split_name.size() - 1];
+      } else {
+        output[4] = split_name[split_name.size() - 1] + " " + output[4];
+      }
+      split_name.pop_back();
+    }
+  }
+
+  // If there's only >1 element, surnames
+  if(split_name.size() > 0){
     output[3] = split_name[split_name.size() - 1];
     split_name.pop_back();
   } else {
     return output;
   }
+
 
   // If there is still 1 or more elements we test for compounds
   while(split_name.size() > 0 && match_component(split_name[split_name.size() - 1], compounds)){

tests/testthat/test.R

@@ -48,3 +48,15 @@ test_that("Names with all elements can be parsed", {
   expect_true(result["suffix"] == "PhD")
 
 })
+
+test_that("Names with no spaces do not break everything", {
+  result <- unlist(parse_names("G.R.Dobbs"))
+  expect_true(result["first_name"] == "G.R.Dobbs")
+})
+
+test_that("Names with multiple suffixes can be parsed", {
+  result <- unlist(parse_names("Jim Jeffries Jr PhD"))
+  expect_true(result["first_name"] == "Jim")
+  expect_true(result["last_name"] == "Jeffries")
+  expect_true(result["suffix"] == "Jr PhD")
+})