Old pr

.Rbuildignore

@@ -1,7 +1,13 @@
+^LICENSE\.md$
 ^\.travis\.yml$
 ^cran-comments\.md$
 ^.*\.Rproj$
 ^\.Rproj\.user$
 ^codecov\.yml$
 ^README\.Rmd$
 ^README-.*\.png$
+^packrat/
+^\.Rprofile$
+^working/
+^appveyor\.yml$
+^revdep/

.gitattributes

@@ -0,0 +1,4 @@
+* text=auto
+data/* binary
+src/* text=lf
+R/* text=lf

.gitignore

@@ -6,3 +6,7 @@ inst/doc
 .Rproj.user
 *.Rproj
 .DS_Store
+packrat/lib*/
+packrat/src/
+working/
+.Rprofile

.travis.yml

@@ -4,8 +4,29 @@ language: R
 sudo: false
 cache: packages
 
+os:
+  - linux
+  - osx
+
+r:
+- oldrel
+- release
+- devel
+
+matrix:
+  allow_failures:
+  - r: devel
+
 r_packages:
   - covr
+
+script: 
+  - |
+    travis_wait 60 R CMD build --no-build-vignettes --no-manual --no-resave-data . 
+    travis_wait 60 R CMD check --no-build-vignettes --no-manual tidyjson*tar.gz
 
 after_success:
   - Rscript -e 'library(covr); codecov()'
+
+after_script:
+ - ./travis-tool.sh dump_logs

DESCRIPTION

@@ -1,8 +1,10 @@
 Package: tidyjson
 Title: Tidy Complex JSON
-Version: 0.2.1.9000
-Author: Jeremy Stanley <[email protected]>
-Maintainer: Jeremy Stanley <[email protected]>
+Version: 0.2.1.9001
+Authors@R: c(
+    person("Jeremy", "Stanley", , "[email protected]", c("aut")),
+    person("Cole", "Arendt", , "[email protected]", c("aut", "cre"))
+  )
 Description: Turn complex JSON data into tidy data frames.
 Depends:
     R (>= 3.1.0)
@@ -21,15 +23,15 @@ Suggests:
     testthat,
     ggplot2,
     rmarkdown,
-    needs,
     forcats,
     wordcloud,
     viridis,
     listviewer,
     igraph,
     RColorBrewer,
-    covr
+    covr,
+    lubridate
 VignetteBuilder: knitr
-URL: https://github.com/jeremystan/tidyjson
-BugReports: https://github.com/jeremystan/tidyjson/issues
-RoxygenNote: 5.0.1
+URL: https://github.com/colearendt/tidyjson
+BugReports: https://github.com/colearendt/tidyjson/issues
+RoxygenNote: 6.1.1

LICENSE

@@ -1,2 +1,2 @@
-YEAR: 2016
-COPYRIGHT HOLDER: Jeremy Stanley
+YEAR: 2019
+COPYRIGHT HOLDER: Jeremy Stanley, Cole Arendt

LICENSE.md

@@ -0,0 +1,21 @@
+# MIT License
+
+Copyright (c) 2019 Jeremy Stanley, Cole Arendt
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

NAMESPACE

@@ -1,20 +1,28 @@
 # Generated by roxygen2: do not edit by hand
 
 S3method("[",tbl_json)
+S3method(arrange,tbl_json)
 S3method(arrange_,tbl_json)
 S3method(as.character,tbl_json)
 S3method(as.tbl_json,character)
 S3method(as.tbl_json,data.frame)
 S3method(as.tbl_json,tbl_json)
+S3method(as_tibble,tbl_json)
+S3method(filter,tbl_json)
 S3method(filter_,tbl_json)
+S3method(mutate,tbl_json)
 S3method(mutate_,tbl_json)
 S3method(print,tbl_json)
+S3method(slice,tbl_json)
 S3method(slice_,tbl_json)
 export("%>%")
 export(append_values_logical)
 export(append_values_number)
 export(append_values_string)
 export(as.tbl_json)
