Merge pull request #8 from AliSoftware/feature/runtime-args

Added support for up to six runtime arguments

Author: AliSoftware

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## Develop
+* Added support for factories with up to six runtime arguments
+[#8](https://github.com/AliSoftware/Dip/pull/8), [@ilyapuchka](https://github.com/ilyapuchka)
+* Parameter `tag` is now named in all register/resolve methods
+
 ## 2.0.0
 
 * Moved from generic _tag_ parameter on container to `Tag` enum with `String` and `Int` cases  

Dip/Dip.xcodeproj/project.pbxproj

@@ -11,6 +11,10 @@
 		0945269C1BEA1CFF0034E72A /* Dip.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 094526911BEA1CFF0034E72A /* Dip.framework */; };
 		094526A11BEA1CFF0034E72A /* DipTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 094526A01BEA1CFF0034E72A /* DipTests.swift */; };
 		094526AC1BEA1D200034E72A /* Dip.swift in Sources */ = {isa = PBXBuildFile; fileRef = 094526AB1BEA1D200034E72A /* Dip.swift */; };
+		094526B41BEA51540034E72A /* RuntimeArguments.swift in Sources */ = {isa = PBXBuildFile; fileRef = 094526B31BEA51540034E72A /* RuntimeArguments.swift */; };
+		094526B61BEA520B0034E72A /* Definition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 094526B51BEA520B0034E72A /* Definition.swift */; };
+		094526B81BEA536A0034E72A /* RuntimeArgumentsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 094526B71BEA536A0034E72A /* RuntimeArgumentsTests.swift */; };
+		09969C551BEB7C0A00F93C70 /* Dip.podspec in Resources */ = {isa = PBXBuildFile; fileRef = 09969C541BEB7C0A00F93C70 /* Dip.podspec */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -31,10 +35,13 @@
 		094526A01BEA1CFF0034E72A /* DipTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DipTests.swift; sourceTree = "<group>"; };
 		094526A21BEA1CFF0034E72A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		094526AB1BEA1D200034E72A /* Dip.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dip.swift; sourceTree = "<group>"; };
-		094526AE1BEA1D5E0034E72A /* Dip.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; name = Dip.podspec; path = /Users/ilya/Documents/Developer/iPhoneProjects/Dip/Dip.podspec; sourceTree = "<absolute>"; };
 		094526B01BEA1E1C0034E72A /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
 		094526B11BEA1E1C0034E72A /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = CHANGELOG.md; path = ../CHANGELOG.md; sourceTree = "<group>"; };
 		094526B21BEA1E1C0034E72A /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
+		094526B31BEA51540034E72A /* RuntimeArguments.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = RuntimeArguments.swift; sourceTree = "<group>"; tabWidth = 2; };
+		094526B51BEA520B0034E72A /* Definition.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = Definition.swift; sourceTree = "<group>"; tabWidth = 2; };
+		094526B71BEA536A0034E72A /* RuntimeArgumentsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RuntimeArgumentsTests.swift; sourceTree = "<group>"; };
+		09969C541BEB7C0A00F93C70 /* Dip.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Dip.podspec; path = ../Dip.podspec; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -64,7 +71,9 @@
 				0945269F1BEA1CFF0034E72A /* DipTests */,
 				094526921BEA1CFF0034E72A /* Products */,
 			);
+			indentWidth = 2;
 			sourceTree = "<group>";
+			tabWidth = 2;
 		};
 		094526921BEA1CFF0034E72A /* Products */ = {
 			isa = PBXGroup;
@@ -80,6 +89,8 @@
 			children = (
 				094526941BEA1CFF0034E72A /* Dip.h */,
 				094526AB1BEA1D200034E72A /* Dip.swift */,
+				094526B31BEA51540034E72A /* RuntimeArguments.swift */,
+				094526B51BEA520B0034E72A /* Definition.swift */,
 				094526961BEA1CFF0034E72A /* Info.plist */,
 			);
 			path = Dip;
@@ -89,6 +100,7 @@
 			isa = PBXGroup;
 			children = (
 				094526A01BEA1CFF0034E72A /* DipTests.swift */,
+				094526B71BEA536A0034E72A /* RuntimeArgumentsTests.swift */,
 				094526A21BEA1CFF0034E72A /* Info.plist */,
 			);
 			path = DipTests;
@@ -97,7 +109,7 @@
 		094526AF1BEA1E0B0034E72A /* Podspec Metadata */ = {
 			isa = PBXGroup;
 			children = (
-				094526AE1BEA1D5E0034E72A /* Dip.podspec */,
+				09969C541BEB7C0A00F93C70 /* Dip.podspec */,
 				094526B01BEA1E1C0034E72A /* README.md */,
 				094526B11BEA1E1C0034E72A /* CHANGELOG.md */,
 				094526B21BEA1E1C0034E72A /* LICENSE */,
@@ -196,6 +208,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				09969C551BEB7C0A00F93C70 /* Dip.podspec in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -214,6 +227,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				094526AC1BEA1D200034E72A /* Dip.swift in Sources */,
+				094526B61BEA520B0034E72A /* Definition.swift in Sources */,
+				094526B41BEA51540034E72A /* RuntimeArguments.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -222,6 +237,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				094526A11BEA1CFF0034E72A /* DipTests.swift in Sources */,
+				094526B81BEA536A0034E72A /* RuntimeArgumentsTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Dip/Dip/Definition.swift

@@ -0,0 +1,66 @@
+//
+//  Definition.swift
+//  Dip
+//
+//  Created by Ilya Puchka on 04.11.15.
+//  Copyright © 2015 AliSoftware. All rights reserved.
+//
+
+import Foundation
+
+///Internal representation of a key used to associate definitons and factories by tag, type and factory.
+struct DefinitionKey : Hashable, Equatable, CustomDebugStringConvertible {
+  var protocolType: Any.Type
+  var factoryType: Any.Type
+  var associatedTag: DependencyContainer.Tag?
+  
+  var hashValue: Int {
+    return "\(protocolType)-\(factoryType)-\(associatedTag)".hashValue
+  }
+  
+  var debugDescription: String {
+    return "type: \(protocolType), factory: \(factoryType), tag: \(associatedTag)"
+  }
+}
+
+func ==(lhs: DefinitionKey, rhs: DefinitionKey) -> Bool {
+  return
+    lhs.protocolType == rhs.protocolType &&
+      lhs.factoryType == rhs.factoryType &&
+      lhs.associatedTag == rhs.associatedTag
+}
+
+///Describes the lifecycle of instances created by container.
+public enum ComponentScope {
+  /// Indicates that a new instance of the component will be created each time it's resolved.
+  case Prototype
+  /// Indicates that resolved component should be retained by container and always reused.
+  case Singleton
+}
+
+///Definition of type T describes how instances of this type should be created when they are resolved by container.
+public final class DefinitionOf<T>: Definition {
+  let factory: Any
+  let scope: ComponentScope
+  
+  init(factory: Any, scope: ComponentScope = .Prototype) {
+    self.factory = factory
+    self.scope = scope
+  }
+  
+  var resolvedInstance: T? {
+    get {
+      guard scope == .Singleton else { return nil }
+      return _resolvedInstance
+    }
+    set {
+      guard scope == .Singleton else { return }
+      _resolvedInstance = newValue
+    }
+  }
+  
+  private var _resolvedInstance: T?
+}
+
+///Dummy protocol to store definitions for different types in collection
+protocol Definition {}