Review wb_dims()

R/asserts.R

@@ -1,6 +1,9 @@
-
-assert_class <- function(x, class, or_null = FALSE, all = FALSE, package = NULL, envir = parent.frame()) {
+# Use arg_nm to override the default
+assert_class <- function(x, class, or_null = FALSE, all = FALSE, package = NULL, envir = parent.frame(), arg_nm = NULL) {
   sx <- as.character(substitute(x, envir))
+  if (identical(sx, character(0)) || !is.null(arg_nm)) {
+    sx <- arg_nm %||% "argument"
+  }
 
   ok <- if (all) {
     all(vapply(class, function(i) inherits(x, i), NA))

R/class-workbook-wrappers.R

@@ -1710,8 +1710,8 @@ wb_set_order <- function(wb, sheets) {
 #'   sheet = 1,
 #'   name = "iris",
 #'   dims = wb_dims(
-#'     row = seq_len(nrow(iris) + 1),
-#'     col = seq_along(iris)
+#'     rows = seq_len(nrow(iris) + 1),
+#'     cols = seq_along(iris)
 #'   )
 #' )
 #'
@@ -1903,8 +1903,7 @@ wb_remove_filter <- function(wb, sheet = current_sheet()) {
 #'   "t" = as.POSIXct("2016-01-01") + -5:5 * 10000
 #' )
 #' wb$add_data_table(2, x = df)
-#' wb$add_data_validation(2,
-#'   col = 1, rows = 2:12, type = "date",
+#' wb$add_data_validation(2, dims = "B2:B12", type = "date",
 #'   operator = "greaterThanOrEqual", value = as.Date("2016-01-01")
 #' )
 #' wb$add_data_validation(2,

R/converters.R

@@ -16,22 +16,26 @@ int2col <- function(x) {
   sapply(x, int_to_col)
 }
 
-#' @name col2int
-#' @title Convert Excel column to integer
-#' @description Converts an Excel column label to an integer.
+#' Convert Excel column to integer
+#'
+#' Converts an Excel column label to an integer.
+#'
 #' @param x A character vector
+#' @return An integer column label (or `NULL` if `x` is `NULL`)
 #' @export
 #' @examples
 #' col2int(LETTERS)
 col2int <- function(x) {
-
+  if (is.null(x)) {
+      return(NULL)
+    }
   if (is.numeric(x) || is.integer(x) || is.factor(x))
-    return(as.numeric(x))
+    return(as.integer(x))
 
   if (!is.character(x)) {
     stop("x must be character")
 
-    if (any(is.na(x)))
+    if (anyNA(x))
       stop("x must be a valid character")
   }