Overhaul vcr_configure() to avoid overwriting existing config parameters

DESCRIPTION

@@ -8,7 +8,7 @@ Description: Record test suite 'HTTP' requests and replays them during
     real 'HTTP' responses on disk in 'cassettes'. Subsequent 'HTTP' requests
     matching any previous requests in the same 'cassette' use a cached
     'HTTP' response.
-Version: 0.4.1.93
+Version: 0.4.1.94
 Authors@R: c(person("Scott", "Chamberlain", role = c("aut", "cre"),
     email = "sckott@protonmail.com", 
     comment = c(ORCID="0000-0003-1444-9135")),

NAMESPACE

@@ -56,6 +56,7 @@ importFrom(lazyeval,lazy_dots)
 importFrom(lazyeval,lazy_eval)
 importFrom(urltools,url_compose)
 importFrom(urltools,url_parse)
+importFrom(utils,getParseData)
 importFrom(webmockr,pluck_body)
 importFrom(yaml,as.yaml)
 importFrom(yaml,yaml.load)

R/cassette_class.R

@@ -132,32 +132,14 @@ Cassette <- R6::R6Class(
       self$serialize_with <- serialize_with
       self$persist_with <- persist_with
       if (!missing(record)) {
-        recmodes <- c("none", "once", "new_episodes", "all")
-        if (!record %in% recmodes) {
-          stop("'record' value of '", record, "' is not in the allowed set: ",
-               paste0(recmodes, collapse = ", "), call. = FALSE)
-        }
-        self$record <- record
+        self$record <- check_record_mode(record)
       }
       self$make_dir()
       self$manfile <- sprintf("%s/%s.yml", path.expand(cassette_path()),
                               self$name)
       if (!file.exists(self$manfile)) cat("\n", file = self$manfile)
       if (!missing(match_requests_on)) {
-        mro <- c("method", "uri", "headers", "host", "path", "body")
-        if (!any(match_requests_on %in% mro)) {
-          stop("1 or more 'match_requests_on' values (",
-               paste0(match_requests_on, collapse = ", "),
-               ") is not in the allowed set: ",
-               paste0(mro, collapse = ", "), call. = FALSE)
-        }
-        # we don't yet support the following matchers: host, path
-        if (any(match_requests_on %in% c("host", "path"))) {
-          stop("we do not yet support host and path matchers",
-            "\n see https://github.com/ropensci/vcr/issues/70",
-            call. = FALSE)
-        }
-        self$match_requests_on <- match_requests_on
+        self$match_requests_on <- check_request_matchers(match_requests_on)
       }
       if (!missing(re_record_interval))
         self$re_record_interval <- re_record_interval

R/cassettes.R

@@ -31,7 +31,7 @@
 #'
 #' # list the path to cassettes
 #' cassette_path()
-#' vcr_configure(file.path(tempdir(), "foo"))
+#' vcr_configure(dir = file.path(tempdir(), "foo"))
 #' cassette_path()
 #'
 #' vcr_configure_reset()

R/check_cassette_names.R

@@ -24,7 +24,7 @@ check_cassette_names <- function(pattern = "test-", behavior = "stop") {
   if (length(files) == 0) return()
   cassette_names <- function(x) {
     tmp <- parse(x, keep.source = TRUE)
-    df <- getParseData(tmp)
+    df <- utils::getParseData(tmp)
     row.names(df) = NULL
     z <- as.numeric(row.names(df[df$text == "use_cassette", ])) + 2
     gsub("\"", "", df[z, "text"])