Merge branch 'small_scope_update'

ivlevAstef · Mar 30, 2018 · b7518c7 · b7518c7
2 parents 511b596 + 722e466
commit b7518c7
Show file tree

Hide file tree

Showing 89 changed files with 3,199 additions and 1,926 deletions.
diff --git a/.gitignore b/.gitignore
@@ -64,3 +64,7 @@ fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
 Cartfile.resolved
+Samples/CompareSpeedSwinjectVSTranquillity/Pods
+Podfile.lock
+Samples/CompareSpeedSwinjectVSTranquillity/CompareSpeedSwinjectVSTranquillity.xcodeproj/project.xcworkspace
+Samples/CompareSpeedSwinjectVSTranquillity/CompareSpeedSwinjectVSTranquillity.xcworkspace
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v3.2.1
+* rename lifetimes: single, perRun(weak/strong), perContainer(weak/strong), objectGraph, prototype.
+* small improve internal code
+
 # v3.2.0
 * support injection by keyPath for swift4
 * small improve logging - add new log level `.verbose`

diff --git a/DITranquillity.podspec b/DITranquillity.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = 'DITranquillity'
-  s.version      = '3.2.0'
+  s.version      = '3.2.1'
   s.summary      = 'DITranquillity - Dependency injection for iOS/macOS/tvOS (Swift) '
 
   s.description  = <<-DESC

diff --git a/Documentation/code/Classes.html b/Documentation/code/Classes.html
diff --git a/Documentation/code/Classes/DIComponentBuilder.html b/Documentation/code/Classes/DIComponentBuilder.html
diff --git a/Documentation/code/Classes/DIContainer.html b/Documentation/code/Classes/DIContainer.html
diff --git a/Documentation/code/Classes/DIScanFramework.html b/Documentation/code/Classes/DIScanFramework.html
@@ -14,7 +14,7 @@
     <a title="DIScanFramework Class Reference"></a>
     <header>
       <div class="content-wrapper">
-        <p><a href="../index.html">DITranquillity Docs</a> (92% documented)</p>
+        <p><a href="../index.html">DITranquillity Docs</a> (91% documented)</p>
         <p class="header-right"><a href="https://github.com/ivlevAstef/DITranquillity"><img src="../img/gh.png"/>View on GitHub</a></p>
         <p class="header-right"><a href="dash-feed://https%3A%2F%2Fgithub%2Ecom%2FivlevAstef%2FDITranquillity%2Fcode%2Fdocsets%2FDITranquillity%2Exml"><img src="../img/dash.png"/>Install in Dash</a></p>
       </div>
@@ -77,11 +77,14 @@
             </ul>
           </li>
           <li class="nav-group-name">
-            <a href="../Enums.html">Enums</a>
+            <a href="../Enums.html">Enumerations</a>
             <ul class="nav-group-tasks">
               <li class="nav-group-task">
                 <a href="../Enums/DILifeTime.html">DILifeTime</a>
               </li>
+              <li class="nav-group-task">
+                <a href="../Enums/DILifeTime/ReferenceCounting.html">– ReferenceCounting</a>
+              </li>
               <li class="nav-group-task">
                 <a href="../Enums/DILogLevel.html">DILogLevel</a>
               </li>
@@ -91,7 +94,7 @@
             <a href="../Functions.html">Functions</a>
             <ul class="nav-group-tasks">
               <li class="nav-group-task">
-                <a href="../Functions/*(_:).html">*(_:)</a>
+                <a href="../Functions.html#/s:14DITranquillity1mopxAA11DIContainerClF">*(_:)</a>
               </li>
               <li class="nav-group-task">
                 <a href="../Functions.html#/s:14DITranquillity2byq_xm3tag_AA7DIByTagCyxq_G2ontr0_lF">by(tag:on:)</a>
@@ -125,7 +128,7 @@
             </ul>
           </li>
           <li class="nav-group-name">
-            <a href="../Structs.html">Structs</a>
+            <a href="../Structs.html">Structures</a>
             <ul class="nav-group-tasks">
               <li class="nav-group-task">
                 <a href="../Structs/DIComponentInfo.html">DIComponentInfo</a>
