Add loadStoryboard and Fix misc

corin8823 · Oct 5, 2015 · 5868d9f · 5868d9f
1 parent fa432e1
commit 5868d9f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/SwiftyExtensions/Swift+Extensions.swift b/SwiftyExtensions/Swift+Extensions.swift
@@ -17,12 +17,16 @@ public func Localized(key: String) -> String {
 }
 
 public func StringFromClass(object: AnyObject) -> String {
-  return NSStringFromClass(object.dynamicType).componentsSeparatedByString(".").last!
+  return NSStringFromClass(object.dynamicType).componentsSeparatedByString(".").last! as String
 }
 
-public func LOG(  _ body: AnyObject! = "", function: String = __FUNCTION__, line: Int = __LINE__) {
-  #if DEBUG
-    println("[\(function) : \(line)] \(body)")
+public func StringFromType<T>(type: T) -> String {
+  return String(type.self).componentsSeparatedByString(".").last!
+}
+
+public func LOG<T>(body: T, function: String = __FUNCTION__, line: Int = __LINE__) {
+  #if DEBUG || DEV
+    print("[\(function) : \(line)] \(body)", terminator: "\n")
   #endif
 }
 

diff --git a/SwiftyExtensions/UIView+Addtions.swift b/SwiftyExtensions/UIView+Addtions.swift
@@ -76,7 +76,7 @@ extension UIView {
 
   public func removeSublayers() {
     if let sublayers = self.layer.sublayers {
-      for layer in self.layer.sublayers {
+      for layer in sublayers {
         layer.removeFromSuperlayer()
       }
     }

diff --git a/SwiftyExtensions/UIViewController+UIStoryBoard.swift b/SwiftyExtensions/UIViewController+UIStoryBoard.swift
@@ -20,4 +20,17 @@ extension UIViewController {
     let storyboard = UIStoryboard(name: className, bundle: nil)
     return storyboard.instantiateViewControllerWithIdentifier(className)
   }
+}
+
+extension UIViewController: StoryboardLoadable {}
+
+protocol StoryboardLoadable {}
+
+extension StoryboardLoadable {
+
+  static func loadStoryboard() -> Self {
+    let className = StringFromType(Self)
+    let storyboard = UIStoryboard(name: className, bundle: nil)
+    return storyboard.instantiateViewControllerWithIdentifier(className) as! Self
+  }
 }