Merge pull request #70 from getwilds/test

Test
getwilds · Mar 11, 2024 · c3ff69e · c3ff69e
2 parents d9bf492 + 70266f6
commit c3ff69e
Show file tree

Hide file tree

Showing 27 changed files with 89 additions and 262 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -27,17 +27,14 @@ importFrom(dplyr,filter)
 importFrom(dplyr,mutate)
 importFrom(dplyr,mutate_all)
 importFrom(dplyr,na_if)
-importFrom(dplyr,rename)
 importFrom(httr2,req_perform)
 importFrom(httr2,req_url_query)
 importFrom(httr2,request)
 importFrom(httr2,resp_body_string)
 importFrom(magrittr,"%>%")
-importFrom(rlang,":=")
 importFrom(rlang,is_na)
 importFrom(rlang,sym)
 importFrom(stats,setNames)
 importFrom(stringr,str_pad)
-importFrom(stringr,str_replace_all)
 importFrom(utils,data)
 importFrom(utils,read.csv)
diff --git a/R/cancerprof-package.R b/R/cancerprof-package.R
@@ -0,0 +1,6 @@
+#' @keywords internal
+"_PACKAGE"
+
+## usethis namespace: start
+## usethis namespace: end
+NULL
diff --git a/R/demo-crowding.R b/R/demo-crowding.R
@@ -52,17 +52,14 @@
 #'   race = "black"
 #' )
 #' }
