Add tests for #149

By first making it testable and slightly more robust

NEWS.md

@@ -3,6 +3,7 @@
 * added progress bar for long running queries (#141) by @chainsawriot
 * added 429 check (#144)
 * fixed #146 by adding a confirmation step for `auth_setup(browser = FALSE)`(#147)
+* fixed #149 by removing quotes around the inputted instance name though `auth_setup(instance = "")` (#150) by @thisisnic
 
 # rtoot 0.3.3
 

R/auth.R

@@ -26,9 +26,7 @@ auth_setup <- function(instance = NULL, type = NULL, name = NULL, path = NULL, c
     while (is.null(instance) || instance == "") {
         instance <- rtoot_ask(prompt = "On which instance do you want to authenticate (e.g., \"mastodon.social\")? ", pass = FALSE)
     }
-    if(quoted_string(instance)){
-        instance <- substr(instance, 2, nchar(instance)-1)
-    }
+    instance <- process_instance(instance) #149
     client <- get_client(instance = instance)
     if (!isTRUE(type %in% c("public", "user"))) {
         type <- c("public", "user")[rtoot_menu(choices = c("public", "user"), title = "What type of token do you want?", verbose = TRUE)]

R/utils.R

@@ -267,6 +267,13 @@ break_process_request <- function(api_response, retryonratelimit = FALSE, verbos
 }
 
 ## a function to determine if input to readline has been quoted or not
-quoted_string <- function(x){
-    (grepl("^\"", x) && grepl("\"$", x)) || (grepl("^'", x) && grepl("'$", x))
+is_quoted_string <- function(x) {
+    grepl("^[\"'].+[\"']$", x)
+}
+
+process_instance <- function(x) {
+    if (!is_quoted_string(x)) {
+        return(x)
+    }
+    gsub("^['\"]+|['\"]+$", "", x)
 }

README.md

@@ -138,7 +138,7 @@ You can post toots with:
 post_toot(status = "my first rtoot #rstats")
 ```
 
-It can also include media and alt_text.
+It can also include media and alt\_text.
 
 ``` r
 post_toot(

tests/testthat/test-auth_create_token.R

@@ -4,3 +4,11 @@ test_that("defensive", {
   expect_error(create_token(iris), "client is not an object of type rtoot_client")
   expect_error(create_token(fake_client, type = "elon"), "should be one of")
 })
+
+test_that("test for #149", {
+    expect_equal(process_instance("\"fosstodon.org\""), "fosstodon.org")
+    expect_equal(process_instance("\'fosstodon.org\'"), "fosstodon.org")
+    expect_equal(process_instance("\'\'fosstodon.org\'\'"), "fosstodon.org")
+    expect_equal(process_instance("fosstodon.org"), "fosstodon.org")
+    expect_equal(process_instance("fosst\"odon.org"), "fosst\"odon.org")
+})