Move dplyr to Suggests

DESCRIPTION

@@ -21,7 +21,6 @@ License: MIT + file LICENSE
 URL: https://pkgs.rstudio.com/connectapi/, https://github.com/rstudio/connectapi
 BugReports: https://github.com/rstudio/connectapi/issues
 Imports:
-    dplyr,
     fs,
     glue,
     httr,
@@ -41,6 +40,7 @@ Suggests:
     crayon,
     dbplyr,
     devtools,
+    dplyr,
     flexdashboard,
     ggplot2,
     gridExtra,

NAMESPACE

@@ -6,7 +6,6 @@ S3method("[[",connect_tag_tree)
 S3method(api_build,op_base_connect)
 S3method(api_build,op_head)
 S3method(as.data.frame,tbl_connect)
-S3method(collect,tbl_connect)
 S3method(connect_vars,op_base)
 S3method(connect_vars,op_single)
 S3method(connect_vars,tbl_connect)
@@ -37,7 +36,6 @@ export(bundle_dir)
 export(bundle_path)
 export(bundle_static)
 export(cache_apps)
-export(collect)
 export(connect)
 export(content_add_group)
 export(content_add_user)
@@ -135,7 +133,6 @@ export(user_guid_from_username)
 export(users_create_remote)
 export(variant_render)
 export(verify_content_name)
-importFrom(dplyr,collect)
 importFrom(lifecycle,deprecate_warn)
 importFrom(magrittr,"%>%")
 importFrom(rlang,"%||%")

NEWS.md

@@ -2,10 +2,14 @@
 
 ## Breaking changes
 
+- All previously deprecated functions are now removed.
 - The functions `Connect$download_bundle()` and
   `Connect$bundle_delete()` have been removed. Use `Content$bundle_download()`
   and `Content$bundle_delete()` instead.
-- All previously deprecated functions are now removed.
+- dplyr is no longer a required dependency. If you use `tbl_connect()`,
+  you will need to install dplyr and dbplyr explicitly. (#246)
+
+## Enhancements and fixes
 
 - The package is now tested against many versions of Connect, back to 1.8.8.2 (May 2021).
   There are now fewer warnings about version mismatches: you should only see a warning if your Connect server is older than that. (#244)
@@ -15,6 +19,7 @@
   than removing the tag entirely. (#194)
 - Fix issue with `NULL` or `length 1` job outputs ([#193](https://github.com/rstudio/connectapi/issues/193))
 
+
 # connectapi 0.1.3.1
 
 - Fix generated documentation HTML for CRAN submission

R/connectapi.R

@@ -22,3 +22,8 @@ utils::globalVariables(
 )
 
 current_connect_version <- "2024.03.0"
+
+.onLoad <- function(...) {
+  vctrs::s3_register("dplyr::collect", "tbl_connect")
+  invisible()
+}

R/get.R

@@ -334,12 +334,16 @@ content_list_with_permissions <- function(src, ..., .p = NULL) {
   content_list <- get_content(src, .p = .p)
 
   message("Getting permission list")
-  pb <- progress::progress_bar$new(total = nrow(content_list), format = "[:bar] :percent :eta")
-  updated_list <- content_list %>% dplyr::mutate(
-    permission = purrr::map(guid, function(.x) .get_content_permission_with_progress(src, .x, pb))
+  pb <- progress::progress_bar$new(
+    total = nrow(content_list),
+    format = "[:bar] :percent :eta"
+  )
+  content_list[["permission"]] <- purrr::map(
+    content_list$guid,
+    function(.x) .get_content_permission_with_progress(src, .x, pb)
   )
 
-  return(updated_list)
+  content_list
 }
 
 #' Content List
@@ -367,13 +371,10 @@ content_list_by_tag <- function(src, tag) {
 #' @export
 content_list_guid_has_access <- function(content_list, guid) {
   warn_experimental("content_list_filter_by_guid")
-  filtered <- content_list %>% dplyr::filter(
-    access_type == "all" |
-      access_type == "logged_in" |
-      owner_guid == {{ guid }} |
-      purrr::map_lgl(permission, ~ {{ guid }} %in% .x$principal_guid)
-  )
-  return(filtered)
+  rows_keep <- content_list$access_type %in% c("all", "logged_in") |
+    content_list$owner_guid == guid |
+    purrr::map_lgl(content_list$permission, ~ guid %in% .x$principal_guid)
+  content_list[rows_keep, ]
 }
 
 #' Get usage information for deployed shiny applications

R/lazy.R

@@ -36,8 +36,7 @@ tbl_connect <- function(src, from = c("users", "groups", "content", "usage_shiny
   dplyr::make_tbl(c("connect", "lazy"), src = src, ops = ops)
 }
 
-#' @importFrom dplyr collect
-#' @export
+# This will be registered in .onLoad if dplyr is available
 collect.tbl_connect <- function(x, ..., n = Inf) {
   api_build(op = x[["ops"]], con = x[["src"]], n = n)
 }
@@ -96,7 +95,10 @@ print.tbl_connect <- function(x, ..., n = NULL) {
 
 #' @export
 as.data.frame.tbl_connect <- function(x, row.names = NULL, optional = NULL, ..., n = Inf) {
-  as.data.frame(collect(x, n = n))
+  # We don't need to check if dplyr is available here
+  # because you won't have a tbl_connect without first
+  # checking for dplyr.
+  as.data.frame(dplyr::collect(x, n = n))
 }
 
 op_base_connect <- function(x, vars) {

R/tags.R

@@ -435,7 +435,7 @@ tag_tree <- function(.x) {
 
 parse_tags_tbl <- function(x) {
   parsed_tags <- purrr::map_dfr(x, ~ {
-    out <- dplyr::tibble(
+    out <- tibble::tibble(
       id = as.character(.x$id),
       name = .x$name,
       created_time = .x$created_time,
@@ -445,7 +445,7 @@ parse_tags_tbl <- function(x) {
 
     if (length(.x$children) > 0) {
       child <- parse_tags_tbl(.x$children)
-      out <- dplyr::bind_rows(out, child)
+      out <- rbind(out, child)
     }
 
     return(out)

tests/integrated/test-lazy.R

@@ -1,3 +1,5 @@
+testthat::skip_if_not_installed("dbplyr")
+
 # should connect with env vars
 test_conn_1 <- connect(prefix = "TEST_1")
 test_conn_2 <- connect(prefix = "TEST_2")