From 49e1971aaeeffc8eb54fd708f7286de03a24f744 Mon Sep 17 00:00:00 2001
From: Stefan Verhoeven <stefan.verhoeven@gmail.com>
Date: Wed, 25 Sep 2024 13:50:56 +0200
Subject: [PATCH] tidy formatting

---
 R/remotebmi/R/route.R                   | 652 ++++++++++++------------
 R/remotebmi/R/server.R                  |  22 +-
 R/remotebmi/tests/testthat/test-route.R |  65 ++-
 3 files changed, 368 insertions(+), 371 deletions(-)

diff --git a/R/remotebmi/R/route.R b/R/remotebmi/R/route.R
index 0bbf4c7..cea5a84 100644
--- a/R/remotebmi/R/route.R
+++ b/R/remotebmi/R/route.R
@@ -1,343 +1,341 @@
-
-
 last_segment <- function(path) {
-    # keys values are lowercase at https://github.com/thomasp85/routr/blob/8605611a10607016a83660f83f310075787a27b2/R/route.R#L250
-    # need untouched version
-    segments <- unlist(strsplit(path, '/'))
-    return(segments[length(segments)])
+  # keys values are lowercase at https://github.com/thomasp85/routr/blob/8605611a10607016a83660f83f310075787a27b2/R/route.R#L250
+  # need untouched version
+  segments <- unlist(strsplit(path, "/"))
+  return(segments[length(segments)])
 }
 
 
 #' Create a Route for the Given Model
 #'
-#' This function generates a route for the specified model. The route is used to 
+#' This function generates a route for the specified model. The route is used to
 #' facilitate communication and interaction with the model.
 #'
 #' @param model The model instance to be used in route handlers Must implement the subclass of [AbstractBmi](https://github.com/eWaterCycle/bmi-r/blob/master/R/abstract-bmi.R)
-#' 
+#'
 #' @return A route object that can be used to interact with the model.
 #'
 #' @examples
 #' \dontrun{
-#'   model <- SomeModel$new()
-#'   route <- create_route(model)
+#' model <- SomeModel$new()
+#' route <- create_route(model)
 #' }
 #'
 create_route <- function(model) {
-    bmi_initialize <- function(request, response, keys, ...) {
-        request$parse(json = reqres::parse_json())
-        model$bmi_initialize(request$body$config_file)
-        response$status <- 201L
-        return(FALSE)
-    }
-
-    update <- function(request, response, keys, ...) {
-        model$update()
-        response$status <- 204L
-        return(FALSE)
-    }
-
-    update_until <- function(request, response, keys, ...) {
-        request$parse(json = reqres::parse_json())
-        until = request$body
-        model$updateUntil(until)
-        response$status <- 204L
-        return(FALSE)
-    }
-
-    finalize <- function(request, response, keys, ...) {
-        model$bmi_finalize()
-        response$status <- 204L
-        return(FALSE)
-    }
-
-    get_component_name <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- list(name = model$getComponentName())
-        response$format(json = reqres::format_json(auto_unbox=TRUE))
-        return(FALSE)
-    }
-
-    get_output_var_names <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- model$getOutputVarNames()
-        response$format(json = reqres::format_json())
-        return(FALSE)
-    }
-
-    get_input_var_names <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- model$getInputVarNames()
-        response$format(json = reqres::format_json())
-        return(FALSE)
-    }
-
-    get_time_units <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- list(units = model$getTimeUnits())
-        response$format(json = reqres::format_json(auto_unbox=TRUE))
-        return(FALSE)
-    }
-
-    get_time_step <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- model$getTimeStep()
-        response$format(json = reqres::format_json(auto_unbox=TRUE))
-        return(FALSE)
-    }
-
-    get_current_time <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- model$getCurrentTime()
-        response$format(json = reqres::format_json(auto_unbox=TRUE))
-        return(FALSE)
-    }
-
-    get_start_time <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- model$getStartTime()
-        response$format(json = reqres::format_json(auto_unbox=TRUE))
-        return(FALSE)
-    }
-
-    get_end_time <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- model$getEndTime()
-        response$format(json = reqres::format_json(auto_unbox=TRUE))
-        return(FALSE)
-    }
-
-    get_var_grid <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- model$getVarGrid(last_segment(request$path))
-        response$format(json = reqres::format_json(auto_unbox=TRUE))
-        return(FALSE)
-    }
-
-    get_var_type <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        rawType <- model$getVarType(last_segment(request$path))
-        type <- ifelse(rawType == 'float64', 'double', rawType)
-        # TODO map other types to double, float, int32 or int64  
-        response$body <- list(type = type)
-        response$format(json = reqres::format_json(auto_unbox=TRUE))
-        return(FALSE)
-    }
-
-    get_var_itemsize <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- model$getVarItemSize(last_segment(request$path))
-        response$format(json = reqres::format_json(auto_unbox=TRUE))
-        return(FALSE)
-    }
-
-    get_var_units <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- list(units = model$getVarUnits(last_segment(request$path)))
-        response$format(json = reqres::format_json(auto_unbox=TRUE))
-        return(FALSE)
-    }
-
-    get_var_nbytes <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- model$getVarNBytes(last_segment(request$path))
-        response$format(json = reqres::format_json(auto_unbox=TRUE))
-        return(FALSE)
-    }
-
-    get_value <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- model$getValue(last_segment(request$path))
-        response$format(json = reqres::format_json())
-        return(FALSE)
-    }
-
-    get_value_at_indices <- function(request, response, keys, ...) {
-        request$parse(json = reqres::parse_json())
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- model$getValueAtIndices(last_segment(request$path), request$body)
-        response$format(json = reqres::format_json())
-        return(FALSE)
-    }
-
-    set_value <- function(request, response, keys, ...) {
-        request$parse(json = reqres::parse_json())
-        model$setValue(last_segment(request$path), request$body)
-        response$status <- 204L
-        return(FALSE)
-    }
-
-    set_value_at_indices <- function(request, response, keys, ...) {
-        request$parse(json = reqres::parse_json())
-        model$setValueAtIndices(last_segment(request$path), request$body$indices, request$body$values)
-        response$status <- 204L
-        return(FALSE)
-    }
-
-    get_grid_rank <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- model$getGridRank(keys$grid)
-        response$format(json = reqres::format_json(auto_unbox=TRUE))
-        return(FALSE)
-    }
-
-    get_grid_type <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- list(type = model$getGridType(keys$grid))
-        response$format(json = reqres::format_json(auto_unbox=TRUE))
-        return(FALSE)
-    }
-
-    get_grid_size <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- model$getGridSize(keys$grid)
-        response$format(json = reqres::format_json(auto_unbox=TRUE))
-        return(FALSE)
-    }
-
-    get_grid_x <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- model$getGridX(keys$grid)
-        response$format(json = reqres::format_json())
-        return(FALSE)
-    }
-
-    get_grid_y <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- model$getGridY(keys$grid)
-        response$format(json = reqres::format_json())
-        return(FALSE)
-    }
-
-    get_grid_z <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- model$getGridZ(keys$grid)
-        response$format(json = reqres::format_json())
-        return(FALSE)
-    }
-
-    get_grid_origin <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- model$getGridOrigin(keys$grid)
-        response$format(json = reqres::format_json())
-        return(FALSE)
-    }
-
-    get_grid_shape <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- model$getGridShape(keys$grid)
-        response$format(json = reqres::format_json())
-        return(FALSE)
-    }
-
-    get_grid_spacing <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- model$getGridSpacing(keys$grid)
-        response$format(json = reqres::format_json())
-        return(FALSE)
-    }
-
-    get_grid_connectivity <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- model$getGridConnectivity(keys$grid)
-        response$format(json = reqres::format_json())
-        return(FALSE)
-    }
-
-    get_grid_offset <- function(request, response, keys, ...) {
-        response$status <- 200L
-        response$type <- 'application/json'
-        response$body <- model$getGridOffset(keys$grid)
-        response$format(json = reqres::format_json())
-        return(FALSE)
-    }
-
-    route <- routr::Route$new()
-    # IRF    
-    route$add_handler('post', '/initialize', bmi_initialize)
-    route$add_handler('post', '/update', update)
-    route$add_handler('post', '/update_until', update_until)
-    route$add_handler('delete', '/finalize', finalize)
-
-    # Exchange items
-    route$add_handler('get', '/get_component_name', get_component_name)
-    route$add_handler('get', '/get_output_var_names', get_output_var_names)
-    route$add_handler('get', '/get_input_var_names', get_input_var_names)
-
-    # Getters
-    route$add_handler('get', '/get_value/:name', get_value)
-    route$add_handler('get', '/get_value_at_indices/:name', get_value_at_indices)
-
-    # Setters
-    route$add_handler('post', '/set_value/:name', set_value)
-    route$add_handler('post', '/set_value_at_indices/:name', set_value_at_indices)
-
-    # Time information
-    route$add_handler('get', '/get_time_units', get_time_units)
-    route$add_handler('get', '/get_time_step', get_time_step)
-    route$add_handler('get', '/get_current_time', get_current_time)
-    route$add_handler('get', '/get_start_time', get_start_time)
-    route$add_handler('get', '/get_end_time', get_end_time)
-
-    # Variable information
-    route$add_handler('get', '/get_var_grid/:name', get_var_grid)
-    route$add_handler('get', '/get_var_type/:name', get_var_type)
-    route$add_handler('get', '/get_var_itemsize/:name', get_var_itemsize)
-    route$add_handler('get', '/get_var_units/:name', get_var_units)
-    route$add_handler('get', '/get_var_nbytes/:name', get_var_nbytes)
-
-    # Grid information
-    route$add_handler('get', '/get_grid_rank/:grid', get_grid_rank)
-    route$add_handler('get', '/get_grid_type/:grid', get_grid_type)
-    route$add_handler('get', '/get_grid_size/:grid', get_grid_size)
-
-    # NURC
-    route$add_handler('get', '/get_grid_x/:grid', get_grid_x)
-    route$add_handler('get', '/get_grid_y/:grid', get_grid_y)
-    route$add_handler('get', '/get_grid_z/:grid', get_grid_z)
-
-    # Uniform rectilinear
-    route$add_handler('get', '/get_grid_origin/:grid', get_grid_origin)
-    route$add_handler('get', '/get_grid_shape/:grid', get_grid_shape)
-    route$add_handler('get', '/get_grid_spacing/:grid', get_grid_spacing)
-
-    # Unstructured
-    route$add_handler('get', '/get_grid_connectivity/:grid', get_grid_connectivity)
-    route$add_handler('get', '/get_grid_offset/:grid', get_grid_offset)
-
-    # TODO Needed?
-    hFallback <- function(request, response, keys, ...) {
-        response$status <- 404L
-        response$type <- 'text/plain'
-        response$body <- 'Not found'
-        return(FALSE)
-    }
-    route$add_handler('get', '/*', hFallback)
-
-    return(route)
-}
\ No newline at end of file
+  bmi_initialize <- function(request, response, keys, ...) {
+    request$parse(json = reqres::parse_json())
+    model$bmi_initialize(request$body$config_file)
+    response$status <- 201L
+    return(FALSE)
+  }
+
+  update <- function(request, response, keys, ...) {
+    model$update()
+    response$status <- 204L
+    return(FALSE)
+  }
+
+  update_until <- function(request, response, keys, ...) {
+    request$parse(json = reqres::parse_json())
+    until <- request$body
+    model$updateUntil(until)
+    response$status <- 204L
+    return(FALSE)
+  }
+
+  finalize <- function(request, response, keys, ...) {
+    model$bmi_finalize()
+    response$status <- 204L
+    return(FALSE)
+  }
+
+  get_component_name <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- list(name = model$getComponentName())
+    response$format(json = reqres::format_json(auto_unbox = TRUE))
+    return(FALSE)
+  }
+
+  get_output_var_names <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- model$getOutputVarNames()
+    response$format(json = reqres::format_json())
+    return(FALSE)
+  }
+
+  get_input_var_names <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- model$getInputVarNames()
+    response$format(json = reqres::format_json())
+    return(FALSE)
+  }
+
+  get_time_units <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- list(units = model$getTimeUnits())
+    response$format(json = reqres::format_json(auto_unbox = TRUE))
+    return(FALSE)
+  }
+
+  get_time_step <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- model$getTimeStep()
+    response$format(json = reqres::format_json(auto_unbox = TRUE))
+    return(FALSE)
+  }
+
+  get_current_time <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- model$getCurrentTime()
+    response$format(json = reqres::format_json(auto_unbox = TRUE))
+    return(FALSE)
+  }
+
+  get_start_time <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- model$getStartTime()
+    response$format(json = reqres::format_json(auto_unbox = TRUE))
+    return(FALSE)
+  }
+
+  get_end_time <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- model$getEndTime()
+    response$format(json = reqres::format_json(auto_unbox = TRUE))
+    return(FALSE)
+  }
+
+  get_var_grid <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- model$getVarGrid(last_segment(request$path))
+    response$format(json = reqres::format_json(auto_unbox = TRUE))
+    return(FALSE)
+  }
+
+  get_var_type <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    rawType <- model$getVarType(last_segment(request$path))
+    type <- ifelse(rawType == "float64", "double", rawType)
+    # TODO map other types to double, float, int32 or int64
+    response$body <- list(type = type)
+    response$format(json = reqres::format_json(auto_unbox = TRUE))
+    return(FALSE)
+  }
+
+  get_var_itemsize <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- model$getVarItemSize(last_segment(request$path))
+    response$format(json = reqres::format_json(auto_unbox = TRUE))
+    return(FALSE)
+  }
+
+  get_var_units <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- list(units = model$getVarUnits(last_segment(request$path)))
+    response$format(json = reqres::format_json(auto_unbox = TRUE))
+    return(FALSE)
+  }
+
+  get_var_nbytes <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- model$getVarNBytes(last_segment(request$path))
+    response$format(json = reqres::format_json(auto_unbox = TRUE))
+    return(FALSE)
+  }
+
+  get_value <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- model$getValue(last_segment(request$path))
+    response$format(json = reqres::format_json())
+    return(FALSE)
+  }
+
+  get_value_at_indices <- function(request, response, keys, ...) {
+    request$parse(json = reqres::parse_json())
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- model$getValueAtIndices(last_segment(request$path), request$body)
+    response$format(json = reqres::format_json())
+    return(FALSE)
+  }
+
+  set_value <- function(request, response, keys, ...) {
+    request$parse(json = reqres::parse_json())
+    model$setValue(last_segment(request$path), request$body)
+    response$status <- 204L
+    return(FALSE)
+  }
+
+  set_value_at_indices <- function(request, response, keys, ...) {
+    request$parse(json = reqres::parse_json())
+    model$setValueAtIndices(last_segment(request$path), request$body$indices, request$body$values)
+    response$status <- 204L
+    return(FALSE)
+  }
+
+  get_grid_rank <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- model$getGridRank(keys$grid)
+    response$format(json = reqres::format_json(auto_unbox = TRUE))
+    return(FALSE)
+  }
+
+  get_grid_type <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- list(type = model$getGridType(keys$grid))
+    response$format(json = reqres::format_json(auto_unbox = TRUE))
+    return(FALSE)
+  }
+
+  get_grid_size <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- model$getGridSize(keys$grid)
+    response$format(json = reqres::format_json(auto_unbox = TRUE))
+    return(FALSE)
+  }
+
+  get_grid_x <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- model$getGridX(keys$grid)
+    response$format(json = reqres::format_json())
+    return(FALSE)
+  }
+
+  get_grid_y <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- model$getGridY(keys$grid)
+    response$format(json = reqres::format_json())
+    return(FALSE)
+  }
+
+  get_grid_z <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- model$getGridZ(keys$grid)
+    response$format(json = reqres::format_json())
+    return(FALSE)
+  }
+
+  get_grid_origin <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- model$getGridOrigin(keys$grid)
+    response$format(json = reqres::format_json())
+    return(FALSE)
+  }
+
+  get_grid_shape <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- model$getGridShape(keys$grid)
+    response$format(json = reqres::format_json())
+    return(FALSE)
+  }
+
+  get_grid_spacing <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- model$getGridSpacing(keys$grid)
+    response$format(json = reqres::format_json())
+    return(FALSE)
+  }
+
+  get_grid_connectivity <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- model$getGridConnectivity(keys$grid)
+    response$format(json = reqres::format_json())
+    return(FALSE)
+  }
+
+  get_grid_offset <- function(request, response, keys, ...) {
+    response$status <- 200L
+    response$type <- "application/json"
+    response$body <- model$getGridOffset(keys$grid)
+    response$format(json = reqres::format_json())
+    return(FALSE)
+  }
+
+  route <- routr::Route$new()
+  # IRF
+  route$add_handler("post", "/initialize", bmi_initialize)
+  route$add_handler("post", "/update", update)
+  route$add_handler("post", "/update_until", update_until)
+  route$add_handler("delete", "/finalize", finalize)
+
+  # Exchange items
+  route$add_handler("get", "/get_component_name", get_component_name)
+  route$add_handler("get", "/get_output_var_names", get_output_var_names)
+  route$add_handler("get", "/get_input_var_names", get_input_var_names)
+
+  # Getters
+  route$add_handler("get", "/get_value/:name", get_value)
+  route$add_handler("get", "/get_value_at_indices/:name", get_value_at_indices)
+
+  # Setters
+  route$add_handler("post", "/set_value/:name", set_value)
+  route$add_handler("post", "/set_value_at_indices/:name", set_value_at_indices)
+
+  # Time information
+  route$add_handler("get", "/get_time_units", get_time_units)
+  route$add_handler("get", "/get_time_step", get_time_step)
+  route$add_handler("get", "/get_current_time", get_current_time)
+  route$add_handler("get", "/get_start_time", get_start_time)
+  route$add_handler("get", "/get_end_time", get_end_time)
+
+  # Variable information
+  route$add_handler("get", "/get_var_grid/:name", get_var_grid)
+  route$add_handler("get", "/get_var_type/:name", get_var_type)
+  route$add_handler("get", "/get_var_itemsize/:name", get_var_itemsize)
+  route$add_handler("get", "/get_var_units/:name", get_var_units)
+  route$add_handler("get", "/get_var_nbytes/:name", get_var_nbytes)
+
+  # Grid information
+  route$add_handler("get", "/get_grid_rank/:grid", get_grid_rank)
+  route$add_handler("get", "/get_grid_type/:grid", get_grid_type)
+  route$add_handler("get", "/get_grid_size/:grid", get_grid_size)
+
+  # NURC
+  route$add_handler("get", "/get_grid_x/:grid", get_grid_x)
+  route$add_handler("get", "/get_grid_y/:grid", get_grid_y)
+  route$add_handler("get", "/get_grid_z/:grid", get_grid_z)
+
+  # Uniform rectilinear
+  route$add_handler("get", "/get_grid_origin/:grid", get_grid_origin)
+  route$add_handler("get", "/get_grid_shape/:grid", get_grid_shape)
+  route$add_handler("get", "/get_grid_spacing/:grid", get_grid_spacing)
+
+  # Unstructured
+  route$add_handler("get", "/get_grid_connectivity/:grid", get_grid_connectivity)
+  route$add_handler("get", "/get_grid_offset/:grid", get_grid_offset)
+
+  # TODO Needed?
+  hFallback <- function(request, response, keys, ...) {
+    response$status <- 404L
+    response$type <- "text/plain"
+    response$body <- "Not found"
+    return(FALSE)
+  }
+  route$add_handler("get", "/*", hFallback)
+
+  return(route)
+}
diff --git a/R/remotebmi/R/server.R b/R/remotebmi/R/server.R
index aa50a08..a45540c 100644
--- a/R/remotebmi/R/server.R
+++ b/R/remotebmi/R/server.R
@@ -13,15 +13,15 @@ library(reqres)
 #' @return The server application.
 #' @export
 serve <- function(model, port = 50051, host = "127.0.0.1", ignite = TRUE) {
-    route = create_route(model)
-    router <- routr::RouteStack$new()
-    router$add_route(route, 'bmi')
+  route <- create_route(model)
+  router <- routr::RouteStack$new()
+  router$add_route(route, "bmi")
 
-    port = as.integer(Sys.getenv("BMI_PORT", port))
-    app <- fiery::Fire$new(host=host, port=port)
-    app$attach(router)
-    if (ignite) {
-        app$ignite()
-    }
-    return(app)
-}
\ No newline at end of file
+  port <- as.integer(Sys.getenv("BMI_PORT", port))
+  app <- fiery::Fire$new(host = host, port = port)
+  app$attach(router)
+  if (ignite) {
+    app$ignite()
+  }
+  return(app)
+}
diff --git a/R/remotebmi/tests/testthat/test-route.R b/R/remotebmi/tests/testthat/test-route.R
index 93b986e..aa258bb 100644
--- a/R/remotebmi/tests/testthat/test-route.R
+++ b/R/remotebmi/tests/testthat/test-route.R
@@ -1,45 +1,44 @@
-
 # Poor mans mock
