Check for NA and blank tokens

Closes #144

DESCRIPTION

@@ -6,8 +6,8 @@ Description: Encapsulates functions to streamline calls from R to the REDCap
     University.  The Application Programming Interface (API) offers an avenue
     to access and modify data programmatically, improving the capacity for
     literate and reproducible programming.
-Version: 0.9.7.9000
-Date: 2017-02-06
+Version: 0.9.7.9001
+Date: 2017-03-23
 Authors@R: c(person("Will", "Beasley", role = c("aut", "cre"), email =
     "[email protected]"), person("David", "Bard", role = "ctb"),
     person("Thomas", "Wilson", role = "ctb"), person(given="John J",

R/sanitize-token.R

@@ -22,11 +22,15 @@
 #' sanitize_token(secret_token_2)
 
 sanitize_token <- function( token ) {
-  # Validate only 32-character hexadecimals, with an optional line ending.
   pattern <- "^([0-9A-F]{32})(?:\\n)?$"
 
-  if( !grepl(pattern, token, perl=TRUE) )
+  if( is.na(token) ) {
+    stop("The token is `NA`, not a valid 32-character hexademical value.")
+  } else if( nchar(token)==0L ) {
+    stop("The token is an empty string, not a valid 32-character hexademical value.")
+  } else if( !grepl(pattern, token, perl=TRUE) ) {
     stop("The token is not a valid 32-character hexademical value.")
+  }
 
   sub(pattern, "\\1", token, perl=TRUE)
 }

tests/testthat/test-sanitize.R

@@ -25,4 +25,18 @@ test_that("sanitize token w/o line endings", {
   )
 })
 
+test_that("sanitize token -NA", {
+  secret_token <- NA_character_
+  expect_error(
+    object    = sanitize_token(secret_token),
+    regexp    = "The token is `NA`, not a valid 32-character hexademical value\\."
+  )
+})
 
+test_that("sanitize token -empty", {
+  secret_token <- ""
+  expect_error(
+    object    = sanitize_token(secret_token),
+    regexp    = "The token is an empty string, not a valid 32-character hexademical value\\."
+  )
+})