-#'
-demo_crowding <- function(area, areatype,
-                          crowding = "household with >1 person per room",
-                          race) {
-  areatype <- tolower(areatype)
+demo_crowding <- function(area, areatype, crowding, race) {
+
   req <- create_request("demographics")
 
   resp <- req %>%
     req_url_query(
       stateFIPS = fips_scp(area),
-      areatype = areatype,
+      areatype = tolower(areatype),
       topic = "crowd",
       demo = handle_crowding(crowding),
       race = handle_race(race),
@@ -73,7 +70,7 @@ demo_crowding <- function(area, areatype,
     ) %>%
     req_perform()
 
-  resp <- process_response(resp)
+  resp <- process_resp(resp, "demographics")
 
   areatype_map <- c(
     "county" = "County", "hsa" = "Health_Service_Area",
@@ -86,8 +83,11 @@ demo_crowding <- function(area, areatype,
 
   resp %>%
     setNames(c(
-      areatype_title, areacode_title, "Percent",
-      "Households", "Rank"
+      areatype_title,
+      areacode_title,
+      "Percent",
+      "Households",
+      "Rank"
     )) %>%
     mutate(across(c("Percent", "Households"), \(x) as.numeric(x)))
 }
diff --git a/R/demo-education.R b/R/demo-education.R
@@ -93,7 +93,7 @@ demo_education <- function(area, areatype, education, sex = NULL, race = NULL) {
   resp <- resp %>%
     req_perform()
 
-  resp <- process_response(resp)
+  resp <- process_resp(resp, "demographics")
 
   areatype_map <- c(
     "county" = "County",

diff --git a/R/demo-food-access.R b/R/demo-food-access.R
@@ -75,7 +75,7 @@ demo_food <- function(area, areatype, food, race = NULL) {
   resp <- req_draft %>%
     req_perform()
 
-  resp <- process_response(resp) %>%
+  resp <- process_resp(resp, "demographics") %>%
     mutate(Value..Percent. = as.integer(Value..Percent.))
 
   areatype_map <- c("county" = "County", "state" = "State")

diff --git a/R/demo-income.R b/R/demo-income.R
@@ -65,7 +65,7 @@ demo_income <- function(area, areatype, income, race) {
     ) %>%
     req_perform()
 
-  resp <- process_response(resp) %>%
+  resp <- process_resp(resp, "demographics") %>%
     mutate(Value..Dollars. = as.integer(Value..Dollars.))
 
   areatype_map <- c("county" = "County", "state" = "State")

diff --git a/R/demo-insurance.R b/R/demo-insurance.R
@@ -89,10 +89,9 @@ demo_insurance <- function(area, areatype, insurance, sex, age, race = NULL) {
     "asian non-hispanic", "hispanic (any race)"
   )
 
-
   req <- create_request("demographics")
 
-  if ((sex == "males" || sex == "females") & (age == "under 19 years" || age == "21 to 64 years")) {
+  if ((sex == "males" || sex == "females") && (age == "under 19 years" || age == "21 to 64 years")) {
     cli_abort("For males and females, age CANNOT be under 19 years OR 21 to 64 years")
   } else if (areatype == "state" && is.null(race)) {
     cli_abort("For areatype State, Race must not be null")
@@ -127,7 +126,7 @@ demo_insurance <- function(area, areatype, insurance, sex, age, race = NULL) {
   resp <- resp %>%
     req_perform()
 
-  resp <- process_response(resp)
+  resp <- process_resp(resp, "demographics")
 
   areatype_map <- c(
     "county" = "County",

diff --git a/R/demo-mobility.R b/R/demo-mobility.R
@@ -60,7 +60,7 @@ demo_mobility <- function(area, areatype, mobility) {
     ) %>%
     req_perform()
 
-  resp <- process_response(resp)
+  resp <- process_resp(resp, "demographics")
 
   areatype_map <- c(
     "county" = "County",

diff --git a/R/demo-non-english-language.R b/R/demo-non-english-language.R
@@ -54,7 +54,7 @@ demo_language <- function(area, areatype, language) {
     req_perform()
 
 
-  resp <- process_response(resp)
+  resp <- process_resp(resp, "demographics")
 
   areatype_map <- c(
     "county" = "County",

diff --git a/R/demo-population.R b/R/demo-population.R
@@ -115,7 +115,7 @@ demo_population <- function(area, areatype, population, race = NULL, sex = NULL)
   resp <- resp %>%
     req_perform()
 
-  resp <- process_response(resp)
+  resp <- process_resp(resp, "demographics")
 
   areatype_map <- c(
     "county" = "County",

diff --git a/R/demo-poverty.R b/R/demo-poverty.R
@@ -95,7 +95,7 @@ demo_poverty <- function(area, areatype, poverty, race = NULL, sex = NULL) {
   resp <- resp %>%
     req_perform()
 
-  resp <- process_response(resp)
+  resp <- process_resp(resp, "demographics")
 
   areatype_map <- c(
     "county" = "County",

diff --git a/R/demo-svi.R b/R/demo-svi.R
@@ -52,7 +52,7 @@ demo_svi <- function(area, svi) {
     req_perform()
 
 
-  resp <- process_response(resp)
+  resp <- process_resp(resp, "demographics")
 
   resp %>%
     setNames(c("County", "FIPS", "Score"))

diff --git a/R/demo-workforce.R b/R/demo-workforce.R
@@ -63,7 +63,7 @@ demo_workforce <- function(area, areatype, workforce, race, sex) {
     req_url_query(
       stateFIPS = fips_scp(area),
       areatype = tolower(areatype),
-      topic = "crowd",
+      topic = "work",
       demo = handle_workforce(workforce),
       race = handle_race(race),
       sex = handle_sex(sex),
@@ -74,7 +74,7 @@ demo_workforce <- function(area, areatype, workforce, race, sex) {
     ) %>%
     req_perform()
 
-  resp <- process_response(resp)
+  resp <- process_resp(resp, "demographics")
 
   areatype_map <- c(
     "county" = "County",

diff --git a/R/incidence-cancer.R b/R/incidence-cancer.R
@@ -168,7 +168,7 @@ incidence_cancer <- function(area, areatype, cancer, race, sex, age, stage, year
   resp <- resp %>%
     req_perform()
 
-  resp <- process_incidence(resp)
+  resp <- process_resp(resp, "incidence")
 
 
   areatype_map <- c(

diff --git a/R/mortality-cancer.R b/R/mortality-cancer.R
@@ -147,7 +147,7 @@ mortality_cancer <- function(area, areatype, cancer, race, sex, age, year) {
   resp <- resp %>%
     req_perform()
 
-  resp <- process_mortality(resp)
+  resp <- process_resp(resp, "mortality")
 
   areatype_map <- c(
     "county" = "County",

diff --git a/R/process-incidence.R b/R/process-incidence.R
diff --git a/R/process-mortality.R b/R/process-mortality.R
diff --git a/R/process-screening.R b/R/process-screening.R