From 58d977dc02b206bd3bb04f40e6e57dcfeddd9a58 Mon Sep 17 00:00:00 2001
From: Ilya Puchka <ilyapuchka@gmail.com>
Date: Sun, 3 Jul 2016 22:05:19 +0200
Subject: [PATCH] optional dipTag, calling dipTag getter in setter

---
 DipUI/DipUITests/DipUITests.swift        | 45 +++++++++++++++++++++---
 DipUI/DipUITests/NSStoryboard.storyboard | 20 +++++++++--
 DipUI/DipUITests/UIStoryboard.storyboard | 27 ++++++++++++--
 Sources/StoryboardInstantiatable.swift   |  9 ++---
 4 files changed, 89 insertions(+), 12 deletions(-)

diff --git a/DipUI/DipUITests/DipUITests.swift b/DipUI/DipUITests/DipUITests.swift
index 7233e87..3f3338c 100644
--- a/DipUI/DipUITests/DipUITests.swift
+++ b/DipUI/DipUITests/DipUITests.swift
@@ -42,7 +42,8 @@ import XCTest
   
 #endif
 
-class DipViewController: ViewController, StoryboardInstantiatable { }
+class DipViewController: ViewController, StoryboardInstantiatable {}
+class NilTagViewController: ViewController, StoryboardInstantiatable {}
 
 class DipUITests: XCTestCase {
   
@@ -76,8 +77,8 @@ class DipUITests: XCTestCase {
     DependencyContainer.uiContainer = container
     storyboard.instantiateViewControllerWithIdentifier("ViewController")
   }
-  
-  func testThatItResolvesIfContainerAndTagAreSet() {
+
+  func testThatItResolvesIfContainerAndStringTagAreSet() {
     var resolved = false
     let container = DependencyContainer()
     container.register(tag: "vc") { DipViewController() }
@@ -87,9 +88,45 @@ class DipUITests: XCTestCase {
     
     DependencyContainer.uiContainer = container
     storyboard.instantiateViewControllerWithIdentifier("DipViewController")
-    XCTAssertTrue(resolved, "Should resolve when container is set.")
+    XCTAssertTrue(resolved, "Should resolve when container and tag are set.")
+  }
+
+  func testThatItResolvesIfContainerAndNilTagAreSet() {
+    var resolved = false
+    let container = DependencyContainer()
+    container.register() { NilTagViewController() }
+      .resolveDependencies { _, _ in
+        resolved = true
+    }
+    
+    DependencyContainer.uiContainer = container
+    storyboard.instantiateViewControllerWithIdentifier("NilTagViewController")
+    XCTAssertTrue(resolved, "Should resolve when container and nil tag are set.")
+  }
+
+  func testThatItDoesNotResolveIfTagDoesNotMatch() {
+    let container = DependencyContainer()
+    container.register(tag: "wrong tag") { DipViewController() }
+      .resolveDependencies { _, _ in
+        XCTFail("Should not resolve when container is not set.")
+    }
+    
+    DependencyContainer.uiContainer = container
+    storyboard.instantiateViewControllerWithIdentifier("DipViewController")
   }
   
+  func testThatItResolvesWithDefinitionWithNoTag() {
+    var resolved = false
+    let container = DependencyContainer()
+    container.register() { DipViewController() }
+      .resolveDependencies { _, _ in
+        resolved = true
+    }
+    
+    DependencyContainer.uiContainer = container
+    storyboard.instantiateViewControllerWithIdentifier("DipViewController")
+    XCTAssertTrue(resolved, "Should fallback to definition with no tag.")
+  }
 }
 
 protocol SomeService: class {
diff --git a/DipUI/DipUITests/NSStoryboard.storyboard b/DipUI/DipUITests/NSStoryboard.storyboard
index 145a3cb..9d46876 100644
--- a/DipUI/DipUITests/NSStoryboard.storyboard
+++ b/DipUI/DipUITests/NSStoryboard.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9531"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
     </dependencies>
     <scenes>
         <!--Dip View Controller-->
@@ -20,6 +20,22 @@
             </objects>
             <point key="canvasLocation" x="311" y="339"/>
         </scene>
+        <!--Nil Tag View Controller-->
+        <scene sceneID="OhX-tC-zpS">
+            <objects>
+                <viewController storyboardIdentifier="NilTagViewController" id="35S-Ec-qEA" customClass="NilTagViewController" customModule="DipUI_OSXTests" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" id="y58-K4-cDZ">
+                        <rect key="frame" x="0.0" y="0.0" width="450" height="300"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </view>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="nil" keyPath="dipTag"/>
+                    </userDefinedRuntimeAttributes>
+                </viewController>
+                <customObject id="pvf-jv-8Cj" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="874" y="339"/>
+        </scene>
         <!--View Controller-->
         <scene sceneID="Rwu-gt-fAa">
             <objects>
diff --git a/DipUI/DipUITests/UIStoryboard.storyboard b/DipUI/DipUITests/UIStoryboard.storyboard
index f2264d9..26cefce 100644
--- a/DipUI/DipUITests/UIStoryboard.storyboard
+++ b/DipUI/DipUITests/UIStoryboard.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="5AO-J3-7R4">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="5AO-J3-7R4">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -48,5 +48,28 @@
             </objects>
             <point key="canvasLocation" x="646" y="200"/>
         </scene>
+        <!--Dip View Controller-->
+        <scene sceneID="AUA-qF-7ky">
+            <objects>
+                <viewController storyboardIdentifier="NilTagViewController" id="fFP-hb-OdS" userLabel="Dip View Controller" customClass="NilTagViewController" customModule="DipUI_iOSTests" customModuleProvider="target" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="Sio-ii-jPl"/>
+                        <viewControllerLayoutGuide type="bottom" id="bhs-zK-dln"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="4xq-UV-htt">
+                        <rect key="frame" x="0.0" y="0.0" width="200" height="100"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    </view>
+                    <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+                    <size key="freeformSize" width="200" height="100"/>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="nil" keyPath="dipTag"/>
+                    </userDefinedRuntimeAttributes>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="xvW-k9-I9y" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="898" y="200"/>
+        </scene>
     </scenes>
 </document>
diff --git a/Sources/StoryboardInstantiatable.swift b/Sources/StoryboardInstantiatable.swift
index deafcbe..9906fb6 100644
--- a/Sources/StoryboardInstantiatable.swift
+++ b/Sources/StoryboardInstantiatable.swift
@@ -118,11 +118,12 @@ public protocol StoryboardInstantiatable {
    ```
    
   */
-  func didInstantiateFromStoryboard(container: DependencyContainer, tag: DependencyContainer.Tag)
+  func didInstantiateFromStoryboard(container: DependencyContainer, tag: DependencyContainer.Tag?)
+  var dipTag: String? { get }
 }
 
 extension StoryboardInstantiatable {
-  public func didInstantiateFromStoryboard(container: DependencyContainer, tag: DependencyContainer.Tag) {
+  public func didInstantiateFromStoryboard(container: DependencyContainer, tag: DependencyContainer.Tag?) {
     do {
       try container.resolveDependenciesOf(self, tag: tag)
     }
@@ -143,15 +144,15 @@ extension NSObject {
   
   ///A string tag that will be used to resolve dependencies of this instance
   ///if it implements `StoryboardInstantiatable` protocol.
-  @IBInspectable private(set) public var dipTag: String? {
+  private(set) public var dipTag: String? {
     get {
       return objc_getAssociatedObject(self, DipTagAssociatedObjectKey) as? String
     }
     set {
       objc_setAssociatedObject(self, DipTagAssociatedObjectKey, newValue, .OBJC_ASSOCIATION_COPY_NONATOMIC)
       
+      let tag = dipTag.map(DependencyContainer.Tag.String)
       if let
-        tag = newValue.map(DependencyContainer.Tag.String),
         container = DependencyContainer.uiContainer,
         instantiatable = self as? StoryboardInstantiatable {
           instantiatable.didInstantiateFromStoryboard(container, tag: tag)