extensionを別ファイルへ

Author: pixel-ink

PIImageCache.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name                   = "PIImageCache"
-  s.version                = "0.1.1"
+  s.version                = "0.2.1"
   s.summary                = "Ripple Effect for iOS (swift)"
   s.homepage               = "https://github.com/pixel-ink/PIImageCache"
   s.license                = { :type => "MIT", :file => "LICENSE" }
@@ -12,6 +12,6 @@ Pod::Spec.new do |s|
                                :git => "https://github.com/pixel-ink/PIImageCache.git",
                                :tag => s.version
                              }
-  s.source_files           = "**/PIImageCache.swift"
+  s.source_files           = "**/PIImageCache/PIImageCache*.swift"
 
 end

PIImageCache/PIImageCache.xcodeproj/project.pbxproj

@@ -9,6 +9,8 @@
 /* Begin PBXBuildFile section */
 		840EFCC31B2C9F1600688CA9 /* PIImageCacheBasicTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 840EFCC21B2C9F1600688CA9 /* PIImageCacheBasicTests.swift */; };
 		840EFCC51B2CC56600688CA9 /* PIImageCacheDiskCacheTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 840EFCC41B2CC56600688CA9 /* PIImageCacheDiskCacheTests.swift */; };
+		840EFCC71B2CFA0B00688CA9 /* PIImageCacheExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 840EFCC61B2CFA0A00688CA9 /* PIImageCacheExtensions.swift */; };
+		840EFCC81B2CFA3500688CA9 /* PIImageCacheExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 840EFCC61B2CFA0A00688CA9 /* PIImageCacheExtensions.swift */; };
 		8459DB6B1B2910D10046F3FF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8459DB6A1B2910D10046F3FF /* AppDelegate.swift */; };
 		8459DB6D1B2910D10046F3FF /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8459DB6C1B2910D10046F3FF /* ViewController.swift */; };
 		8459DB701B2910D10046F3FF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8459DB6E1B2910D10046F3FF /* Main.storyboard */; };
@@ -32,6 +34,7 @@
 /* Begin PBXFileReference section */
 		840EFCC21B2C9F1600688CA9 /* PIImageCacheBasicTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PIImageCacheBasicTests.swift; sourceTree = "<group>"; };
 		840EFCC41B2CC56600688CA9 /* PIImageCacheDiskCacheTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PIImageCacheDiskCacheTests.swift; sourceTree = "<group>"; };
+		840EFCC61B2CFA0A00688CA9 /* PIImageCacheExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PIImageCacheExtensions.swift; sourceTree = "<group>"; };
 		8459DB651B2910D10046F3FF /* PIImageCache.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PIImageCache.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		8459DB691B2910D10046F3FF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		8459DB6A1B2910D10046F3FF /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -87,6 +90,7 @@
 				8459DB6A1B2910D10046F3FF /* AppDelegate.swift */,
 				8459DB6C1B2910D10046F3FF /* ViewController.swift */,
 				8459DB8A1B2911240046F3FF /* PIImageCache.swift */,
+				840EFCC61B2CFA0A00688CA9 /* PIImageCacheExtensions.swift */,
 				8459DB6E1B2910D10046F3FF /* Main.storyboard */,
 				8459DB711B2910D10046F3FF /* Images.xcassets */,
 				8459DB731B2910D10046F3FF /* LaunchScreen.xib */,
@@ -225,6 +229,7 @@
 				8459DB6D1B2910D10046F3FF /* ViewController.swift in Sources */,
 				8459DB8B1B2911240046F3FF /* PIImageCache.swift in Sources */,
 				8459DB6B1B2910D10046F3FF /* AppDelegate.swift in Sources */,
+				840EFCC71B2CFA0B00688CA9 /* PIImageCacheExtensions.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -235,6 +240,7 @@
 				840EFCC31B2C9F1600688CA9 /* PIImageCacheBasicTests.swift in Sources */,
 				840EFCC51B2CC56600688CA9 /* PIImageCacheDiskCacheTests.swift in Sources */,
 				8459DB811B2910D10046F3FF /* PIImageMemoryCacheTests.swift in Sources */,
+				840EFCC81B2CFA3500688CA9 /* PIImageCacheExtensions.swift in Sources */,
 				8459DB8C1B2911240046F3FF /* PIImageCache.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

PIImageCache/PIImageCache/PIImageCache.swift

@@ -3,50 +3,6 @@
 
 import UIKit
 
-public extension NSURL {
-  public func getImageWithCache() -> UIImage? {
-    return PIImageCache.shared.get(self)
-  }
-  
-  public func getImageWithCache(cache: PIImageCache) -> UIImage? {
-    return cache.get(self)
-  }
-}
-
-public extension UIImageView {
-  public func imageOfURL(url: NSURL) {
-    PIImageCache.shared.get(url) {
-      [weak self] img in
-      self?.image = img
-    }
-  }
-  
-  public func imageOfURL(url: NSURL, cache: PIImageCache) {
-    cache.get(url) {
-      [weak self] img in
-      self?.image = img
-    }
-  }
-
-  public func imageOfURL(url: NSURL, then:(Bool)->Void) {
-    PIImageCache.shared.get(url) {
-      [weak self] img in
-      let isOK = img != nil
-      self?.image = img
-      then(isOK)
-    }
-  }
-  
-  public func imageOfURL(url: NSURL, cache: PIImageCache, then:(Bool)->Void) {
-    cache.get(url) {
-      [weak self] img in
-      let isOK = img != nil
-      self?.image = img
-      then(isOK)
-    }
-  }
-}
-
 public class PIImageCache {
 
   private func myInit() {

PIImageCache/PIImageCache/PIImageCacheExtensions.swift

@@ -0,0 +1,48 @@
+
+// https://github.com/pixel-ink/PIImageCache
+
+import UIKit
+
+public extension NSURL {
+  public func getImageWithCache() -> UIImage? {
+    return PIImageCache.shared.get(self)
+  }
+  
+  public func getImageWithCache(cache: PIImageCache) -> UIImage? {
+    return cache.get(self)
+  }
+}
+
+public extension UIImageView {
+  public func imageOfURL(url: NSURL) {
+    PIImageCache.shared.get(url) {
+      [weak self] img in
+      self?.image = img
+    }
+  }
+  
+  public func imageOfURL(url: NSURL, cache: PIImageCache) {
+    cache.get(url) {
+      [weak self] img in
+      self?.image = img
+    }
+  }
+  
+  public func imageOfURL(url: NSURL, then:(Bool)->Void) {
+    PIImageCache.shared.get(url) {
+      [weak self] img in
+      let isOK = img != nil
+      self?.image = img
+      then(isOK)
+    }
+  }
+  
+  public func imageOfURL(url: NSURL, cache: PIImageCache, then:(Bool)->Void) {
+    cache.get(url) {
+      [weak self] img in
+      let isOK = img != nil
+      self?.image = img
+      then(isOK)
+    }
+  }
+}

README.md

@@ -1,5 +1,5 @@
 
-# Working now.
+# not stable.
 
 ---
 
@@ -20,8 +20,9 @@
 
 - manually
   - add PIImageCache.swift into your project
+  - add PIImageCacheExtensions.swift into your project
 - cocoapods
-  - add " pod 'PIImageCache', '0.1.1' " into your Podfile
+  - add " pod 'PIImageCache', '0.2.1' " into your Podfile
   - add " import PIImageCache " into your code
 
 ### step2