Merge branch 'r-1.1.0.9001' into production

krlmlr · krlmlr · commit eb97c17ac561 · 2017-11-30T10:35:17.000+01:00
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: blob
 Title: A Simple S3 Class for Representing Vectors of Binary Data ('BLOBS')
-Version: 1.1.0.9000
+Version: 1.1.0.9001
 Authors@R: c(
     person("Hadley", "Wickham", role = c("aut")),
     person("Kirill", "Müller", , "krlmlr+r@mailbox.org", role = c("cre")),
@@ -12,7 +12,8 @@ Description: R's raw vector is useful for storing a single binary object.
     use as a column in data frame.
 Imports:
     methods,
-    pillar
+    pillar,
+    prettyunits
 License: GPL-3
 Encoding: UTF-8
 LazyData: true
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,8 @@
+### blob 1.1.0.9001 (2017-11-30)
+
+- Now using the prettyunits package to format data sizes.
+
+
 ### blob 1.1.0.9000 (2017-11-29)
 
 - Use `B` instead of `b` as unit.
diff --git a/R/format.R b/R/format.R
@@ -33,19 +33,7 @@ is_vector_s3.blob <- function(x) TRUE
 
 blob_size <- function(x, digits = 3, trim = TRUE, ...) {
   x <- vapply(x, length, numeric(1))
-
-  units <- c("kB", "MB", "GB", "TB")
-  power <- min(floor(log(abs(x), 1000)), length(units))
-  if (power < 1) {
-    unit <- "B"
-  } else {
-    unit <- units[[power]]
-    x <- x / (1024 ^ power)
-  }
-
-  x1 <- signif(x, digits = digits %||% 3)
-  x2 <- format(x1, big.mark = ",", scientific = FALSE, trim = trim)
-  paste0(x2, " ", unit)
+  prettyunits::pretty_bytes(x)
 }
 
 #' @importFrom pillar pillar_shaft
@@ -54,7 +42,7 @@ pillar_shaft.blob <- function(x, ...) {
   out <- ifelse(
     is.na(x),
     NA_character_,
-    paste0(pillar::style_subtle("["), blob_size(x, ...), pillar::style_subtle("]"))
+    paste0(pillar::style_subtle("<raw "), blob_size(x, ...), pillar::style_subtle(">"))
   )
 
   pillar::new_pillar_shaft_simple(out, align = "right")
