From ee869f75ef5609f62d322284c2a5d762e2ea2a33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Nussbaumer?= <rafnuss@gmail.com>
Date: Sat, 28 Dec 2024 22:49:14 +0100
Subject: [PATCH 1/3] Add suggestion to read the data and attach to object in
 `read_package`

---
 R/read_package.R | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/R/read_package.R b/R/read_package.R
index 8af3fd3..d9ab40e 100644
--- a/R/read_package.R
+++ b/R/read_package.R
@@ -8,6 +8,8 @@
 #' Data Package standard.
 #'
 #' @param file Path or URL to a `datapackage.json` file.
+#' @param attach Attach the resources' data to the package object rather than keeping the path. See
+#' [data location](https://specs.frictionlessdata.io/data-resource/#data-location).
 #' @return A Data Package object, see [create_package()].
 #' @family read functions
 #' @export
@@ -22,7 +24,7 @@
 #' # Access the Data Package properties
 #' package$name
 #' package$created
-read_package <- function(file = "datapackage.json") {
+read_package <- function(file = "datapackage.json", attach = FALSE) {
   # Read file
   if (!is.character(file)) {
     cli::cli_abort(
@@ -48,5 +50,20 @@ read_package <- function(file = "datapackage.json") {
   descriptor$directory <- dirname(file) # Also works for URLs
 
   # Create package
-  create_package(descriptor)
+  package <- create_package(descriptor)
+
+  # Attach path and url to package
+  if (attach) {
+    package$resources <- purrr::map(package$resources, ~ {
+      resource <- get_resource(package, .x$name)
+      if (resource$read_from == "path" || resource$read_from == "url") {
+        df <- read_from_path(package, .x$name, col_select = NULL)
+        .x$data <- df
+        .x$path <- NULL
+      }
+      return(.x)
+    })
+  }
+
+  return(package)
 }

From 8058ce8982d7ca45c416fc3504ff855c55139c58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Nussbaumer?= <rafnuss@gmail.com>
Date: Sat, 28 Dec 2024 22:49:24 +0100
Subject: [PATCH 2/3] Add a test

---
 tests/testthat/test-read_package.R | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/testthat/test-read_package.R b/tests/testthat/test-read_package.R
index 072dee8..02045bd 100644
--- a/tests/testthat/test-read_package.R
+++ b/tests/testthat/test-read_package.R
@@ -131,3 +131,17 @@ test_that("read_package() converts JSON null to NULL", {
   # { "image": null } is read as NULL (use chuck() to force error if missing)
   expect_null(purrr::chuck(p, "image"))
 })
+
+
+test_that("read_package() with `attach=TRUE`", {
+  p_path <- system.file("extdata", "v1", "datapackage.json", package = "frictionless")
+  p <- read_package(p_path, attach = TRUE)
+  expect_s3_class(p$resources[[1]]$data, "data.frame")
+
+  p_url <- file.path(
+    "https://raw.githubusercontent.com/frictionlessdata/frictionless-r/",
+    "main/inst/extdata/v1/datapackage.json"
+  )
+  p_remote <- read_package(p_url, attach = TRUE)
+  expect_s3_class(p_remote$resources[[1]]$data, "data.frame")
+})

From ee595d01aeadf03bda19e7c1dad90907d2ecc1de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Nussbaumer?= <rafnuss@gmail.com>
Date: Sat, 28 Dec 2024 23:00:06 +0100
Subject: [PATCH 3/3] minor cosmetic update

---
 R/read_package.R | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/R/read_package.R b/R/read_package.R
index d9ab40e..ca30b81 100644
--- a/R/read_package.R
+++ b/R/read_package.R
@@ -56,12 +56,11 @@ read_package <- function(file = "datapackage.json", attach = FALSE) {
   if (attach) {
     package$resources <- purrr::map(package$resources, ~ {
       resource <- get_resource(package, .x$name)
-      if (resource$read_from == "path" || resource$read_from == "url") {
-        df <- read_from_path(package, .x$name, col_select = NULL)
-        .x$data <- df
+      if (resource$read_from %in% c("path", "url")) {
+        .x$data <- read_from_path(package, .x$name, col_select = NULL)
         .x$path <- NULL
       }
-      return(.x)
+      .x
     })
   }