Merge pull request #18 from transportfoundry/develop

Close develop

DESCRIPTION

@@ -1,13 +1,15 @@
 Package: censusr
 Type: Package
 Title: Collect Data from the Census API
-Version: 0.0.2
+Version: 0.0.2.9000
 Date: 2015-12-11
 Authors@R:  c(
     person("Greg", "Macfarlane", email = "[email protected]", role = c("cre", "aut")),
     person("Josie", "Kressner", email = "[email protected]", role = "aut"))
 Description: Use the US Census API to collect summary data tables
     for SF1 and ACS datasets at arbitrary geographies.
+URL: https://github.com/transportfoundry/censusr
+BugReports: https://github.com/transportfoundry/censusr/issues
 License: MIT + file LICENSE
 LazyData: TRUE
 Depends:

R/call_census_api.R

@@ -37,6 +37,13 @@ call_census_api <- function(variables_to_get,
                             year = 2013, period = 5,
                             api_key = NULL){
 
+  data_source <- match.arg(data_source)
+
+  if (stringr::str_sub(variables_to_get, -1, -1) %in% c("E", "M") &
+      data_source != "acs") {
+    stop('Your variables look like ACS variables. You have specified, or the call has defaulted to, the decennial census. Set `data_source = "acs"` in the function call.')
+  }
+
   if(Sys.getenv("CENSUS_TOKEN") == "" && is.null(api_key)){
     stop("censusr requires an API key. Request one at http://api.census.gov/data/key_signup.html")
   }
@@ -116,7 +123,9 @@ call_api_once <- function(variables_to_get, geoid, allgeos, data_source, year,
   url <- paste0(call_start, var_string, geo_string, api_string)
 
   # gives back a list of lists; convert to dataframe
-  response <- httr::content(httr::GET(url))
+  r <- httr::GET(url)
+  httr::stop_for_status(r)
+  response <- httr::content(r)
 
   df <- data.frame(t(sapply(response, c)), stringsAsFactors = F)[-1,]
   names(df) <- response[[1]]

vignettes/censusr.Rmd

@@ -4,7 +4,7 @@ author: ""
 date: "`r Sys.Date()`"
 output: rmarkdown::html_vignette
 vignette: >
-  %\VignetteIndexEntry{Vignette Title}
+  %\VignetteIndexEntry{censusr}
   %\VignetteEngine{knitr::rmarkdown}
   %\VignetteEncoding{UTF-8}
 ---