Commit48ad5e4

committed

Fixes to make sure it still works without readr

1 parent5aa0bee commit48ad5e4Copy full SHA for 48ad5e4

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`#' # Download a sheet manually using readr`
`14`	`14`	`#' url <- 'docs.google.com/spreadsheets/d/1I9mJsS5QnXF2TNNntTy-HrcdHmIF9wJ8ONYvEJTXSNo'`
`15`	`15`	`#'`
`16`		`-#' if(requireNamespace('readr')){`
	`16`	`+#' if(requireNamespace('readr', quietly=TRUE)){`
`17`	`17`	`#' library(readr)`
`18`	`18`	`#' read_csv(construct_download_url(url), col_types = cols(`
`19`	`19`	`#' mpg = col_double(),`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`#' read.csv(text=gsheet2text(url, format='csv'), stringsAsFactors=FALSE)`
`37`	`37`	`#'`
`38`	`38`	`#' # Or, with readr:`
`39`		`-#' if(requireNamespace('readr')){`
	`39`	`+#' if(requireNamespace('readr', quietly=TRUE)){`
`40`	`40`	`#' library(readr)`
`41`	`41`	`#' read_csv(construct_download_url(url), col_types = cols(`
`42`	`42`	`#' mpg = col_double(),`
`@@ -54,7 +54,7 @@`
`54`	`54`	`#' }`
`55`	`55`	`#'`
`56`	`56`	`gsheet2tbl<-function(url,sheetid=NULL){`
`57`		`-if(requireNamespace('readr')){`
	`57`	`+if(requireNamespace('readr',quietly=TRUE)){`
`58`	`58`	`suppressMessages(table<-readr::read_csv(file= construct_download_url(url,format='csv',sheetid=NULL)))`
`59`	`59`	`}else{`
`60`	`60`	`table<-utils::read.csv(text=gsheet2text(url=url,format='csv',sheetid=sheetid),stringsAsFactors=FALSE)`

Lines changed: 1 addition & 1 deletion

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Lines changed: 1 addition & 1 deletion

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ test_that('Works correctly with and with url containing sheetid = 850032961', {`
`13`	`13`
`14`	`14`	`test_that('Correct result on corner cases sheet', {`
`15`	`15`	`a<- gsheet2tbl('https://docs.google.com/spreadsheets/d/1QNaOSRePfMRpdyR6DQfdO82pAq9RRrlJeK6DP3ZlMCg/edit?usp=sharing')`
`16`		`- expect_equal(a[1,][['case']],'<test>hello')`
	`16`	`+ expect_equal(a[1,'case'] %>% as.character(),'<test>hello')`
`17`	`17`	`})`

Comments

(0)