Fix/type

Makefile

@@ -5,6 +5,9 @@ TARBALL=${PACKAGE}_${VERSION}.tar.gz
 PKGDIR=.
 CHKDIR=.
 
+testn: 
+	Rscript inst/validation/latest.R
+
 # development cycle - bumps the version and tags based on version
 bump-dev:
 	Rscript -e 'usethis::use_version("dev")'

R/load_spec.R

@@ -333,9 +333,6 @@ unpack_col <- function(x) {
   if(.no("short",x)) {
     x[["short"]] <- x[["col"]]
   }
-  if(.no("type", x)) {
-    x[["type"]] <- "numeric"
-  }
   x <- unpack_about(x)
   x$continuous <- .has("range",x)
   if(x$continuous) {
@@ -349,8 +346,13 @@ unpack_col <- function(x) {
     if(!.has("decode",x)) {
       x$decode <- names(x$values)
     }
-    x$values <- sapply(x$values, sub_null_natom, USE.NAMES=FALSE)
-    if(is.character(x$values)) x$type <- "character"
+    x$values <- sapply(x$values, sub_null_natom, USE.NAMES = FALSE)
+    if(is.character(x$values) && .no("type", x)) {
+      x$type <- "character"
+    }
+  }
+  if(.no("type", x)) {
+    x[["type"]] <- "numeric"
   }
   if(.has("source", x)) {
     x$source <- paste0(x$source, collapse = " ")  

inst/validation/latest.R

@@ -0,0 +1,15 @@
+library(yaml)
+
+x <- yaml.load_file("inst/validation/yspec-stories.yaml")
+
+stories <- names(x)
+stories <- sub("YSP-S", "", stories)
+stories <- as.integer(stories)
+
+tests <- unlist(lapply(x,  function(x) x$tests), use.names=FALSE)
+dupt <- any(duplicated(tests))
+tests <- sub("YSP-TEST-", "", tests)
+tests <- as.integer(tests)
+
+message("last story: ", max(stories))
+message("last test: ", max(tests))

inst/validation/yspec-stories.yaml

@@ -1,3 +1,13 @@
+YSP-S034:
+  name: ys_load - only assume character type if type is NULL
+  description: > 
+    As a user, I want yspec to infer that type is character for discrete 
+    data when type is missing and the values field has type character.
+  ProductRisk: low-risk
+  tests: YSP-TEST-0145
+
+
+# --------
 YSP-S001:
   name: Make ys_get_short_unit return list
   description: ys_get_short_unit returns list not character vector

tests/testthat/test-load_spec.R

@@ -119,3 +119,19 @@ test_that("Error when values is mis-coded as list of lists [YSP-TEST-0072]", {
   )
 })
 
+test_that("ys_load - only assume character type if type is NULL [YSP-TEST-0145]", {
+  spec <- yspec:::test_spec_list(
+    list(A = list(values = letters[1:3]))
+  )
+  expect_equal(spec$A$type, "character")
+
+  spec <- yspec:::test_spec_list(
+    list(A = list(values = c(1,2,3), type = "integer"))
+  )
+  expect_equal(spec$A$type, "integer")
+
+  spec <- yspec:::test_spec_list(
+    list(A = list(values = letters[1:3], type = "integer"))
+  )
+  expect_equal(spec$A$type, "integer")
+})