Merge pull request #197 from tripleCC/master

delete redundant code

Kingfisher/ImageCache.swift

@@ -201,10 +201,8 @@ public extension ImageCache {
                     }
                     
                     self.fileManager.createFileAtPath(self.cachePathForKey(key), contents: data, attributes: nil)
-                    callHandlerInMainQueue()
-                } else {
-                    callHandlerInMainQueue()
                 }
+                callHandlerInMainQueue()
             })
         } else {
             callHandlerInMainQueue()
@@ -493,9 +491,7 @@ extension ImageCache {
                     NSNotificationCenter.defaultCenter().postNotificationName(KingfisherDidCleanDiskCacheNotification, object: self, userInfo: [KingfisherDiskCacheCleanedHashKey: cleanedHashes])
                 }
                 
-                if let completionHandler = completionHandler {
-                    completionHandler()
-                }
+                completionHandler?()
             })
         })
     }
@@ -580,7 +576,7 @@ public extension ImageCache {
     
     - parameter completionHandler: Called with the calculated size when finishes.
     */
-    public func calculateDiskCacheSizeWithCompletionHandler(completionHandler: ((size: UInt) -> ())?) {
+    public func calculateDiskCacheSizeWithCompletionHandler(completionHandler: ((size: UInt) -> ())) {
         dispatch_async(ioQueue, { () -> Void in
             let diskCacheURL = NSURL(fileURLWithPath: self.diskCachePath)
                 
@@ -609,9 +605,7 @@ public extension ImageCache {
             }
             
             dispatch_async(dispatch_get_main_queue(), { () -> Void in
-                if let completionHandler = completionHandler {
-                    completionHandler(size: diskCacheSize)
-                }
+                completionHandler(size: diskCacheSize)
             })
         })
     }

Kingfisher/KingfisherOptionsInfo.swift

@@ -65,12 +65,6 @@ func <== (lhs: KingfisherOptionsInfoItem, rhs: KingfisherOptionsInfoItem) -> Boo
 extension CollectionType where Generator.Element == KingfisherOptionsInfoItem {
     
     func kf_firstMatchIgnoringAssociatedValue(target: Generator.Element) -> Generator.Element? {
-        
-        let index = indexOf {
-            item in
-            return item <== target
-        }
-        
-        return (index != nil) ? self[index!] : nil
+        return indexOf { $0 <== target }.flatMap { self[$0] }
     }
 }

Kingfisher/String+MD5.swift

@@ -31,11 +31,7 @@ extension String {
             let MD5Data = MD5Calculator.calculate()
             let resultBytes = UnsafeMutablePointer<CUnsignedChar>(MD5Data.bytes)
             let resultEnumerator = UnsafeBufferPointer<CUnsignedChar>(start: resultBytes, count: MD5Data.length)
-            var MD5String = ""
-            for c in resultEnumerator {
-                MD5String += String(format: "%02x", c)
-            }
-            return MD5String
+            return resultEnumerator.reduce(""){ $0 + String(format: "%02x", $1) }
         } else {
             return self
         }