Merge pull request #132 from frictionlessdata/126-replace-variable_collapse-with-gluecollapse

126 replace variable collapse with gluecollapse

Author: peterdesmet

DESCRIPTION

@@ -49,4 +49,4 @@ Encoding: UTF-8
 Language: en-GB
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.2
+RoxygenNote: 7.2.3

R/check_schema.R

@@ -18,13 +18,16 @@ check_schema <- function(schema, data = NULL) {
 
   # Check fields have names
   field_names <- purrr::map_chr(fields, ~ replace_null(.x$name, NA_character_))
-  field_numbers_collapse <- paste(which(is.na(field_names)), collapse = "`, `")
   assertthat::assert_that(
     all(!is.na(field_names)),
     msg = glue::glue(
       "All fields in `schema` must have property `name`.",
-      "\u2139 Field(s) `{field_numbers_collapse}` don't have a name.",
-      .sep = "\n"
+      "\u2139 Field(s) {field_numbers_collapse} don't have a name.",
+      .sep = "\n",
+      field_numbers_collapse = glue::glue_collapse(
+        glue::backtick(which(is.na(field_names))),
+        sep = ", "
+      )
     )
   )
 
@@ -36,13 +39,16 @@ check_schema <- function(schema, data = NULL) {
     NA_character_
   )
   invalid_types <- setdiff(field_types, valid_types)
-  invalid_types_collapse <- paste(invalid_types, collapse = "`, `")
   assertthat::assert_that(
     all(is.na(field_types)) | length(invalid_types) == 0,
     msg = glue::glue(
       "All fields in `schema` must have valid `type`.",
-      "Type `{invalid_types_collapse}` is invalid.",
-      .sep = " "
+      "Type {invalid_types_collapse} is invalid.",
+      .sep = " ",
+      invalid_types_collapse = glue::glue_collapse(
+        glue::backtick(invalid_types),
+        sep = ", "
+      )
     )
   )
 
@@ -57,16 +63,22 @@ check_schema <- function(schema, data = NULL) {
       )
     )
 
-    field_names_collapse <- paste(field_names, collapse = "`, `")
     col_names <- colnames(data)
-    col_names_collapse <- paste(col_names, collapse = "`, `")
     assertthat::assert_that(
       identical(field_names, col_names),
       msg = glue::glue(
         "Field names in `schema` must match column names in data:",
-        "\u2139 Field names: `{field_names_collapse}`",
-        "\u2139 Column names: `{col_names_collapse}`",
-        .sep = "\n"
+        "\u2139 Field names: {field_names_collapse}",
+        "\u2139 Column names: {col_names_collapse}",
+        .sep = "\n",
+        field_names_collapse = glue::glue_collapse(
+          glue::backtick(field_names),
+          sep = ", "
+        ),
+        col_names_collapse = glue::glue_collapse(
+          glue::backtick(col_names),
+          sep = ", "
+        )
       )
     )
   } else {

R/get_resource.R

@@ -22,11 +22,14 @@ get_resource <- function(package, resource_name) {
 
   # Check resource
   resource_names <- resources(package)
-  resource_names_collapse <- paste(resource_names, collapse = "`, `")
   assertthat::assert_that(
     resource_name %in% resource_names,
     msg = glue::glue(
-      "Can't find resource `{resource_name}` in `{resource_names_collapse}`."
+      "Can't find resource `{resource_name}` in {resource_names_collapse}.",
+      resource_names_collapse = glue::glue_collapse(
+        glue::backtick(resource_names),
+        sep = ", "
+      )
     )
   )