colearendt#26 make path(...) work with enter object as well

NAMESPACE

@@ -55,6 +55,7 @@ importFrom(purrr,flatten_chr)
 importFrom(purrr,flatten_dbl)
 importFrom(purrr,flatten_int)
 importFrom(purrr,invoke_map)
+importFrom(purrr,lift_vl)
 importFrom(purrr,list_along)
 importFrom(purrr,map)
 importFrom(purrr,map2)

R/enter_object.R

@@ -18,8 +18,8 @@
 #'    entered into, \code{\link{gather_array}} to gather an array in an object
 #'    and \code{\link{spread_all}} to spread values in an object.
 #' @param .x a json string or tbl_json object
-#' @param ... a sequence of character strings designating the object name or
-#'            sequences of names you wish to enter
+#' @param ... a quoted or unquoted sequence of strings designating the object
+#'            name or sequences of names you wish to enter
 #' @return a \code{\link{tbl_json}} object
 #' @export
 #' @examples
@@ -35,21 +35,28 @@
 #' # Let's capture the parent first and then enter in the children object
 #' json %>% spread_all %>% enter_object("children")
 #'
+#' # No need to quote the path "children"
+#' json %>% spread_all %>% enter_object(children)
+#'
 #' # Notice that "anne" was discarded, as she has no children
 #'
 #' # We can now use gather array to stack the array
-#' json %>% spread_all %>% enter_object("children") %>%
+#' json %>% spread_all %>% enter_object(children) %>%
 #'   gather_array("child.num")
 #'
 #' # And append_values_string to add the children names
-#' json %>% spread_all %>% enter_object("children") %>%
+#' json %>% spread_all %>% enter_object(children) %>%
 #'   gather_array("child.num") %>%
 #'   append_values_string("child")
 #'
+#' # The path can be comma delimited to go deep into a nested object
+#' json <- '{"name": "bob", "attributes": {"age": 32, "gender": "male"}}'
+#' json %>% enter_object(attributes, age)
+#'
 #' # A more realistc example with companies data
 #' library(dplyr)
 #' companies %>%
-#'   enter_object("acquisitions") %>%
+#'   enter_object(acquisitions) %>%
 #'   gather_array %>%
 #'   spread_all %>%
 #'   glimpse
@@ -58,7 +65,7 @@ enter_object <- function(.x, ...) {
   if (!is.tbl_json(.x)) .x <- as.tbl_json(.x)
 
   # Prepare path
-  path <- list(...)
+  path <- path(...) %>% as.list
 
   # Extract json
   json <- attr(.x, "JSON")

R/tidyjson-package.R

@@ -6,7 +6,7 @@
 #' @import jsonlite
 #' @importFrom purrr map map_lgl map_dbl map_int map_chr map2 %||% invoke_map
 #' @importFrom purrr map_if at_depth flatten_chr flatten_dbl flatten_int
-#' @importFrom purrr compose partial map2_chr list_along every
+#' @importFrom purrr compose partial map2_chr list_along every lift_vl
 #' @import dplyr
 #' @import tidyr
 #' @importFrom magrittr extract2 is_greater_than

tests/testthat/test-enter_object.R

@@ -1,7 +1,7 @@
 context("enter_object")
 
 test_that("filter works with one path", {
-    
+
     json <- '{"name": "bob", "attributes": {"age": 32, "gender": "male"}}'
 
     expect_identical(
@@ -11,12 +11,24 @@ test_that("filter works with one path", {
         list(list(age = 32L, gender = "male"))
       )
     )
-    
+
   }
 )
 
+test_that("works with quoted or unquoted", {
+
+  json <- '{"name": "bob", "attributes": {"age": 32, "gender": "male"}}'
+
+  expect_identical(
+    json %>% enter_object("attributes", "age"),
+    json %>% enter_object(attributes, age)
+  )
+
+}
+)
+
 test_that("filter works with multiple depth paths", {
-    
+
     json <- '{"name": "bob", "attributes": { "demographics": {"age": 32, "gender": "male"}}}'
 
     expect_identical(
@@ -26,67 +38,67 @@ test_that("filter works with multiple depth paths", {
         list(list(age = 32L, gender = "male"))
       )
     )
-    
+
   }
 )
 
 test_that("filter removes records with missing path", {
-    
+
     json <- c(
       '{"name": "bob", "attributes": {"age": 32, "gender": "male"}}',
       '{"name": "susan"}'
     )
-    
+
     expect_identical(
       json %>% spread_values(name = jstring("name")) %>%
         enter_object("attributes"),
       tbl_json(
         data.frame(
-          document.id = 1L, 
-          name = 'bob', 
+          document.id = 1L,
+          name = 'bob',
           stringsAsFactors = FALSE),
         list(list(age = 32L, gender = "male"))
       )
     )
-    
+
   }
 )
 
 test_that("works if no paths exist", {
-    
+
     json <- '{"name": "bob"}'
-    
+
     expect_identical(
       json %>% spread_values(name = jstring("name")) %>%
         enter_object("attributes"),
       tbl_json(
         data.frame(
-          document.id = integer(0), 
-          name = character(0), 
+          document.id = integer(0),
+          name = character(0),
           stringsAsFactors = FALSE),
         list()
       )
     )
-    
+
   }
 )
 
 test_that("correctly handles character(0), {}, []", {
-    
+
     empty <- tbl_json(
       data.frame(
-        document.id = integer(0), 
+        document.id = integer(0),
         stringsAsFactors = FALSE),
       list())
-    
+
     expect_identical(
       character(0) %>% enter_object("name"),
       empty)
-    
+
     expect_identical(
       '{}' %>% enter_object("name"),
       empty)
-    
+
     expect_identical(
       '[]' %>% enter_object("name"),
       empty)