Cleanup + formatting

ochococo · ochococo · commit 01f5c85cccee · 2014-09-01T21:03:02.000+02:00
diff --git a/Design-Patterns.playground.zip b/Design-Patterns.playground.zip
diff --git a/Design-Patterns.playground/Documentation/section-1.html b/Design-Patterns.playground/Documentation/section-1.html
@@ -21,7 +21,7 @@ <h1 id="creational">Creational</h1>
 <p>In software engineering, creational design patterns are design patterns that deal with object creation mechanisms, trying to create objects in a manner suitable to the situation. The basic form of object creation could result in design problems or added complexity to the design. Creational design patterns solve this problem by somehow controlling this object creation.</p>
 <p><strong>Source:</strong> <a href="http://en.wikipedia.org/wiki/Creational_pattern">wikipedia.org</a></p>
 </blockquote>
-<h2 id="singleton">Singleton</h2>
+<h2 id="-singleton">💍 Singleton</h2>
 
   </section>
 </div>
diff --git a/Design-Patterns.playground/Documentation/section-11.html b/Design-Patterns.playground/Documentation/section-11.html
@@ -11,7 +11,7 @@
 <body>
 <div class="content-wrapper">
   <section class="section">
-    <h2 id="abstract-factory">Abstract Factory</h2>
+    <h2 id="-abstract-factory">🌰 Abstract Factory</h2>
 
   </section>
 </div>
diff --git a/Design-Patterns.playground/Documentation/section-15.html b/Design-Patterns.playground/Documentation/section-15.html
@@ -11,7 +11,7 @@
 <body>
 <div class="content-wrapper">
   <section class="section">
-    <h2 id="prototype">Prototype</h2>
+    <h2 id="-prototype">🃏 Prototype</h2>
 
   </section>
 </div>
diff --git a/Design-Patterns.playground/Documentation/section-19.html b/Design-Patterns.playground/Documentation/section-19.html
@@ -11,7 +11,7 @@
 <body>
 <div class="content-wrapper">
   <section class="section">
-    <h2 id="factory-method">Factory Method</h2>
+    <h2 id="-factory-method">🏭 Factory Method</h2>
 
   </section>
 </div>
diff --git a/Design-Patterns.playground/Documentation/section-23.html b/Design-Patterns.playground/Documentation/section-23.html
@@ -16,7 +16,7 @@ <h1 id="structural">Structural</h1>
 <p>In software engineering, structural design patterns are design patterns that ease the design by identifying a simple way to realize relationships between entities.</p>
 <p><strong>Source:</strong> <a href="http://en.wikipedia.org/wiki/Structural_pattern">wikipedia.org</a></p>
 </blockquote>
-<h2 id="composite">Composite</h2>
+<h2 id="-composite">🌿 Composite</h2>
 
   </section>
 </div>
diff --git a/Design-Patterns.playground/Documentation/section-27.html b/Design-Patterns.playground/Documentation/section-27.html
@@ -11,7 +11,7 @@
 <body>
 <div class="content-wrapper">
   <section class="section">
-    <h2 id="fa-ade">Façade</h2>
+    <h2 id="-fa-ade">🎁 Façade</h2>
 
   </section>
 </div>
diff --git a/Design-Patterns.playground/Documentation/section-31.html b/Design-Patterns.playground/Documentation/section-31.html
@@ -11,7 +11,7 @@
 <body>
 <div class="content-wrapper">
   <section class="section">
-    <h2 id="adapter">Adapter</h2>
+    <h2 id="-adapter">🔌 Adapter</h2>
 
   </section>
 </div>
diff --git a/Design-Patterns.playground/Documentation/section-35.html b/Design-Patterns.playground/Documentation/section-35.html
@@ -11,16 +11,16 @@
 <body>
 <div class="content-wrapper">
   <section class="section">
-    <h2 id="bridge">Bridge</h2>
-<h2 id="decorator">Decorator</h2>
-<h2 id="proxy">Proxy</h2>
+    <h2 id="-bridge">🚧  Bridge</h2>
+<h2 id="-decorator">🚧  Decorator</h2>
+<h2 id="-proxy">🚧  Proxy</h2>
 <h1 id="behavioral">Behavioral</h1>
 <blockquote>
 <p>In software engineering, behavioral design patterns are design patterns that identify common communication patterns between objects and realize these patterns. By doing so, these patterns increase flexibility in carrying out this communication.</p>
 <p><strong>Source:</strong> <a href="http://en.wikipedia.org/wiki/Behavioral_pattern">wikipedia.org</a></p>
 </blockquote>