@@ -142,7 +145,7 @@
             </ul>
           </li>
           <li class="nav-group-name">
-            <a href="../Typealiases.html">Typealiases</a>
+            <a href="../Typealiases.html">Type Aliases</a>
             <ul class="nav-group-tasks">
               <li class="nav-group-task">
                 <a href="../Typealiases.html#/s:14DITranquillity7DIATypea">DIAType</a>
@@ -163,22 +166,22 @@
             <h1>DIScanFramework</h1>
               <div class="declaration">
                 <div class="language">
-                  <pre class="highlight"><code><span class="n">open</span> <span class="kd">class</span> <span class="kt">DIScanFramework</span><span class="p">:</span> <span class="kt"><a href="../Classes.html#/s:14DITranquillity6DIScanC">DIScan</a></span><span class="p">,</span> <span class="kt"><a href="../Protocols/DIFramework.html">DIFramework</a></span></code></pre>
+                  <pre class="highlight swift"><code><span class="kd">open</span> <span class="kd">class</span> <span class="kt">DIScanFramework</span><span class="p">:</span> <span class="kt"><a href="../Classes.html#/s:14DITranquillity6DIScanC">DIScan</a></span><span class="p">,</span> <span class="kt"><a href="../Protocols/DIFramework.html">DIFramework</a></span></code></pre>
 
                 </div>
               </div>
             <p>Allows you to find all frameworks marked as <code><a href="../Protocols.html#/s:14DITranquillity9DIScannedP">DIScanned</a></code> in the application that satisfy certain characteristics:
 predicate - allows you to check a framework type both by its name or using the type itself
 Using:</p>
-<pre class="highlight plaintext"><code>class YourScanFramework: DIScanFramework {
-  override class var predicate: Predicate? { return .name({ $0.contains("ScannedFramework") }) }
-}
+<pre class="highlight swift"><code><span class="kd">class</span> <span class="kt">YourScanFramework</span><span class="p">:</span> <span class="kt">DIScanFramework</span> <span class="p">{</span>
+  <span class="k">override</span> <span class="kd">class</span> <span class="k">var</span> <span class="nv">predicate</span><span class="p">:</span> <span class="kt">Predicate</span><span class="p">?</span> <span class="p">{</span> <span class="k">return</span> <span class="o">.</span><span class="nf">name</span><span class="p">({</span> <span class="nv">$0</span><span class="o">.</span><span class="nf">contains</span><span class="p">(</span><span class="s">"ScannedFramework"</span><span class="p">)</span> <span class="p">})</span> <span class="p">}</span>
+<span class="p">}</span>
 </code></pre>
 
 <p>OR</p>
-<pre class="highlight plaintext"><code>class YourScanFramework: DIScanFramework {
-  override class var predicate: Predicate? { return .type({ $0 is YourCustomFrameworkBase.Type }) }
-}
+<pre class="highlight swift"><code><span class="kd">class</span> <span class="kt">YourScanFramework</span><span class="p">:</span> <span class="kt">DIScanFramework</span> <span class="p">{</span>
+  <span class="k">override</span> <span class="kd">class</span> <span class="k">var</span> <span class="nv">predicate</span><span class="p">:</span> <span class="kt">Predicate</span><span class="p">?</span> <span class="p">{</span> <span class="k">return</span> <span class="o">.</span><span class="nf">type</span><span class="p">({</span> <span class="nv">$0</span> <span class="k">is</span> <span class="kt">YourCustomFrameworkBase</span><span class="o">.</span><span class="k">Type</span> <span class="p">})</span> <span class="p">}</span>
+<span class="p">}</span>
 </code></pre>
 
           </section>
@@ -211,7 +214,7 @@ <h1>DIScanFramework</h1>
                         <h4>Declaration</h4>
                         <div class="language">
                           <p class="aside-title">Swift</p>
-                          <pre class="highlight"><code><span class="kd">public</span> <span class="kd">enum</span> <span class="kt">Predicate</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">enum</span> <span class="kt">Predicate</span></code></pre>
 
                         </div>
                       </div>
