done

Author: dajmcdon

R/methods-epi_df.R

@@ -12,12 +12,11 @@ as_tibble.epi_df <- function(x, ...) {
   # Decaying drops the class and metadata. `as_tibble.grouped_df` drops the
   # grouping and should be called by `NextMethod()` in the current design.
   # See #223 for discussion of alternatives.
-  if (attr(x, "no_decay_to_tibble") %||% FALSE) {
-    metadata <- attr(x, "metadata")
-    x <- NextMethod()
-    return(reclass(x, metadata))
+  if (attr(x, "decay_to_tibble") %||% TRUE) {
+    return(decay_epi_df(NextMethod()))
   }
-  decay_epi_df(NextMethod())
+  metadata <- attr(x, "metadata")
+  reclass(NextMethod(), metadata)
 }
 
 #' Convert to tsibble format

tests/testthat/test-as_tibble-decay.R

@@ -1,15 +1,19 @@
 test_that("as_tibble checks an attr to avoid decay to tibble", {
   edf <- jhu_csse_daily_subset
   expect_identical(class(as_tibble(edf)), c("tbl_df", "tbl", "data.frame"))
-  attr(edf, "no_decay_to_tibble") <- TRUE
+  attr(edf, "decay_to_tibble") <- TRUE
+  expect_identical(class(as_tibble(edf)), c("tbl_df", "tbl", "data.frame"))
+  attr(edf, "decay_to_tibble") <- FALSE
   expect_identical(class(as_tibble(edf)), c("epi_df", "tbl_df", "tbl", "data.frame"))
 })
 
 test_that("as_tibble ungroups if needed", {
   edf <- jhu_csse_daily_subset %>% group_by(geo_value)
   # removes the grouped_df class
-  expect_identical(class(as_tibble(edf)), c("tbl_df", "tbl", "data.frame")) 
-  attr(edf, "no_decay_to_tibble") <- TRUE
+  expect_identical(class(as_tibble(edf)), c("tbl_df", "tbl", "data.frame"))
+  attr(edf, "decay_to_tibble") <- TRUE
+  expect_identical(class(as_tibble(edf)), c("tbl_df", "tbl", "data.frame"))
+  attr(edf, "decay_to_tibble") <- FALSE
   # removes grouped_df but not `epi_df`
   expect_identical(class(as_tibble(edf)), c("epi_df", "tbl_df", "tbl", "data.frame"))
 })