:sparkles :enable validation directly in question see #6

R/generate.R

@@ -18,7 +18,13 @@ generate_form <- function(prompt = "", question = NULL, choices = NULL,
     out <- function(x = NULL) {
 
       if (!is.null(x)) {
-        return(validate(x))
+        if (is.function(pre)) x <- pre(x)
+        if (is.function(validate)) {
+          if (validate(x)) {
+            if (is.function(post)) x <- post(x)
+            return(x)
+          } else return(NA)
+        } else return(x)
       }
 
       if (!is.null(question)) {

R/join.R

@@ -44,7 +44,9 @@ join_pair <- function(x, y) {
   stopifnot(class(x) %in% c("form_partial", "form"))
   stopifnot(class(y) %in% c("form_partial", "form"))
 
-  structure(function() {
+  structure(function(...) {
+    # so far arguments are not used
+    arg <- list(...)
     r1 <- x()
     r2 <- y()
     if (class(x) == "form" | class(y) == "form") {

tests/testthat/test_basic.R

@@ -5,4 +5,20 @@ q2 <- fob_yorn("Be or not to be", "shake")
 q3 <- fob_date("When was that?", "date")
 q4 <- fob_pattern("2 letters + 1 digit", "^[A-Za-z]{2}[0-9]$")
 myform <- q1 %+% q2 %+% q3 %+% q4
-# res <- myform()
+# res <- myform()
+
+test_that("unit questions work", {
+  expect_equal(q1(1), "Apple")
+  expect_true(is.na(q1(3)))
+
+  expect_true(q2("yes"))
+  expect_true(!q2("N"))
+  expect_true(is.na(q2("k")))
+
+  expect_equal(q3("2012-01-11"), "2012-01-11")
+  expect_true(is.na(q3("2012-01")))
+
+  expect_equal(q4("ll1"), "ll1")
+  expect_true(is.na(q4("lll")))
+})
+