Merge branch 'r-1.1.0.9000' into production

krlmlr · krlmlr · commit 79f776614052 · 2017-11-29T09:40:13.000+01:00
diff --git a/API b/API
@@ -6,10 +6,23 @@ as.blob(x, ...)
 blob(...)
 new_blob(x)
 
-## S3 methods
+## Foreign S3 methods
 
+[.blob(x, i, ...)
+[<-.blob(x, i, ..., value)
+[[<-.blob(x, i, ..., value)
 as.blob.blob(x, ...)
 as.blob.character(x, ...)
 as.blob.integer(x, ...)
 as.blob.list(x, ...)
 as.blob.raw(x, ...)
+as.data.frame.blob(x, row.names = NULL, optional = FALSE, ..., nm = paste(deparse(substitute(x), width.cutoff = 500L), collapse = " "))
+c.blob(x, ...)
+format.blob(x, ...)
+is.na.blob(x)
+is.na<-.blob(x, value)
+is_vector_s3.blob(x)
+obj_sum.blob(x)
+pillar_shaft.blob(x, ...)
+print.blob(x, ...)
+type_sum.blob(x)
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,17 +1,18 @@
 Package: blob
 Title: A Simple S3 Class for Representing Vectors of Binary Data ('BLOBS')
-Version: 1.1.0
+Version: 1.1.0.9000
 Authors@R: c(
     person("Hadley", "Wickham", role = c("aut")),
     person("Kirill", "Müller", , "krlmlr+r@mailbox.org", role = c("cre")),
     person("RStudio", role = "cph")
   )
 Description: R's raw vector is useful for storing a single binary object.
-    What if you want to put a vector of them in a data frame? The blob
+    What if you want to put a vector of them in a data frame? The 'blob'
     package provides the blob object, a list of raw vectors, suitable for
     use as a column in data frame.
 Imports:
-    tibble
+    methods,
+    pillar
 License: GPL-3
 Encoding: UTF-8
 LazyData: true
diff --git a/NAMESPACE b/NAMESPACE
@@ -10,15 +10,19 @@ S3method(as.blob,integer)
 S3method(as.blob,list)
 S3method(as.blob,raw)
 S3method(as.data.frame,blob)
+S3method(c,blob)
 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(tibble,is_vector_s3)
-importFrom(tibble,obj_sum)
-importFrom(tibble,type_sum)
+importFrom(methods,setOldClass)
+importFrom(pillar,is_vector_s3)
+importFrom(pillar,obj_sum)
+importFrom(pillar,pillar_shaft)
+importFrom(pillar,type_sum)
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,11 @@
+### blob 1.1.0.9000 (2017-11-29)
+
+- Use `B` instead of `b` as unit.
+- Now importing pillar instead of tibble, and using colored formatting.
+- The blob class can now be used for S4 dispatch.
+- Calling `c()` on blob objects returns a blob.
+
+
 # blob 1.1.0 (2017-06-17)
 
 - New maintainer: Kirill Müller.
diff --git a/R/accessors.R b/R/accessors.R
@@ -25,3 +25,6 @@
     NextMethod()
   }
 }
+
+#' @export
+c.blob <- function(x, ...) as.blob(NextMethod())
diff --git a/R/blob.R b/R/blob.R
@@ -1,3 +1,6 @@
+#' @importFrom methods setOldClass
+setOldClass("blob")
+
 #' Construct a blob object
 #'
 #' \code{new_blob} is a low-level constructor that takes a list of
diff --git a/R/format.R b/R/format.R
@@ -3,7 +3,7 @@ format.blob <- function(x, ...) {
   if (length(x) == 0)
     return(character())
 
-  ifelse(is.na(x), "<NA>", paste0("blob[", blob_size(x, ...) , "]"))
+  ifelse(is.na(x), "<NA>", paste0("blob[", blob_size(x, ...), "]"))
 }
 
 #' @export
@@ -16,25 +16,25 @@ 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, ...) {
   x <- vapply(x, length, numeric(1))
 
-  units <- c("kb", "Mb", "Gb", "Tb")
+  units <- c("kB", "MB", "GB", "TB")
   power <- min(floor(log(abs(x), 1000)), length(units))
   if (power < 1) {
     unit <- "B"
@@ -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")
+}
diff --git a/tests/testthat/test-accessors.R b/tests/testthat/test-accessors.R
@@ -22,3 +22,10 @@ test_that("can insert raw or NULL", {
 
   expect_equal(x, blob(as.raw(0), as.raw(0), NULL, NULL))
 })
+
+test_that("can combine", {
+  expect_identical(
+    c(blob(raw(4), raw(5)), blob(raw(7))),
+    blob(raw(4), raw(5), raw(7))
+  )
+})
diff --git a/tests/testthat/test-format.R b/tests/testthat/test-format.R
@@ -35,9 +35,9 @@ test_that("similar sizes", {
   expect_format_equal(
     format(x),
     c(
-      "blob[1 kb]",
-      "blob[2 kb]",
-      "blob[4 kb]"
+      "blob[1 kB]",
+      "blob[2 kB]",
+      "blob[4 kB]"
     )
   )
 })

Original file line number	Diff line number	Diff line change
`@@ -25,3 +25,6 @@`
`25`	`25`	`NextMethod()`
`26`	`26`	`}`
`27`	`27`	`}`
	`28`	`+`
	`29`	`+#' @export`
	`30`	`+c.blob <- function(x, ...) as.blob(NextMethod())`
Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,9 @@ test_that("similar sizes", {`
`35`	`35`	`expect_format_equal(`
`36`	`36`	`format(x),`
`37`	`37`	`c(`
`38`		`- "blob[1 kb]",`
`39`		`- "blob[2 kb]",`
`40`		`- "blob[4 kb]"`
	`38`	`+ "blob[1 kB]",`
	`39`	`+ "blob[2 kB]",`
	`40`	`+ "blob[4 kB]"`
`41`	`41`	`)`
`42`	`42`	`)`
`43`	`43`	`})`