mv 'assert_ext' -> 'has_ext' & mv to 'utils.R' for #38

Author: mpadge

DESCRIPTION

@@ -66,6 +66,7 @@ Collate:
     'gtfsio.R'
     'import_gtfs.R'
     'new_gtfs.R'
+    'utils.R'
 LazyData: true
 Depends: 
     R (>= 3.1.0)

R/assert_inputs.R

@@ -278,16 +278,3 @@ error_x_wrong_inheritance <- function(input_name,
     error_call
   )
 }
-
-#' Vectorized assertion of path extensions
-#'
-#' @param path Vector of file paths
-#' @param ext File extension to be asserted for each `path`
-#'
-#' @return Logical vector of same length as `path`, with `TRUE` for each element
-#' with specified extension, `FALSE` otherwise.
-#'
-#' @noRd
-assert_extension <- function(path, ext = "zip") {
-  fs::path_ext(path) == ext
-}

R/export_gtfs.R

@@ -68,8 +68,8 @@ export_gtfs <- function(gtfs,
   # input checks that depend on more than one argument
 
   if (fs::file_exists(path) & !overwrite) error_cannot_overwrite()
-  if (!as_dir & !assert_extension(path, "zip")) error_ext_must_be_zip()
-  if (as_dir & assert_extension(path, "zip")) error_path_must_be_dir()
+  if (!as_dir & !has_extension(path, "zip")) error_ext_must_be_zip()
+  if (as_dir & has_extension(path, "zip")) error_path_must_be_dir()
 
   extra_files <- setdiff(files, names(gtfsio::gtfs_reference))
   if (standard_only & !is.null(files) & !identical(extra_files, character(0))) {
@@ -132,7 +132,7 @@ export_gtfs <- function(gtfs,
 
     dt <- gtfs[[file]]
 
-    if (assert_extension(filename, "geojson")) {
+    if (has_extension(filename, "geojson")) {
       jsonlite::write_json(dt, filepath, pretty = FALSE, auto_unbox = TRUE, digits = 8)
     } else {
 

R/import_gtfs.R

@@ -117,7 +117,7 @@ import_gtfs <- function(path,
   )
   if (inherits(filenames_in_gtfs, "error")) error_path_must_be_zip()
 
-  non_standard_file_ext <- filenames_in_gtfs[!(assert_extension(filenames_in_gtfs, "txt") | assert_extension(filenames_in_gtfs, "geojson"))]
+  non_standard_file_ext <- filenames_in_gtfs[!(has_extension(filenames_in_gtfs, "txt") | has_extension(filenames_in_gtfs, "geojson"))]
 
   if (!identical(non_standard_file_ext, character(0))) {
     warning(
@@ -241,7 +241,7 @@ read_files <- function(file,
   stopifnot(length(file) == 1L)
 
   filename <- file
-  file_type <- ifelse(assert_extension(file, "txt"), "txt", "geojson")
+  file_type <- ifelse(has_extension(file, "txt"), "txt", "geojson")
   file <- remove_file_ext(file)
 
   if (!quiet) message("Reading ", file)
@@ -374,25 +374,6 @@ read_geojson <- function(file.geojson) {
   read_json(file.geojson)
 }
 
-remove_file_ext = function(file) {
-  fs::path_ext_remove(file)
-}
-
-append_file_ext = function(file) {
-  vapply(file, function(.f) {
-    file_ext <- gtfsio::gtfs_reference[[remove_file_ext(.f)]][["file_ext"]]
-    if (is.null(file_ext)) {
-      # use default for argument-specified non-standard files,
-      # behaviour defined in test_import_gtfs.R#292
-      file_ext <- "txt"
-    }
-    if (!assert_extension(.f, file_ext)) {
-      .f <- fs::path_ext_set(.f, file_ext)
-    }
-    return(.f)
-  }, ".txt", USE.NAMES = FALSE)
-}
-
 # errors ------------------------------------------------------------------
 
 

R/utils.R

@@ -0,0 +1,31 @@
+remove_file_ext = function(file) {
+  fs::path_ext_remove(file)
+}
+
+append_file_ext = function(file) {
+  vapply(file, function(.f) {
+    file_ext <- gtfsio::gtfs_reference[[remove_file_ext(.f)]][["file_ext"]]
+    if (is.null(file_ext)) {
+      # use default for argument-specified non-standard files,
+      # behaviour defined in test_import_gtfs.R#292
+      file_ext <- "txt"
+    }
+    if (!has_extension(.f, file_ext)) {
+      .f <- fs::path_ext_set(.f, file_ext)
+    }
+    return(.f)
+  }, ".txt", USE.NAMES = FALSE)
+}
+
+#' Vectorized assertion of path extensions
+#'
+#' @param path Vector of file paths
+#' @param ext File extension to be asserted for each `path`
+#'
+#' @return Logical vector of same length as `path`, with `TRUE` for each element
+#' with specified extension, `FALSE` otherwise.
+#'
+#' @noRd
+has_extension <- function(path, ext = "zip") {
+  fs::path_ext(path) == ext
+}