Use parsing in HTTR instead of doing it ourself in jsonlite

ropensci · Mar 19, 2016 · 9a092dd · 9a092dd
1 parent 3bbde5c
commit 9a092dd
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 22 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -16,9 +16,8 @@ BugReports: https://github.com/ropensci/internetarchive/issues
 Depends:
     R (>= 3.1.0)
 Imports:
-    httr (>= 0.6.1),
-    jsonlite (>= 0.9.14),
-    dplyr (>= 0.4.1)
+    httr (>= 1.1.0),
+    dplyr (>= 0.4.3)
 Suggests:
     knitr,
     testthat,

diff --git a/NAMESPACE b/NAMESPACE
@@ -10,7 +10,6 @@ export(ia_list_fields)
 export(ia_metadata)
 export(ia_search)
 import(httr)
-import(jsonlite)
 importFrom(dplyr,"%>%")
 importFrom(dplyr,as_data_frame)
 importFrom(dplyr,data_frame)

diff --git a/R/ia_download.R b/R/ia_download.R
@@ -18,13 +18,11 @@
 #' @return A data frame including the file names of the downloaded files.
 #' @examples
 #' \dontrun{
-#' if(require(dplyr)) {
+#' if (require(dplyr)) {
 #'   dir <- tempdir()
 #'   ia_get_items("thedamnationofth00133gut") %>%
 #'     ia_files() %>%
 #'     filter(type == "txt") %>% # download only the files we want
-#'     group_by(id) %>%
-#'     slice(1) %>%
 #'     ia_download(dir = dir, extended_name = FALSE)
 #' }
 #' }
@@ -47,7 +45,7 @@ download_row <- function(row, dir, extended_name, overwrite, silence) {
   }
 
   if (overwrite | !file.exists(row$local_file)) {
-    if(!silence) message(paste("Downloading", row$local_file))
+    if (!silence) message(paste("Downloading", row$local_file))
     GET(row$url, write_disk(row$local_file, overwrite = overwrite))
     row$downloaded <- TRUE
   }

diff --git a/R/ia_get_item.R b/R/ia_get_item.R
@@ -20,8 +20,7 @@ ia_get_items <- function(item_id, silence = FALSE) {
   if (!silence) message(paste("Getting", item_id))
   req <- GET("https://archive.org/", path = path, query = list(output = "json"))
   warn_for_status(req)
-  result <- content(req, as = "text")
-  if (identical(result, "")) stop("")
-  fromJSON(result, simplifyVector = FALSE)
+  result <- content(req, as = "parsed", encoding = "UTF-8")
+  result
 }
 ia_get_items <- Vectorize(ia_get_items, SIMPLIFY = FALSE)
diff --git a/R/ia_keyword_search.R b/R/ia_keyword_search.R
@@ -20,9 +20,7 @@ ia_keyword_search <- function(keywords, num_results = 5, page = 1,
   url <-  modify_url(base, path = path, query = query)
   req <- GET(url)
   warn_for_status(req)
-  result <- content(req, as = "text")
-  if (identical(result, "")) stop("")
-  response <- fromJSON(result, simplifyVector = FALSE)
+  response <- content(req, as = "parsed", encoding = "UTF-8")
 
   if (print_total)
     message(paste(response$response$numFound, "total items found.",

diff --git a/R/ia_search.R b/R/ia_search.R
@@ -36,9 +36,7 @@ ia_search <- function(terms, num_results = 5, page = 1, print_url = FALSE,
   if (print_url) message(url)
   req <- GET(url)
   warn_for_status(req)
-  result <- content(req, as = "text")
-  if (identical(result, "")) stop("")
-  response <- fromJSON(result, simplifyVector = FALSE)
+  response <- content(req, as = "parsed", encoding = "UTF-8")
 
   if (print_total)
     message(paste(response$response$numFound, "total items found.",

diff --git a/R/internetarchive-package.R b/R/internetarchive-package.R
@@ -5,13 +5,12 @@
 #' files (\link{ia_files}) in a pipeable interface.
 #'
 #' @import httr
-#' @import jsonlite
 #' @importFrom dplyr rbind_all data_frame %>% mutate rowwise do as_data_frame
 #' @importFrom tools file_ext
 #' @name internetarchive
 NULL
 
 # Hide variables from R CMD check
-if(getRversion() >= "2.15.1") {
+if (getRversion() >= "2.15.1") {
   utils::globalVariables(c(".", "id"))
 }
diff --git a/man/ia_download.Rd b/man/ia_download.Rd