Commit56fbb9f

committed

Remove all types of whitespace#31

1 parent601ec14 commit56fbb9fCopy full SHA for 56fbb9f

File tree

+27

-2

lines changed

+27

-2

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -183,13 +183,15 @@ oadoi_fetch <-`
`183`	`183`	`#' }`
`184`	`184`	`#' @export`
`185`	`185`	`oadoi_fetch_<-function(doi=NULL,email=NULL) {`
	`186`	`+ check_wsp_dois(doi)`
`186`	`187`	`u<-httr::modify_url(`
`187`	`188`	`oadoi_baseurl(),`
`188`	`189`	`query=list(email=email),`
`189`		`-path= c(oadoi_api_version(), trimws(doi))`
	`190`	`+path= c(oadoi_api_version(),`
	`191`	`+ gsub("[[:space:]]","",doi))`
`190`	`192`	`)`
`191`	`193`	`# Call Unpaywall Data API`
`192`		`-resp<-httr::RETRY("GET",u,ua)`
	`194`	`+resp<-httr::RETRY("GET",u,ua,httr::timeout(5))`
`193`	`195`
`194`	`196`	`# test for valid json`
`195`	`197`	`if (httr::http_type(resp)!="application/json") {`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,3 +39,14 @@ email_regex <-`
`39`	`39`	`# nolint start`
`40`	`40`	`"^[_a-zA-Z0-9-]+(\\.[_a-zA-Z0-9-]+)@[a-zA-Z0-9-]+(\\.[a-zA-Z0-9-]+)(\\.[a-zA-Z]{2,4})$"`
`41`	`41`	`# nolint end`
	`42`	`+`
	`43`	`+#' White space check`
	`44`	`+#'`
	`45`	`+#' @noRd`
	`46`	`+check_wsp_dois<-function(x) {`
	`47`	`+wsp_doi<-x[grepl("[[:space:]]",x)]`
	`48`	`+if (!is.null(wsp_doi))`
	`49`	`+ message(`
	`50`	`+ paste("Removed white space character(s) from:",wsp_doi))`
	`51`	`+ }`
	`52`	`+`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -86,3 +86,15 @@ test_that("emails are validated", {`
`86`	`86`	`expect_error(oadoi_fetch("10.1038/ng.3260",email="najko@gnx"))`
`87`	`87`	`expect_error(oadoi_fetch("10.1038/ng.3260",email="FOOL"))`
`88`	`88`	`})`
	`89`	`+`
	`90`	`+test_that("oadoi_fetch removes all types of whitespace", {`
	`91`	`+ skip_on_cran()`
	`92`	`+dois<- c("10.1177/ 0042098012452322",`
	`93`	`+"10.1038/ng.3260",`
	`94`	`+" 10. 7717/peerj.2323`
	`95`	`+")`
	`96`	`+a<- expect_message(`
	`97`	`+ oadoi_fetch(dois,email="najko.jahn@gmail.com")`
	`98`	`+ )`
	`99`	`+ expect_equal(nrow(a),3)`
	`100`	`+})`

Comments

(0)