Merge pull request #59 from onevcat/1.4.1

1.4.1

Kingfisher-Demo WatchKit App/Base.lproj/Interface.storyboard

@@ -10,12 +10,20 @@
             <objects>
                 <controller title="Kingfisher" id="AgC-eL-Hgc" customClass="InterfaceController" customModule="Kingfisher_Demo_WatchKit_App" customModuleProvider="target">
                     <items>
-                        <imageView width="136" height="136" alignment="left" id="qqx-yl-rXm"/>
+                        <imageView width="1" height="1" alignment="left" id="qqx-yl-rXm"/>
                     </items>
                     <menu key="menu" id="f2I-Fc-a4o">
                         <items>
-                            <menuItem title="Reload" icon="repeat" id="Bgg-54-XH4"/>
-                            <menuItem title="Clear" icon="trash" id="Zeb-O0-qjI"/>
+                            <menuItem title="Reload" icon="repeat" id="Bgg-54-XH4">
+                                <connections>
+                                    <action selector="reload" destination="AgC-eL-Hgc" id="C8e-FF-5a8"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Clear" icon="trash" id="Zeb-O0-qjI">
+                                <connections>
+                                    <action selector="clear" destination="AgC-eL-Hgc" id="ZhC-NL-jtr"/>
+                                </connections>
+                            </menuItem>
                         </items>
                     </menu>
                     <connections>
@@ -31,12 +39,20 @@
             <objects>
                 <controller title="Kingfisher" id="Yjb-zT-nsD" customClass="InterfaceController" customModule="Kingfisher_Demo_WatchKit_App" customModuleProvider="target">
                     <items>
-                        <imageView width="136" height="136" alignment="left" id="FkW-um-dvx"/>
+                        <imageView width="1" height="1" alignment="left" id="FkW-um-dvx"/>
                     </items>
                     <menu key="menu" id="RUS-Qh-WsK">
                         <items>
-                            <menuItem title="Reload" icon="repeat" id="N8b-bj-MA5"/>
-                            <menuItem title="Clear" icon="trash" id="wka-8B-mSJ"/>
+                            <menuItem title="Reload" icon="repeat" id="N8b-bj-MA5">
+                                <connections>
+                                    <action selector="reload" destination="Yjb-zT-nsD" id="cJQ-eV-Nho"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Clear" icon="trash" id="wka-8B-mSJ">
+                                <connections>
+                                    <action selector="clear" destination="Yjb-zT-nsD" id="giF-7K-4cj"/>
+                                </connections>
+                            </menuItem>
                         </items>
                     </menu>
                     <connections>
@@ -51,12 +67,20 @@
             <objects>
                 <controller title="Kingfisher" id="aIE-iB-3Mc" customClass="InterfaceController" customModule="Kingfisher_Demo_WatchKit_App" customModuleProvider="target">
                     <items>
-                        <imageView width="136" height="136" alignment="left" id="goU-5Y-EJp"/>
+                        <imageView width="1" height="1" alignment="left" id="goU-5Y-EJp"/>
                     </items>
                     <menu key="menu" id="Pd8-BI-hYu">
                         <items>
-                            <menuItem title="Reload" icon="repeat" id="QZ4-Kn-vb2"/>
-                            <menuItem title="Clear" icon="trash" id="CAy-YI-8hI"/>
+                            <menuItem title="Reload" icon="repeat" id="QZ4-Kn-vb2">
+                                <connections>
+                                    <action selector="reload" destination="aIE-iB-3Mc" id="3ue-bl-Fpd"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Clear" icon="trash" id="CAy-YI-8hI">
+                                <connections>
+                                    <action selector="clear" destination="aIE-iB-3Mc" id="rda-qa-Squ"/>
+                                </connections>
+                            </menuItem>
                         </items>
                     </menu>
                     <connections>

Kingfisher-Demo WatchKit Extension/InterfaceController.swift

