feat: Suppression dependance stringr

MurielleDelmotte · MurielleDelmotte · commit a968993d4136 · 2023-07-17T17:13:07.000+02:00
pourquoi: - supprimer la dependance à stringr quoi: - remplacement des fonctions de stringr par du rbase Issue #51
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -30,7 +30,6 @@ Imports:
     magrittr (>= 2.0.3),
     purrr (>= 0.3.4),
     shiny (>= 1.7.1),
-    stringr (>= 1.4.0),
     utils,
     XML (>= 3.99.0.10)
 Suggests:
@@ -39,6 +38,7 @@ Suggests:
     knitr (>= 1.39),
     readxl (>= 1.4.0),
     rmarkdown (>= 2.14),
+    stringr (>= 1.4.0),
     testthat (>= 3.0.0),
     tibble (>= 3.1.7),
     withr (>= 2.5.0)
diff --git a/NAMESPACE b/NAMESPACE
@@ -68,9 +68,5 @@ importFrom(shiny,tagList)
 importFrom(shiny,updateCheckboxInput)
 importFrom(shiny,updateNumericInput)
 importFrom(shiny,updateSelectInput)
-importFrom(stringr,str_detect)
-importFrom(stringr,str_pad)
-importFrom(stringr,str_replace_all)
-importFrom(stringr,str_which)
 importFrom(utils,file_test)
 importFrom(utils,read.csv2)
diff --git a/R/convert_file_to_dsfr.R b/R/convert_file_to_dsfr.R
@@ -8,32 +8,34 @@
 #' @param tab_corresp la table de correspondance comportant 2 colonnes (composant_shiny, composant_dsfr)
 #' @importFrom glue glue
 #' @importFrom purrr reduce2
-#' @importFrom stringr str_replace_all
 #' @importFrom utils file_test
 #'
 #' @return un fichier
 #' @noRd
 convert_file_to_dsfr <- function(file, tab_corresp) {
+
   # verifie que c'est bien un fichier et non un dossier
   if (isTRUE(file_test("-f", file))) {
+
     message(glue::glue("scan {file}"))
     file_read <- readLines(file)
-
+    
     if (isTRUE(grep("tabPanel", file_read) > 0)) {
-      message(glue::glue("Attention le {file} contient un 'tabPanel': \n - Si celui ci \u00e9tait dans un navbarPage alors le remplacer par un navbarPanel_dsfr. \n - Si celui ci \u00e9tait dans un 'tabsetPanel', alors le remplacer par un 'tabPanel_dsfr'"))
+        message(glue::glue("Attention le {file} contient un 'tabPanel': \n - Si celui ci \u00e9tait dans un navbarPage alors le remplacer par un navbarPanel_dsfr. \n - Si celui ci \u00e9tait dans un 'tabsetPanel', alors le remplacer par un 'tabPanel_dsfr'"))
     }
 
     if (isTRUE(grep("navbarPage", file_read) > 0)) {
-      message(glue::glue("Attention le {file} contient un 'navbarPage()', la version dsfr n\u00e9cessite un header, voir \\?navbarPage_dsfr"))
+        message(glue::glue("Attention le {file} contient un 'navbarPage()', la version dsfr n\u00e9cessite un header, voir \\?navbarPage_dsfr"))
     }
 
-    file_convert <- purrr::reduce2(
-      paste0(tab_corresp$composant_shiny, "\\("),
-      paste0(tab_corresp$composant_dsfr, "\\("),
-      .init = file_read,
-      stringr::str_replace_all
-    )
+    file_convert <- purrr::reduce2(paste0(tab_corresp$composant_shiny, "\\("),
+                                   paste0(tab_corresp$composant_dsfr, "\\("),
+                                   .init = file_read,
+                                   function(string, pattern, replacement) {
+                                     gsub(pattern, replacement, string)
+                                   })
     writeLines(file_convert, con = file)
+
   }
   return(NULL)
 }
diff --git a/R/convert_to_dsfr.R b/R/convert_to_dsfr.R
@@ -12,7 +12,6 @@
 #' @importFrom purrr map
 #' @importFrom glue glue
 #' @importFrom utils read.csv2
-#' @importFrom stringr str_which
 #' @return des fichiers modifies
 #'
 #' @export
