use fob_ instead of one_ (prefix)

inSileco · Nov 10, 2020 · 41137cd · 41137cd
1 parent 54d8ad4
commit 41137cd
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 47 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -2,15 +2,15 @@
 
 export("%+%")
 export(export_answer)
+export(fob_among)
+export(fob_date)
+export(fob_integer)
+export(fob_numeric)
+export(fob_text)
+export(fob_word)
 export(join)
 export(match_pattern)
 export(multi)
-export(one_among)
-export(one_date)
-export(one_integer)
-export(one_numeric)
-export(one_text)
-export(one_word)
 importFrom(cli,style_bold)
 importFrom(cli,style_underline)
 importFrom(crayon,blue)

diff --git a/R/join.R b/R/join.R
@@ -10,10 +10,10 @@ join <- function(...) {
   tmp <- list(...)
   n <- length(tmp)
   if (n == 1) {
-    out <- to_form(tmp[[1]])
+    out <- to_form(tmp[[1L]])
   } else {
     if (n > 1) {
-      out <- join_pair(tmp[[1]], tmp[[2]])
+      out <- join_pair(tmp[[1L]], tmp[[2L]])
       if (n > 2) {
         for (i in seq(3, n)) {
           out <- join_pair(out, tmp[[i]])

diff --git a/R/one_among.R b/R/one_among.R
@@ -9,7 +9,7 @@
 #' @return Return the choice selected either as the choice value or its identifier (an integer).
 #' @export
 
-one_among <- function(question, choices, field_name = "", output = "choice", 
+fob_among <- function(question, choices, field_name = "", output = "choice", 
   ...) {
 
   output <- match.arg(output, c("choice", "id"))

diff --git a/R/one_integer.R b/R/one_integer.R
@@ -10,35 +10,35 @@
 #' @return Return the choice selected either as the choice value or its identifier (an integer).
 #' @export
 
-one_integer <- function(question, field_name = "", prompt = NULL) {
+fob_integer <- function(question, field_name = "", prompt = NULL) {
   if (is.null(prompt)) prompt <- "Enter your answer (an integer): "
   generate_form_pattern(question = question, prompt = prompt, 
     pattern = "^[0-9]+$", confirm = FALSE, pre = NULL, post = as.integer, field_name = field_name)
 } 
 
-#' @describeIn one_integer a numeric. 
+#' @describeIn fob_integer a numeric. 
 #' @export
-one_numeric <- function(question, field_name = "", prompt = NULL) {
+fob_numeric <- function(question, field_name = "", prompt = NULL) {
   if (is.null(prompt)) prompt <- "Enter your answer (a numeric): "
   generate_form_pattern(question = question, prompt = prompt, 
     pattern = "^[0-9]+\\.?[0-9]*$|^[0-9]*\\.?[0-9]+$", confirm = FALSE,
     pre = NULL, post = as.numeric, field_name = field_name)
 } 
 
 
-#' @describeIn one_integer a word.
+#' @describeIn fob_integer a word.
 #' @export
-one_word <- function(question, field_name = "", prompt = NULL) {
+fob_word <- function(question, field_name = "", prompt = NULL) {
   if (is.null(prompt)) prompt <- "Enter your answer (one word): "
   generate_form_pattern(question = question, prompt = prompt, 
     pattern = "^[A-Za-z\\-]+$", pre = NULL, post = NULL, confirm = FALSE,
     field_name = field_name)
 } 
 
 
-#' @describeIn one_integer a text.
+#' @describeIn fob_integer a text.
 #' @export
-one_text <- function(question, field_name = "", max = NULL, prompt = NULL, ...) {
+fob_text <- function(question, field_name = "", max = NULL, prompt = NULL, ...) {
 
   if (is.null(prompt)) {
     if (is.null(max)) {
@@ -66,9 +66,9 @@ one_text <- function(question, field_name = "", max = NULL, prompt = NULL, ...)
 } 
 
 
-#' @describeIn one_integer a date.
+#' @describeIn fob_integer a date.
 #' @export
-one_date <- function(question, field_name = "", format = "%Y-%m-%d", 
+fob_date <- function(question, field_name = "", format = "%Y-%m-%d", 
   prompt = NULL, ...) {
 
   if (is.null(prompt)) 
@@ -82,9 +82,9 @@ one_date <- function(question, field_name = "", format = "%Y-%m-%d",
 }
 
 
-#' @describeIn one_integer `TRUE` for yes and `FALSE` for no.
+#' @describeIn fob_integer `TRUE` for yes and `FALSE` for no.
 
-one_yorn <- function(question, field_name = "", 
+fob_yorn <- function(question, field_name = "", 
   prompt = "Enter [Y]es or [N]o: ", ...) { 
 
   f_post <- function(x) grepl("^Y", x)
@@ -102,9 +102,9 @@ one_yorn <- function(question, field_name = "",
 }
 
 
-#' @describeIn one_integer one boolean/logical (i.e. `TRUE` or `FALSE`).
+#' @describeIn fob_integer one boolean/logical (i.e. `TRUE` or `FALSE`).
 
-one_boolean <- function(question, field_name = "", 
+fob_boolean <- function(question, field_name = "", 
   prompt = "Enter [T]RUE or [F]ALSE: ", ...) { 
 
   f_post <- function(x) grepl("^T", x)

diff --git a/man/one_among.Rd → man/fob_among.Rd b/man/one_among.Rd → man/fob_among.Rd
diff --git a/man/one_integer.Rd → man/fob_integer.Rd b/man/one_integer.Rd → man/fob_integer.Rd
diff --git a/tests/testthat/test_basic.R b/tests/testthat/test_basic.R
@@ -5,4 +5,4 @@ q2 <- one_yorn("Be or not to be", "shake")
 q3 <- one_date("When was that?", "date")
 q4 <- match_pattern("2 letters + 1 digit", "^[A-Za-z]{2}[0-9]$")
 myform <- q1 %+% q2 %+% q3 %+% q4
-# res <- myform()   
+# res <- myform()