From 833f1e0637b509fb45cf43005c22dbcef6b4d59f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABlle=20Salmon?= Date: Fri, 15 Mar 2024 11:47:16 +0100 Subject: [PATCH] style: some restyling guided by lintr --- R/EMODnetWFS-package.R | 2 +- R/client.R | 4 ++-- R/deprecate-service-version.R | 2 +- R/info.R | 2 +- R/layer_attributes.R | 19 +++++++++++-------- R/layers.R | 2 +- .../_snaps/deprecate-service-version.md | 4 ++-- .../testthat/test-deprecate-service-version.R | 6 +++--- tests/testthat/test-layer_attributes.R | 2 +- 9 files changed, 23 insertions(+), 20 deletions(-) diff --git a/R/EMODnetWFS-package.R b/R/EMODnetWFS-package.R index 822ab22..dabb199 100644 --- a/R/EMODnetWFS-package.R +++ b/R/EMODnetWFS-package.R @@ -43,5 +43,5 @@ emodnetwfs_user_agent <- function() { globalVariables(c("layer_name", "n")) release_bullets <- function() { # nocov start - c('update vignette with knitr::knit("vignettes/EMODnetWFS.Rmd.orig", output = "vignettes/EMODnetWFS.Rmd")') + c('update vignette with knitr::knit("vignettes/EMODnetWFS.Rmd.orig", output = "vignettes/EMODnetWFS.Rmd")') # nolint: line_length_linter } # nocov end diff --git a/R/client.R b/R/client.R index 10b7491..ee52082 100644 --- a/R/client.R +++ b/R/client.R @@ -20,9 +20,9 @@ emodnet_init_wfs_client <- function(service, service_version = NULL, logger = NULL) { - deprecate_message_service_version( + deprecate_msg_service_version( service_version, - "deprecate_message_service_version" + "emodnet_init_wfs_client" ) check_service_name(service) diff --git a/R/deprecate-service-version.R b/R/deprecate-service-version.R index eb7945e..551ca23 100644 --- a/R/deprecate-service-version.R +++ b/R/deprecate-service-version.R @@ -1,4 +1,4 @@ -deprecate_message_service_version <- function(service_version, function_name) { +deprecate_msg_service_version <- function(service_version, function_name) { if (!is.null(service_version)) { lifecycle::deprecate_soft( sprintf("%s(service_version)", function_name), diff --git a/R/info.R b/R/info.R index de457d7..270c8ee 100644 --- a/R/info.R +++ b/R/info.R @@ -41,7 +41,7 @@ emodnet_get_layer_info <- memoise::memoise(.emodnet_get_layer_info) .emodnet_get_wfs_info <- function(wfs = NULL, service = NULL, service_version = NULL) { - deprecate_message_service_version(service_version, "emodnet_get_wfs_info") + deprecate_msg_service_version(service_version, "emodnet_get_wfs_info") if (is.null(wfs) && is.null(service)) { cli::cli_abort( diff --git a/R/layer_attributes.R b/R/layer_attributes.R index 3a17b1d..aed0302 100644 --- a/R/layer_attributes.R +++ b/R/layer_attributes.R @@ -20,7 +20,7 @@ layer_attributes_summarise <- function(wfs = NULL, service = NULL, service_version = NULL, layer) { - deprecate_message_service_version( + deprecate_msg_service_version( service_version, "layer_attributes_summarise" ) @@ -52,7 +52,7 @@ layer_attributes_summarise <- function(wfs = NULL, layer_attribute_descriptions <- function(wfs = NULL, service = NULL, service_version = NULL, layer) { - deprecate_message_service_version( + deprecate_msg_service_version( service_version, "layer_attribute_descriptions" ) @@ -84,7 +84,7 @@ layer_attributes_get_names <- function(wfs = NULL, service = NULL, service_version = NULL, layer) { - deprecate_message_service_version( + deprecate_msg_service_version( service_version, "layer_attributes_get_names" ) @@ -113,13 +113,16 @@ layer_attributes_get_names <- function(wfs = NULL, #' \dontrun{ #' wfs <- emodnet_init_wfs_client(service = "biology") #' layer_attributes_get_names(wfs, layer = "mediseh_zostera_m_pnt") -#' layer_attribute_inspect(wfs, layer = "mediseh_zostera_m_pnt", attribute = "country") +#' layer_attribute_inspect( +#' wfs, layer = "mediseh_zostera_m_pnt", +#' attribute = "country" +#' ) #' } layer_attribute_inspect <- function(wfs = NULL, service = NULL, service_version = NULL, layer, attribute) { - deprecate_message_service_version(service_version, "layer_attribute_inspect") + deprecate_msg_service_version(service_version, "layer_attribute_inspect") wfs <- wfs %||% emodnet_init_wfs_client(service) check_wfs(wfs) @@ -180,7 +183,7 @@ layer_attribute_inspect <- function(wfs = NULL, layer_attributes_tbl <- function(wfs = NULL, service = NULL, service_version = NULL, layer) { - deprecate_message_service_version(service_version, "layer_attributes_tbl") + deprecate_msg_service_version(service_version, "layer_attributes_tbl") wfs <- wfs %||% emodnet_init_wfs_client(service) check_wfs(wfs) @@ -237,12 +240,12 @@ get_layer_default_crs <- function(layer, choices = emodnet_get_wfs_info(wfs)$layer_name ) - crs <- get_layer_metadata(layer, wfs)$getDefaultCRS() + crs <- get_layer_metadata(layer, wfs)$getDefaultCRS() # nolint: object_name_linter if (output == "crs") { return(crs) } - epsg.text <- regmatches( + epsg.text <- regmatches( # nolint: object_name_linter crs$input, regexpr("epsg\\:[[:digit:]]{4}", crs$input) ) diff --git a/R/layers.R b/R/layers.R index 618da2f..2c89fdc 100644 --- a/R/layers.R +++ b/R/layers.R @@ -67,7 +67,7 @@ emodnet_get_layers <- function(wfs = NULL, cql_filter = NULL, reduce_layers = FALSE, ...) { - deprecate_message_service_version(service_version, "emodnet_get_layers") + deprecate_msg_service_version(service_version, "emodnet_get_layers") # check wfs ---------------------------------------------------------------- if (is.null(wfs) && is.null(service)) { diff --git a/tests/testthat/_snaps/deprecate-service-version.md b/tests/testthat/_snaps/deprecate-service-version.md index 37f1b6a..bc9f714 100644 --- a/tests/testthat/_snaps/deprecate-service-version.md +++ b/tests/testthat/_snaps/deprecate-service-version.md @@ -1,7 +1,7 @@ -# deprecate_message_service_version() works +# deprecate_msg_service_version() works Code - deprecate_message_service_version("1.1", "blop") + deprecate_msg_service_version("1.1", "blop") Condition Warning: The `service_version` argument of `blop()` is deprecated as of EMODnetWFS 2.0.1. diff --git a/tests/testthat/test-deprecate-service-version.R b/tests/testthat/test-deprecate-service-version.R index 161e71e..c8325a2 100644 --- a/tests/testthat/test-deprecate-service-version.R +++ b/tests/testthat/test-deprecate-service-version.R @@ -1,4 +1,4 @@ -test_that("deprecate_message_service_version() works", { - expect_silent(deprecate_message_service_version(NULL, "blop")) - expect_snapshot(deprecate_message_service_version("1.1", "blop")) +test_that("deprecate_msg_service_version() works", { + expect_silent(deprecate_msg_service_version(NULL, "blop")) + expect_snapshot(deprecate_msg_service_version("1.1", "blop")) }) diff --git a/tests/testthat/test-layer_attributes.R b/tests/testthat/test-layer_attributes.R index a0c96b6..17f148d 100644 --- a/tests/testthat/test-layer_attributes.R +++ b/tests/testthat/test-layer_attributes.R @@ -3,7 +3,7 @@ test_that("layer attributes stuff works", { wfs <- create_biology_wfs() with_mock_dir("biology-layers", { - layer_attr <- layer_attributes_get_names(wfs, layer = "mediseh_zostera_m_pnt") + layer_attr <- layer_attributes_get_names(wfs, layer = "mediseh_zostera_m_pnt") # nolint: line_length_linter expect_identical(layer_attr, c("id", "country", "the_geom")) layer_attr_desc <- layer_attribute_descriptions(