@@ -241,7 +244,7 @@ <h4>Declaration</h4>
                         <h4>Declaration</h4>
                         <div class="language">
                           <p class="aside-title">Swift</p>
-                          <pre class="highlight"><code><span class="n">open</span> <span class="kd">class</span> <span class="k">var</span> <span class="nv">predicate</span><span class="p">:</span> <span class="kt"><a href="../Classes/DIScanFramework/Predicate.html">Predicate</a></span><span class="p">?</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">open</span> <span class="kd">class</span> <span class="k">var</span> <span class="nv">predicate</span><span class="p">:</span> <span class="kt"><a href="../Classes/DIScanFramework/Predicate.html">Predicate</a></span><span class="p">?</span></code></pre>
 
                         </div>
                       </div>
@@ -271,7 +274,7 @@ <h4>Declaration</h4>
                         <h4>Declaration</h4>
                         <div class="language">
                           <p class="aside-title">Swift</p>
-                          <pre class="highlight"><code><span class="kd">public</span> <span class="kd">static</span> <span class="kd">func</span> <span class="nf">load</span><span class="p">(</span><span class="nv">container</span><span class="p">:</span> <span class="kt"><a href="../Classes/DIContainer.html">DIContainer</a></span><span class="p">)</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">static</span> <span class="kd">func</span> <span class="nf">load</span><span class="p">(</span><span class="nv">container</span><span class="p">:</span> <span class="kt"><a href="../Classes/DIContainer.html">DIContainer</a></span><span class="p">)</span></code></pre>
 
                         </div>
                       </div>
@@ -286,8 +289,8 @@ <h4>Declaration</h4>
           </section>
         </section>
         <section id="footer">
-          <p>&copy; 2017 <a class="link" href="https://github.com/ivlevAstef" target="_blank" rel="external">Ivlev</a>. All rights reserved. (Last updated: 2017-11-28)</p>
-          <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.8.3</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+          <p>&copy; 2018 <a class="link" href="https://github.com/ivlevAstef" target="_blank" rel="external">Ivlev</a>. All rights reserved. (Last updated: 2018-03-30)</p>
+          <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.1</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
         </section>
       </article>
     </div>

diff --git a/Documentation/code/Classes/DIScanFramework/Predicate.html b/Documentation/code/Classes/DIScanFramework/Predicate.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Predicate Enum Reference</title>
+    <title>Predicate Enumeration Reference</title>
     <link rel="stylesheet" type="text/css" href="../../css/jazzy.css" />
     <link rel="stylesheet" type="text/css" href="../../css/highlight.css" />
     <meta charset='utf-8'>
@@ -11,10 +11,10 @@
   </head>
   <body>
     <a name="//apple_ref/swift/Enum/Predicate" class="dashAnchor"></a>
-    <a title="Predicate Enum Reference"></a>
+    <a title="Predicate Enumeration Reference"></a>
     <header>
       <div class="content-wrapper">
-        <p><a href="../../index.html">DITranquillity Docs</a> (92% documented)</p>
+        <p><a href="../../index.html">DITranquillity Docs</a> (91% documented)</p>
         <p class="header-right"><a href="https://github.com/ivlevAstef/DITranquillity"><img src="../../img/gh.png"/>View on GitHub</a></p>
         <p class="header-right"><a href="dash-feed://https%3A%2F%2Fgithub%2Ecom%2FivlevAstef%2FDITranquillity%2Fcode%2Fdocsets%2FDITranquillity%2Exml"><img src="../../img/dash.png"/>Install in Dash</a></p>
       </div>
@@ -23,7 +23,7 @@
       <p id="breadcrumbs">
         <a href="../../index.html">DITranquillity Reference</a>
         <img id="carat" src="../../img/carat.png" />
-        Predicate Enum Reference
+        Predicate Enumeration Reference
       </p>
     </div>
     <div class="content-wrapper">
@@ -77,11 +77,14 @@
             </ul>
           </li>
           <li class="nav-group-name">