@@ -63,7 +62,7 @@ convert_to_dsfr <- function(path = "R/", version = get_dsfr_version()) {
   # ajout de la dependance a app_ui.R si il existe
   if (file.exists(file.path(path, "app_ui.R"))) {
     file_read <- readLines(file.path(path, "app_ui.R"))
-    local <- stringr::str_which(string = file_read, pattern = "@import shiny")
+    local <- grep(pattern = "@import shiny", x = file_read)
     for (i in local) {
       file_read <- append(file_read, "#' @import shinygouv", after = i)
     }
diff --git a/R/get_dsfr_version.R b/R/get_dsfr_version.R
@@ -10,7 +10,7 @@
 #' get_dsfr_version()
 #' get_dsfr_version(with_v = TRUE)
 get_dsfr_version <- function(with_v = FALSE) {
-  res <- utils::packageDescription(pkg = "shinygouv")[["VersionDsfr"]]
+  res <- utils::packageDescription(pkg = 'shinygouv')[["VersionDsfr"]]
   if (isTRUE(with_v)) {
     res <- paste0("v", res)
   }
diff --git a/R/parse_html.R b/R/parse_html.R
@@ -1,4 +1,4 @@
-# WARNING - Generated by {fusen} from dev/tools/flat_tools.Rmd: do not edit by hand
+# WARNING - Generated by {fusen} from /dev/tools/flat_tools.Rmd: do not edit by hand
 
 #' Traduit du html en resultat shiny
 #'
@@ -12,6 +12,7 @@
 #' html_code <- '<button id="test" type="button" class="btn btn-default action-button">test</button>'
 #' parse_html(html_code)
 parse_html <- function(html_code, zone = "/html/body/*") {
+
   xml <- parse_to_xml(html_code, zone) %>% render_node(prefix = TRUE)
 
   eval(parse(text = xml))
diff --git a/R/parse_to_xml.R b/R/parse_to_xml.R
@@ -1,4 +1,4 @@
-# WARNING - Generated by {fusen} from dev/tools/flat_tools.Rmd: do not edit by hand
+# WARNING - Generated by {fusen} from /dev/tools/flat_tools.Rmd: do not edit by hand
 
 #' Traduit du code html de htmltools pour du code xml
 #'
diff --git a/R/render_node.R b/R/render_node.R
@@ -1,4 +1,4 @@
-# WARNING - Generated by {fusen} from dev/tools/flat_tools.Rmd: do not edit by hand
+# WARNING - Generated by {fusen} from /dev/tools/flat_tools.Rmd: do not edit by hand
 
 #' render_node
 #'
@@ -7,9 +7,7 @@
 #' @param prefix si TRUE alors le resultat sera prefixe par tags
 #'
 #' @importFrom XML xmlName xmlValue xmlChildren
-#' @importFrom stringr str_pad
 #' @importFrom purrr partial
-#'
 #' @noRd
 render_node <- function(node, indent = 0, prefix = FALSE) {
   if (xmlName(node) == "text") {
@@ -24,43 +22,28 @@ render_node <- function(node, indent = 0, prefix = FALSE) {
       xmlName(node)
     }
 
-    my_render <- partial(
-      render_node,
-      indent = newIndent,
-      prefix = prefix
-    )
+    my_render <- partial(render_node, indent = newIndent,
+      prefix = prefix)
     newIndent <- indent + length(tagName) + 1
     xmlChildren(node) %>%
       Keep(my_render, .) %>%
       append(make_attrs(node), .) %>%
-      paste(collapse = str_pad(
-        ",\n",
-        width = newIndent,
-        side = c("right")
-      )) %>%
+      paste(collapse = sprintf(paste0("%-",newIndent,"s"), ",\n")) %>%
       trimws(which = c("left")) %>%
       paste0(tagName, "(", ., ")")
   }
 }
 
 #' @noRd
 #' @importFrom XML xmlAttrs
-#' @importFrom stringr str_detect
 make_attrs <- function(node) {
   attrs <- xmlAttrs(node)
   names(attrs) %>% Map(function(name) {
     val <- attrs[[name]]
-    if (str_detect(string = name, pattern = "-") || str_detect(
-      string = name,
-      pattern = "for"
-    )) {
+    if (grepl(pattern = "-", x = name) || grepl(pattern = "for", x = name)) {
       name <- paste0("`", name, "`")
     }
-    paste0(name, " = ", if (val == "") {
-      "NA"
-    } else {
-      paste0("\"", val, "\"")
-    })
+    paste0(name, " = ", if (val == "") {"NA"} else { paste0("\"", val, "\"")})
   }, .)
 }
 
diff --git a/R/update_inline.R b/R/update_inline.R
@@ -1,4 +1,4 @@
-# WARNING - Generated by {fusen} from dev/tools/flat_tools.Rmd: do not edit by hand
+# WARNING - Generated by {fusen} from /dev/tools/flat_tools.Rmd: do not edit by hand
 
 #' @noRd
 update_inline <- function(inputId, inline, session) {
diff --git a/dev/tools/flat_convert_to_dsfr.Rmd b/dev/tools/flat_convert_to_dsfr.Rmd
@@ -24,7 +24,6 @@ pkgload::load_all(export_all = FALSE)
 #' @param tab_corresp la table de correspondance comportant 2 colonnes (composant_shiny, composant_dsfr)
 #' @importFrom glue glue
 #' @importFrom purrr reduce2
-#' @importFrom stringr str_replace_all
 #' @importFrom utils file_test
 #'
 #' @return un fichier
@@ -43,12 +42,13 @@ convert_file_to_dsfr <- function(file, tab_corresp) {
     if (isTRUE(grep("navbarPage", file_read) > 0)) {
         message(glue::glue("Attention le {file} contient un 'navbarPage()', la version dsfr n\u00e9cessite un header, voir \\?navbarPage_dsfr"))
     }
-    
-    file_convert <- purrr::reduce2(
-      paste0(tab_corresp$composant_shiny, "\\("),
-      paste0(tab_corresp$composant_dsfr, "\\("),
-      .init = file_read,
-      stringr::str_replace_all)
+
+    file_convert <- purrr::reduce2(paste0(tab_corresp$composant_shiny, "\\("),
+                                   paste0(tab_corresp$composant_dsfr, "\\("),
+                                   .init = file_read,
+                                   function(string, pattern, replacement) {
+                                     gsub(pattern, replacement, string)
+                                   })
     writeLines(file_convert, con = file)
 
   }
@@ -151,7 +151,6 @@ convert_to_dsfr(path = "le_chemin_de_mon_application")
 #' @importFrom purrr map
 #' @importFrom glue glue
 #' @importFrom utils read.csv2
-#' @importFrom stringr str_which
 #' @return des fichiers modifies
 #'
 #' @export
@@ -188,7 +187,7 @@ convert_to_dsfr <- function(path = "R/", version = get_dsfr_version()) {
   # ajout de la dependance a app_ui.R si il existe
   if (file.exists(file.path(path, "app_ui.R"))) {
     file_read <- readLines(file.path(path, "app_ui.R"))
-    local <- stringr::str_which(string = file_read, pattern = "@import shiny")
+    local <- grep(pattern = "@import shiny", x = file_read)
     for (i in local) {
       file_read <- append(file_read, "#' @import shinygouv", after = i)
     }
diff --git a/dev/tools/flat_tools.Rmd b/dev/tools/flat_tools.Rmd
@@ -78,9 +78,8 @@ test_that("parse_to_xml works", {
 #' @param prefix si TRUE alors le resultat sera prefixe par tags
 #'
 #' @importFrom XML xmlName xmlValue xmlChildren
-#' @importFrom stringr str_pad
 #' @importFrom purrr partial
-#'
+#' @noRd
 render_node <- function(node, indent = 0, prefix = FALSE) {
   if (xmlName(node) == "text") {
     txt <- xmlValue(node)
@@ -100,22 +99,19 @@ render_node <- function(node, indent = 0, prefix = FALSE) {
     xmlChildren(node) %>%
       Keep(my_render, .) %>%
       append(make_attrs(node), .) %>%
-      paste(collapse = str_pad(",\n", width = newIndent,
-        side = c("right"))) %>%
+      paste(collapse = sprintf(paste0("%-",newIndent,"s"), ",\n")) %>%
       trimws(which = c("left")) %>%
       paste0(tagName, "(", ., ")")
   }
 }
 
 #' @noRd
 #' @importFrom XML xmlAttrs
-#' @importFrom stringr str_detect
 make_attrs <- function(node) {
   attrs <- xmlAttrs(node)
   names(attrs) %>% Map(function(name) {
     val <- attrs[[name]]
-    if (str_detect(string = name, pattern = "-") || str_detect(string = name,
-      pattern = "for")) {
+    if (grepl(pattern = "-", x = name) || grepl(pattern = "for", x = name)) {
       name <- paste0("`", name, "`")
     }
     paste0(name, " = ", if (val == "") {"NA"} else { paste0("\"", val, "\"")})
diff --git a/tests/testthat/test-convert_file_to_dsfr.R b/tests/testthat/test-convert_file_to_dsfr.R
@@ -1,6 +1,7 @@
 # WARNING - Generated by {fusen} from /dev/tools/flat_convert_to_dsfr.Rmd: do not edit by hand
 
 test_that("convert_file_to_dsfr works", {
+
   skip_on_ci()
 
   library(tibble)
@@ -16,10 +17,8 @@ test_that("convert_file_to_dsfr works", {
     open = FALSE
   )
 
-  table_passage <- tibble(
-    composant_shiny = c("actionButton", "fluidPage"),
-    composant_dsfr = c("actionButton_dsfr", "fluidPage_dsfr")
-  )
+  table_passage <- tibble(composant_shiny = c("actionButton", "fluidPage"),
+    composant_dsfr = c("actionButton_dsfr", "fluidPage_dsfr"))
 
   fichier <- file.path(mydir, "R", "app_ui.R")
   convert_file_to_dsfr(file = fichier, table_passage)
@@ -30,10 +29,8 @@ test_that("convert_file_to_dsfr works", {
   expect_false(any(stringr::str_detect(fichier_transform, pattern = "fluidPage\\(")))
 
 
-  table_passage <- tibble(
-    composant_shiny = c("actionButton", "fluidPage", NA),
-    composant_dsfr = c("actionButton_dsfr", "fluidPage_dsfr", "header_dsfr")
-  )
+  table_passage <- tibble(composant_shiny = c("actionButton", "fluidPage", NA),
+    composant_dsfr = c("actionButton_dsfr", "fluidPage_dsfr", "header_dsfr"))
 
   fichier <- file.path(mydir, "R", "app_ui.R")
   convert_file_to_dsfr(file = fichier, table_passage)
@@ -42,4 +39,5 @@ test_that("convert_file_to_dsfr works", {
   #' @description les composants dsfr n ayant pas d equivalent en shiny ne sont pas remplaces
 
   expect_false(any(stringr::str_detect(fichier_transform, pattern = "header_dsfr\\(")))
+
 })
diff --git a/tests/testthat/test-convert_to_dsfr.R b/tests/testthat/test-convert_to_dsfr.R
@@ -13,10 +13,8 @@ test_that("convert_to_dsfr works", {
     open = FALSE
   )
 
-  file.copy(
-    from = file.path(mydir, "R", "app_ui.R"),
-    to = file.path(mydir, "R", "module_ui.R")
-  )
+  file.copy(from = file.path(mydir, "R", "app_ui.R"),
+    to = file.path(mydir, "R", "module_ui.R"))
 
   #' @description Retourne une erreur si le numero de version est NULL
   expect_error(convert_to_dsfr(path = file.path(mydir, "R"), version = NULL))
@@ -34,4 +32,5 @@ test_that("convert_to_dsfr works", {
   #' @description les composants dsfr n ayant pas d equivalent en shiny ne sont pas remplaces, par exemple header_dsfr
 
   expect_false(any(stringr::str_detect(app_ui, pattern = "header_dsfr\\(")))
+
 })
diff --git a/tests/testthat/test-parse_html.R b/tests/testthat/test-parse_html.R
@@ -1,4 +1,4 @@
-# WARNING - Generated by {fusen} from dev/tools/flat_tools.Rmd: do not edit by hand
+# WARNING - Generated by {fusen} from /dev/tools/flat_tools.Rmd: do not edit by hand
 
 test_that("tester parse_html", {
   html_code <- '<button id="test" type="button" class="btn btn-default action-button">test</button>'
diff --git a/tests/testthat/test-parse_to_xml.R b/tests/testthat/test-parse_to_xml.R
@@ -1,4 +1,4 @@
-# WARNING - Generated by {fusen} from dev/tools/flat_tools.Rmd: do not edit by hand
+# WARNING - Generated by {fusen} from /dev/tools/flat_tools.Rmd: do not edit by hand
 
 test_that("parse_to_xml works", {
   expect_true(inherits(parse_to_xml, "function"))
@@ -21,4 +21,5 @@ test_that("parse_to_xml works", {
 
   #' @description tester la classe du resultat de la fonction sur un shiny.tag
   expect_s3_class(test2, "XMLInternalElementNode")
+
 })
diff --git a/tests/testthat/test-render_node.R b/tests/testthat/test-render_node.R
@@ -1,4 +1,4 @@
-# WARNING - Generated by {fusen} from dev/tools/flat_tools.Rmd: do not edit by hand
+# WARNING - Generated by {fusen} from /dev/tools/flat_tools.Rmd: do not edit by hand
 
 test_that("render_node works", {
   expect_true(inherits(render_node, "function"))

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`#' get_dsfr_version()`
`11`	`11`	`#' get_dsfr_version(with_v = TRUE)`
`12`	`12`	`get_dsfr_version <- function(with_v = FALSE) {`
`13`		`- res <- utils::packageDescription(pkg = "shinygouv")[["VersionDsfr"]]`
	`13`	`+ res <- utils::packageDescription(pkg = 'shinygouv')[["VersionDsfr"]]`
`14`	`14`	`if (isTRUE(with_v)) {`
`15`	`15`	`res <- paste0("v", res)`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# WARNING - Generated by {fusen} from dev/tools/flat_tools.Rmd: do not edit by hand`
	`1`	`+# WARNING - Generated by {fusen} from /dev/tools/flat_tools.Rmd: do not edit by hand`
`2`	`2`
`3`	`3`	`#' Traduit du code html de htmltools pour du code xml`
`4`	`4`	`#'`