Fix469 (#470)

* temp

* Fix #469

Author: chainsawriot

DESCRIPTION

@@ -78,6 +78,6 @@ Suggests:
 License: GPL-2
 VignetteBuilder: knitr
 Encoding: UTF-8
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.2
 Roxygen: list(markdown = TRUE)
 Config/Needs/website: gesistsa/tsatemplate

NAMESPACE

@@ -70,6 +70,7 @@ S3method(.import,rio_syd)
 S3method(.import,rio_tsv)
 S3method(.import,rio_txt)
 S3method(.import,rio_xls)
+S3method(.import,rio_xlsm)
 S3method(.import,rio_xlsx)
 S3method(.import,rio_xml)
 S3method(.import,rio_xpt)

R/import_list.R

@@ -95,7 +95,7 @@ import_list <- function(file, setclass = getOption("rio.import.class", "data.fra
         return(.import.rio_rdata(file = file, .return_everything = TRUE, ...))
     }
     archive_format <- find_compress(file)
-    if (!format %in% c("html", "xlsx", "xls", "ods", "fods") && !archive_format$compress %in% c("zip", "tar", "tar.gz", "tar.bz2")) {
+    if (!format %in% c("html", "xlsx", "xls", "xlsm", "ods", "fods") && !archive_format$compress %in% c("zip", "tar", "tar.gz", "tar.bz2")) {
         which <- 1
         whichnames <- NULL
     }
@@ -112,7 +112,7 @@ import_list <- function(file, setclass = getOption("rio.import.class", "data.fra
         )
         names(which) <- whichnames
     }
-    if (format %in% c("xls", "xlsx", "ods", "fods")) {
+    if (format %in% c("xls", "xlsx", "xlsm","ods", "fods")) {
         ## .check_pkg_availability("readxl")
         sheet_func <- readxl::excel_sheets
         if (format %in% c("ods", "fods")) {

R/import_methods.R

@@ -287,6 +287,9 @@ import_delim <- function(file, which = 1, sep = "auto", header = "auto", strings
     .remap_tidy_convention(readxl::read_xlsx, file = file, which = which, header = header, ...)
 }
 
+#' @export
+.import.rio_xlsm <- .import.rio_xlsx
+
 #' @export
 .import.rio_fortran <- function(file, which = 1, style, ...) {
     if (missing(style)) {

R/sysdata.rda

@@ -149,6 +149,7 @@ The full list of supported formats is below:
 | Epiinfo                             | epiinfo / rec                       | foreign        |                | Default |                                |
 | Excel                               | excel / xlsx                        | readxl         | writexl        | Default |                                |
 | Excel (Legacy)                      | xls                                 | readxl         |                | Default |                                |
+| Excel (Read only)                   | xlsm / xltx / xltm                  | readxl         |                | Default |                                |
 | Fixed-width format data             | fwf                                 | readr          | utils          | Default |                                |
 | Fortran data                        | fortran                             | utils          |                | Default | No recognized extension        |
 | Google Sheets                       | googlesheets                        | data.table     |                | Default | As comma-separated data        |

README.md

@@ -233,6 +233,33 @@
         "export_function": "writexl::write_xlsx",
         "note": ""
     },
+    {
+        "input": "xlsm",
+        "format": "xlsm",
+        "type": "import",
+        "format_name": "Excel (Read only)",
+        "import_function": "readxl::read_xlsx",
+        "export_function": "",
+        "note": ""
+    },
+    {
+        "input": "xltx",
+        "format": "xlsm",
+        "type": "import",
+        "format_name": "Excel (Read only)",
+        "import_function": "readxl::read_xlsx",
+        "export_function": "",
+        "note": ""
+    },
+    {
+        "input": "xltm",
+        "format": "xlsm",
+        "type": "import",
+        "format_name": "Excel (Read only)",
+        "import_function": "readxl::read_xlsx",
+        "export_function": "",
+        "note": ""
+    },
     {
         "input": "fst",
         "format": "fst",

data-raw/single.json

@@ -51,13 +51,28 @@ test_that("Import from Excel (.xls)", {
 })
 
 test_that("Import from Excel (.xlsm)", {
-  expect_true(is.data.frame(import("../testdata/example.xlsm", sheet = 1, format = "xlsx")))
-  expect_true(is.data.frame(import("../testdata/example.xlsm", which = 1, format = "xlsx")))
-  expect_equal(
-    import_list("../testdata/example.xlsm", format = "xlsx"),
-    list(
-      Sheet1 = data.frame(A = 1),
-      Sheet2 = data.frame(B = 2)
+    expect_true(is.data.frame(import("../testdata/example.xlsm", sheet = 1, format = "xlsx")))
+    expect_true(is.data.frame(import("../testdata/example.xlsm", which = 1, format = "xlsx")))
+    expect_true(is.data.frame(import("../testdata/example.xlsm")))
+
+    expect_equal(
+        import_list("../testdata/example.xlsm", format = "xlsx"),
+        list(
+            Sheet1 = data.frame(A = 1),
+            Sheet2 = data.frame(B = 2)
+        )
+    )
+    expect_equal(
+        import_list("../testdata/example.xlsm"),
+        list(
+            Sheet1 = data.frame(A = 1),
+            Sheet2 = data.frame(B = 2)
+        )
     )
-  )
+})
+
+test_that("Exporting to xlsm is not supported #469", {
+    withr::with_tempfile("iris_file", fileext = ".xlsm", code = {
+        expect_error(export(iris, iris_file), "Format not supported")
+    })
 })