Skip to content

Commit c97b2b4

Browse files
pepijn-devriesVries
and
Vries
authored
merge dbplyr into main work-in-progress branch (#7)
* Initial implementation of dplyr verbs * Corrected the datatype for NCBI_TAXID field * minor corrections * Final fixes before submitting to CRAN Co-authored-by: Vries <[email protected]>
1 parent 33c5336 commit c97b2b4

21 files changed

+1150
-555
lines changed

DESCRIPTION

+14-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
Package: ECOTOXr
22
Type: Package
33
Title: Download and Extract Data from US EPA's ECOTOX Database
4-
Version: 0.1.2
5-
Date: TODO
4+
Version: 0.2.0
5+
Date: 2022-11-17
66
Authors@R: c(person("Pepijn", "de Vries", role = c("aut", "cre", "dtc"),
7-
email = "[email protected]"))
7+
email = "[email protected]",
8+
comment = list(ORCID = "0000-0002-7961-6646")))
89
Author:
9-
Pepijn de Vries [aut, cre, dtc]
10+
Pepijn de Vries [aut, cre, dtc] (0000-0002-7961-6646)
1011
Maintainer: Pepijn de Vries <[email protected]>
1112
Description: The US EPA ECOTOX database is a freely available database
1213
with a treasure of aquatic and terrestrial ecotoxicological data.
@@ -19,17 +20,24 @@ Depends:
1920
RSQLite
2021
Imports:
2122
crayon,
23+
dbplyr,
24+
dplyr,
2225
httr,
26+
purrr,
2327
rappdirs,
2428
readr,
29+
rlang,
2530
rvest,
2631
stringr,
2732
tibble,
33+
tidyr,
34+
tidyselect,
2835
utils
2936
Suggests:
3037
DBI,
31-
webchem,
32-
testthat (>= 3.0.0)
38+
standartox,
39+
testthat (>= 3.0.0),
40+
webchem
3341
URL: <https://github.com/pepijn-devries/ECOTOXr>
3442
BugReports: https://github.com/pepijn-devries/ECOTOXr/issues
3543
License: GPL (>= 3)

NAMESPACE

+45-35
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,45 @@
1-
# Generated by roxygen2: do not edit by hand
2-
3-
S3method("[",cas)
4-
S3method("[<-",cas)
5-
S3method("[[",cas)
6-
S3method("[[<-",cas)
7-
S3method(as.character,cas)
8-
S3method(as.data.frame,cas)
9-
S3method(as.double,cas)
10-
S3method(as.integer,cas)
11-
S3method(as.list,cas)
12-
S3method(c,cas)
13-
S3method(format,cas)
14-
S3method(print,cas)
15-
export(as.cas)
16-
export(build_ecotox_sqlite)
17-
export(cas)
18-
export(check_ecotox_availability)
19-
export(cite_ecotox)
20-
export(dbConnectEcotox)
21-
export(dbDisconnectEcotox)
22-
export(download_ecotox_data)
23-
export(get_ecotox_info)
24-
export(get_ecotox_path)
25-
export(get_ecotox_sqlite_file)
26-
export(get_ecotox_url)
27-
export(is.cas)
28-
export(list_ecotox_fields)
29-
export(search_ecotox)
30-
export(search_query_ecotox)
31-
export(show.cas)
32-
importFrom(RSQLite,dbConnect)
33-
importFrom(RSQLite,dbDisconnect)
34-
importFrom(RSQLite,dbExecute)
35-
importFrom(RSQLite,dbWriteTable)
1+
# Generated by roxygen2: do not edit by hand
2+
3+
S3method("[",cas)
4+
S3method("[<-",cas)
5+
S3method("[[",cas)
6+
S3method("[[<-",cas)
7+
S3method(as.character,cas)
8+
S3method(as.data.frame,cas)
9+
S3method(as.double,cas)
10+
S3method(as.integer,cas)
11+
S3method(as.list,cas)
12+
S3method(c,cas)
13+
S3method(format,cas)
14+
S3method(print,cas)
15+
export("%>%")
16+
export(as.cas)
17+
export(build_ecotox_sqlite)
18+
export(cas)
19+
export(check_ecotox_availability)
20+
export(cite_ecotox)
21+
export(dbConnectEcotox)
22+
export(dbDisconnectEcotox)
23+
export(download_ecotox_data)
24+
export(get_ecotox_info)
25+
export(get_ecotox_path)
26+
export(get_ecotox_sqlite_file)
27+
export(get_ecotox_url)
28+
export(is.cas)
29+
export(list_ecotox_fields)
30+
export(search_ecotox)
31+
export(search_ecotox_lazy)
32+
export(search_query_ecotox)
33+
export(show.cas)
34+
importFrom(RSQLite,dbConnect)
35+
importFrom(RSQLite,dbDisconnect)
36+
importFrom(RSQLite,dbExecute)
37+
importFrom(RSQLite,dbWriteTable)
38+
importFrom(dplyr,"%>%")
39+
importFrom(dplyr,collect)
40+
importFrom(dplyr,inner_join)
41+
importFrom(dplyr,left_join)
42+
importFrom(dplyr,select)
43+
importFrom(dplyr,sql)
44+
importFrom(dplyr,tbl)
45+
importFrom(rlang,":=")

NEWS

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
ECOTOXr v0.2.0 (Release date: ***********TODO)
2+
=============
3+
4+
* Major changes:
5+
6+
* Modified searching routines to make advantage of
7+
the sql parser and optimisers implemented in
8+
the package 'dplyr'. Performance (i.e. speed) of the
9+
search routines have improved considerably.
10+
* Added support for handling Chemical Abstracts
11+
Service (CAS) numbers.
12+
13+
* Several minor adjustments and corrections to code
14+
and manual. These include fixes to address notes
15+
from CRAN checks.
16+
117
ECOTOXr v0.1.1 (Release date: 2021-10-04)
218
=============
319

R/ECOTOXr.r

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#' This may not always work on all machines as R does not always accept the website SSL certificate from the EPA.
2020
#' In those cases the zipped archive with the database files can be downloaded manually with a different (more
2121
#' forgiving) browser. The files from the zip archive can be extracted to a location of choice. Alternatively,
22-
#' the user could try to use \code{\link{download_ecotox_data(ssl_verifypeer = 0L)}} when the download URL is trusted.
22+
#' the user could try to use \code{\link{download_ecotox_data}(ssl_verifypeer = 0L)} when the download URL is trusted.
2323
#' }
2424
#' \item{
2525
#' Next, an SQLite database needs to be build from the downloaded files. This will be done automatically when

0 commit comments

Comments
 (0)