Merge pull request #72 from phuse-org/hotfix-dynamic-referencing-df

extend dynamic referencing for data.frame
phuse-org · Mar 18, 2021 · 585de77 · 585de77
2 parents fb42035 + ffb6270
commit 585de77
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 7 deletions.
diff --git a/R/dynamic_referencing.R b/R/dynamic_referencing.R
@@ -52,7 +52,7 @@ vt_dynamic_referencer <- R6::R6Class("vt_dynamic_referencer",
           scrape_references = function(text){
 
             ## Drop roxygen comment headers from text for scraping references.
-            text <- text[!grepl("^#'", text)]
+            text <- unname(unlist(text[!grepl("^#'", text)]))
 
             reference_locations <-
               gregexpr(
@@ -133,13 +133,21 @@ vt_dynamic_referencer <- R6::R6Class("vt_dynamic_referencer",
             for(ref in names(references)){
               ref_value <- references[[ref]]
 
+              if("data.frame" %in% class(text)){
+                text <- as.data.frame(lapply(text, gsub,
+                                             pattern = paste0(private$reference_indicator, ref),
+                                             replacement = ref_value,
+                                             fixed = TRUE))
+              } else {
+                text <- gsub(
+                  pattern = paste0(private$reference_indicator,ref),
+                  replacement = ref_value,
+                  text,
+                  fixed = TRUE,
+                )
+              }
+
 
-              text = gsub(
-                pattern = paste0(private$reference_indicator,ref),
-                replacement = ref_value,
-                text,
-                fixed = TRUE,
-              )
             }
 
             text

diff --git a/tests/testthat/test-dynamic_referencing.R b/tests/testthat/test-dynamic_referencing.R
@@ -447,3 +447,21 @@ test_that("Dynamic Number Referencing across rmarkdown chunks", {
   ))
 
 })
+
+test_that("Dynaming referencing within a data.frame",{
+
+  cov_matrix_content <- data.frame( req_id = "##req:first",
+                                    tc_id = c("##tc:first", "##tc:second"))
+
+  references <- vt_dynamic_referencer$new()
+  references$initialize(reference_indicator = "##")
+  references$scrape_references(cov_matrix_content)
+  expect_equal(references$reference_insertion(cov_matrix_content),
+               data.frame(req_id = "1",
+                          tc_id = c("1", "2")))
+
+  expect_equal(references$reference_insertion(cov_matrix_content$tc_id),
+               c("1", "2"))
+
+
+})