📛 Rename Transition to Procedure [#64]

** UPDATE **
 - Scenario's protocol is named `Transition`, but scenario does not transition, but handle transtion.
 - So, scenario close to procedure rather than transition
 - `Transition` keyword will be used other class

KabuKit/Classes/core/Swift/Scenario.swift

@@ -7,7 +7,7 @@ import Foundation
  一つのSceneごとにつくられる
  
  */
-public class Scenario<Current: Screen, Stage> : Transition {
+public class Scenario<Current: Screen, Stage> : Procedure {
 
     internal typealias Transitioning = (Current, Stage, Any?) -> Void
 
@@ -35,7 +35,7 @@ public class Scenario<Current: Screen, Stage> : Transition {
         name = String(reflecting: fromType)
     }
 
-    internal func setup<S>(at: Screen, on stage: S, with: SceneContainer, when rewind: Transition.Rewind?) {
+    internal func setup<S>(at: Screen, on stage: S, with: SceneContainer, when rewind: Procedure.Rewind?) {
         self.setup(at: at, on: stage, with: with, when: rewind, {})
     }
 

KabuKit/Classes/core/Swift/SceneOperation.swift

@@ -10,11 +10,11 @@ import Foundation
  */
 public class SceneOperation<Stage> {
 
-    private var scenedTransition = [String : Transition]()
+    private var scenedProcedure = [String : Procedure]()
 
-    private var anyTransition: Transition?
+    private var anyProcedure: Procedure?
 
-    private let anyTransitionName: String
+    private let anyProcedureName: String
 
     /**
      指定したSceneでのScenarioのフローを定義します
@@ -37,7 +37,7 @@ public class SceneOperation<Stage> {
      */
     public func at<From: Scene>(_ fromType: From.Type, _ run: (Scenario<From, Stage>) -> Void) {
         let scenario = Scenario<From, Stage>(fromType)
-        scenedTransition[scenario.name] = scenario
+        scenedProcedure[scenario.name] = scenario
         run(scenario)
     }
 
@@ -60,28 +60,28 @@ public class SceneOperation<Stage> {
      - Parameters:
        - run: Scenarioを使ったフロー
      */
-    public func atAnyScene(run: (Scenario<AnyTransition, Stage>) -> Void){
-        anyTransition = anyTransition ?? Scenario<AnyTransition, Stage>(AnyTransition.self)
-        guard let scenario = anyTransition as? Scenario<AnyTransition, Stage> else { return }
-        scenedTransition[anyTransitionName] = scenario
+    public func atAnyScene(run: (Scenario<AnyProcedure, Stage>) -> Void){
+        anyProcedure = anyProcedure ?? Scenario<AnyProcedure, Stage>(AnyProcedure.self)
+        guard let scenario = anyProcedure as? Scenario<AnyProcedure, Stage> else { return }
+        scenedProcedure[anyProcedureName] = scenario
         run(scenario)
     }
 
-    internal func resolve(from: Screen) -> Transition? {
+    internal func resolve(from: Screen) -> Procedure? {
         let name = String(reflecting: type(of: from))
         print(name)
-        return scenedTransition[name]
+        return scenedProcedure[name]
     }
 
-    internal func resolve() -> Transition? {
-        return scenedTransition[anyTransitionName]
+    internal func resolve() -> Procedure? {
+        return scenedProcedure[anyProcedureName]
     }
 
     internal init() {
-        anyTransitionName = String(reflecting: AnyTransition.self)
+        anyProcedureName = String(reflecting: AnyProcedure.self)
     }
 }
 
-public class AnyTransition: Screen {
+public class AnyProcedure: Screen {
     internal init() {}
 }

KabuKit/Classes/core/Swift/SceneSequence.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-internal var transitionByScene = [ScreenHashWrapper : Transition]()
+internal var ProcedureByScene = [ScreenHashWrapper : Procedure]()
 
 /**
  複数のSceneを管理し、それぞれからの遷移リクエストを受け付け画面切り替えを行うクラス
@@ -17,7 +17,7 @@ public class SceneSequence<C, G: Guide> : Scene, SceneContainer {
 
     private var scenes: [Screen]
 
-    private var currentTransition: Transition?
+    private var currentProcedure: Procedure?
 
     private let isRecordable: Bool
 
@@ -33,15 +33,15 @@ public class SceneSequence<C, G: Guide> : Scene, SceneContainer {
         guard let scenario = self.operation?.resolve(from: screen) else { return }
         let hashwrap = ScreenHashWrapper(screen)
         self.scenes.append(screen)
-        transitionByScene[hashwrap] = scenario
+        ProcedureByScene[hashwrap] = scenario
         contextByScreen[hashwrap] = context
         scenario.setup(at: screen, on: self.stage!, with: self, when: rewind)
     }
 
     internal func remove(screen: Screen, completion: () -> Void) {
         let hashwrap = ScreenHashWrapper(screen)
         _ = self.scenes.popLast()
-        transitionByScene.removeValue(forKey: hashwrap)
+        ProcedureByScene.removeValue(forKey: hashwrap)
         contextByScreen.removeValue(forKey: hashwrap)
     }
 

KabuKit/Classes/core/Swift/Screen.swift

@@ -34,8 +34,8 @@ public protocol Screen : class {
 extension Screen {
 
 
-    internal var transition: Transition? {
-        return transitionByScene[ScreenHashWrapper(self)]
+    internal var Procedure: Procedure? {
+        return ProcedureByScene[ScreenHashWrapper(self)]
     }
 
 
@@ -45,7 +45,7 @@ extension Screen {
 
 
     public func leave(_ completion: @escaping (Bool) -> Void) -> Void {
-        self.transition?.back(completion)
+        self.Procedure?.back(completion)
     }
 
     public func send<T>(_ request: Request<T>) -> Void {
@@ -54,7 +54,7 @@ extension Screen {
 
 
     public func send<T>(_ request: Request<T>, _ completion: @escaping (Bool) -> Void) -> Void {
-        transition?.start(at: request, completion)
+        Procedure?.start(at: request, completion)
     }
 
 }

KabuKit/Classes/core/Swift/Transition.swift

@@ -5,18 +5,18 @@
 import Foundation
 
 /**
- 画面遷移を示したプロトコル
+ 画面を切り替える手順を示したプロトコル
 
  */
-protocol Transition {
+protocol Procedure {
 
     typealias Rewind = () -> Void
 
     /**
-     Trnasitionを実行するために必要なパラメータをセットする
+     Procedureを実行するために必要なパラメータをセットする
      
      - Parameters:
-       - at: どこの画面のTransitionか指定するため
+       - at: どこの画面のProcedureか指定するため
        - stage: Transionを行うベースとなるメソッド
        - rewind: 前の画面に戻る為の処理
      */
@@ -25,7 +25,7 @@ protocol Transition {
     func setup<S>(at: Screen, on stage: S, with: SceneContainer, when rewind: Rewind?, _ completion: @escaping () -> Void)
 
     /**
-     Transitionを実行する
+     Procedureを実行する
      
      - Parameters: 
        - request: aa