Refactor.

Common/ActiveRecord/SwifterActiveRecord.swift

@@ -10,7 +10,11 @@ struct SwifterActiveRecordField {
     let name: String?
 }
 
-class SwifterActiveRecord<T: NSObject> {
+protocol WithInit {
+    init()
+}
+
+class SwifterActiveRecord<T: WithInit> {
     
     init() {
 
@@ -18,7 +22,7 @@ class SwifterActiveRecord<T: NSObject> {
     
     private func scheme(error: NSErrorPointer?) -> [SwifterActiveRecordField] {
         var results = [SwifterActiveRecordField]()
-        let classInfoDump = reflect(self)
+        let classInfoDump = reflect(T())
         for var index = 1; index < classInfoDump.count; ++index {
             let field = classInfoDump[index]
             results.append(SwifterActiveRecordField(name: field.0))
@@ -40,4 +44,3 @@ class SwifterActiveRecord<T: NSObject> {
 }
 
 
-

Common/HttpParser.swift

@@ -57,7 +57,7 @@ class HttpParser {
         var body = ""
         var counter = 0;
         while ( counter < size ) {
-            let c = nextUInt8(socket)
+            let c = nextInt8(socket)
             if ( c < 0 ) {
                 if error != nil { error.memory = err("IO error while reading body") }
                 return nil
@@ -89,7 +89,7 @@ class HttpParser {
         return nil
     }
 
-    private func nextUInt8(socket: CInt) -> Int {
+    private func nextInt8(socket: CInt) -> Int {
         var buffer = [UInt8](count: 1, repeatedValue: 0);
         let next = recv(socket, &buffer, UInt(buffer.count), 0)
         if next <= 0 { return next }
@@ -100,7 +100,7 @@ class HttpParser {
         var characters: String = ""
         var n = 0
         do {
-            n = nextUInt8(socket)
+            n = nextInt8(socket)
             if ( n > 13 /* CR */ ) { characters.append(Character(UnicodeScalar(n))) }
         } while ( n > 0 && n != 10 /* NL */)
         if ( n == -1 && characters.isEmpty ) {

Common/HttpServer.swift

@@ -44,9 +44,9 @@ class HttpServer
                             if let (expression, handler) = self.findHandler(request.url) {
                                 let capturedUrlsGroups = self.captureExpressionGroups(expression, value: request.url)
                                 let updatedRequest = HttpRequest(url: request.url, urlParams: request.urlParams, method: request.method, headers: request.headers, body: request.body, capturedUrlGroups: capturedUrlsGroups)
-                                HttpServer.writeResponse(socket, response: handler(updatedRequest), keepAlive: keepAlive)
+                                HttpServer.respond(socket, response: handler(updatedRequest), keepAlive: keepAlive)
                             } else {
-                                HttpServer.writeResponse(socket, response: HttpResponse.NotFound, keepAlive: keepAlive)
+                                HttpServer.respond(socket, response: HttpResponse.NotFound, keepAlive: keepAlive)
                             }
                             if !keepAlive { break }
                         }
@@ -83,20 +83,20 @@ class HttpServer
         return NSMakeRange(0, value.lengthOfBytesUsingEncoding(NSASCIIStringEncoding))
     }
     
-    class func writeResponse(socket: CInt, response: HttpResponse, keepAlive: Bool) {
-        Socket.writeStringUTF8(socket, string: "HTTP/1.1 \(response.statusCode()) \(response.reasonPhrase())\r\n")
+    class func respond(socket: CInt, response: HttpResponse, keepAlive: Bool) {
+        Socket.writeUTF8(socket, string: "HTTP/1.1 \(response.statusCode()) \(response.reasonPhrase())\r\n")
         if let body = response.body() {
-            Socket.writeStringASCII(socket, string: "Content-Length: \(body.length)\r\n")
+            Socket.writeASCII(socket, string: "Content-Length: \(body.length)\r\n")
         } else {
-            Socket.writeStringASCII(socket, string: "Content-Length: 0\r\n")
+            Socket.writeASCII(socket, string: "Content-Length: 0\r\n")
         }
         if keepAlive {
-            Socket.writeStringASCII(socket, string: "Connection: keep-alive\r\n")
+            Socket.writeASCII(socket, string: "Connection: keep-alive\r\n")
         }
         for (name, value) in response.headers() {
-            Socket.writeStringASCII(socket, string: "\(name): \(value)\r\n")
+            Socket.writeASCII(socket, string: "\(name): \(value)\r\n")
         }
-        Socket.writeStringASCII(socket, string: "\r\n")
+        Socket.writeASCII(socket, string: "\r\n")
         if let body = response.body() {
             Socket.writeData(socket, data: body)
         }

Common/Socket.swift

@@ -49,14 +49,14 @@ struct Socket {
         return s
     }
     
-    static func writeStringUTF8(socket: CInt, string: String, error: NSErrorPointer = nil) -> Bool {
+    static func writeUTF8(socket: CInt, string: String, error: NSErrorPointer = nil) -> Bool {
         if let nsdata = string.dataUsingEncoding(NSUTF8StringEncoding) {
             writeData(socket, data: nsdata, error: error)
         }
         return true
     }
     
-    static func writeStringASCII(socket: CInt, string: String, error: NSErrorPointer = nil) -> Bool {
+    static func writeASCII(socket: CInt, string: String, error: NSErrorPointer = nil) -> Bool {
         if let nsdata = string.dataUsingEncoding(NSASCIIStringEncoding) {
             writeData(socket, data: nsdata, error: error)
         }

Swifter.xcodeproj/xcuserdata/damiankolakowski.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -585,7 +585,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "86"
             endingLineNumber = "86"
-            landmarkName = "writeResponse(_:response:keepAlive:)"
+            landmarkName = "respond(_:response:keepAlive:)"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -601,7 +601,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "87"
             endingLineNumber = "87"
-            landmarkName = "writeResponse(_:response:keepAlive:)"
+            landmarkName = "respond(_:response:keepAlive:)"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -633,7 +633,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "55"
             endingLineNumber = "55"
-            landmarkName = "writeStringUTF8(_:string:error:)"
+            landmarkName = "writeUTF8(_:string:error:)"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -847,8 +847,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "79"
             endingLineNumber = "79"
-            landmarkName = "SwifterSQLiteDatabaseProxy"
-            landmarkType = "3">
+            landmarkName = "init(name:)"
+            landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy