Merge pull request #3 from mrahmiao/master

Fix typo and eliminate confusion.

Kingfisher/ImageCache.swift

@@ -216,7 +216,7 @@ extension ImageCache {
         }
         
         let block = dispatch_block_create(DISPATCH_BLOCK_INHERIT_QOS_CLASS) {
-            if let image = self.retriveImageInMemoryCaheForKey(key) {
+            if let image = self.retrieveImageInMemoryCacheForKey(key) {
                 
                 //Found image in memory cache.
                 if options.shouldDecode {
@@ -234,7 +234,7 @@ extension ImageCache {
                 //Begin to load image from disk
                 dispatch_async(self.ioQueue, { () -> Void in
                     
-                    if let image = self.retriveImageInDiskCacheForKey(key) {
+                    if let image = self.retrieveImageInDiskCacheForKey(key) {
                         
                         if options.shouldDecode {
                             dispatch_async(self.processQueue, { () -> Void in
@@ -277,7 +277,7 @@ extension ImageCache {
     
     :returns: The image object if it is cached, or `nil` if there is no such key in the cache.
     */
-    public func retriveImageInMemoryCaheForKey(key: String) -> UIImage? {
+    public func retrieveImageInMemoryCacheForKey(key: String) -> UIImage? {
         return memoryCache.objectForKey(key) as? UIImage
     }
     
@@ -288,7 +288,7 @@ extension ImageCache {
     
     :returns: The image object if it is cached, or `nil` if there is no such key in the cache.
     */
-    public func retriveImageInDiskCacheForKey(key: String) -> UIImage? {
+    public func retrieveImageInDiskCacheForKey(key: String) -> UIImage? {
         return diskImageForKey(key)
     }
 }

Kingfisher/KingfisherManager.swift

@@ -32,15 +32,15 @@ import Foundation
 */
 public class RetrieveImageTask {
     
-    var diskRetriveTask: RetrieveImageDiskTask?
+    var diskRetrieveTask: RetrieveImageDiskTask?
     var downloadTask: RetrieveImageDownloadTask?
     
     /**
     Cancel current task. If this task does not begin or already done, do nothing.
     */
     public func cancel() {
-        if let diskRetriveTask = diskRetriveTask {
-            dispatch_block_cancel(diskRetriveTask)
+        if let diskRetrieveTask = diskRetrieveTask {
+            dispatch_block_cancel(diskRetrieveTask)
         }
         
         if let downloadTask = downloadTask {
@@ -106,17 +106,17 @@ public class KingfisherManager {
     
     :returns: A `RetrieveImageTask` task object. You can use this object to cancel the task.
     */
-    public func retriveImageWithURL(URL: NSURL,
+    public func retrieveImageWithURL(URL: NSURL,
                                 options: KingfisherOptions,
                           progressBlock:DownloadProgressBlock?,
                       completionHandler:CompletionHandler?) -> RetrieveImageTask
     {
         let task = RetrieveImageTask()
         
-        let options = (forceRefresh: options & KingfisherOptions.ForceRefresh != KingfisherOptions.None,
-                        lowPriority: options & KingfisherOptions.LowPriority != KingfisherOptions.None,
-                    cacheMemoryOnly: options & KingfisherOptions.CacheMemoryOnly != KingfisherOptions.None,
-                       shouldDecode: options & KingfisherOptions.BackgroundDecode != KingfisherOptions.None)
+        let options = (forceRefresh: (options & KingfisherOptions.ForceRefresh) != KingfisherOptions.None,
+                        lowPriority: (options & KingfisherOptions.LowPriority) != KingfisherOptions.None,
+                    cacheMemoryOnly: (options & KingfisherOptions.CacheMemoryOnly) != KingfisherOptions.None,
+                       shouldDecode: (options & KingfisherOptions.BackgroundDecode) != KingfisherOptions.None)
 
         if let key = URL.absoluteString {
             if options.forceRefresh {
@@ -139,7 +139,7 @@ public class KingfisherManager {
                             options: options)
                     }
                 })
-                task.diskRetriveTask = diskTask
+                task.diskRetrieveTask = diskTask
             }
         }
         

Kingfisher/UIImageView+Kingfisher.swift

@@ -113,7 +113,7 @@ public extension UIImageView {
         image = placeHolderImage
         
         self.kf_setWebURL(URL)
-        let task = KingfisherManager.sharedManager.retriveImageWithURL(URL, options: options, progressBlock: { (recivedSize, totalSize) -> () in
+        let task = KingfisherManager.sharedManager.retrieveImageWithURL(URL, options: options, progressBlock: { (recivedSize, totalSize) -> () in
             if let progressBlock = progressBlock {
                 dispatch_async(dispatch_get_main_queue(), { () -> Void in
                     progressBlock(receivedSize: recivedSize, totalSize: totalSize)