Merge pull request #346 from metrumresearchgroup/fix/glue

Only pass environment into glue

DESCRIPTION

@@ -38,9 +38,8 @@ Suggests: testthat, yaml, texPreview, magick, pdftools, withr
 Encoding: UTF-8
 Language: en-US
 LazyData: true
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.2
 Roxygen: list(markdown = TRUE)
-VignetteBuilder: knitr
 Collate: 
     'class-new_names.R'
     'class-digits.R'

R/AAAA.R

@@ -198,10 +198,8 @@ find_cached_root <- function() {
 #
 #'
 #' @md
-#' @docType package
 #' @name pmtables
-NULL
-
+"_PACKAGE"
 
 #' Load an example data set
 #'

R/preview-standalone.R

@@ -98,15 +98,14 @@ st_to_standalone <- function(text, stem, dir,
     vwidth <- ""
   }
 
-  env <- list(
-    border = border,
-    texfile = texfile,
-    font = fonts[[font]],
-    textw_tex = as.character(textw_tex),
-    rule = rule,
-    vwidth = vwidth,
-    ltversion = paste0("[=v", ltversion, "]%")
-  )
+  env <- new.env()
+  env$border <- border
+  env$texfile <- texfile
+  env$font <- fonts[[font]]
+  env$textw_tex <- as.character(textw_tex)
+  env$rule <- rule
+  env$vwidth <- vwidth
+  env$ltversion <- paste0("[=v", ltversion, "]%")
 
   temp_text <- mgluet(temp_text, .envir = env)
   build_file <- basename(temp_file)

R/preview.R

@@ -248,7 +248,7 @@ st2article <- function(..., .list = NULL, ntex = 1,  #nocov start
 
   temp <- readLines(template)
 
-  env <- list()
+  env <- new.env()
   env$list_of_tables <- c("\\listoftables", "\\clearpage")
   env$input_file <- st2article_input
   env$hmargin <- margin[1]

R/table-utils.R

@@ -112,6 +112,9 @@ require_col <- function(data,col,context=NULL) {
 
 gluet <- function(x, .envir = parent.frame(), ...) {
   x <- force(x)
+  if(!is.environment(.envir)) {
+    abort("pmtables error: cannot `glue()` - .envir is not an environment.")
+  }
   glue(x,.open = "<", .close = ">", .envir = .envir)
 }
 

tests/testthat/test-table-utils.R

@@ -278,3 +278,12 @@ test_that("table-utils paste units [PMT-TEST-0239]", {
     c("B mg", "E", "D kg", "C pounds", "A")
   )
 })
+
+test_that("error is generated when calling gluet with non-environment", {
+  x <- list(a = 1, b = 2, c = 3)
+  what <- "<b><a><c>"
+  expect_error(pmtables:::gluet(what, .envir = x), "pmtables error:")
+  env <- as.environment(x)
+  ans <- pmtables:::gluet(what, .envir = env)
+  expect_identical(unclass(ans), "213")
+})