Merge pull request #1453 from Mutix/master

Added API to save image NSData to disk cache.

@@ -135,6 +135,14 @@ typedef void(^SDWebImageCalculateSizeBlock)(NSUInteger fileCount, NSUInteger tot
 - (void)storeImage:(UIImage *)image recalculateFromImage:(BOOL)recalculate imageData:(NSData *)imageData forKey:(NSString *)key toDisk:(BOOL)toDisk;
 - (void)storeImage:(UIImage *)image recalculateFromImage:(BOOL)recalculate imageData:(NSData *)imageData forKey:(NSString *)key toDisk:(BOOL)toDisk;
 
 
 /**
 /**
+ * Store image NSData into disk cache at the given key.
+ *
+ * @param imageData The image data to store
+ * @param key   The unique image cache key, usually it's image absolute URL
+ */
+- (void)storeImageDataToDisk:(NSData *)imageData forKey:(NSString *)key;
+
+/**
  * Query the disk cache asynchronously.
  * Query the disk cache asynchronously.
  *
  *
  * @param key The unique key used to store the wanted image
  * @param key The unique key used to store the wanted image

@@ -241,23 +241,7 @@ FOUNDATION_STATIC_INLINE NSUInteger SDCacheCostForImage(UIImage *image) {
 #endif
 #endif
             }
             }
 
 
-            if (data) {
-                if (![_fileManager fileExistsAtPath:_diskCachePath]) {
-                    [_fileManager createDirectoryAtPath:_diskCachePath withIntermediateDirectories:YES attributes:nil error:NULL];
-                }
-
-                // get cache Path for image key
-                NSString *cachePathForKey = [self defaultCachePathForKey:key];
-                // transform to NSUrl
-                NSURL *fileURL = [NSURL fileURLWithPath:cachePathForKey];
-
-                [_fileManager createFileAtPath:cachePathForKey contents:data attributes:nil];
-
-                // disable iCloud backup
-                if (self.shouldDisableiCloud) {
-                    [fileURL setResourceValue:[NSNumber numberWithBool:YES] forKey:NSURLIsExcludedFromBackupKey error:nil];
-                }
-            }
+            [self storeImageDataToDisk:data forKey:key];
         });
         });
     }
     }
 }
 }
@@ -270,6 +254,29 @@ FOUNDATION_STATIC_INLINE NSUInteger SDCacheCostForImage(UIImage *image) {
     [self storeImage:image recalculateFromImage:YES imageData:nil forKey:key toDisk:toDisk];
     [self storeImage:image recalculateFromImage:YES imageData:nil forKey:key toDisk:toDisk];
 }
 }
 
 
+- (void)storeImageDataToDisk:(NSData *)imageData forKey:(NSString *)key {
+    
+    if (!imageData) {
+        return;
+    }
+    
+    if (![_fileManager fileExistsAtPath:_diskCachePath]) {
+        [_fileManager createDirectoryAtPath:_diskCachePath withIntermediateDirectories:YES attributes:nil error:NULL];
+    }
+    
+    // get cache Path for image key
+    NSString *cachePathForKey = [self defaultCachePathForKey:key];
+    // transform to NSUrl
+    NSURL *fileURL = [NSURL fileURLWithPath:cachePathForKey];
+    
+    [_fileManager createFileAtPath:cachePathForKey contents:imageData attributes:nil];
+    
+    // disable iCloud backup
+    if (self.shouldDisableiCloud) {
+        [fileURL setResourceValue:[NSNumber numberWithBool:YES] forKey:NSURLIsExcludedFromBackupKey error:nil];
+    }
+}
+
 - (BOOL)diskImageExistsWithKey:(NSString *)key {
 - (BOOL)diskImageExistsWithKey:(NSString *)key {
     BOOL exists = NO;
     BOOL exists = NO;
     
     

@@ -122,6 +122,7 @@
 				DA248D50195472AA00390AB0 /* Frameworks */,
 				DA248D50195472AA00390AB0 /* Frameworks */,
 				DA248D51195472AA00390AB0 /* Resources */,
 				DA248D51195472AA00390AB0 /* Resources */,
 				D6347736BDF64FC5A4D078A4 /* Copy Pods Resources */,
 				D6347736BDF64FC5A4D078A4 /* Copy Pods Resources */,
+				4B51E412BA3594400947AC71 /* Embed Pods Frameworks */,
 			);
 			);
 			buildRules = (
 			buildRules = (
 			);
 			);
@@ -170,6 +171,21 @@
 /* End PBXResourcesBuildPhase section */
 /* End PBXResourcesBuildPhase section */
 
 
 /* Begin PBXShellScriptBuildPhase section */
 /* Begin PBXShellScriptBuildPhase section */
+		4B51E412BA3594400947AC71 /* Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ios/Pods-ios-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		D6347736BDF64FC5A4D078A4 /* Copy Pods Resources */ = {
 		D6347736BDF64FC5A4D078A4 /* Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			buildActionMask = 2147483647;

@@ -14,7 +14,7 @@
 
 
 #import "SDImageCache.h"
 #import "SDImageCache.h"
 
 
-NSString *kImageTestKey = @"TestImageKey";
+NSString *kImageTestKey = @"TestImageKey.jpg";
 
 
 @interface SDImageCacheTests : XCTestCase
 @interface SDImageCacheTests : XCTestCase
 @property (strong, nonatomic) SDImageCache *sharedImageCache;
 @property (strong, nonatomic) SDImageCache *sharedImageCache;
@@ -185,6 +185,25 @@ NSString *kImageTestKey = @"TestImageKey";
     expect(path).notTo.beNil;
     expect(path).notTo.beNil;
 }
 }
 
 
+// TODO -- Testing image data insertion
+
+- (void)testInsertionOfImageData {
+    
+    NSData *imageData = [NSData dataWithContentsOfFile:[self testImagePath]];
+    [self.sharedImageCache storeImageDataToDisk:imageData forKey:kImageTestKey];
+    
+    UIImage *storedImageFromMemory = [self.sharedImageCache imageFromMemoryCacheForKey:kImageTestKey];
+    expect(storedImageFromMemory).to.equal(nil);
+    
+    NSString *cachePath = [self.sharedImageCache defaultCachePathForKey:kImageTestKey];
+    NSData *storedImageData = [NSData dataWithContentsOfFile:cachePath];
+    expect([storedImageData isEqualToData:imageData]).will.beTruthy;
+    
+    [self.sharedImageCache diskImageExistsWithKey:kImageTestKey completion:^(BOOL isInCache) {
+        expect(isInCache).to.equal(YES);
+    }];
+}
+
 #pragma mark Helper methods
 #pragma mark Helper methods
 
 
 - (void)clearAllCaches{
 - (void)clearAllCaches{
@@ -193,9 +212,14 @@ NSString *kImageTestKey = @"TestImageKey";
 }
 }
 
 
 - (UIImage *)imageForTesting{
 - (UIImage *)imageForTesting{
-    NSBundle *testBundle=[NSBundle bundleForClass:[self class]];
-    NSString *testBundlePath=[testBundle pathForResource:@"TestImage" ofType:@"jpg"];
-    return [UIImage imageWithContentsOfFile:testBundlePath];
+    
+    return [UIImage imageWithContentsOfFile:[self testImagePath]];
+}
+
+- (NSString *)testImagePath {
+    
+    NSBundle *testBundle = [NSBundle bundleForClass:[self class]];
+    return [testBundle pathForResource:@"TestImage" ofType:@"jpg"];
 }
 }
 
 
-@end
+@end