Merge pull request ochococo#57 from kingreza/master

Add further example. update source to match README
hungdlv · Jun 6, 2016 · dc27931 · dc27931
2 parents 6b86c20 + 2d7c6a4
commit dc27931
Show file tree

Hide file tree

Showing 19 changed files with 111 additions and 22 deletions.
diff --git a/Design-Patterns.playground.zip b/Design-Patterns.playground.zip
diff --git a/Design-Patterns.playground/Pages/Behavioral.xcplaygroundpage/Contents.swift b/Design-Patterns.playground/Pages/Behavioral.xcplaygroundpage/Contents.swift
@@ -99,6 +99,9 @@ atm.canWithdraw(100) // Can withdraw - 1x100
 atm.canWithdraw(165) // Cannot withdraw because ATM doesn't has bill with value of 5
 atm.canWithdraw(30)  // Can withdraw - 1x20, 2x10
 /*:
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Chain-Of-Responsibility)
+*/
+/*:
 👫 Command
 ----------
 
@@ -250,6 +253,9 @@ intContext.assign(c, value: 3)
 
 var result = expression?.evaluate(intContext)
 /*:
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Interpreter)
+*/
+/*:
 🍫 Iterator
 -----------
 
@@ -342,6 +348,9 @@ messagesMediator.addColleague(user1)
 
 user0.send("Hello") // user1 receives message
 /*:
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Mediator)
+*/
+/*:
 💾 Memento
 ----------
 
@@ -373,14 +382,14 @@ class GameState {
 /*:
 Caretaker
 */
