Merge pull request #15 from inbo/hotfix

fit_model() gains a bucket argument when x is character

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: n2kanalysis
 Title: Generic Functions to Analyse Data from the Natura 2000 Monitoring
-Version: 0.2.4
-Date: 2017-11-25
+Version: 0.2.4.1
+Date: 2017-11-29
 Authors@R: c(person("Thierry", "Onkelinx", email = "[email protected]", role = c("aut", "cre")))
 Description: All generic functions for the analysis. The full analysis is
     defined in the analysis package of each monitoring scheme.

R/fit_model_character.R

@@ -1,6 +1,7 @@
 #' @rdname fit_model
 #' @importFrom methods setMethod new
 #' @importFrom assertthat assert_that is.flag noNA
+#' @importFrom aws.s3 get_bucket
 #' @details
 #' \describe{
 #'  \item{\code{status}}{A vector with status levels naming the levels which should be recalculated. Defaults to \code{"new"}}
@@ -22,11 +23,15 @@ setMethod(
       message(x)
     }
     if (is.null(dots$base)) {
-      dots$base <- gsub(
-        pattern = "(.*)/(.*)/.*/[[:xdigit:]]{40}\\.(rds|manifest)",
-        replacement = "\\1",
-        x = x
-      )
+      if (is.null(dots$bucket)) {
+        dots$base <- gsub(
+          pattern = "(.*)/(.*)/.*/[[:xdigit:]]{40}\\.(rds|manifest)",
+          replacement = "\\1",
+          x = x
+        )
+      } else {
+        dots$base <- get_bucket(dots$bucket)
+      }
     }
     if (is.null(dots$project)) {
       dots$project <- gsub(