Demote viewFromNib to MessageView class function

Author: wtmoose

SwiftMessages.xcodeproj/project.pbxproj

@@ -22,7 +22,6 @@
 		867E21731D4D01D500594A41 /* SwiftMessagesUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 867E21721D4D01D500594A41 /* SwiftMessagesUITests.swift */; };
 		867E21831D4D025200594A41 /* MessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 867E21821D4D025200594A41 /* MessageView.swift */; };
 		867E21851D4D044F00594A41 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 867E21841D4D044F00594A41 /* Configuration.swift */; };
-		867E21901D4D3E5E00594A41 /* UIView+Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 867E218F1D4D3E5E00594A41 /* UIView+Utils.swift */; };
 		867E21941D4D50BB00594A41 /* Presenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 867E21931D4D50BB00594A41 /* Presenter.swift */; };
 		86AAF8181D54F0650031EE32 /* PassthroughView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 86AAF8171D54F0650031EE32 /* PassthroughView.swift */; };
 		86AAF81A1D54F0850031EE32 /* PassthroughWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 86AAF8191D54F0850031EE32 /* PassthroughWindow.swift */; };
@@ -71,7 +70,6 @@
 		867E21741D4D01D500594A41 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		867E21821D4D025200594A41 /* MessageView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageView.swift; sourceTree = "<group>"; };
 		867E21841D4D044F00594A41 /* Configuration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Configuration.swift; sourceTree = "<group>"; };
-		867E218F1D4D3E5E00594A41 /* UIView+Utils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+Utils.swift"; sourceTree = "<group>"; };
 		867E21931D4D50BB00594A41 /* Presenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Presenter.swift; sourceTree = "<group>"; };
 		86AAF8171D54F0650031EE32 /* PassthroughView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PassthroughView.swift; sourceTree = "<group>"; };
 		86AAF8191D54F0850031EE32 /* PassthroughWindow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PassthroughWindow.swift; sourceTree = "<group>"; };
@@ -126,7 +124,6 @@
 				864495551D4F7C390056EB2A /* Identifiable.swift */,
 				86AAF81D1D5549680031EE32 /* MarginAdjustable.swift */,
 				86AAF82A1D580DD70031EE32 /* Error.swift */,
-				867E218F1D4D3E5E00594A41 /* UIView+Utils.swift */,
 			);
 			name = Base;
 			sourceTree = "<group>";
@@ -342,7 +339,6 @@
 				867E21941D4D50BB00594A41 /* Presenter.swift in Sources */,
 				8644955D1D4FAF7C0056EB2A /* WindowViewController.swift in Sources */,
 				867E21531D4D01D500594A41 /* AppDelegate.swift in Sources */,
-				867E21901D4D3E5E00594A41 /* UIView+Utils.swift in Sources */,
 				86AAF81E1D5549680031EE32 /* MarginAdjustable.swift in Sources */,
 				86AAF82B1D580DD70031EE32 /* Error.swift in Sources */,
 				86AAF81C1D551FE70031EE32 /* UIViewController+Utils.swift in Sources */,

SwiftMessages/MessageView.swift

@@ -31,10 +31,29 @@ public class MessageView: UIView, Identifiable, MarginAdjustable {
         case StatusLine = "StatusLine"
     }
 
-    public static func viewFromNib(layout layout: Layout, bundle: NSBundle? = nil) -> MessageView {
+    public static func viewFromNib<T: MessageView>(layout layout: Layout, bundle: NSBundle? = nil) -> T {
         return try! MessageView.viewFromNib(named: layout.rawValue, bundle: bundle)
     }
 
+    public class func viewFromNib<T: MessageView>(bundle bundle: NSBundle? = nil) throws -> T {
+        let name = description().componentsSeparatedByString(".").last
+        assert(name != nil)
+        let view: T = try viewFromNib(named: name!, bundle: bundle)
+        return view
+    }
+    
+    public class func viewFromNib<T: MessageView>(named name: String, bundle: NSBundle? = nil) throws -> T {
+        let resolvedBundle: NSBundle
+        if let bundle = bundle {
+            resolvedBundle = bundle
+        } else {
+            resolvedBundle = NSBundle.frameworkBundle()
+        }
+        guard let arrayOfViews = resolvedBundle.loadNibNamed(name, owner: self, options: nil) else { throw Error.CannotLoadNib(nibName: name) }
+        guard let view = arrayOfViews.first as? T else { throw Error.CannotLoadViewFromNib(nibName: name) }
+        return view
+    }
+
     /*
      MARK: - Configuring the theme
      */