Ensure generate_author_yml retains affiliation order by person

R/generate_author_yml.R

@@ -73,7 +73,8 @@ generate_author_yml <- function(
     )
 
     authors <- sapply(seq_along(researchers), function(i) {
-      i_affil = paste(affil_numeric[affil_order %in% unlist(researchers[i])], collapse = ",")
+      i_affil <- affil_numeric[match(unlist(researchers[i]), names(affil_numeric))]
+      i_affil <- paste(i_affil, collapse = ",")
 
       if (names(researchers)[i] == corres_name) {
         extra <- as.character(

tests/testthat/test-generate_author_yml.R

@@ -42,29 +42,28 @@ test_that(
 
     rmd <- paste(rmd, collapse = "\n")
 
-    input_path <- tempfile(fileext = ".Rmd")
-    write(rmd, file = input_path)
+    input_file <- tempfile(fileext = ".Rmd")
+    write(rmd, file = input_file)
 
-    output_path <- tempfile(fileext = ".pdf")
+    output_file <- gsub(input_file, pattern = "\\.Rmd$", replacement = ".pdf")
 
     suppressWarnings(
       try(
         capture.output(
           rmarkdown::render(
-            input = input_path,
-            output_file = output_path,
-            quiet = TRUE,
+            input = input_file,
+            quiet = TRUE
           )
         )
         , silent = TRUE
       )
     )
 
-    expect_true(file.exists(output_path))
+    expect_true(file.exists(output_file))
 
     # Clean up
-    file.remove(input_path)
-    file.remove(output_path)
+    file.remove(input_file)
+    file.remove(output_file)
 
   }
 )
@@ -129,3 +128,27 @@ test_that("generate_author_yml enforces unique authors/affiliations", {
   )
 
 })
+
+test_that("generate_author_yml preserves affiliation order", {
+
+  text <- generate_author_yml(
+    researchers = list(
+      "James H. Conigrave" = c("IPPE", "UQ"),
+      "Michael Noetel" = c("UQ", "IPPE")
+    ),
+    affiliations = list("IPPE" = "Institute for Postitive Psychology and Education",
+                        "UQ" = "University of Queensland"),
+    corres_email = "james@conigrave.com",
+    corres_address = "33 Berry Street, North Sydney, NSW, Australia",
+    corres_name = "James H. Conigrave"
+  )
+
+  matches <- gregexpr("(?<=affiliation   : \")\\d+(,\\d+)*", text, perl=TRUE)
+
+  all_affiliations <- regmatches(text, matches)[[1]]
+
+  # Get the second instance
+  second_affiliation <- all_affiliations[2]
+  expect_equal("2,1", second_affiliation)
+
+})