[Carson] code cleanup

cramsden@thoughtworks.com · cramsden@thoughtworks.com · commit 463df228f6a7 · 2016-06-30T10:57:15.000-05:00
diff --git a/RestExample/HelloRest/HelloRest.xcodeproj/project.pbxproj b/RestExample/HelloRest/HelloRest.xcodeproj/project.pbxproj
@@ -18,6 +18,7 @@
 		680951131D24339000EF3F63 /* PeopleTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 680951121D24339000EF3F63 /* PeopleTransformer.swift */; };
 		680951151D243C7100EF3F63 /* PeopleListViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 680951141D243C7100EF3F63 /* PeopleListViewModelTests.swift */; };
 		680951171D243E0700EF3F63 /* PeopleServiceMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 680951161D243E0700EF3F63 /* PeopleServiceMock.swift */; };
+		68F3F63B1D257519007CD3A4 /* PeopleTransformerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68F3F63A1D257519007CD3A4 /* PeopleTransformerTests.swift */; };
 		AD550FF41D1D5D33001B640B /* PeopleListViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD550FF31D1D5D33001B640B /* PeopleListViewControllerTests.swift */; };
 		AD86366D1D1CA38000792EDC /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD86366C1D1CA38000792EDC /* AppDelegate.swift */; };
 		AD8636721D1CA38000792EDC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AD8636701D1CA38000792EDC /* Main.storyboard */; };
@@ -49,6 +50,7 @@
 		680951121D24339000EF3F63 /* PeopleTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PeopleTransformer.swift; sourceTree = "<group>"; };
 		680951141D243C7100EF3F63 /* PeopleListViewModelTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PeopleListViewModelTests.swift; sourceTree = "<group>"; };
 		680951161D243E0700EF3F63 /* PeopleServiceMock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PeopleServiceMock.swift; sourceTree = "<group>"; };
+		68F3F63A1D257519007CD3A4 /* PeopleTransformerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PeopleTransformerTests.swift; sourceTree = "<group>"; };
 		AAA49A9A49AFCAAE85CD5DFA /* Pods_HelloRest.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_HelloRest.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		AD550FF31D1D5D33001B640B /* PeopleListViewControllerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PeopleListViewControllerTests.swift; sourceTree = "<group>"; };
 		AD70B3D63BE2E643752101A6 /* Pods-HelloRestSpecs.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HelloRestSpecs.release.xcconfig"; path = "../Pods/Target Support Files/Pods-HelloRestSpecs/Pods-HelloRestSpecs.release.xcconfig"; sourceTree = "<group>"; };
@@ -144,6 +146,7 @@
 			isa = PBXGroup;
 			children = (
 				680950F51D24216E00EF3F63 /* PeopleServiceTests.swift */,
+				68F3F63A1D257519007CD3A4 /* PeopleTransformerTests.swift */,
 			);
 			name = Services;
 			sourceTree = "<group>";
@@ -500,6 +503,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				68F3F63B1D257519007CD3A4 /* PeopleTransformerTests.swift in Sources */,
 				AD550FF41D1D5D33001B640B /* PeopleListViewControllerTests.swift in Sources */,
 				680951151D243C7100EF3F63 /* PeopleListViewModelTests.swift in Sources */,
 				680951111D24300200EF3F63 /* PersonTests.swift in Sources */,
