fix request/response

.gitignore

@@ -1,3 +1,5 @@
 Packages
 .build
-main.swift
+main.swift
+Public
+Resources

Sources/Request.swift

@@ -33,7 +33,7 @@ public class Request {
     var headers: [String: String] = [:]
     var body: [UInt8] = []
     var address: String? = ""
-    var session: Session = Session()
+    public var session: Session = Session()
 
     init(method: Method) {
         self.method = method

Sources/Response.swift

@@ -166,7 +166,7 @@ public class Response {
             "error": true,
             "message": error
         ]
-        try! self.init(status: .Error, jsonObject: object as! AnyObject)
+        try! self.init(status: .Error, json: object as! AnyObject)
     }
 
     convenience init(status: Status, html: String) {
@@ -180,8 +180,8 @@ public class Response {
         self.init(status: status, data: data, contentType: .Text)
     }
 
-    convenience init(status: Status, jsonObject: Any) throws {
-        guard let jsonObject = jsonObject as? AnyObject else {
+    convenience init(status: Status, json: Any) throws {
+        guard let jsonObject = json as? AnyObject else {
             throw SerializationError.InvalidObject
         }
         guard NSJSONSerialization.isValidJSONObject(jsonObject) else {

Sources/ResponseConvertible.swift

@@ -15,7 +15,7 @@ extension String: ResponseConvertible {
 extension Dictionary: ResponseConvertible {
 	public func response() -> Response {
 		do {
-            return try Response(status: .OK, jsonObject: self)    
+            return try Response(status: .OK, json: self)    
         } catch {
             return Response(error: "JSON serialization error: \(error)")
         }
@@ -25,7 +25,7 @@ extension Dictionary: ResponseConvertible {
 extension Array: ResponseConvertible {
 	public func response() -> Response {
 		do {
-            return try Response(status: .OK, jsonObject: (self as! AnyObject))    
+            return try Response(status: .OK, json: (self as! AnyObject))    
         } catch {
             return Response(error: "JSON serialization error: \(error)")
         }

Sources/Server.swift

@@ -19,8 +19,9 @@ public class Server: SocketServer {
         for route in Route.routes {
             self.router.register(route.method.rawValue, path: route.path) { request in 
 
+
                 //grab request params
-                let routePaths = route.path.split("/")
+                let routePaths = route.path.split("?")[0].split("/")
                 for (index, path) in routePaths.enumerate() {
                     if path.hasPrefix(":") {
                         let requestPaths = request.path.split("/")