- Adapt to dev prettyunits.

krlmlr · krlmlr · commit 1c523e3a0cc6 · 2020-01-15T16:18:38.000+01:00
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -21,14 +21,16 @@ URL: https://github.com/tidyverse/blob
 BugReports: https://github.com/tidyverse/blob/issues
 Imports: 
     methods,
-    prettyunits,
+    prettyunits (>= 1.1.0.9000),
     rlang,
     vctrs (>= 0.2.1)
 Suggests: 
     covr,
     crayon,
     pillar (>= 1.2.1),
     testthat
+Remotes:
+    r-lib/prettyunits#24
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE, roclets = c("collate", "namespace", "rd", "pkgapi::api_roclet"))
diff --git a/R/format.R b/R/format.R
@@ -32,7 +32,7 @@ is_vector_s3.blob <- function(x) TRUE
 
 blob_size <- function(x, digits = 3, trim = TRUE, ...) {
   x <- vapply(x, length, numeric(1))
-  prettyunits::pretty_bytes(x)
+  prettyunits::pretty_bytes(x, if (isTRUE(trim)) "nopad" else "default")
 }
 
 # Dynamically exported, see zzz.R
diff --git a/tests/testthat/blob.txt b/tests/testthat/blob.txt
@@ -1,2 +1,2 @@
 <blob[3]>
-[1] blob[4.00 B]  blob[2.05 kB] blob[1.05 MB]
+[1] blob[4 B]     blob[2.05 kB] blob[1.05 MB]
diff --git a/tests/testthat/test-format.R b/tests/testthat/test-format.R
@@ -15,7 +15,7 @@ test_that("unequal sizes", {
   expect_format_equal(
     format(x),
     c(
-      "blob[4.00 B]",
+      "blob[4 B]",
       "blob[2.05 kB]",
       "blob[1.05 MB]"
     )
@@ -24,7 +24,7 @@ test_that("unequal sizes", {
   expect_format_equal(
     format(x, trim = FALSE),
     c(
-      "blob[4.00 B]",
+      "blob[    4 B]",
       "blob[2.05 kB]",
       "blob[1.05 MB]"
     )

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ is_vector_s3.blob <- function(x) TRUE`
`32`	`32`
`33`	`33`	`blob_size <- function(x, digits = 3, trim = TRUE, ...) {`
`34`	`34`	`x <- vapply(x, length, numeric(1))`
`35`		`- prettyunits::pretty_bytes(x)`
	`35`	`+ prettyunits::pretty_bytes(x, if (isTRUE(trim)) "nopad" else "default")`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`# Dynamically exported, see zzz.R`