-            <a href="../../Enums.html">Enums</a>
+            <a href="../../Enums.html">Enumerations</a>
             <ul class="nav-group-tasks">
               <li class="nav-group-task">
                 <a href="../../Enums/DILifeTime.html">DILifeTime</a>
               </li>
+              <li class="nav-group-task">
+                <a href="../../Enums/DILifeTime/ReferenceCounting.html">– ReferenceCounting</a>
+              </li>
               <li class="nav-group-task">
                 <a href="../../Enums/DILogLevel.html">DILogLevel</a>
               </li>
@@ -91,7 +94,7 @@
             <a href="../../Functions.html">Functions</a>
             <ul class="nav-group-tasks">
               <li class="nav-group-task">
-                <a href="../../Functions/*(_:).html">*(_:)</a>
+                <a href="../../Functions.html#/s:14DITranquillity1mopxAA11DIContainerClF">*(_:)</a>
               </li>
               <li class="nav-group-task">
                 <a href="../../Functions.html#/s:14DITranquillity2byq_xm3tag_AA7DIByTagCyxq_G2ontr0_lF">by(tag:on:)</a>
@@ -125,7 +128,7 @@
             </ul>
           </li>
           <li class="nav-group-name">
-            <a href="../../Structs.html">Structs</a>
+            <a href="../../Structs.html">Structures</a>
             <ul class="nav-group-tasks">
               <li class="nav-group-task">
                 <a href="../../Structs/DIComponentInfo.html">DIComponentInfo</a>
@@ -142,7 +145,7 @@
             </ul>
           </li>
           <li class="nav-group-name">
-            <a href="../../Typealiases.html">Typealiases</a>
+            <a href="../../Typealiases.html">Type Aliases</a>
             <ul class="nav-group-tasks">
               <li class="nav-group-task">
                 <a href="../../Typealiases.html#/s:14DITranquillity7DIATypea">DIAType</a>
@@ -163,7 +166,7 @@
             <h1>Predicate</h1>
               <div class="declaration">
                 <div class="language">
-                  <pre class="highlight"><code><span class="kd">public</span> <span class="kd">enum</span> <span class="kt">Predicate</span></code></pre>
+                  <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">enum</span> <span class="kt">Predicate</span></code></pre>
 
                 </div>
               </div>
@@ -198,7 +201,7 @@ <h1>Predicate</h1>
                         <h4>Declaration</h4>
                         <div class="language">
                           <p class="aside-title">Swift</p>
-                          <pre class="highlight"><code><span class="kd">public</span> <span class="kd">enum</span> <span class="kt">Predicate</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">case</span> <span class="nf">type</span><span class="p">((</span><span class="kt"><a href="../../Protocols/DIFramework.html">DIFramework</a></span><span class="o">.</span><span class="k">Type</span><span class="p">)</span><span class="o">-&gt;</span><span class="kt">Bool</span><span class="p">)</span></code></pre>
 
                         </div>
                       </div>
@@ -232,7 +235,7 @@ <h4>Declaration</h4>
                         <h4>Declaration</h4>
                         <div class="language">
                           <p class="aside-title">Swift</p>
-                          <pre class="highlight"><code><span class="kd">public</span> <span class="kd">enum</span> <span class="kt">Predicate</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">case</span> <span class="nf">name</span><span class="p">((</span><span class="kt">String</span><span class="p">)</span><span class="o">-&gt;</span><span class="kt">Bool</span><span class="p">)</span></code></pre>
 
                         </div>
                       </div>
@@ -247,8 +250,8 @@ <h4>Declaration</h4>
           </section>
         </section>
         <section id="footer">
-          <p>&copy; 2017 <a class="link" href="https://github.com/ivlevAstef" target="_blank" rel="external">Ivlev</a>. All rights reserved. (Last updated: 2017-11-28)</p>
-          <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.8.3</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+          <p>&copy; 2018 <a class="link" href="https://github.com/ivlevAstef" target="_blank" rel="external">Ivlev</a>. All rights reserved. (Last updated: 2018-03-30)</p>
+          <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.1</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
         </section>
       </article>
     </div>