Improve input validation

Check if the 'bins' parameter of the 'split.data.by.bins' actually
contains 'bins' component. Use 'get.date.from.string' instead of
accessing 'lubridate::ymd_hms' directly, to encapsulate date conversion.
Also allow 'vector' component of 'bins' to be of any subclass of
'numeric' instead of explicitly 'numeric'.

Signed-off-by: Maximilian Löffler <[email protected]>

util-split.R

@@ -65,9 +65,9 @@ split.data.time.based = function(project.data, time.period = "3 months", bins =
                                  number.windows = NULL, split.basis = c("commits", "mails", "issues"),
                                  sliding.window = FALSE, project.conf.new = NULL) {
 
-    # validate type of the 'bins' parameter
+    # validate existence and type of the 'bins' parameter
     if (!is.null(bins) && !lubridate::is.POSIXct(bins)) {
-        dates = parallel::mclapply(bins, function(bin) lubridate::ymd_hms(bin, truncated = 3))
+        dates = parallel::mclapply(bins, function(bin) get.date.from.string(bin))
         if (any(is.na(dates))) {
             logging::logerror("The bins parameter, if present, needs to be a character representing a date")
             stop("Stopped due to incorrect parameter types")
@@ -104,21 +104,26 @@ split.data.by.bins = function(project.data, activity.amount, bins, split.basis =
         stop("Stopped due to incorrect parameter types")
     }
 
-    # validate type of the 'bins' component of the 'bins' parameter
-    dates = parallel::mclapply(bins[["bins"]], function(bin) lubridate::ymd_hms(bin, truncated = 3))
+    # validate existence and type of the 'bins' component of the 'bins' parameter
+    if (!"bins" %in% names(bins)) {
+        logging::logerror("The 'bins' parameter needs to include a component 'bins'")
+        stop("Stopped due to incorrect parameter types")
+    }
+
+    dates = parallel::mclapply(bins[["bins"]], function(bin) get.date.from.string(bin))
     if (any(is.na(dates))) {
         logging::logerror("The 'bins' component of the bins parameter needs to be a character representing a date")
         stop("Stopped due to incorrect parameter types")
     }
 
-    # validate type of the 'vector' component of the 'bins' parameter
-    if (class(bins[["vector"]]) != "numeric") {
+    # validate existence and type of the 'vector' component of the 'bins' parameter
+    if (!inherits(bins[["vector"]], "numeric")) {
         logging::logerror("The 'vector' component of the bins parameter needs to be a numeric vector")
         stop("Stopped due to incorrect parameter types")
     }
 
     split = split.data.by.time.or.bins(project.data, activity.amount, bins, split.by.time = FALSE,
-                                        sliding.window = sliding.window, split.basis = split.basis)
+                                       sliding.window = sliding.window, split.basis = split.basis)
     return(split)
 }