Use readr.

DESCRIPTION

@@ -17,7 +17,8 @@ BugReports: https://github.com/maurolepore/tor/issues
 Imports: 
     fs,
     rlang,
-    tibble
+    tibble,
+    readr
 Suggests: 
     covr,
     spelling,

NEWS.md

@@ -2,6 +2,9 @@
 
 ## Minor
 
+* `list_any()`, `list_csv()`, `list_tsv()`, `load_csv()`, and `load_tsv()` now use __readr__.
+  * This makes reading data faster and safer.
+
 * Each dataframe output is now converted to tibble. 
     * Users no longer need to call `tibble::as_tibble()`.
 

R/list_any.R

@@ -46,9 +46,7 @@ list_any <- function(path = ".",
   )
 
   if (length(files) == 0) {
-    abort(
-      sprintf("Can't find files matching '%s' in:\n '%s'", regexp, path)
-    )
+    abort(sprintf("Can't find files matching '%s' in:\n '%s'", regexp, path))
   }
 
   file_names <- fs::path_ext_remove(fs::path_file(files))

R/list_csv.R

@@ -3,8 +3,8 @@
 #' These functions wrap the most common special cases of [list_any()].
 #'
 #' @inheritParams list_any
-#' @inheritParams utils::read.table
-#' @param ... Arguments passed to [utils::read.table()].
+#' @inheritParams readr::read_delim
+#' @param ... Arguments passed to `readr::read_csv()` or `readr::read_tsv()`.
 #'
 #' @return A list.
 #'
@@ -33,28 +33,10 @@ list_csv <- function(path = ".",
                      regexp = "[.]csv$",
                      ignore.case = TRUE,
                      invert = FALSE,
-                     header = TRUE,
-                     sep = ",",
-                     quote = "\"",
-                     dec = ".",
-                     fill = TRUE,
-                     comment.char = "",
-                     stringsAsFactors = FALSE,
-                     na.strings = c("", "NA"),
                      ...) {
   list_any(
     path,
-    function(x) utils::read.csv(
-        file = x,
-        header = header,
-        sep = sep,
-        quote = quote,
-        dec = dec,
-        fill = fill,
-        comment.char = comment.char,
-        stringsAsFactors = stringsAsFactors,
-        na.strings = na.strings
-      ),
+    readr::read_csv,
     regexp = regexp,
     ignore.case = ignore.case,
     invert = invert,
@@ -68,28 +50,10 @@ list_tsv <- function(path = ".",
                      regexp = "[.]tsv$",
                      ignore.case = TRUE,
                      invert = FALSE,
-                     header = TRUE,
-                     sep = "\t",
-                     quote = "\"",
-                     dec = ".",
-                     fill = TRUE,
-                     comment.char = "",
-                     stringsAsFactors = FALSE,
-                     na.strings = c("", "NA"),
                      ...) {
   list_any(
     path,
-    function(x) utils::read.csv(
-        file = x,
-        header = header,
-        sep = sep,
-        quote = quote,
-        dec = dec,
-        fill = fill,
-        comment.char = comment.char,
-        stringsAsFactors = stringsAsFactors,
-        na.strings = na.strings
-      ),
+    .f = readr::read_tsv,
     regexp = regexp,
     ignore.case = ignore.case,
     invert = invert,

R/load_csv.R

@@ -27,30 +27,11 @@ load_csv <- function(path = ".",
                      regexp = "[.]csv$",
                      ignore.case = TRUE,
                      invert = FALSE,
-                     header = TRUE,
-                     sep = ",",
-                     quote = "\"",
-                     dec = ".",
-                     fill = TRUE,
-                     comment.char = "",
-                     stringsAsFactors = FALSE,
-                     na.strings = c("", "NA"),
                      envir = .GlobalEnv,
                      ...) {
   lst <- list_any(
     path,
-    # TODO: Use function(x) to more obviously show what's going on
-    function(x) utils::read.csv(
-        file = x,
-        header = header,
-        sep = sep,
-        quote = quote,
-        dec = dec,
-        fill = fill,
-        comment.char = comment.char,
-        stringsAsFactors = stringsAsFactors,
-        na.strings = na.strings
-      ),
+    readr::read_csv,
     regexp = regexp,
     ignore.case = ignore.case,
     invert = invert,
@@ -67,29 +48,11 @@ load_tsv <- function(path = ".",
                      regexp = "[.]tsv$",
                      ignore.case = TRUE,
                      invert = FALSE,
-                     header = TRUE,
-                     sep = "\t",
-                     quote = "\"",
-                     dec = ".",
-                     fill = TRUE,
-                     comment.char = "",
-                     stringsAsFactors = FALSE,
-                     na.strings = c("", "NA"),
                      envir = .GlobalEnv,
                      ...) {
   lst <- list_any(
     path,
-    function(x) utils::read.csv(
-        file = x,
-        header = header,
-        sep = sep,
-        quote = quote,
-        dec = dec,
-        fill = fill,
-        comment.char = comment.char,
-        stringsAsFactors = stringsAsFactors,
-        na.strings = na.strings
-      ),
+    readr::read_tsv,
     regexp = regexp,
     ignore.case = ignore.case,
     invert = invert,

inst/extdata/tsv/tsv1.tsv

@@ -1,4 +1,4 @@
 x	y
 1	a
-2	
+2	NA
 3	NA

inst/extdata/tsv/tsv2.tsv

@@ -1,4 +1,4 @@
 x	y
 1	a
-2
+2	NA
 3	b

tests/testthat/csv2.csv

@@ -0,0 +1,3 @@
+y
+a
+b

tests/testthat/test-list_csv.R

@@ -82,7 +82,8 @@ test_that("list_csv defaults to `stringsAsFactors = FALSE`", {
 })
 
 test_that("list_csv defaults to read from working directory", {
-  expect_true(any("csv" %in% names(list_csv())))
+  # WARNING: Not for interactive use.
+  expect_true(all(c("csv1", "csv2") %in% names(list_csv())))
 })
 
 test_that("list_csv is sensitive to `regexp`, `invert, and `ignore.case`", {