show which filenames let as.quitte fail

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '626216492'
+ValidationKey: '627240389'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'

CITATION.cff

@@ -2,8 +2,8 @@ cff-version: 1.2.0
 message: If you use this software, please cite it using the metadata from this file.
 type: software
 title: 'quitte: Bits and pieces of code to use with quitte-style data frames'
-version: 0.3137.2
-date-released: '2024-08-26'
+version: 0.3137.3
+date-released: '2024-09-27'
 abstract: A collection of functions for easily dealing with quitte-style data frames,
   doing multi-model comparisons and plots.
 authors:

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: quitte
 Title: Bits and pieces of code to use with quitte-style data frames
-Version: 0.3137.2
-Date: 2024-08-26
+Version: 0.3137.3
+Date: 2024-09-27
 Authors@R: c(
     person("Michaja", "Pehl", , "[email protected]", role = c("aut", "cre")),
     person("Nico", "Bauer", , "[email protected]", role = "aut"),

R/as.quitte.R

@@ -32,12 +32,12 @@ as.quitte <- function(x, periodClass = "integer", addNA = FALSE, na.rm = FALSE)
 
 #' @export
 as.quitte.character <- function(x, periodClass = "integer", addNA = FALSE, na.rm = FALSE) { # nolint
-    if (all(file.exists(x) & grepl("\\.(mif|csv|rds|xlsx?)$", x)))
+    welldefined <- file.exists(x) & grepl("\\.(mif|csv|rds|xlsx?)$", x)
+    if (all(welldefined))
         return(as.quitte(read.quitte(x, sep = NULL),
                          periodClass = periodClass, addNA = addNA, na.rm = na.rm))
-    stop(
-        "Provided character cannot be converted to quitte as it does not seem to be a valid file path!"
-    )
+    stop("Provided character cannot be converted to quitte as those do not seem to be a valid file path: ",
+         paste(x[! welldefined], collapse = ", "))
 }
 
 #' @method as.quitte quitte
@@ -242,7 +242,7 @@ as.quitte.list <- function(x, periodClass = "integer", addNA = FALSE, na.rm = FA
 #' @method as.quitte NULL
 #' @export
 as.quitte.NULL <- function(x, periodClass = "integer", addNA = FALSE, na.rm = FALSE) { # nolint
-    return(filter(as.quitte(as_tibble(as.quitte(data.frame(value = 0), periodClass = periodClass))), .data$value > 1))
+    return(droplevels(filter(as.quitte(as_tibble(as.quitte(data.frame(value = 0), periodClass = periodClass))), .data$value > 1)))
 }
 
 qaddNA <- function(x) {

README.md

@@ -1,6 +1,6 @@
 # Bits and pieces of code to use with quitte-style data frames
 
-R package **quitte**, version **0.3137.2**
+R package **quitte**, version **0.3137.3**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/quitte)](https://cran.r-project.org/package=quitte)  [![R build status](https://github.com/pik-piam/quitte/workflows/check/badge.svg)](https://github.com/pik-piam/quitte/actions) [![codecov](https://codecov.io/gh/pik-piam/quitte/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/quitte) [![r-universe](https://pik-piam.r-universe.dev/badges/quitte)](https://pik-piam.r-universe.dev/builds)
 
@@ -47,7 +47,7 @@ In case of questions / problems please contact Michaja Pehl <michaja.pehl@pik-po
 
 To cite package **quitte** in publications use:
 
-Pehl M, Bauer N, Hilaire J, Levesque A, Luderer G, Schultes A, Dietrich J, Richters O (2024). _quitte: Bits and pieces of code to use with quitte-style data frames_. R package version 0.3137.2, <https://github.com/pik-piam/quitte>.
+Pehl M, Bauer N, Hilaire J, Levesque A, Luderer G, Schultes A, Dietrich J, Richters O (2024). _quitte: Bits and pieces of code to use with quitte-style data frames_. R package version 0.3137.3, <https://github.com/pik-piam/quitte>.
 
 A BibTeX entry for LaTeX users is
 
@@ -56,7 +56,7 @@ A BibTeX entry for LaTeX users is
   title = {quitte: Bits and pieces of code to use with quitte-style data frames},
   author = {Michaja Pehl and Nico Bauer and Jérôme Hilaire and Antoine Levesque and Gunnar Luderer and Anselm Schultes and Jan Philipp Dietrich and Oliver Richters},
   year = {2024},
-  note = {R package version 0.3137.2},
+  note = {R package version 0.3137.3},
   url = {https://github.com/pik-piam/quitte},
 }
 ```

tests/testthat/test-as.quitte.R

@@ -92,6 +92,15 @@ test_that(
   {
     expect_true(is.quitte(as.quitte(NULL)))
     expect_equal(nrow(as.quitte(NULL)), 0)
+    expect_equal(length(levels(as.quitte(NULL)$model)), 0)
+  }
+)
+
+test_that(
+  'as.quitte fails on non-supported filename',
+  {
+    expect_error(as.quitte('unknownfiletype.§§$%'),
+                 'do not seem to be a valid file path: unknownfiletype.§§$%', fixed = TRUE)
   }
 )