Revert "Replace read_from property with data_location attribute"

This reverts commit ce5cbad.

Author: peterdesmet

R/read_resource.R

@@ -50,20 +50,19 @@ read_resource <- function(package, resource_name, col_select = NULL) {
   resource <- resource(package, resource_name)
 
   # Read data directly
-  data_location <- attr(resource, "data_location")
-  if (data_location == "df") {
+  if (resource$read_from == "df") {
     df <- dplyr::as_tibble(resource$data)
 
   # Read data from data
-  } else if (data_location == "data") {
+  } else if (resource$read_from == "data") {
     df <- do.call(
       function(...) rbind.data.frame(..., stringsAsFactors = FALSE),
       resource$data
     )
     df <- dplyr::as_tibble(df)
 
   # Read data from path(s)
-  } else if (data_location == "path" || data_location == "url") {
+  } else if (resource$read_from == "path" || resource$read_from == "url") {
     df <- read_from_path(package, resource_name, col_select)
   }
   return(df)

R/resource.R

@@ -4,8 +4,8 @@
 #' described `resources`.
 #'
 #' @inheritParams read_resource
-#' @return List describing a Data Resource, with new attribute `data_location`
-#'   to indicate how the data are attached.
+#' @return List describing a Data Resource, with new property `read_from` to
+#'   indicate how data should be read.
 #'   If present, `path` will be updated to contain the full path(s).
 #' @family accessor functions
 #' @noRd
@@ -47,12 +47,12 @@ resource <- function(package, resource_name) {
     )
   }
 
-  # Assign data_location attribute (based on path, then df, then data)
+  # Assign read_from property (based on path, then df, then data)
   if (length(resource$path) != 0) {
     if (all(is_url(resource$path))) {
-      data_location <- "url"
+      resource$read_from <- "url"
     } else {
-      data_location <- "path"
+      resource$read_from <- "path"
     }
     # Expand paths to full paths, check if file exists and check path safety,
     # unless those paths were willingly added by user in add_resource()
@@ -62,11 +62,10 @@ resource <- function(package, resource_name) {
       )
     }
   } else if (is.data.frame(resource$data)) {
-    data_location <- "df"
+    resource$read_from <- "df"
   } else if (!is.null(resource$data)) {
-    data_location <- "data"
+    resource$read_from <- "data"
   }
-  attr(resource, "data_location") <- data_location
 
   return(resource)
 }

R/write_resource.R

@@ -14,8 +14,7 @@ write_resource <- function(package, resource_name, directory = ".",
   resource <- resource(package, resource_name)
 
   # Resource contains new data
-  data_location <- attr(resource, "data_location")
-  if (data_location == "df") {
+  if (resource$read_from == "df") {
     if (compress) {
       file_name <- paste(resource_name, "csv", "gz", sep = ".")
     } else {
@@ -29,14 +28,15 @@ write_resource <- function(package, resource_name, directory = ".",
     resource$mediatype <- "text/csv"
     resource$encoding <- "utf-8" # Enforced by readr::write_csv()
     resource$dialect <- NULL
+    resource$read_from <- NULL
     resource$data <- NULL
 
   # Resource originally had data property
-  } else if (data_location == "data") {
-    # Do nothing
+  } else if (resource$read_from == "data") {
+    resource$read_from <- NULL
 
   # Resource has local paths (optionally mixed with URLs)
-  } else if (data_location == "path") {
+  } else if (resource$read_from == "path") {
     # Download or copy file to directory, point path to file name (in that dir)
     # Note that existing files will not be overwritten
     out_paths <- vector()
@@ -56,15 +56,14 @@ write_resource <- function(package, resource_name, directory = ".",
       }
       out_paths <- append(out_paths, file_name)
     }
+    resource$read_from <- NULL
     resource$path <- out_paths
 
   # Resource has URL paths (only)
-  } else if (data_location == "url") {
+  } else if (resource$read_from == "url") {
     # Don't touch file, leave URL path as is
+    resource$read_from <- NULL
   }
 
-  # Remove attributes
-  attr(resource, "data_location") <- NULL
-
   return(resource)
 }

tests/testthat/test-write_package.R

@@ -333,6 +333,7 @@ test_that("write_package() sets correct properties for data frame resources", {
   expect_null(resource_written$dialect)
   expect_identical(resource_written$schema, schema)
   expect_null(resource_written$data)
+  expect_null(resource_written$read_from)
 })
 
 test_that("write_package() retains custom properties set in add_resource()", {