From 76bfc6d44a8eba47bd8c17d4b06fb48e474515dc Mon Sep 17 00:00:00 2001 From: Kyle Chesney Date: Wed, 31 Aug 2022 12:39:28 -0400 Subject: [PATCH 1/3] escape . to treat as literal character instead of wildcard in gsub statements --- R/dataset_diff.R | 2 +- R/write_data.R | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/R/dataset_diff.R b/R/dataset_diff.R index e8e2835..98675f4 100644 --- a/R/dataset_diff.R +++ b/R/dataset_diff.R @@ -48,7 +48,7 @@ dataset_diff <- function(source, dplyr::anti_join(target) %>% dplyr::inner_join(target, by=source_pk) %>% dplyr::select(dplyr::any_of(target_pk), dplyr::any_of(names(source)), dplyr::ends_with(".x")) %>% - dplyr::rename_with(., ~ gsub(".x", "", .x), dplyr::ends_with(".x")) + dplyr::rename_with(., ~ gsub("\\.x", "", .x), dplyr::ends_with(".x")) ids_of_update_records <- update_records %>% dplyr::pull({{target_pk}}) diff --git a/R/write_data.R b/R/write_data.R index 665c320..94dc82c 100644 --- a/R/write_data.R +++ b/R/write_data.R @@ -228,7 +228,7 @@ sync_table_2 <- function( dplyr::anti_join(target) %>% dplyr::inner_join(target, by=source_pk) %>% dplyr::select(dplyr::any_of(target_pk), dplyr::any_of(names(source)), dplyr::ends_with(".x")) %>% - dplyr::rename_with(., ~ gsub(".x", "", .x), dplyr::ends_with(".x")) + dplyr::rename_with(., ~ gsub("\\.x", "", .x), dplyr::ends_with(".x")) ids_of_update_records <- update_records %>% dplyr::pull({{target_pk}}) From f9e489a382394259c45f6d3054d633c6c78c5224 Mon Sep 17 00:00:00 2001 From: Philip Chase Date: Wed, 14 Sep 2022 12:09:21 -0400 Subject: [PATCH 2/3] Specify package for na.exclude() --- R/read_email.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/read_email.R b/R/read_email.R index 0fb81db..0e223ba 100644 --- a/R/read_email.R +++ b/R/read_email.R @@ -47,7 +47,7 @@ get_bad_emails_from_individual_emails <- function(username, mRpostman::sent_since(date_char = format(messages_since_date, format = "%d-%b-%Y")) ) ) %>% - na.exclude() + stats::na.exclude() patterns <- c( "Original-Recipient: rfc822;.*", From 1cfa1139d5594137b2a45a42e574c800453557ad Mon Sep 17 00:00:00 2001 From: Philip Chase Date: Wed, 14 Sep 2022 12:10:31 -0400 Subject: [PATCH 3/3] Bump VERSION and update NEWS.md for release 1.3.2 --- DESCRIPTION | 2 +- NEWS.md | 6 ++++++ VERSION | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 15bbd97..54000ed 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: redcapcustodian Type: Package Title: System data cleaning for REDCap -Version: 1.3.1 +Version: 1.3.2 Authors@R: c( person("Philip", "Chase", email = "pbc@ufl.edu", diff --git a/NEWS.md b/NEWS.md index a0cdb4c..d22e154 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,6 +3,12 @@ All notable changes to the redcapcustodian package and its contained scripts wil This project adheres to [Semantic Versioning](http://semver.org/). +## [1.3.2] - 2022-09-14 +### Changed +- Specify package for na.exclude() (Philip Chase) +- escape . to treat as literal character instead of wildcard in gsub statements (Kyle Chesney) + + ## [1.3.1] - 2022-08-30 ### Added - Remove remants of the site concept (Philip Chase) diff --git a/VERSION b/VERSION index 3a3cd8c..1892b92 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.3.1 +1.3.2