-<h2 id="chain-of-responsibility">Chain Of Responsibility</h2>
-<h2 id="command">Command</h2>
+<h2 id="-chain-of-responsibility">🚧 Chain Of Responsibility</h2>
+<h2 id="-command">👫 Command</h2>
 
   </section>
 </div>
diff --git a/Design-Patterns.playground/Documentation/section-39.html b/Design-Patterns.playground/Documentation/section-39.html
@@ -11,11 +11,11 @@
 <body>
 <div class="content-wrapper">
   <section class="section">
-    <h2 id="iterator">Iterator</h2>
-<h2 id="mediator">Mediator</h2>
-<h2 id="memento">Memento</h2>
-<h2 id="observer">Observer</h2>
-<h2 id="state">State</h2>
+    <h2 id="-iterator">🚧  Iterator</h2>
+<h2 id="-mediator">🚧  Mediator</h2>
+<h2 id="-memento">🚧  Memento</h2>
+<h2 id="-observer">🚧  Observer</h2>
+<h2 id="-state">🐉 State</h2>
 
   </section>
 </div>
diff --git a/Design-Patterns.playground/Documentation/section-43.html b/Design-Patterns.playground/Documentation/section-43.html
@@ -11,7 +11,7 @@
 <body>
 <div class="content-wrapper">
   <section class="section">
-    <h2 id="strategy">Strategy</h2>
+    <h2 id="-strategy">💡 Strategy</h2>
 
   </section>
 </div>
diff --git a/Design-Patterns.playground/Documentation/section-47.html b/Design-Patterns.playground/Documentation/section-47.html
@@ -11,7 +11,7 @@
 <body>
 <div class="content-wrapper">
   <section class="section">
-    <h2 id="visitor">Visitor</h2>
+    <h2 id="-visitor">🏃 Visitor</h2>
 
   </section>
 </div>
diff --git a/Design-Patterns.playground/Documentation/section-5.html b/Design-Patterns.playground/Documentation/section-5.html
@@ -11,7 +11,7 @@
 <body>
 <div class="content-wrapper">
   <section class="section">
-    <h2 id="builder">Builder</h2>
+    <h2 id="-builder">👷 Builder</h2>
 
   </section>
 </div>
