Merge pull request #342 from shapenaji/master

Combines PR 340 and PR 341 and fixes email for CLA

R/plumber.R

@@ -167,15 +167,17 @@ plumber <- R6Class(
         filters <- list()
       }
 
+      # Initialize
+      private$serializer <- serializer_json()
+      private$errorHandler <- defaultErrorHandler()
+      private$notFoundHandler <- default404Handler
+
       # Add in the initial filters
       for (fn in names(filters)){
         fil <- PlumberFilter$new(fn, filters[[fn]], private$envir, private$serializer, NULL)
         private$filts <- c(private$filts, fil)
       }
 
-      private$errorHandler <- defaultErrorHandler()
-      private$notFoundHandler <- default404Handler
-
       if (!is.null(file)){
         private$lines <- readUTF8(file)
         private$parsed <- parseUTF8(file)
@@ -271,7 +273,7 @@ plumber <- R6Class(
       super$registerHook(stage, handler)
     },
 
-    handle = function(methods, path, handler, preempt, serializer, endpoint){
+    handle = function(methods, path, handler, preempt, serializer, endpoint, ...){
       epdef <- !missing(methods) || !missing(path) || !missing(handler) || !missing(serializer)
       if (!missing(endpoint) && epdef){
         stop("You must provide either the components for an endpoint (handler and serializer) OR provide the endpoint yourself. You cannot do both.")
@@ -282,7 +284,7 @@ plumber <- R6Class(
           serializer <- private$serializer
         }
 
-        endpoint <- PlumberEndpoint$new(methods, path, handler, private$envir, serializer)
+        endpoint <- PlumberEndpoint$new(methods, path, handler, private$envir, serializer, ...)
       }
       private$addEndpointInternal(endpoint, preempt)
     },
@@ -630,7 +632,7 @@ plumber <- R6Class(
       paths
     }
   ), private = list(
-    serializer = serializer_json(), # The default serializer for the router
+    serializer = NULL, # The default serializer for the router
 
     ends = list(), # List of endpoints indexed by their pre-empted filter.
     filts = NULL, # Array of filters