+export(as_data_frame)
+export(as_tibble)
+export(bind_rows)
 export(enter_object)
 export(gather_array)
 export(gather_keys)

NEWS.md

@@ -1,4 +1,31 @@
-# purrr 0.2.1.9000
+# tidyjson 0.2.1.9001
+
+## New functions
+
+* Add `bind_rows()` support.  Though currently not an S3 implementation, it behaves as much like the `dplyr` variant as possible, preserving the `attr(.,'JSON')` components if all components are `tbl_json` objects. (#58)
+
+## 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)
+
+## Bug fixes and minor changes
+
+* `DROP=TRUE` caused an error.  Altered behavior to be consistent with `tbl_df`
+
+* Fix `spread_all(recursive=FALSE)` bug that caused an error (#65)
+
+* Alter `spread_all()` behavior to recursively check for deduplication of names (and thus avoid an error) (#76)
+
+* Add named support for the `NSE` versions of dplyr functions (`filter()`,`mutate()`,`slice()`, etc.) since the `SE` variants are no longer called behind-the-scenes since `dplyr 0.6.0`.  (#97)
+
+* Fix errors with `print.tbl_json()` when the JSON attribute is missing
+
+* Fix json_structure() failure if `document.id` missing by imputing 
+the missing `document.id`.  (#86)
+
+# tidyjson 0.2.1.9000
 
 ## New functions
 
@@ -30,9 +57,9 @@
 
 * `tbl_json` objects now print with a tidy character representation of the JSON attribute (#61)
 
-* Use [purrr](https://github.com/jeremystan/purrr) for most list based internal operations (#1)
+* Use [purrr](https://github.com/tidyverse/purrr) for most list based internal operations (#1)
 
-* Use [tidyr](https://github.com/hadley/tidyr) for `gather_array` and `gather_object` functions (#28)
+* Use [tidyr](https://github.com/tidyverse/tidyr) for `gather_array` and `gather_object` functions (#28)
 
 * Imported the magrittr `%>%` operator (#17)
 
@@ -46,7 +73,7 @@
 
 ## Other changes
 
-* Migrated development to [jeremystan](https://github.com/jeremystan/tidyjson) from [sailthru](https://github.com/sailthru/tidyjson)
+* Migrated development to [colearendt](https://github.com/colearendt/tidyjson) from [jeremystan](https://github.com/jeremystan/tidyjson) and [sailthru](https://github.com/sailthru/tidyjson)
 
 ## Deprecated functions
 

R/append_values.R

@@ -52,12 +52,12 @@ append_values_factory <- function(type, as.value) {
 
     if (!is.tbl_json(.x)) .x <- as.tbl_json(.x)
 
-    if (force == FALSE) assert_that(recursive == FALSE)
+    if (force == FALSE) assertthat::assert_that(recursive == FALSE)
 
     # Extract json
     json <- attr(.x, "JSON")
 
-    assert_that(length(json) == nrow(.x))
+    assertthat::assert_that(length(json) == nrow(.x))
 
     # if json is empty, return empty
     if (length(json) == 0) {
@@ -78,7 +78,7 @@ append_values_factory <- function(type, as.value) {
           new_val[loc] <- NA
        }
        new_val <- new_val %>% as.value
-       assert_that(length(new_val) == nrow(.x))
+       assertthat::assert_that(length(new_val) == nrow(.x))
        .x[column.name] <- new_val
     }
 
@@ -92,7 +92,7 @@ append_values_factory <- function(type, as.value) {
 #' @param l a list that we want to unlist
 #' @param recursive logical indicating whether to unlist nested lists
 my_unlist <- function(l, recursive = FALSE) {
-  nulls <- map_int(l, length) != 1
+  nulls <- purrr::map_int(l, length) != 1
   l[nulls] <- NA
   unlist(l, recursive = recursive)
 }

R/enter_object.R

@@ -16,7 +16,7 @@
 #'
 #' @seealso \code{\link{gather_object}} to find sub-objects that could be
 #'    entered into, \code{\link{gather_array}} to gather an array in an object
-#'    and \code{\link{spread_all}} to spread values in an object.
+#'    and \code{\link{spread_all}} or \code{\link{spread_values}} to spread values in an object.
 #' @param .x a json string or tbl_json object
 #' @param ... a quoted or unquoted sequence of strings designating the object
 #'            name or sequences of names you wish to enter
@@ -71,7 +71,7 @@ enter_object <- function(.x, ...) {
   json <- attr(.x, "JSON")
 
   # Access path
-  json <- map(json, path %>% as.list)
+  json <- purrr::map(json, path %>% as.list)
 
   tbl_json(.x, json, drop.null.json = TRUE)
 

R/gather.R

@@ -12,8 +12,8 @@ gather_factory <- function(default.column.name, default.column.empty,
 
   function(.x, column.name = default.column.name) {
 
-    assert_that(!("..name" %in% names(.x)))
-    assert_that(!("..json" %in% names(.x)))
+    assertthat::assert_that(!("..name" %in% names(.x)))
+    assertthat::assert_that(!("..json" %in% names(.x)))
 
     if (!is.tbl_json(.x)) .x <- as.tbl_json(.x)
 
@@ -36,13 +36,13 @@ gather_factory <- function(default.column.name, default.column.empty,
       stop(sprintf("%s records are not %ss", sum(bad_type), required.type))
 
     y <- .x %>%
-      tbl_df %>%
-      mutate(
-        ..name = json %>% map(expand.fun),
+      dplyr::as_tibble() %>%
+      dplyr::mutate(
+        ..name = json %>% purrr::map(expand.fun),
         ..json = json %>%
-          map(~data_frame(..json = as.list(.)))
+          purrr::map(~dplyr::data_frame(..json = as.list(.)))
       ) %>%
-      unnest(..name, ..json, .drop = FALSE)
+      tidyr::unnest(..name, ..json, .drop = FALSE)
 
     # Check to see if column.name exists, otherwise, increment until not
     if (column.name %in% names(y)) {
@@ -58,10 +58,10 @@ gather_factory <- function(default.column.name, default.column.empty,
     }
 
     # Rename
-    y <- y %>% rename_(.dots = setNames("..name", column.name))
+    y <- y %>% dplyr::rename_(.dots = setNames("..name", column.name))
 
     # Construct tbl_json
-    tbl_json(y %>% select(-..json), y$..json)
+    tbl_json(y %>% dplyr::select(-..json), y$..json)
 
   }
 

R/is_json.R

@@ -46,15 +46,15 @@ NULL
 
 #' @rdname is_json
 #' @export
-is_json_string  <- is_json_factory("string")
+is_json_string <- is_json_factory('string')
 
 #' @rdname is_json
 #' @export
-is_json_number  <- is_json_factory("number")
+is_json_number <- is_json_factory('number')
 
 #' @rdname is_json
 #' @export
-is_json_logical <- is_json_factory("logical")
+is_json_logical <- is_json_factory('logical')
 
 #' @rdname is_json
 #' @export

R/json_complexity.R

@@ -35,7 +35,7 @@ json_complexity <- function(.x, column.name = "complexity") {
   json <- attr(.x, "JSON")
 
   # Determine lengths
-  lengths <- json %>% map(unlist, recursive = TRUE) %>% map_int(length)
+  lengths <- json %>% purrr::map(unlist, recursive = TRUE) %>% purrr::map_int(length)
 
   # Add as a column to x
   .x[column.name] <- lengths

R/json_lengths.R

@@ -36,7 +36,7 @@ json_lengths <- function(.x, column.name = "length") {
   json <- attr(.x, "JSON")
 
   # Determine lengths
-  lengths <- map_int(json, length)
+  lengths <- purrr::map_int(json, length)
 
   # Add as a column to x
   .x[column.name] <- lengths