@@ -32,6 +32,8 @@ class InterfaceController: WKInterfaceController {
 
     static var counter: Int = 0
     
+    var URLString: String?
+    
     @IBOutlet weak var imageView: WKInterfaceImage!
     
     override func awakeWithContext(context: AnyObject?) {
@@ -40,7 +42,8 @@ class InterfaceController: WKInterfaceController {
         // Configure interface objects here.
         InterfaceController.counter =  InterfaceController.counter + 1
         
-        imageView.kf_setImageWithURL(NSURL(string: "https://raw.githubusercontent.com/onevcat/Kingfisher/master/images/kingfisher-\(InterfaceController.counter).jpg")!, placeholderImage: nil, optionsInfo: [.Options: KingfisherOptions.CacheInWatch], progressBlock: { (receivedSize, totalSize) -> () in
+        URLString = "https://raw.githubusercontent.com/onevcat/Kingfisher/master/images/kingfisher-\(InterfaceController.counter).jpg"
+        imageView.kf_setImageWithURL(NSURL(string: URLString!)!, placeholderImage: nil, optionsInfo: [.Options: KingfisherOptions.CacheInWatch], progressBlock: { (receivedSize, totalSize) -> () in
             
         }) { (error, cacheType, imageURL, cachedInWatch) -> () in
             println("\(imageURL) : \(cachedInWatch)")
@@ -57,4 +60,18 @@ class InterfaceController: WKInterfaceController {
         super.didDeactivate()
     }
 
+    @IBAction func reload() {
+        imageView.kf_setImageWithURL(NSURL(string: URLString!)!, placeholderImage: nil, optionsInfo: [.Options: KingfisherOptions.CacheInWatch], progressBlock: { (receivedSize, totalSize) -> () in
+            
+            }) { (error, cacheType, imageURL, cachedInWatch) -> () in
+                println("\(imageURL) : \(cachedInWatch)")
+        }
+    }
+    
+    @IBAction func clear() {
+        KingfisherManager.sharedManager.cache.clearDiskCache()
+        KingfisherManager.sharedManager.cache.clearMemoryCache()
+        WKInterfaceDevice.currentDevice().removeAllCachedImages()
+    }
+    
 }

Kingfisher.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "Kingfisher"
-  s.version      = "1.4.0"
+  s.version      = "1.4.1"
   s.summary      = "A lightweight and pure Swift implemented library for downloading and cacheing image from the web."
 
   s.description  = <<-DESC
@@ -31,5 +31,6 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/onevcat/Kingfisher.git", :tag => s.version }
   s.source_files  = "Kingfisher/*.swift"
   s.requires_arc = true
+  s.weak_framework = 'WatchKit'
 
 end

Kingfisher.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		0D9C68098E20AB4F19D7C313 /* libPods-KingfisherTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9E621E297FEFAD35D39C34E /* libPods-KingfisherTests.a */; };
+		4B3E714F1B02005900F5AAED /* WatchKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B3E714D1B01FEB200F5AAED /* WatchKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		4B412CA51AE8A2F9008D530A /* KingfisherOptionsInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B412CA41AE8A2F9008D530A /* KingfisherOptionsInfo.swift */; };
 		4B6D4F651AE0A46D0084D15B /* UIImageViewExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6D4F641AE0A46D0084D15B /* UIImageViewExtensionTests.swift */; };
 		4B6D4F671AE0B82A0084D15B /* UIButtonExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6D4F661AE0B82A0084D15B /* UIButtonExtensionTests.swift */; };
@@ -105,6 +106,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		4B3E714D1B01FEB200F5AAED /* WatchKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WatchKit.framework; path = System/Library/Frameworks/WatchKit.framework; sourceTree = SDKROOT; };
 		4B412CA41AE8A2F9008D530A /* KingfisherOptionsInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KingfisherOptionsInfo.swift; sourceTree = "<group>"; };
 		4B6D4F641AE0A46D0084D15B /* UIImageViewExtensionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIImageViewExtensionTests.swift; sourceTree = "<group>"; };
 		4B6D4F661AE0B82A0084D15B /* UIButtonExtensionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIButtonExtensionTests.swift; sourceTree = "<group>"; };
@@ -167,6 +169,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4B3E714F1B02005900F5AAED /* WatchKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -327,6 +330,7 @@
 		EA99D30544BD22799F7A5367 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				4B3E714D1B01FEB200F5AAED /* WatchKit.framework */,
 				A9E621E297FEFAD35D39C34E /* libPods-KingfisherTests.a */,
 			);
 			name = Frameworks;
@@ -933,6 +937,7 @@
 				4BD352EE1AF3681800B18A40 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		4BD352F01AF3681800B18A40 /* Build configuration list for PBXNativeTarget "Kingfisher-Demo WatchKit Extension" */ = {
 			isa = XCConfigurationList;
@@ -941,6 +946,7 @@
 				4BD352EC1AF3681800B18A40 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		D1ED2D061AD2CFA600CFC3EB /* Build configuration list for PBXProject "Kingfisher" */ = {
 			isa = XCConfigurationList;