Let's make this 0.15.0

Author: jemus42

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: tRakt
 Title: Get Data from 'trakt.tv'
-Version: 0.14.0.9000
+Version: 0.15.0
 Authors@R: 
     person(given = "Lukas",
            family = "Burk",

NEWS.md

@@ -1,6 +1,7 @@
-# tRakt 0.14.0.90000
+# tRakt 0.15.0
 
-This is a big one, like v1.0.0 big one.
+This is a big one, but not 1.0.0 big one I guess.  
+This is a consolidation release with lots of internal improvements, but for the 1.0.0 I decided to overhaul the structure of the package *again*, so before I completely break any kind of backwards compatiblity, I thought I'd get this one out.
 
 ## Consolidation for the people
 

R/api.R

@@ -43,9 +43,11 @@
 #' }
 trakt_credentials <- function(username, client_id, silent = TRUE) {
   username <- ifelse(missing(username),
-                     Sys.getenv("trakt_username"), username)
+    Sys.getenv("trakt_username"), username
+  )
   client_id <- ifelse(missing(client_id),
-                      Sys.getenv("trakt_client_id"), client_id)
+    Sys.getenv("trakt_client_id"), client_id
+  )
 
   if (username != "") {
     options(trakt_username = username)
@@ -58,8 +60,10 @@ trakt_credentials <- function(username, client_id, silent = TRUE) {
   } else {
     options(trakt_client_id = tRakt_client_id)
     if (!silent) {
-      message("I provided my client_id as a fallback for you. ",
-              "Please use it responsibly.")
+      message(
+        "I provided my client_id as a fallback for you. ",
+        "Please use it responsibly."
+      )
     }
   }
 
@@ -195,7 +199,8 @@ trakt_get_token <- function() {
 
   # 3. Get OAuth credentials
   oauth2.0_token(
-    trakt_endpoint, app, use_oob = TRUE,
+    trakt_endpoint, app,
+    use_oob = TRUE,
     config_init = user_agent("https://github.com/jemus42/tRakt")
   )
 }

R/fanarttv.R

@@ -34,7 +34,7 @@ fanarttv_get <- function(tvdb) {
   )
 
   res_y <- res[!(names(res) %in% c("name", "thetvdb_id"))] %>%
-    map(~list(.x)) %>%
+    map(~ list(.x)) %>%
     as_tibble()
 
   bind_cols(res_x, res_y)

R/omdb_get.R

@@ -21,7 +21,8 @@
 #' }
 omdb_get <- function(imdb) {
   base_url <- modify_url("https://www.omdbapi.com/",
-                         query = list(apikey = Sys.getenv("OMDB_API_KEY")))
+    query = list(apikey = Sys.getenv("OMDB_API_KEY"))
+  )
 
   url <- modify_url(base_url, query = list(i = imdb))
 

R/trakt-people.R

@@ -174,7 +174,9 @@ trakt.media.people <- function(type = c("shows", "movies"), target,
   url <- build_trakt_url(type, target, "people", extended = extended)
   response <- trakt_get(url = url)
 
-  if (is_empty(response)) return(tibble())
+  if (is_empty(response)) {
+    return(tibble())
+  }
 
   # Flatten the data.frame
   if (has_name(response, "cast") & !is_empty(response$cast)) {

R/trakt-search.R

@@ -48,20 +48,23 @@
 trakt.search <- function(query, type = "show",
                          years = NULL, n_results = 1L,
                          extended = c("min", "full")) {
-
   ok_types <- c("movie", "show", "episode", "person", "list")
   type <- match.arg(type, choices = ok_types, several.ok = TRUE)
   extended <- match.arg(extended)
   years <- check_filter_arg(years, "years")
 
   if (length(type) > 1) {
-    return(map_df(type, ~ trakt.search(query, type = .x, years,
-                                       n_results, extended)))
+    return(map_df(type, ~ trakt.search(query,
+      type = .x, years,
+      n_results, extended
+    )))
   }
 
   # Construct URL, make API call
-  url <- build_trakt_url("search", type, query = query, years = years,
-                         extended = extended)
+  url <- build_trakt_url("search", type,
+    query = query, years = years,
+    extended = extended
+  )
   response <- trakt_get(url = url)
 
   if (identical(response, tibble())) {

R/trakt-seasons.R

@@ -79,7 +79,6 @@ trakt.seasons.season <- function(target, seasons = 1L, extended = c("min", "full
 #' @examples
 #' # Get just the season numbers and their IDs
 #' trakt.seasons.summary("breaking-bad", extended = "min")
-#'
 #' \dontrun{
 #' # Get season numbers, ratings, votes, titles and other metadata as well as
 #' # a list-column containing all episode data

R/trakt-user-collection.R

@@ -42,14 +42,17 @@ trakt.user.collection <- function(user = getOption("trakt_username"),
   if (length(user) > 1) {
     names(user) <- user
     return(map_df(user, ~ trakt.user.collection(user = .x, type, unnest_episodes),
-                  .id = "user"))
+      .id = "user"
+    ))
   }
 
   # Construct URL, make API call
   url <- build_trakt_url("users", user, "collection", type)
   response <- trakt_get(url = url)
 
-  if (is_empty(response)) return(tibble())
+  if (is_empty(response)) {
+    return(tibble())
+  }
 
   if (type == "shows") {
     response <- response %>%

R/trakt-user-history.R

@@ -30,7 +30,7 @@
 #' trakt.user.history(
 #'   user = "jemus42", type = "shows", limit = 5,
 #'   start_at = "2015-12-24", end_at = "2015-12-28"
-#'   )
+#' )
 #' }
 trakt.user.history <- function(user = getOption("trakt_username"),
                                type = c("shows", "movies"),
@@ -41,12 +41,13 @@ trakt.user.history <- function(user = getOption("trakt_username"),
   extended <- match.arg(extended)
 
   start_at <- if (!is.null(start_at)) format(as.POSIXct(start_at), "%FT%T.000Z", tz = "UTC")
-  end_at   <- if (!is.null(end_at))   format(as.POSIXct(end_at),   "%FT%T.000Z", tz = "UTC")
+  end_at <- if (!is.null(end_at)) format(as.POSIXct(end_at), "%FT%T.000Z", tz = "UTC")
 
   if (length(user) > 1) {
     names(user) <- user
     return(map_df(user, ~ trakt.user.history(user = .x, type, limit, start_at, end_at, extended),
-                  .id = "user"))
+      .id = "user"
+    ))
   }
 
   # Construct URL, make API call
@@ -56,7 +57,9 @@ trakt.user.history <- function(user = getOption("trakt_username"),
   response <- trakt_get(url = url)
   response <- as_tibble(response)
 
-  if (identical(response, tibble())) return(response)
+  if (identical(response, tibble())) {
+    return(response)
+  }
 
   if (type == "shows") {
     response <- bind_cols(
@@ -71,7 +74,7 @@ trakt.user.history <- function(user = getOption("trakt_username"),
         bind_cols(fix_ids(response$episode$ids)) %>%
         rename(episode = number) %>%
         fix_tibble_response() %>%
-        rename_all(~paste0("episode_", .x))
+        rename_all(~ paste0("episode_", .x))
     )
   }
   if (type == "movies") {

R/trakt-user-watched.R

@@ -41,7 +41,9 @@ trakt.user.watched <- function(user = getOption("trakt_username"),
   url <- build_trakt_url("users", user, "watched", type, extended = extended)
   response <- trakt_get(url = url)
 
-  if (identical(response, tibble())) return(response)
+  if (identical(response, tibble())) {
+    return(response)
+  }
 
   if (type == "shows") {
     # Unpack the show media object and bind it to the base tbl

R/utils-extract-fix.R

@@ -175,7 +175,7 @@ fix_datetime <- function(response) {
 
   if (inherits(response, "data.frame")) {
     response %>%
-      mutate_at(.vars = vars(datevars), ~{
+      mutate_at(.vars = vars(datevars), ~ {
         # Don't convert already POSIXct vars
         if (!(inherits(.x, "POSIXct"))) {
           ymd_hms(.x)
@@ -242,7 +242,6 @@ fix_missing <- function(x) {
 #' @keywords internal
 #' @importFrom httr stop_for_status
 check_username <- function(user, validate = FALSE) {
-
   fail_empty_chr <- identical(user, "")
   fail_null <- is.null(user)
   fail_chr <- !is.character(user)
@@ -284,7 +283,9 @@ check_filter_arg <- function(filter,
   filter_type <- match.arg(filter_type)
 
   # Empty in, empty out. Can't explain that.
-  if (is_empty(filter) | identical(filter, "")) return(NULL)
+  if (is_empty(filter) | identical(filter, "")) {
+    return(NULL)
+  }
 
   if (filter_type == "query") {
     filter <- as.character(filter)
@@ -303,7 +304,7 @@ check_filter_arg <- function(filter,
     if (grepl(x = filter, pattern = "(^\\d{4}-\\d{4}$)|(^\\d{4}$)")) {
       filter
     } else {
-     warning("'years' must be interpretable as 4 digit year or range of 4-digit years")
+      warning("'years' must be interpretable as 4 digit year or range of 4-digit years")
     }
   }
   if (filter_type == "runtimes") {
@@ -344,19 +345,15 @@ check_filter_arg <- function(filter,
   }
   if (filter_type == "genres") {
     filter <- check_filter_arg_fixed(filter, filter_type, genres$slug)
-
   }
   if (filter_type == "languages") {
     filter <- check_filter_arg_fixed(filter, filter_type, languages$code)
-
   }
   if (filter_type == "countries") {
     filter <- check_filter_arg_fixed(filter, filter_type, countries$code)
-
   }
   if (filter_type == "certifications") {
     filter <- check_filter_arg_fixed(filter, filter_type, certifications$slug)
-
   }
   if (filter_type == "networks") {
     filter <- check_filter_arg_fixed(filter, filter_type, networks)

data-raw/episodes.R

@@ -6,7 +6,7 @@ library(stringr)
 library(tidyr)
 
 # Futurama ----
-futurama <- trakt.seasons.season("futurama",  seasons = 1:7, extended = "full")
+futurama <- trakt.seasons.season("futurama", seasons = 1:7, extended = "full")
 usethis::use_data(futurama, overwrite = TRUE)
 
 

data-raw/static_data.R

@@ -14,7 +14,7 @@ languages <- full_join(
   trakt_get("languages/movies"),
   trakt_get("languages/shows"),
   by = c("name", "code")
-  ) %>%
+) %>%
   as_tibble()
 
 use_data(languages, overwrite = TRUE)
@@ -24,7 +24,7 @@ genres <- full_join(
   trakt_get("genres/movies"),
   trakt_get("genres/shows"),
   by = c("name", "slug")
-  ) %>%
+) %>%
   as_tibble()
 
 use_data(genres, overwrite = TRUE)
@@ -34,13 +34,13 @@ countries <- full_join(
   trakt_get("countries/movies"),
   trakt_get("countries/shows"),
   by = c("name", "code")
-  ) %>%
+) %>%
   as_tibble()
 
 use_data(countries, overwrite = TRUE)
 
 # Certifications ----
-certifications <- map_df(c("movies", "shows"), ~{
+certifications <- map_df(c("movies", "shows"), ~ {
   trakt_get(build_trakt_url("certifications", .x)) %>%
     map_df(as_tibble, .id = "country") %>%
     mutate(type = .x)

tests/testthat/test-misc.R

@@ -48,7 +48,6 @@ test_that("check_user throws errors when it should", {
 })
 
 test_that("check_filter_arg fails how it should", {
-
   expect_null(check_filter_arg(NULL))
 
   expect_warning(check_filter_arg(10239, "years"))

tests/testthat/test-stats.R

@@ -20,7 +20,6 @@ test_that("trakt.user.stats works", {
     "movies", "shows", "seasons", "episodes",
     "network", "ratings"
   ))
-
 })
 
 test_that("trakt.media.stats does things", {

tests/testthat/test-user-friendfollow.R

@@ -27,7 +27,6 @@ test_that("trakt.user.network works", {
 })
 
 test_that("No NULLs or \"\" in trakt.user.network", {
-
   friends <- trakt.user.network("followers", "jemus42", "full")
   expect_true(!any(map_lgl(friends, function(col) any(is.null(col)))))
   expect_true(!any(map_lgl(friends, function(col) any(identical(col, "")))))