diff --git a/RestExample/HelloRest/HelloRest/PeopleList/PeopleListViewModel.swift b/RestExample/HelloRest/HelloRest/PeopleList/PeopleListViewModel.swift
@@ -8,7 +8,7 @@ struct PeopleListViewModel {
 
     init(peopleService: PeopleServiceType) {
         self.peopleService = peopleService
-        peopleService.getAllPeopleJSON() { people in
+        peopleService.getAllPeople() { people in
             self.people.value = people
         }
     }
diff --git a/RestExample/HelloRest/HelloRest/Services/PeopleService.swift b/RestExample/HelloRest/HelloRest/Services/PeopleService.swift
@@ -3,19 +3,19 @@ import Alamofire
 import SwiftyJSON
 
 protocol PeopleServiceType {
-    func getAllPeopleJSON(onCompletion: ([Person]) -> Void)
+    func getAllPeople(onCompletion: ([Person]) -> Void)
 }
 
 class PeopleService : PeopleServiceType {
 
-    func getAllPeopleJSON(onCompletion: ([Person]) -> Void) {
+    func getAllPeople(onCompletion: ([Person]) -> Void) {
         Alamofire
             .request(.GET, "http://localhost:8000/list")
             .validate(statusCode: 200..<400)
             .responseJSON { response in
                 if let value = response.result.value {
                     let json = JSON(value)
-                    let people = PeopleTransformer.transformListOfPeopleWithoutDetail(json)
+                    let people = PeopleTransformer.transformListOfPeople(json)
                     onCompletion(people)
                 }
         }
diff --git a/RestExample/HelloRest/HelloRest/Services/PeopleTransformer.swift b/RestExample/HelloRest/HelloRest/Services/PeopleTransformer.swift
@@ -2,10 +2,10 @@ import Foundation
 import SwiftyJSON
 
 struct PeopleTransformer {
-    static func transformListOfPeopleWithoutDetail(response: JSON) -> [Person] {
+    static func transformListOfPeople(response: JSON) -> [Person] {
         let jsonArray = response.arrayValue
         return jsonArray.map { json in
-            Person(id: json["id"].intValue, name: json["name"].stringValue)
+            Person(id: json["id"].intValue, name: json["name"].stringValue, age: json["age"].int, phone: json["phone"].string)
         }
     }
 }
diff --git a/RestExample/HelloRest/HelloRestSpecs/PeopleServiceMock.swift b/RestExample/HelloRest/HelloRestSpecs/PeopleServiceMock.swift
@@ -6,7 +6,7 @@ class PeopleServiceMock: PeopleServiceType {
     var getAllPeopleCalled = false
     var stubbedPeopleWithoutDetail = [Person(id: 1, name: "someName")]
 
-    func getAllPeopleJSON(onCompletion: ([Person]) -> Void){
+    func getAllPeople(onCompletion: ([Person]) -> Void){
         getAllPeopleCalled = true
         onCompletion(stubbedPeopleWithoutDetail)
     }
diff --git a/RestExample/HelloRest/HelloRestSpecs/PeopleServiceTests.swift b/RestExample/HelloRest/HelloRestSpecs/PeopleServiceTests.swift
@@ -29,19 +29,25 @@ class PeopleServiceTests: QuickSpec {
             OHHTTPStubs.removeAllStubs()
         }
 
-        describe(".getAllPeopleJSON") {
-            it("should get data from list all") {
+        describe(".getAllPeople") {
+            it("should get people with limited detail from list endpoint") {
                 let peopleService = PeopleService()
                 var completionCalled = false
-                var actualResponse:[Person] = []
+                var actualPeople:[Person] = []
 
-                peopleService.getAllPeopleJSON { response in
+                peopleService.getAllPeople { people in
                     completionCalled = true
-                    actualResponse = response
+                    actualPeople = people
                 }
 
                 expect(completionCalled).toEventually(beTrue())
-                expect(actualResponse).toEventually(haveCount(2))
+                expect(actualPeople).toEventually(haveCount(2))
+
+                let firstPerson = actualPeople.first
+
+                expect(firstPerson?.id).toNot(beNil())
+                expect(firstPerson?.name).toNot(beNil())
+                expect(firstPerson?.phone).to(beNil())
             }
 
         }
diff --git a/RestExample/HelloRest/HelloRestSpecs/PeopleTransformerTests.swift b/RestExample/HelloRest/HelloRestSpecs/PeopleTransformerTests.swift
@@ -0,0 +1,19 @@
+import Foundation
+import Quick
+import Nimble
+import SwiftyJSON
+
+@testable import HelloRest
+
+class PeopleTransformerTests: QuickSpec {
+    override func spec() {
+        describe("TransformListOfPeople") {
+            it("should take a json response without detail and transform it into a person") {
+                let expectedPerson = Person(id: 1, name: "someName")
+                let jsonResponse = JSON([["id": 1, "name":"someName"]])
+                let actualPerson = PeopleTransformer.transformListOfPeople(jsonResponse).first
+                expect(expectedPerson) == actualPerson
+            }
+        }
+    }
+}
diff --git a/RestExample/Podfile.lock b/RestExample/Podfile.lock
@@ -51,4 +51,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: b9f03359ee098d97f977bed85815ef8ccce755da
 
-COCOAPODS: 1.0.1
+COCOAPODS: 1.0.0

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ struct PeopleListViewModel {`
`8`	`8`
`9`	`9`	`init(peopleService: PeopleServiceType) {`
`10`	`10`	`self.peopleService = peopleService`
`11`		`- peopleService.getAllPeopleJSON() { people in`
	`11`	`+ peopleService.getAllPeople() { people in`
`12`	`12`	`self.people.value = people`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@ import Foundation`
`2`	`2`	`import SwiftyJSON`
`3`	`3`
`4`	`4`	`struct PeopleTransformer {`
`5`		`- static func transformListOfPeopleWithoutDetail(response: JSON) -> [Person] {`
	`5`	`+ static func transformListOfPeople(response: JSON) -> [Person] {`
`6`	`6`	`let jsonArray = response.arrayValue`
`7`	`7`	`return jsonArray.map { json in`
`8`		`- Person(id: json["id"].intValue, name: json["name"].stringValue)`
	`8`	`+ Person(id: json["id"].intValue, name: json["name"].stringValue, age: json["age"].int, phone: json["phone"].string)`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ class PeopleServiceMock: PeopleServiceType {`
`6`	`6`	`var getAllPeopleCalled = false`
`7`	`7`	`var stubbedPeopleWithoutDetail = [Person(id: 1, name: "someName")]`
`8`	`8`
`9`		`- func getAllPeopleJSON(onCompletion: ([Person]) -> Void){`
	`9`	`+ func getAllPeople(onCompletion: ([Person]) -> Void){`
`10`	`10`	`getAllPeopleCalled = true`
`11`	`11`	`onCompletion(stubbedPeopleWithoutDetail)`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,4 +51,4 @@ SPEC CHECKSUMS:`
`51`	`51`
`52`	`52`	`PODFILE CHECKSUM: b9f03359ee098d97f977bed85815ef8ccce755da`
`53`	`53`
`54`		`-COCOAPODS: 1.0.1`
	`54`	`+COCOAPODS: 1.0.0`