Merge pull request #109 from colearendt/develop

More old changes

.Rbuildignore

@@ -1,6 +1,7 @@
 ^LICENSE\.md$
 ^\.travis\.yml$
 ^cran-comments\.md$
+^cran-output\.md$
 ^.*\.Rproj$
 ^\.Rproj\.user$
 ^codecov\.yml$

.gitignore

@@ -4,7 +4,6 @@
 *.swp
 inst/doc
 .Rproj.user
-*.Rproj
 .DS_Store
 packrat/lib*/
 packrat/src/

DESCRIPTION

@@ -1,20 +1,20 @@
 Package: tidyjson
 Title: Tidy Complex JSON
-Version: 0.2.1.9001
+Version: 0.2.3.9000
 Authors@R: c(
-    person("Jeremy", "Stanley", , "[email protected]", c("aut")),
-    person("Cole", "Arendt", , "cole@rstudio.com", c("aut", "cre"))
-  )
+	person("Jeremy","Stanley",,"[email protected]",c("aut","cre")),
+	person("Cole","Arendt",, "cole.arendt@outlook.com",c("aut"))
+	)
 Description: Turn complex JSON data into tidy data frames.
 Depends:
     R (>= 3.1.0)
 Imports:
     assertthat,
     jsonlite,
     purrr,
-    dplyr,
+    dplyr (>= 0.7.0),
     magrittr,
-    tidyr,
+    tidyr (>= 0.7.0),
     tibble
 License: MIT + file LICENSE
 LazyData: true

NAMESPACE

@@ -7,6 +7,7 @@ S3method(as.character,tbl_json)
 S3method(as.tbl_json,character)
 S3method(as.tbl_json,data.frame)
 S3method(as.tbl_json,tbl_json)
+S3method(as_data_frame,tbl_json)
 S3method(as_tibble,tbl_json)
 S3method(filter,tbl_json)
 S3method(filter_,tbl_json)
@@ -24,6 +25,7 @@ export(as_data_frame)
 export(as_tibble)
 export(bind_rows)
 export(enter_object)
+export(filter)
 export(gather_array)
 export(gather_keys)
 export(gather_object)
@@ -73,5 +75,6 @@ importFrom(purrr,map_if)
 importFrom(purrr,map_int)
 importFrom(purrr,map_lgl)
 importFrom(purrr,partial)
+importFrom(tibble,as_tibble)
 importFrom(tibble,trunc_mat)
 importFrom(utils,capture.output)

NEWS.md

@@ -1,4 +1,4 @@
-# tidyjson 0.2.1.9001
+# tidyjson dev
 
 ## New functions
 
@@ -43,7 +43,11 @@ the missing `document.id`.  (#86)
 
 * `gather_object()` replaces `gather_keys()`, with default `column.name` of `name` instead of `key` (#66). This more closely matches the [JSON standard](http://www.json.org/), which refers to objects as name-value pairs, and is now consistent with `gather_array()`.
 
-## Documentation changes
+## Documentation Changes
+
+* "Using Multiple APIs" vignette added to show support for using tidyjson with multiple APIs (#85)
+
+* Updated README.md to better explain `spread_all()` (#92)
 
 * "Visualizing JSON" vignette for visualizing the structure of complex JSON data, like the `companies` example (#4)
 

R/tbl_json.R

@@ -291,6 +291,8 @@ as_tibble.tbl_json <- function(x, ...) {
 }
 
 #' @rdname as_tibble.tbl_json
+#' 
+#' @export
 as_data_frame.tbl_json <- function(x, ...) {
   as_tibble.tbl_json(x,...)
 }

R/utils.R

@@ -1,5 +1,3 @@
-#' Pipe operator
-#'
 #' @name %>%
 #' @rdname pipe
 #' @keywords internal
@@ -8,9 +6,7 @@
 #' @export
 magrittr::`%>%`
 
-#' Convert object to tbl_df
-#' 
-#' Exported from dplyr package.  Converts an object
+#' @details Exported from dplyr package.  Converts an object
 #' to a pure tibble (revert to tbl_df class and drops
 #' tbl_json class/attributes).
 #' 
@@ -19,10 +15,18 @@ magrittr::`%>%`
 #' @aliases as_data_frame
 #' @aliases tbl_df
 #' @seealso as_tibble.tbl_json
+#' @importFrom tibble as_tibble
 #' @keywords internal
 #' @export
-#' @usage as_tibble(data)
-dplyr::as_tibble
+tibble::as_tibble
+
+#' @name filter
+#' @rdname filter
+#' @seealso http://r.789695.n4.nabble.com/R-CMD-check-warning-with-S3-method-td4692255.html
+#' @details This needs to be re-exported, since `dplyr` implements a generic that 
+#' is not a generic in the `stats` package, and `tidyjson` provides a method for that generic
+#' @export
+dplyr::filter
 
 #' @export
 #' @rdname as_tibble