-class CheckPoint {
-    class func saveState(memento: Memento, keyName: String = DPMementoGameState) {
+enum CheckPoint {
+    static func saveState(memento: Memento, keyName: String = DPMementoGameState) {
         let defaults = NSUserDefaults.standardUserDefaults()
         defaults.setObject(memento, forKey: keyName)
         defaults.synchronize()
     }
 
-    class func restorePreviousState(keyName keyName: String = DPMementoGameState) -> Memento {
+    static func restorePreviousState(keyName keyName: String = DPMementoGameState) -> Memento {
         let defaults = NSUserDefaults.standardUserDefaults()
 
         return defaults.objectForKey(keyName) as? Memento ?? Memento()
@@ -459,6 +468,9 @@ var testChambers = TestChambers()
 testChambers.observer = observerInstance
 testChambers.testChamberNumber++
 /*:
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Observer)
+*/
+/*:
 🐉 State
 ---------
 
@@ -518,6 +530,9 @@ context.changeStateToAuthorized(userId: "admin")
 context.changeStateToUnauthorized()
 (context.isAuthorized, context.userId)
 /*:
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-State)
+*/
+/*:
 💡 Strategy
 -----------
 
@@ -561,7 +576,9 @@ lower.printString("O tempora, o mores!")
 
 var upper = Printer(strategy:UpperCaseStrategy())
 upper.printString("O tempora, o mores!")
-
+/*:
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Strategy)
+*/
 /*:
 🏃 Visitor
 ----------
@@ -609,3 +626,6 @@ let names = planets.map { (planet: Planet) -> String in
 }
 
 names
+/*:
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Visitor)
+*/
diff --git a/Design-Patterns.playground/Pages/Creational.xcplaygroundpage/Contents.swift b/Design-Patterns.playground/Pages/Creational.xcplaygroundpage/Contents.swift
@@ -61,8 +61,8 @@ enum NumberType {
     case NextStep, Swift
 }
 
-class NumberHelper {
-    class func factoryFor(type : NumberType) -> NumberFactory {
+enum NumberHelper {
+    static func factoryFor(type : NumberType) -> NumberFactory {
         switch type {
         case .NextStep:
             return NextStepNumber.make
@@ -135,6 +135,9 @@ let empire = DeathStarBuilder { builder in
 
 let deathStar = DeathStar(builder:empire)
 /*:
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Builder)
+*/
+/*:
 🏭 Factory Method
 -----------------
 
@@ -171,8 +174,8 @@ enum Country {
     case UnitedStates, Spain, UK, Greece
 }
 
-class CurrencyFactory {
-    class func currencyForCountry(country:Country) -> Currency? {
+enum CurrencyFactory {
+    static func currencyForCountry(country:Country) -> Currency? {
 
         switch country {
             case .Spain, .Greece :
@@ -229,6 +232,9 @@ Christoph.name = "Christoph"
 let Eduardo = Prototype.clone()
 Eduardo.name = "Eduardo"
 /*:
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Prototype)
+*/
+/*:
 💍 Singleton
 ------------
 

diff --git a/Design-Patterns.playground/Pages/Structural.xcplaygroundpage/Contents.swift b/Design-Patterns.playground/Pages/Structural.xcplaygroundpage/Contents.swift
@@ -62,6 +62,9 @@ let oldFormat = OldDeathStarSuperlaserTarget(target)
 oldFormat.angleH
 oldFormat.angleV
 /*:
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Adapter)
+*/
+/*:
 🌉 Bridge
 ----------
 
@@ -244,15 +247,15 @@ The facade pattern is used to define a simplified interface to a more complex su
 
 ### Example
 */
-class Eternal {
+enum Eternal {
 
-    class func setObject(value: AnyObject!, forKey defaultName: String!) {
+    static func setObject(value: AnyObject!, forKey defaultName: String!) {
         let defaults:NSUserDefaults = NSUserDefaults.standardUserDefaults()
         defaults.setObject(value, forKey:defaultName)
         defaults.synchronize()
     }
 
-    class func objectForKey(defaultName: String!) -> AnyObject! {
+    static func objectForKey(defaultName: String!) -> AnyObject! {
         let defaults:NSUserDefaults = NSUserDefaults.standardUserDefaults()
 
         return defaults.objectForKey(defaultName)

diff --git a/README.md b/README.md
@@ -11,6 +11,13 @@ A short cheat-sheet with Xcode 7beta Playground ([Design-Patterns.playground.zip
 * [Creational](#creational)
 * [Structural](#structural)
 
+
+```swift
+ Behavioral |
+ [Creational](Creational) |
+ [Structural](Structural)
+```
+
 Behavioral
 ==========
 
@@ -117,6 +124,8 @@ atm.canWithdraw(165) // Cannot withdraw because ATM doesn't has bill with value
 atm.canWithdraw(30)  // Can withdraw - 1x20, 2x10
 ```
 
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Chain-Of-Responsibility)
+
 👫 Command
 ----------
 
@@ -280,6 +289,8 @@ intContext.assign(c, value: 3)
 var result = expression?.evaluate(intContext)
 ```
 
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Interpreter)
+
 🍫 Iterator
 -----------
 
@@ -384,6 +395,8 @@ messagesMediator.addColleague(user1)
 user0.send("Hello") // user1 receives message
 ```
 
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Mediator)
+
 💾 Memento
 ----------
 
@@ -519,6 +532,8 @@ testChambers.observer = observerInstance
 testChambers.testChamberNumber++
 ```
 
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Observer)
+
 🐉 State
 ---------
 
@@ -584,6 +599,8 @@ context.changeStateToUnauthorized()
 (context.isAuthorized, context.userId)
 ```
 
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-State)
+
 💡 Strategy
 -----------
 
@@ -635,6 +652,8 @@ upper.printString("O tempora, o mores!")
 
 ```
 
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Strategy)
+
 🏃 Visitor
 ----------
 
@@ -686,6 +705,11 @@ let names = planets.map { (planet: Planet) -> String in
 }
 
 names
+```
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Visitor)
+
+```swift
+
  [Behavioral](Behavioral) |
  Creational |
  [Structural](Structural)
@@ -845,6 +869,9 @@ let empire = DeathStarBuilder { builder in
 let deathStar = DeathStar(builder:empire)
 ```
 
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Builder)
+
+
 🏭 Factory Method
 -----------------
 
@@ -951,6 +978,8 @@ let Eduardo = Prototype.clone()
 Eduardo.name = "Eduardo"
 ```
 
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Prototype)
+
 💍 Singleton
 ------------
 
@@ -1056,6 +1085,8 @@ oldFormat.angleH
 oldFormat.angleV
 ```
 
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Adapter)
+
 🌉 Bridge
 ----------
 

diff --git a/source/behavioral/chain_of_responsibility.swift b/source/behavioral/chain_of_responsibility.swift
@@ -85,3 +85,6 @@ atm.canWithdraw(310) // Cannot because ATM has only 300
 atm.canWithdraw(100) // Can withdraw - 1x100
 atm.canWithdraw(165) // Cannot withdraw because ATM doesn't has bill with value of 5
 atm.canWithdraw(30)  // Can withdraw - 1x20, 2x10
+/*:
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Chain-Of-Responsibility)
+*/
diff --git a/source/behavioral/interpreter.swift b/source/behavioral/interpreter.swift
@@ -88,3 +88,6 @@ intContext.assign(b, value: 1)
 intContext.assign(c, value: 3)
 
 var result = expression?.evaluate(intContext)
+/*:
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Interpreter)
+*/
diff --git a/source/behavioral/mediator.swift b/source/behavioral/mediator.swift
@@ -62,3 +62,6 @@ messagesMediator.addColleague(user0)
 messagesMediator.addColleague(user1)
 
 user0.send("Hello") // user1 receives message
+/*:
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Mediator)
+*/
diff --git a/source/behavioral/memento.swift b/source/behavioral/memento.swift
@@ -30,14 +30,14 @@ class GameState {
 /*:
 Caretaker
 */
-class CheckPoint {
-    class func saveState(memento: Memento, keyName: String = DPMementoGameState) {
+enum CheckPoint {
+    static func saveState(memento: Memento, keyName: String = DPMementoGameState) {
         let defaults = NSUserDefaults.standardUserDefaults()
         defaults.setObject(memento, forKey: keyName)
         defaults.synchronize()
     }
 
-    class func restorePreviousState(keyName keyName: String = DPMementoGameState) -> Memento {
+    static func restorePreviousState(keyName keyName: String = DPMementoGameState) -> Memento {
         let defaults = NSUserDefaults.standardUserDefaults()
 
         return defaults.objectForKey(keyName) as? Memento ?? Memento()

diff --git a/source/behavioral/observer.swift b/source/behavioral/observer.swift
@@ -46,3 +46,6 @@ var observerInstance = Observer()
 var testChambers = TestChambers()
 testChambers.observer = observerInstance
 testChambers.testChamberNumber++
+/*:
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Observer)
+*/
diff --git a/source/behavioral/state.swift b/source/behavioral/state.swift
@@ -57,3 +57,6 @@ context.changeStateToAuthorized(userId: "admin")
 (context.isAuthorized, context.userId) // now logged in as "admin"
 context.changeStateToUnauthorized()
 (context.isAuthorized, context.userId)
+/*:
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-State)
+*/
diff --git a/source/behavioral/strategy.swift b/source/behavioral/strategy.swift
@@ -42,4 +42,6 @@ lower.printString("O tempora, o mores!")
 
 var upper = Printer(strategy:UpperCaseStrategy())
 upper.printString("O tempora, o mores!")
-
+/*:
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Strategy)
+*/
diff --git a/source/behavioral/visitor.swift b/source/behavioral/visitor.swift
@@ -45,3 +45,6 @@ let names = planets.map { (planet: Planet) -> String in
 }
 
 names
+/*:
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Visitor)
+*/
diff --git a/source/creational/abstract_factory.swift b/source/creational/abstract_factory.swift
@@ -48,8 +48,8 @@ enum NumberType {
     case NextStep, Swift
 }
 
-class NumberHelper {
-    class func factoryFor(type : NumberType) -> NumberFactory {
+enum NumberHelper {
+    static func factoryFor(type : NumberType) -> NumberFactory {
         switch type {
         case .NextStep:
             return NextStepNumber.make

diff --git a/source/creational/builder.swift b/source/creational/builder.swift
@@ -51,3 +51,6 @@ let empire = DeathStarBuilder { builder in
 }
 
 let deathStar = DeathStar(builder:empire)
+/*:
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Builder)
+*/
diff --git a/source/creational/factory.swift b/source/creational/factory.swift
@@ -35,8 +35,8 @@ enum Country {
     case UnitedStates, Spain, UK, Greece
 }
 
-class CurrencyFactory {
-    class func currencyForCountry(country:Country) -> Currency? {
+enum CurrencyFactory {
+    static func currencyForCountry(country:Country) -> Currency? {
 
         switch country {
             case .Spain, .Greece :

diff --git a/source/creational/prototype.swift b/source/creational/prototype.swift
@@ -32,3 +32,6 @@ Christoph.name = "Christoph"
 
 let Eduardo = Prototype.clone()
 Eduardo.name = "Eduardo"
+/*:
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Prototype)
+*/
diff --git a/source/structural/adapter.swift b/source/structural/adapter.swift
@@ -48,3 +48,6 @@ let oldFormat = OldDeathStarSuperlaserTarget(target)
 
 oldFormat.angleH
 oldFormat.angleV
+/*:
+>**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Adapter)
+*/
diff --git a/source/structural/facade.swift b/source/structural/facade.swift
@@ -6,15 +6,15 @@ The facade pattern is used to define a simplified interface to a more complex su
 
 ### Example
 */
-class Eternal {
+enum Eternal {
 
-    class func setObject(value: AnyObject!, forKey defaultName: String!) {
+    static func setObject(value: AnyObject!, forKey defaultName: String!) {
         let defaults:NSUserDefaults = NSUserDefaults.standardUserDefaults()
         defaults.setObject(value, forKey:defaultName)
         defaults.synchronize()
     }
 
-    class func objectForKey(defaultName: String!) -> AnyObject! {
+    static func objectForKey(defaultName: String!) -> AnyObject! {
         let defaults:NSUserDefaults = NSUserDefaults.standardUserDefaults()
 
         return defaults.objectForKey(defaultName)
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,3 +45,6 @@ let names = planets.map { (planet: Planet) -> String in @@
     }
     names
+    /*:
+    >**Further Examples:** [Design Patterns in Swift](https://github.com/kingreza/Swift-Visitor)
+    */