Merge pull request #24 from sailthru/mutate

adds better support for dplyr::mutate + tests

NAMESPACE

@@ -5,6 +5,7 @@ S3method(arrange_,tbl_json)
 S3method(as.tbl_json,character)
 S3method(as.tbl_json,tbl_json)
 S3method(filter_,tbl_json)
+S3method(mutate_,tbl_json)
 export(append_values_logical)
 export(append_values_number)
 export(append_values_string)

R/data-companies.r

@@ -19,6 +19,9 @@
 #'   spread_values(
 #'     name = jstring("name")
 #'   ) %>% 
+#'   mutate(
+#'     company.sort_order = rank(name)
+#'   ) %>%
 #'   enter_object("relationships") %>%
 #'   gather_array("relationship.index") %>%
 #'   spread_values(
@@ -46,4 +49,4 @@
 #' ggplot(comp_type_counts, aes(key, n, fill = type)) + 
 #'   geom_bar(position = "stack", stat = "identity") +
 #'   coord_flip()
-NULL
+NULL

R/tbl_json.r

@@ -125,3 +125,6 @@ filter_.tbl_json <- wrap_dplyr_verb(dplyr::filter_)
 
 #' @export
 arrange_.tbl_json <- wrap_dplyr_verb(dplyr::arrange_)
+
+#' @export
+mutate_.tbl_json <- wrap_dplyr_verb(dplyr::mutate_)

man/companies.Rd

@@ -23,6 +23,9 @@ key_employees <- companies \%>\%
   spread_values(
     name = jstring("name")
   ) \%>\%
+  mutate(
+    company.sort_order = rank(name)
+  ) \%>\%
   enter_object("relationships") \%>\%
   gather_array("relationship.index") \%>\%
   spread_values(

tests/testthat/test-tbl_json.r

@@ -163,3 +163,44 @@ test_that("dplyr::arrange works with a simple example", {
 
   }
 )
+
+
+test_that("dplyr::mutate works with a simple example", {
+
+    x <- as.tbl_json(c('{"name": "bob"}', '{"name": "susan"}'))
+
+    expect_identical(
+      x %>%
+        spread_values(name = jstring("name")) %>%
+        mutate(fullname = paste(name, "green")),
+      tbl_json(
+        data_frame(
+          document.id = c(1L, 2L),
+          name = c("bob", "susan"),
+          fullname = c("bob green", "susan green")),
+        list(list(name = "bob"), list(name = "susan"))
+      )
+    )
+
+  }
+)
+
+
+test_that("dplyr::mutate works in a more complex pipeline", {
+
+    json <- c(
+      '{"name": "bob", "children": [{"name": "george"}]}',
+      '{"name": "susan", "children": [{"name": "sally"}, {"name": "bobby"}]}')
+
+    children <- json %>% as.tbl_json %>%
+      spread_values(name = jstring("name")) %>%
+      mutate(parent.rank = rank(name)) %>%
+      enter_object("children") %>%
+      gather_array %>%
+      spread_values(child = jstring("name"))
+
+    expect_identical(children$parent.rank, c(1, 2, 2))
+    expect_identical(children$child, c("george", "sally", "bobby"))
+
+  }
+)