Skip to content

Commit ad6fe9c

Browse files
mps9506mps9506
authored
Merge pull request #12 from mps9506/0.1.1
0.1.1
2 parents 8d2a3cb + 119895b commit ad6fe9c

47 files changed

Lines changed: 986 additions & 166 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎DESCRIPTION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: rATTAINS
22
Title: Access EPA 'ATTAINS' Data
3-
Version: 0.1.0
3+
Version: 0.1.1
44
Authors@R:
55
person(given = "Michael",
66
family = "Schramm",

‎NAMESPACE‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ export(huc12_cache)
1313
export(huc12_summary)
1414
export(plans)
1515
export(plans_cache)
16+
export(rATTAINS_options)
1617
export(state_cache)
1718
export(state_summary)
1819
export(surveys)

‎NEWS.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
1+
# rATTAINS 0.1.1
2+
3+
* add package option to cache files, defaults to `FALSE`.
4+
* minor fixes to address CRAN checks on various platforms.
5+
16
# rATTAINS 0.1.0
27

8+
* Released to CRAN
9+
310
# rATTAINS 0.0.0.9000
411

512
* Added primary functions to access webservice.

‎R/actions.R‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -175,26 +175,31 @@ actions <- function(action_id = NULL,
175175

176176
## setup file cache
177177
path <- "attains-public/api/actions"
178-
actions_cache$mkdir()
178+
if(isTRUE(rATTAINSenv$cache_downloads)) {
179+
actions_cache$mkdir()
179180

180-
## check if current results have been cached
181-
file_cache_name <- file_key(arg_list = args,
182-
name = "actions.json")
183-
file_path_name <- fs::path(actions_cache$cache_path_get(),
184-
file_cache_name)
185-
186-
if(file.exists(file_path_name)) {
187-
message(paste0("reading cached file from: ", file_path_name))
188-
content <- readLines(file_path_name, warn = FALSE)
189-
}
190-
191-
## download data
192-
else {
181+
## check if current results have been cached
182+
file_cache_name <- file_key(arg_list = args,
183+
name = "actions.json")
184+
file_path_name <- fs::path(actions_cache$cache_path_get(),
185+
file_cache_name)
186+
if(file.exists(file_path_name)) {
187+
message(paste0("reading cached file from: ", file_path_name))
188+
content <- readLines(file_path_name, warn = FALSE)
189+
} else {
190+
## download data
191+
content <- xGET(path,
192+
args,
193+
file = file_path_name,
194+
...)
195+
}
196+
} else {
197+
## download data without caching
193198
content <- xGET(path,
194199
args,
195-
file = file_path_name,
200+
file = NULL,
196201
...)
197-
}
202+
}
198203

199204
## return raw JSON
200205
if(!isTRUE(tidy)) return(content)

‎R/assessment_units.R‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -124,21 +124,30 @@ assessment_units <- function(assessment_unit_identifer = NULL,
124124

125125
## setup file cache
126126
path <- "attains-public/api/assessmentUnits"
127-
au_cache$mkdir()
127+
if(isTRUE(rATTAINSenv$cache_downloads)) {
128+
au_cache$mkdir()
128129

129-
## check if current results have been cached
130-
file_cache_name <- file_key(arg_list = args,
131-
name = "assessmentUnits.json")
132-
file_path_name <- fs::path(au_cache$cache_path_get(),
133-
file_cache_name)
130+
## check if current results have been cached
131+
file_cache_name <- file_key(arg_list = args,
132+
name = "assessmentUnits.json")
133+
file_path_name <- fs::path(au_cache$cache_path_get(),
134+
file_cache_name)
134135

135-
if(file.exists(file_path_name)) {
136-
message(paste0("reading cached file from: ", file_path_name))
137-
content <- readLines(file_path_name, warn = FALSE)
136+
if(file.exists(file_path_name)) {
137+
message(paste0("reading cached file from: ", file_path_name))
138+
content <- readLines(file_path_name, warn = FALSE)
139+
} else {
140+
## download data
141+
content <- xGET(path,
142+
args,
143+
file = file_path_name,
144+
...)
145+
}
138146
} else {
147+
## download data without caching
139148
content <- xGET(path,
140149
args,
141-
file = file_path_name,
150+
file = NULL,
142151
...)
143152
}
144153

‎R/assessments.R‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -135,26 +135,33 @@ assessments <- function(assessment_unit_id = NULL,
135135

136136
##setup file cache
137137
path = "attains-public/api/assessments"
138-
assessments_cache$mkdir()
138+
if(isTRUE(rATTAINSenv$cache_downloads)){
139+
assessments_cache$mkdir()
139140

140-
## check if current results have been cached
141-
file_cache_name <- file_key(arg_list = args,
142-
name = "assessments.json")
143-
file_path_name <- fs::path(assessments_cache$cache_path_get(),
144-
file_cache_name)
141+
## check if current results have been cached
142+
file_cache_name <- file_key(arg_list = args,
143+
name = "assessments.json")
144+
file_path_name <- fs::path(assessments_cache$cache_path_get(),
145+
file_cache_name)
145146

146-
if(file.exists(file_path_name)) {
147-
message(paste0("reading cached file from: ", file_path_name))
148-
content <- readLines(file_path_name, warn = FALSE)
149-
}
150-
151-
## download data
152-
else{
147+
if(file.exists(file_path_name)) {
148+
message(paste0("reading cached file from: ", file_path_name))
149+
content <- readLines(file_path_name, warn = FALSE)
150+
} else {
151+
## download data
152+
content <- xGET(path,
153+
args,
154+
file = file_path_name,
155+
...)
156+
}
157+
} else {
158+
## download without caching
153159
content <- xGET(path,
154160
args,
155-
file = file_path_name,
161+
file = NULL,
156162
...)
157163
}
164+
158165
if (!isTRUE(tidy)) {
159166
return(content)
160167
} else{

‎R/domain_values.R‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,23 +72,33 @@ domain_values <- function(domain_name = NULL,
7272

7373
##setup file cache
7474
path = "attains-public/api/domains"
75-
dv_cache$mkdir()
75+
if(isTRUE(rATTAINSenv$cache_downloads)) {
76+
dv_cache$mkdir()
7677

77-
## check if current results have been cached
78-
file_cache_name <- file_key(arg_list = args,
79-
name = "domains.json")
80-
file_path_name <- path(dv_cache$cache_path_get(),
81-
file_cache_name)
78+
## check if current results have been cached
79+
file_cache_name <- file_key(arg_list = args,
80+
name = "domains.json")
81+
file_path_name <- path(dv_cache$cache_path_get(),
82+
file_cache_name)
8283

83-
if(file.exists(file_path_name)) {
84-
message(paste0("reading cached file from: ", file_path_name))
85-
content <- readLines(file_path_name, warn = FALSE)
86-
} else {## download data
84+
if(file.exists(file_path_name)) {
85+
message(paste0("reading cached file from: ", file_path_name))
86+
content <- readLines(file_path_name, warn = FALSE)
87+
} else {
88+
## download data with caching
89+
content <- xGET(path,
90+
args,
91+
file = file_path_name,
92+
...)
93+
}
94+
} else {
95+
## download without caching
8796
content <- xGET(path,
8897
args,
89-
file = file_path_name,
98+
file = NULL,
9099
...)
91-
}
100+
}
101+
92102
if(!isTRUE(tidy)) {
93103
return(content)
94104
} else {

‎R/huc12_summary.R‎

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,23 +57,33 @@ huc12_summary <- function(huc, tidy = TRUE, ...) {
5757

5858
##setup file cache
5959
path = "attains-public/api/huc12summary"
60-
huc12_cache$mkdir()
61-
62-
## check if current results have been cached
63-
file_cache_name <- file_key(arg_list = args,
64-
name = "huc12.json")
65-
file_path_name <- fs::path(huc12_cache$cache_path_get(),
66-
file_cache_name)
67-
68-
if(file.exists(file_path_name)) {
69-
message(paste0("reading cached file from: ", file_path_name))
70-
content <- readLines(file_path_name, warn = FALSE)
71-
} else {## download data
60+
if(isTRUE(rATTAINSenv$cache_downloads)) {
61+
huc12_cache$mkdir()
62+
63+
## check if current results have been cached
64+
file_cache_name <- file_key(arg_list = args,
65+
name = "huc12.json")
66+
file_path_name <- fs::path(huc12_cache$cache_path_get(),
67+
file_cache_name)
68+
69+
if(file.exists(file_path_name)) {
70+
message(paste0("reading cached file from: ", file_path_name))
71+
content <- readLines(file_path_name, warn = FALSE)
72+
} else {
73+
## download data with caching
74+
content <- xGET(path,
75+
args,
76+
file = file_path_name,
77+
...)
78+
}
79+
} else {
80+
## download data without caching
7281
content <- xGET(path,
7382
args,
74-
file = file_path_name,
83+
file = NULL,
7584
...)
7685
}
86+
7787
if(!isTRUE(tidy)) {
7888
return(content)
7989
} else {

‎R/internal.R‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,18 @@
1111
#' @importFrom crul HttpClient
1212
#' @keywords internal
1313
#' @noRd
14-
xGET <- function(path, args = list(), file, ...) {
14+
xGET <- function(path, args = list(), file = NULL, ...) {
1515
url <- "https://attains.epa.gov"
1616
cli <- crul::HttpClient$new(url,
1717
opts = list(...))
18-
res <- cli$get(path = path,
19-
disk = file,
20-
query = args)
18+
if(isTRUE(rATTAINSenv$cache_downloads)) {
19+
res <- cli$get(path = path,
20+
disk = file,
21+
query = args)
22+
} else {
23+
res <- cli$get(path = path,
24+
query = args)
25+
}
2126

2227
errs(res)
2328

‎R/plans.R‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -81,23 +81,33 @@ plans <- function(huc,
8181

8282
##setup file cache
8383
path = "attains-public/api/plans"
84-
plans_cache$mkdir()
84+
if(isTRUE(rATTAINSenv$cache_downloads)) {
85+
plans_cache$mkdir()
8586

86-
## check if current results have been cached
87-
file_cache_name <- file_key(arg_list = args,
88-
name = "plans.json")
89-
file_path_name <- fs::path(plans_cache$cache_path_get(),
90-
file_cache_name)
87+
## check if current results have been cached
88+
file_cache_name <- file_key(arg_list = args,
89+
name = "plans.json")
90+
file_path_name <- fs::path(plans_cache$cache_path_get(),
91+
file_cache_name)
9192

92-
if(file.exists(file_path_name)) {
93-
message(paste0("reading cached file from: ", file_path_name))
94-
content <- readLines(file_path_name, warn = FALSE)
95-
} else { ## download data
93+
if(file.exists(file_path_name)) {
94+
message(paste0("reading cached file from: ", file_path_name))
95+
content <- readLines(file_path_name, warn = FALSE)
96+
} else {
97+
## download data
98+
content <- xGET(path,
99+
args,
100+
file = file_path_name,
101+
...)
102+
}
103+
} else {
104+
## download data without caching
96105
content <- xGET(path,
97106
args,
98-
file = file_path_name,
107+
file = NULL,
99108
...)
100109
}
110+
101111
if(!isTRUE(tidy)) { ## return raw data
102112
return(content)
103113
} else { ## return parsed data

0 commit comments

Comments
 (0)