diff --git a/Design-Patterns.playground/section-10.swift b/Design-Patterns.playground/section-10.swift
@@ -1,4 +1,4 @@
-let uglierPoint = Point{
+let uglierPoint = Point {
     $0.x = 0.1
     $0.y = 0.2
     $0.z = 0.3
diff --git a/Design-Patterns.playground/section-12.swift b/Design-Patterns.playground/section-12.swift
@@ -1,24 +1,23 @@
-class Number
-{
-    var number:AnyObject
+class Number {
+    var number: AnyObject
 
-    init(number:AnyObject){
+    init(number:AnyObject) {
         self.number = number
     }
 
-    convenience init(integer:Int){
-        self.init(number:integer)
+    convenience init(integer: Int) {
+        self.init(number: integer)
     }
 
-    convenience init(double:Double){
-        self.init(number:double)
+    convenience init(double: Double) {
+        self.init(number: double)
     }
 
-    func integerValue() -> Int{
+    func integerValue() -> Int {
         return self.number as Int
     }
 
-    func doubleValue() -> Double{
+    func doubleValue() -> Double {
         return self.number as Double
     }
 }
diff --git a/Design-Patterns.playground/section-16.swift b/Design-Patterns.playground/section-16.swift
@@ -1,13 +1,13 @@
-class ThieveryCorporationPersonDisplay{
+class ThieveryCorporationPersonDisplay {
 
-    var name:String?
-    let font:String
+    var name: String?
+    let font: String
 
-    init(font:String){
+    init(font: String) {
         self.font = font
     }
 
-    func clone() -> ThieveryCorporationPersonDisplay{
-        return ThieveryCorporationPersonDisplay(font: self.font)
+    func clone() -> ThieveryCorporationPersonDisplay {
+        return ThieveryCorporationPersonDisplay(font:self.font)
     }
 }
diff --git a/Design-Patterns.playground/section-20.swift b/Design-Patterns.playground/section-20.swift
@@ -30,12 +30,12 @@ enum Country {
 class CurrencyFactory {
     class func currencyForCountry(country:Country) -> Currency? {
         switch country {
-        case .Spain, .France :
-            return Euro()
-        case .UnitedStates :
-            return UnitedStatedDolar()
-        default:
-            return nil
+            case .Spain, .France :
+                return Euro()
+            case .UnitedStates :
+                return UnitedStatedDolar()
+            default:
+                return nil
         }
         
     }
diff --git a/Design-Patterns.playground/section-24.swift b/Design-Patterns.playground/section-24.swift
@@ -2,7 +2,7 @@
  *  Component
  */
 protocol Shape {
-    func draw(fillColor:String)
+    func draw(fillColor: String)
 }
 
 /**
diff --git a/Design-Patterns.playground/section-28.swift b/Design-Patterns.playground/section-28.swift
@@ -1,12 +1,12 @@
-class Eternal{
+class Eternal {
 
-    class func setObject(value: AnyObject!, forKey defaultName: String!){
+    class func setObject(value: AnyObject!, forKey defaultName: String!) {
         let defaults:NSUserDefaults = NSUserDefaults.standardUserDefaults()
-        defaults.setObject(value,forKey:defaultName)
+        defaults.setObject(value, forKey:defaultName)
         defaults.synchronize()
     }
 
-    class func objectForKey(defaultName: String!) -> AnyObject!{
+    class func objectForKey(defaultName: String!) -> AnyObject! {
         let defaults:NSUserDefaults = NSUserDefaults.standardUserDefaults()
         return defaults.objectForKey(defaultName)
     }
diff --git a/Design-Patterns.playground/section-30.swift b/Design-Patterns.playground/section-30.swift
@@ -1,3 +1,3 @@
-Eternal.setObject("Disconnect me. I’d rather be nothing",forKey:"Bishop")
+Eternal.setObject("Disconnect me. I’d rather be nothing", forKey:"Bishop")
 
 Eternal.objectForKey("Bishop")
diff --git a/Design-Patterns.playground/section-32.swift b/Design-Patterns.playground/section-32.swift
@@ -1,6 +1,6 @@
 // WARNING: This example uses Point class from Builder pattern!
 
-class PointConverter{
+class PointConverter {
 
     class func convert(#point:Point, base:Double, negative:Bool) -> Point{
 
diff --git a/Design-Patterns.playground/section-44.swift b/Design-Patterns.playground/section-44.swift
@@ -6,23 +6,23 @@ class Printer {
 
     let strategy: PrintStrategy
     
-    func printString(string:String)->String{
+    func printString(string:String) -> String {
         return self.strategy.printString(string)
     }
     
-    init(strategy: PrintStrategy){
+    init(strategy: PrintStrategy) {
         self.strategy = strategy
     }
 }
 
-class UpperCaseStrategy: PrintStrategy{
-    func printString(string:String)->String{
+class UpperCaseStrategy: PrintStrategy {
+    func printString(string:String) -> String {
         return string.uppercaseString
     }
 }
 
-class LowerCaseStrategy: PrintStrategy{
-    func printString(string:String)->String{
+class LowerCaseStrategy: PrintStrategy {
+    func printString(string:String) -> String {
         return string.lowercaseString
     }
 }
diff --git a/Design-Patterns.playground/section-6.swift b/Design-Patterns.playground/section-6.swift
@@ -1,18 +1,18 @@
 protocol ThreeDimensions {
-    var x:Double? {get}
-    var y:Double? {get}
-    var z:Double? {get}
+    var x: Double? {get}
+    var y: Double? {get}
+    var z: Double? {get}
 }
 
-class Point:ThreeDimensions {
+class Point : ThreeDimensions {
 
-    var x:Double?
-    var y:Double?
-    var z:Double?
+    var x: Double?
+    var y: Double?
+    var z: Double?
 
     typealias PointBuilderClosure = (Point) -> ()
 
-    init(buildClosure:PointBuilderClosure){
+    init(buildClosure: PointBuilderClosure) {
         buildClosure(self)
     }
 }
diff --git a/Design-Patterns.playground/section-8.swift b/Design-Patterns.playground/section-8.swift
@@ -1,4 +1,4 @@
-let fancyPoint = Point{ point in
+let fancyPoint = Point { point in
     point.x = 0.1
     point.y = 0.2
     point.z = 0.3
diff --git a/README.markdown b/README.markdown

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-let uglierPoint = Point{`
	`1`	`+let uglierPoint = Point {`
`2`	`2`	`$0.x = 0.1`
`3`	`3`	`$0.y = 0.2`
`4`	`4`	`$0.z = 0.3`
Original file line number	Diff line number	Diff line change
`@@ -1,24 +1,23 @@`
`1`		`-class Number`
`2`		`-{`
`3`		`- var number:AnyObject`
	`1`	`+class Number {`
	`2`	`+ var number: AnyObject`
`4`	`3`
`5`		`- init(number:AnyObject){`
	`4`	`+ init(number:AnyObject) {`
`6`	`5`	`self.number = number`
`7`	`6`	`}`
`8`	`7`
`9`		`- convenience init(integer:Int){`
`10`		`- self.init(number:integer)`
	`8`	`+ convenience init(integer: Int) {`
	`9`	`+ self.init(number: integer)`
`11`	`10`	`}`
`12`	`11`
`13`		`- convenience init(double:Double){`
`14`		`- self.init(number:double)`
	`12`	`+ convenience init(double: Double) {`
	`13`	`+ self.init(number: double)`
`15`	`14`	`}`
`16`	`15`
`17`		`- func integerValue() -> Int{`
	`16`	`+ func integerValue() -> Int {`
`18`	`17`	`return self.number as Int`
`19`	`18`	`}`
`20`	`19`
`21`		`- func doubleValue() -> Double{`
	`20`	`+ func doubleValue() -> Double {`
`22`	`21`	`return self.number as Double`
`23`	`22`	`}`
`24`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`		`-class ThieveryCorporationPersonDisplay{`
	`1`	`+class ThieveryCorporationPersonDisplay {`
`2`	`2`
`3`		`- var name:String?`
`4`		`- let font:String`
	`3`	`+ var name: String?`
	`4`	`+ let font: String`
`5`	`5`
`6`		`- init(font:String){`
	`6`	`+ init(font: String) {`
`7`	`7`	`self.font = font`
`8`	`8`	`}`
`9`	`9`
`10`		`- func clone() -> ThieveryCorporationPersonDisplay{`
`11`		`- return ThieveryCorporationPersonDisplay(font: self.font)`
	`10`	`+ func clone() -> ThieveryCorporationPersonDisplay {`
	`11`	`+ return ThieveryCorporationPersonDisplay(font:self.font)`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`* Component`
`3`	`3`	`*/`
`4`	`4`	`protocol Shape {`
`5`		`- func draw(fillColor:String)`
	`5`	`+ func draw(fillColor: String)`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-Eternal.setObject("Disconnect me. I’d rather be nothing",forKey:"Bishop")`
	`1`	`+Eternal.setObject("Disconnect me. I’d rather be nothing", forKey:"Bishop")`
`2`	`2`
`3`	`3`	`Eternal.objectForKey("Bishop")`
Original file line number	Diff line number	Diff line change
`@@ -6,23 +6,23 @@ class Printer {`
`6`	`6`
`7`	`7`	`let strategy: PrintStrategy`
`8`	`8`
`9`		`- func printString(string:String)->String{`
	`9`	`+ func printString(string:String) -> String {`
`10`	`10`	`return self.strategy.printString(string)`
`11`	`11`	`}`
`12`	`12`
`13`		`- init(strategy: PrintStrategy){`
	`13`	`+ init(strategy: PrintStrategy) {`
`14`	`14`	`self.strategy = strategy`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
`18`		`-class UpperCaseStrategy: PrintStrategy{`
`19`		`- func printString(string:String)->String{`
	`18`	`+class UpperCaseStrategy: PrintStrategy {`
	`19`	`+ func printString(string:String) -> String {`
`20`	`20`	`return string.uppercaseString`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`		`-class LowerCaseStrategy: PrintStrategy{`
`25`		`- func printString(string:String)->String{`
	`24`	`+class LowerCaseStrategy: PrintStrategy {`
	`25`	`+ func printString(string:String) -> String {`
`26`	`26`	`return string.lowercaseString`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-let fancyPoint = Point{ point in`
	`1`	`+let fancyPoint = Point { point in`
`2`	`2`	`point.x = 0.1`
`3`	`3`	`point.y = 0.2`
`4`	`4`	`point.z = 0.3`