Small cleanup (#501)

* Add path segment wildcard test to testrunner
* Fix compiler warning about class keyword
* Fix (some) linter warnings

Author: michaelenger

Xcode/Sources/HttpServer.swift

@@ -42,10 +42,10 @@ open class HttpServer: HttpServerIO {
     public var delete, patch, head, post, get, put: MethodRoute
 
     public subscript(path: String) -> ((HttpRequest) -> HttpResponse)? {
+        get { return nil }
         set {
             router.register(nil, path: path, handler: newValue)
         }
-        get { return nil }
     }
 
     public var routes: [String] {
@@ -75,10 +75,10 @@ open class HttpServer: HttpServerIO {
         public let method: String
         public let router: HttpRouter
         public subscript(path: String) -> ((HttpRequest) -> HttpResponse)? {
+            get { return nil }
             set {
                 router.register(method, path: path, handler: newValue)
             }
-            get { return nil }
         }
     }
 }

Xcode/Sources/HttpServerIO.swift

@@ -8,7 +8,7 @@
 import Foundation
 import Dispatch
 
-public protocol HttpServerIODelegate: class {
+public protocol HttpServerIODelegate: AnyObject {
     func socketConnectionReceived(_ socket: Socket)
 }
 

Xcode/Sources/WebSockets.swift

@@ -277,7 +277,7 @@ public class WebSocketSession: Hashable, Equatable {
         }
 
         let mask = [try socket.read(), try socket.read(), try socket.read(), try socket.read()]
-        //Read payload all at once, then apply mask (calling `socket.read` byte-by-byte is super slow).
+        // Read payload all at once, then apply mask (calling `socket.read` byte-by-byte is super slow).
         frm.payload = try socket.read(length: Int(len))
         for index in 0..<len {
             frm.payload[Int(index)] ^= mask[Int(index % 4)]

Xcode/SwifterSampleOSX/main.swift

@@ -10,6 +10,7 @@ import Swifter
 do {
     let server = demoServer(try String.File.currentWorkingDirectory())
     server["/testAfterBaseRoute"] = { request in
+        print("Received request: \(request)")
         return .ok(.htmlBody("ok !"))
     }
 

Xcode/Tests/PingServer.swift

@@ -16,7 +16,7 @@ import FoundationNetworking
 extension HttpServer {
     class func pingServer() -> HttpServer {
         let server = HttpServer()
-        server.GET["/ping"] = { request in
+        server.GET["/ping"] = { _ in
             return HttpResponse.ok(.text("pong!"))
         }
         return server

Xcode/Tests/XCTestManifests.swift

@@ -63,6 +63,7 @@ extension SwifterTestsHttpRouter {
         ("testHttpRouterHandlesOverlappingPathsInDynamicRoutes", testHttpRouterHandlesOverlappingPathsInDynamicRoutes),
         ("testHttpRouterHandlesOverlappingPathsInDynamicRoutesInTheMiddle", testHttpRouterHandlesOverlappingPathsInDynamicRoutesInTheMiddle),
         ("testHttpRouterMultiplePathSegmentWildcards", testHttpRouterMultiplePathSegmentWildcards),
+        ("testHttpRouterMultiplePathSegmentWildcardTail", testHttpRouterMultiplePathSegmentWildcardTail),
         ("testHttpRouterPercentEncodedPathSegments", testHttpRouterPercentEncodedPathSegments),
         ("testHttpRouterShouldHandleOverlappingRoutesInTrail", testHttpRouterShouldHandleOverlappingRoutesInTrail),
         ("testHttpRouterSimplePathSegments", testHttpRouterSimplePathSegments),