Lint pass

Author: dshemetov

R/check.R

@@ -11,7 +11,7 @@ check_string_param <- function(name, value, required = TRUE) {
 }
 
 check_int_param <- function(name, value, required = TRUE) {
-  # string or string[]
+  # numeric or numeric[]
   if ((required &&
     !(!is.null(value) &&
       is.numeric(value))) ||
@@ -23,24 +23,24 @@ check_int_param <- function(name, value, required = TRUE) {
 }
 
 is_epirange_like <- function(value) {
+  # character or numeric or EpiRange or list(from=..., to=...)
   is.character(value) ||
     is.numeric(value) ||
     inherits(value, "EpiRange") ||
     (is.list(value) &&
       "from" %in% names(value) && "to" %in% names(value))
 }
 
-check_single_epirange_param <-
-  function(name, value, required = TRUE) {
-    if ((required &&
-      !(!is.null(value) &&
-        is_epirange_like(value))) ||
-      (!required && !(is.null(value) || is_epirange_like(value)))) {
-      rlang::abort(paste0("argument ", name, " is not a epirange"),
-        name = name, value = value, class = "invalid_argument"
-      )
-    }
+check_single_epirange_param <- function(name, value, required = TRUE) {
+  if ((required &&
+    !(!is.null(value) &&
+      is_epirange_like(value))) ||
+    (!required && !(is.null(value) || is_epirange_like(value)))) {
+    rlang::abort(paste0("argument ", name, " is not a epirange"),
+      name = name, value = value, class = "invalid_argument"
+    )
   }
+}
 
 check_epirange_param <- function(name, value, required = TRUE) {
   if (is.null(value)) {

R/covidcast.R

@@ -100,9 +100,9 @@ covidcast_epidata <- function(base_url = global_base_url) {
   url <- join_url(base_url, "covidcast/meta")
   res <- do_request(url, list())
 
-  httr::stop_for_status(res)
-  r <- httr::content(res, "text", encoding = "UTF-8")
-  meta <- jsonlite::fromJSON(r, simplifyVector = FALSE)
+  stop_for_status(res)
+  r <- content(res, "text", encoding = "UTF-8")
+  meta <- fromJSON(r, simplifyVector = FALSE)
 
   sources <- do.call(c, lapply(meta, parse_source, base_url = base_url))
   class(sources) <- c("covidcast_data_source_list", class(sources))