Updated for Beta 5 changes. Holy crap that took a while. Closes #18

mattdonnelly · Aug 5, 2014 · 8b06b61 · 8b06b61
1 parent 45c1e62
commit 8b06b61
Show file tree

Hide file tree

Showing 23 changed files with 422 additions and 401 deletions.
diff --git a/Swifter/Dictionary+Swifter.swift b/Swifter/Dictionary+Swifter.swift
@@ -27,16 +27,6 @@ import Foundation
 
 extension Dictionary {
 
-    func join(other: Dictionary) -> Dictionary {
-        var joinedDictionary = self
-
-        for (key, value) in other {
-            joinedDictionary[key] = value
-        }
-
-        return joinedDictionary
-    }
-
     func filter(predicate: Element -> Bool) -> Dictionary {
         var filteredDictionary = Dictionary()
 
@@ -59,7 +49,7 @@ extension Dictionary {
             parts.append(query)
         }
 
-        return parts.bridgeToObjectiveC().componentsJoinedByString("&") as String
+        return join("&", parts)
     }
 
     func urlEncodedQueryStringWithEncoding(encoding: NSStringEncoding) -> String {
@@ -72,7 +62,19 @@ extension Dictionary {
             parts.append(query)
         }
 
-        return parts.bridgeToObjectiveC().componentsJoinedByString("&") as String
+        return join("&", parts)
     }
 
 }
+
+infix operator + {}
+func + <K,V>(left: Dictionary<K,V>, right: Dictionary<K,V>) -> Dictionary<K,V> {
+    var map = Dictionary<K,V>()
+    for (k, v) in left {
+        map[k] = v
+    }
+    for (k, v) in right {
+        map[k] = v
+    }
+    return map
+}
diff --git a/Swifter/JSON.swift b/Swifter/JSON.swift
@@ -110,7 +110,7 @@ public enum JSON : Equatable, Printable {
             case let array as NSArray:
                 var newArray : [JSONValue] = []
                 for item : AnyObject in array {
-                    newArray += JSON(item)
+                    newArray.append(JSON(item))
                 }
                 self = .JSONArray(newArray)
 
@@ -331,9 +331,9 @@ extension JSON: Printable {
 
 }
 
-extension JSONValue: LogicValue {
+extension JSONValue: BooleanType {
 
-    public func getLogicValue() -> Bool {
+    public var boolValue: Bool {
         switch self {
         case .JSONInvalid:
             return false

diff --git a/Swifter/NSURL+Swifter.swift b/Swifter/NSURL+Swifter.swift
@@ -39,7 +39,7 @@ extension NSURL {
             absoluteURLString = absoluteURLString[0..<absoluteURLString.utf16Count]
         }
 
-        let URLString = absoluteURLString + (absoluteURLString.rangeOfString("?") ? "&" : "?") + queryString
+        let URLString = absoluteURLString + (absoluteURLString.rangeOfString("?") != nil ? "&" : "?") + queryString
 
         return NSURL(string: URLString)
     }

diff --git a/Swifter/String+Swifter.swift b/Swifter/String+Swifter.swift
@@ -76,7 +76,7 @@ extension String {
             scanner.scanUpToString("&", intoString: &value)
             scanner.scanString("&", intoString: nil)
 
-            if key && value {
+            if key != nil && value != nil {
                 parameters.updateValue(value!, forKey: key!)
             }
         }
@@ -88,7 +88,7 @@ extension String {
         let str = self.cStringUsingEncoding(NSUTF8StringEncoding)
         let strLen = UInt(self.lengthOfBytesUsingEncoding(NSUTF8StringEncoding))
         let digestLen = Int(CC_SHA1_DIGEST_LENGTH)
-        let result = UnsafePointer<CUnsignedChar>.alloc(digestLen)
+        let result = UnsafeMutablePointer<CUnsignedChar>(digestLen)
         let keyStr = key.cStringUsingEncoding(NSUTF8StringEncoding)
         let keyLen = UInt(key.lengthOfBytesUsingEncoding(NSUTF8StringEncoding))
 

diff --git a/Swifter/Swifter.swift b/Swifter/Swifter.swift
@@ -109,7 +109,7 @@ public class Swifter {
         let jsonDownloadProgressHandler: SwifterHTTPRequest.DownloadProgressHandler = {
             data, _, _, response in
 
-            if !downloadProgress {
+            if downloadProgress == nil {
                 return
             }
 

diff --git a/Swifter/SwifterAccountsClient.swift b/Swifter/SwifterAccountsClient.swift
@@ -82,8 +82,8 @@ internal class SwifterAccountsClient: SwifterClientProtocol {
         let socialRequest = SLRequest(forServiceType: SLServiceTypeTwitter, requestMethod: SLRequestMethod.POST, URL: url, parameters: stringifiedParameters)
         socialRequest.account = self.credential!.account!
 
-        if postData {
-            let fileName = postDataFileName ? postDataFileName! as String : "media.jpg"
+        if postData != nil {
+            let fileName = postDataFileName ?? "media.jpg"
 
             socialRequest.addMultipartData(postData!, withName: postDataKey!, type: "application/octet-stream", filename: fileName)
         }

diff --git a/Swifter/SwifterFavorites.swift b/Swifter/SwifterFavorites.swift
@@ -38,13 +38,13 @@ extension Swifter {
         let path = "favorites/list.json"
 
         var parameters = Dictionary<String, AnyObject>()
-        if count {
+        if count != nil {
             parameters["count"] = count!
         }
-        if sinceID {
+        if sinceID != nil {
             parameters["since_id"] = sinceID!
         }
-        if maxID {
+        if maxID != nil {
             parameters["max_id"] = maxID!
         }
 
@@ -63,13 +63,13 @@ extension Swifter {
         var parameters = Dictionary<String, AnyObject>()
         parameters["user_id"] = userID
 
-        if count {
+        if count != nil {
             parameters["count"] = count!
         }
-        if sinceID {
+        if sinceID != nil {
             parameters["since_id"] = sinceID!
         }
-        if maxID {
+        if maxID != nil {
             parameters["max_id"] = maxID!
         }
 
@@ -88,13 +88,13 @@ extension Swifter {
         var parameters = Dictionary<String, AnyObject>()
         parameters["screen_name"] = screenName
 
-        if count {
+        if count != nil {
             parameters["count"] = count!
         }
-        if sinceID {
+        if sinceID != nil {
             parameters["since_id"] = sinceID!
         }
-        if maxID {
+        if maxID != nil {
             parameters["max_id"] = maxID!
         }
 
@@ -120,7 +120,7 @@ extension Swifter {
         var parameters = Dictionary<String, AnyObject>()
         parameters["id"] = id
 
-        if includeEntities {
+        if includeEntities != nil {
             parameters["include_entities"] = includeEntities!
         }
 
@@ -146,7 +146,7 @@ extension Swifter {
         var parameters = Dictionary<String, AnyObject>()
         parameters["id"] = id
 
-        if includeEntities {
+        if includeEntities != nil {
             parameters["include_entities"] = includeEntities!
         }