#15 Refactored if statement in process

Kitura · Mar 1, 2016 · e2b2a11 · e2b2a11
1 parent dfb9976
commit e2b2a11
Showing 1 changed file with 18 additions and 13 deletions.
diff --git a/KituraRouter/RouterElement.swift b/KituraRouter/RouterElement.swift
@@ -126,24 +126,29 @@ class RouterElement {
     /// - Parameter response: the response
     ///
     func process(httpMethod: RouterMethod, urlPath: NSData, request: RouterRequest, response: RouterResponse, next: () -> Void) {
-        if  (response.error == nil && (method == .All  ||  method == httpMethod)) || (response.error != nil && method == .Error) {
-            if  let r = regex  {
-                let matcher = r.matcher!
-                if  matcher.match(urlPath) {
+        if response.error == nil || method == .Error {
+            if response.error != nil || method == .All || method == httpMethod {
+                // Either response error exists and method is error, or method matches
+                if  let r = regex  {
+                    let matcher = r.matcher!
+                    if  matcher.match(urlPath) {
+                        request.route = pattern
+                        updateRequestParams(matcher, request: request)
+                        processHelper(request, response: response, next: next)
+                    } else {
+                        next()
+                    }
+                }
+                else {
                     request.route = pattern
-                    updateRequestParams(matcher, request: request)
+                    request.params = [:]
                     processHelper(request, response: response, next: next)
-                } else {
-                    next()
                 }
-            }
-            else {
-                request.route = pattern
-                request.params = [:]
-                processHelper(request, response: response, next: next)
+            } else {
+                next ()
             }
         } else {
-            next()
+            next ()
         }
     }