Eensure json_structure works with tbl_json objects closes #2

R/json_structure.r

@@ -7,7 +7,7 @@
 #' an array, then subsequent rows will recursively correspond to the elements
 #' (and their children) of the object or array.
 #'
-#' @param x a tbl_json object
+#' @param x a json string or a tbl_json object
 #' @return a tbl_json object with the following columns:
 #'
 #'   \code{document.id} 1L if \code{x} is a single JSON string, otherwise the
@@ -46,6 +46,8 @@
 #' '[{"a": 1}, [1, 2], "a", 1, true, null]' %>% json_structure
 json_structure <- function(x) {
 
+  if (!is.tbl_json(x)) x <- as.tbl_json(x)
+
   # Create initial structure for top level
   structure <- json_structure_init(x)
 
@@ -67,7 +69,7 @@ json_structure <- function(x) {
 
 json_structure_init <- function(x) {
 
-  x %>% as.tbl_json %>%
+  x %>%
     mutate(
       parent.id = NA_character_,
       level = 1L,

tests/testthat/test-json_structure.r

@@ -106,3 +106,24 @@ test_that("works with empty values appropriately", {
   )
 
 })
+
+test_that("works with tbl_json already", {
+
+  expect_identical(
+    c('"a"', '"b"') %>% as.tbl_json %>% json_structure,
+    tbl_json(
+      data_frame(
+        document.id = c(1L, 2L),
+        parent.id = rep(NA_character_, 2),
+        level = rep(1L, 2),
+        index = rep(1L, 2),
+        child.id = rep("1", 2),
+        key = rep(NA_character_, 2),
+        type = rep("string", 2) %>% factor(levels = allowed_json_types),
+        length = rep(1L, 2)
+      ),
+      list("a", "b")
+    )
+  )
+
+})