-bmi_initialize_called_with <<- ''
+bmi_initialize_called_with <<- ""
 # Mock model object
-mock_model <- list( 
-    bmi_initialize = function(config_file) {
-      bmi_initialize_called_with <<- config_file
-    },
-    getComponentName = function() "Mock Component",
-    getOutputVarNames = function() c("var1", "var2")
+mock_model <- list(
+  bmi_initialize = function(config_file) {
+    bmi_initialize_called_with <<- config_file
+  },
+  getComponentName = function() "Mock Component",
+  getOutputVarNames = function() c("var1", "var2")
 )
 
-route = create_route(mock_model)
-formatter = reqres::format_json(auto_unbox = TRUE)
+route <- create_route(mock_model)
+formatter <- reqres::format_json(auto_unbox = TRUE)
 
 test_that("/get_component_name", {
-    fake_rook <- fiery::fake_request('/get_component_name')
-    req <- reqres::Request$new(fake_rook)
-    res <- req$respond()
-    route$dispatch(req)
-    expect_equal(res$status, 200)
-    expect_equal(res$body, formatter(list(name="Mock Component")))
+  fake_rook <- fiery::fake_request("/get_component_name")
+  req <- reqres::Request$new(fake_rook)
+  res <- req$respond()
+  route$dispatch(req)
+  expect_equal(res$status, 200)
+  expect_equal(res$body, formatter(list(name = "Mock Component")))
 })
 
 test_that("/get_output_var_names", {
-    fake_rook <- fiery::fake_request('/get_output_var_names')
-    req <- reqres::Request$new(fake_rook)
-    res <- req$respond()
-    route$dispatch(req)
-    expect_equal(res$status, 200)
-    expect_equal(res$body, formatter(c("var1", "var2")))
+  fake_rook <- fiery::fake_request("/get_output_var_names")
+  req <- reqres::Request$new(fake_rook)
+  res <- req$respond()
+  route$dispatch(req)
+  expect_equal(res$status, 200)
+  expect_equal(res$body, formatter(c("var1", "var2")))
 })
 
 test_that("/initialize", {
-    fake_rook <- fiery::fake_request('/initialize'
-        , content = '{"config_file": "some_config"}'
-        , method = "post"
-        , headers = list("Content_Type" = "application/json")
-    )
-    req <- reqres::Request$new(fake_rook)
-    res <- req$respond()
-    route$dispatch(req)
-    expect_equal(res$status, 201)
-    expect_equal(bmi_initialize_called_with, "some_config")
-})
\ No newline at end of file
+  fake_rook <- fiery::fake_request("/initialize",
+    content = '{"config_file": "some_config"}',
+    method = "post",
+    headers = list("Content_Type" = "application/json")
+  )
+  req <- reqres::Request$new(fake_rook)
+  res <- req$respond()
+  route$dispatch(req)
+  expect_equal(res$status, 201)
+  expect_equal(bmi_initialize_called_with, "some_config")
+})