import pillar instead of tibble

krlmlr · krlmlr · commit 684c0eda2422 · 2017-11-29T09:38:56.000+01:00
- Now importing pillar instead of tibble, and using colored formatting.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -12,7 +12,7 @@ Description: R's raw vector is useful for storing a single binary object.
     use as a column in data frame.
 Imports:
     methods,
-    tibble
+    pillar
 License: GPL-3
 Encoding: UTF-8
 LazyData: true
diff --git a/NAMESPACE b/NAMESPACE
@@ -15,12 +15,14 @@ S3method(format,blob)
 S3method(is.na,blob)
 S3method(is_vector_s3,blob)
 S3method(obj_sum,blob)
+S3method(pillar_shaft,blob)
 S3method(print,blob)
 S3method(type_sum,blob)
 export(as.blob)
 export(blob)
 export(new_blob)
 importFrom(methods,setOldClass)
-importFrom(tibble,is_vector_s3)
-importFrom(tibble,obj_sum)
-importFrom(tibble,type_sum)
+importFrom(pillar,is_vector_s3)
+importFrom(pillar,obj_sum)
+importFrom(pillar,pillar_shaft)
+importFrom(pillar,type_sum)
diff --git a/R/format.R b/R/format.R
@@ -16,19 +16,19 @@ print.blob <- function(x, ...) {
 }
 
 #' @export
-#' @importFrom tibble type_sum
+#' @importFrom pillar type_sum
 type_sum.blob <- function(x) {
   "blob"
 }
 
 #' @export
-#' @importFrom tibble obj_sum
+#' @importFrom pillar obj_sum
 obj_sum.blob <- function(x) {
   format(x, trim = FALSE)
 }
 
 #' @export
-#' @importFrom tibble is_vector_s3
+#' @importFrom pillar is_vector_s3
 is_vector_s3.blob <- function(x) TRUE
 
 blob_size <- function(x, digits = 3, trim = TRUE, ...) {
@@ -47,3 +47,15 @@ blob_size <- function(x, digits = 3, trim = TRUE, ...) {
   x2 <- format(x1, big.mark = ",", scientific = FALSE, trim = trim)
   paste0(x2, " ", unit)
 }
+
+#' @importFrom pillar pillar_shaft
+#' @export
+pillar_shaft.blob <- function(x, ...) {
+  out <- ifelse(
+    is.na(x),
+    NA_character_,
+    paste0(pillar::style_subtle("["), blob_size(x, ...), pillar::style_subtle("]"))
+  )
+
+  pillar::new_pillar_shaft_simple(out, align = "right")
+}
