Merge branch 'make-it-injectable'

Author: yoichitgy

Podfile

@@ -4,6 +4,7 @@ use_frameworks!
 
 pod 'Alamofire', :git => 'https://github.com/Alamofire/Alamofire.git', :commit => '1b7b1f1aa'
 pod 'SwiftyJSON', :git => 'https://github.com/SwiftyJSON/SwiftyJSON.git', :commit => '45ca854ce'
+pod 'Swinject', '~> 0.2'
 
 
 def testing_pods

Podfile.lock

@@ -3,12 +3,14 @@ PODS:
   - Nimble (2.0.0-rc.2)
   - Quick (0.5.1)
   - SwiftyJSON (2.2.1)
+  - Swinject (0.2)
 
 DEPENDENCIES:
   - Alamofire (from `https://github.com/Alamofire/Alamofire.git`, commit `1b7b1f1aa`)
   - Nimble (= 2.0.0-rc.2)
   - Quick (~> 0.5.0)
   - SwiftyJSON (from `https://github.com/SwiftyJSON/SwiftyJSON.git`, commit `45ca854ce`)
+  - Swinject (~> 0.2)
 
 EXTERNAL SOURCES:
   Alamofire:
@@ -31,5 +33,6 @@ SPEC CHECKSUMS:
   Nimble: e3cf5e73a491daf21c2bc88783dbfc55ce8b8e02
   Quick: 7426537a99e75076d6930c5b6da58006e4a9f38a
   SwiftyJSON: ae2d0a3d68025d136602a33c4ee215091ced3e33
+  Swinject: 08c22f85e8f073257befa6847485e348c8f13825
 
 COCOAPODS: 0.38.2

SwinjectSimpleExample.xcodeproj/project.pbxproj

@@ -12,6 +12,8 @@
 		9878A1E81B78745C0005ACD9 /* WeatherFetcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9878A1E61B78745C0005ACD9 /* WeatherFetcher.swift */; };
 		9878A1EB1B78746C0005ACD9 /* WeatherFetcherSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9878A1EA1B78746C0005ACD9 /* WeatherFetcherSpec.swift */; };
 		9878A1ED1B7876A70005ACD9 /* OpenWeatherMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9878A1EC1B7876A70005ACD9 /* OpenWeatherMap.swift */; };
+		9878A1EF1B78930E0005ACD9 /* Networking.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9878A1EE1B78930E0005ACD9 /* Networking.swift */; };
+		9878A1F11B7893210005ACD9 /* Network.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9878A1F01B7893210005ACD9 /* Network.swift */; };
 		98BA27341B785EB00047549E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98BA27331B785EB00047549E /* AppDelegate.swift */; };
 		98BA27361B785EB00047549E /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98BA27351B785EB00047549E /* ViewController.swift */; };
 		98BA27391B785EB00047549E /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 98BA27371B785EB00047549E /* Main.storyboard */; };
@@ -36,6 +38,8 @@
 		9878A1E61B78745C0005ACD9 /* WeatherFetcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WeatherFetcher.swift; sourceTree = "<group>"; };
 		9878A1EA1B78746C0005ACD9 /* WeatherFetcherSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WeatherFetcherSpec.swift; sourceTree = "<group>"; };
 		9878A1EC1B7876A70005ACD9 /* OpenWeatherMap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenWeatherMap.swift; sourceTree = "<group>"; };
+		9878A1EE1B78930E0005ACD9 /* Networking.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Networking.swift; sourceTree = "<group>"; };
+		9878A1F01B7893210005ACD9 /* Network.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Network.swift; sourceTree = "<group>"; };
 		98BA27301B785EB00047549E /* SwinjectSimpleExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwinjectSimpleExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		98BA27331B785EB00047549E /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		98BA27351B785EB00047549E /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -89,6 +93,8 @@
 				9878A1E51B78745C0005ACD9 /* City.swift */,
 				9878A1E61B78745C0005ACD9 /* WeatherFetcher.swift */,
 				9878A1EC1B7876A70005ACD9 /* OpenWeatherMap.swift */,
+				9878A1EE1B78930E0005ACD9 /* Networking.swift */,
+				9878A1F01B7893210005ACD9 /* Network.swift */,
 			);
 			name = Model;
 			sourceTree = "<group>";
@@ -355,7 +361,9 @@
 				9878A1ED1B7876A70005ACD9 /* OpenWeatherMap.swift in Sources */,
 				98BA27361B785EB00047549E /* ViewController.swift in Sources */,
 				9878A1E81B78745C0005ACD9 /* WeatherFetcher.swift in Sources */,
+				9878A1EF1B78930E0005ACD9 /* Networking.swift in Sources */,
 				9878A1E71B78745C0005ACD9 /* City.swift in Sources */,
+				9878A1F11B7893210005ACD9 /* Network.swift in Sources */,
 				98BA27341B785EB00047549E /* AppDelegate.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

SwinjectSimpleExample/Network.swift

@@ -0,0 +1,19 @@
+//
+//  Network.swift
+//  SwinjectSimpleExample
+//
+//  Created by Yoichi Tagaya on 8/10/15.
+//  Copyright © 2015 Swinject Contributors. All rights reserved.
+//
+
+import Foundation
+import Alamofire
+
+struct Network : Networking {
+    func request(response: NSData? -> ()) {
+        Alamofire.request(.GET, OpenWeatherMap.url, parameters: OpenWeatherMap.parameters)
+            .response { _, _, data, error in
+                response(data)
+            }
+    }
+}

SwinjectSimpleExample/Networking.swift

@@ -0,0 +1,13 @@
+//
+//  Networking.swift
+//  SwinjectSimpleExample
+//
+//  Created by Yoichi Tagaya on 8/10/15.
+//  Copyright © 2015 Swinject Contributors. All rights reserved.
+//
+
+import Foundation
+
+protocol Networking {
+    func request(response: NSData? -> ())
+}

SwinjectSimpleExample/WeatherFetcher.swift

@@ -11,15 +11,16 @@ import Alamofire
 import SwiftyJSON
 
 struct WeatherFetcher {
-    static func fetch(response: [City]? -> ()) {
-        Alamofire.request(.GET, OpenWeatherMap.url, parameters: OpenWeatherMap.parameters)
-            .response { _, _, data, error in
-                let cities = data.flatMap { decode($0) }
-                response(cities)
-            }
+    let networking: Networking
+    
+    func fetch(response: [City]? -> ()) {
+        networking.request { data in
+            let cities = data.flatMap { self.decode($0) }
+            response(cities)
+        }
     }
 
-    private static func decode(data: NSData) -> [City]? {
+    private func decode(data: NSData) -> [City]? {
         let json = JSON(data: data)
         var cities = [City]()
         for (_, j) in json["list"] {

SwinjectSimpleExampleTests/WeatherFetcherSpec.swift

@@ -9,19 +9,71 @@
 
 import Quick
 import Nimble
+import Swinject
 @testable import SwinjectSimpleExample
 
 class WeatherFetcherSpec: QuickSpec {
+    struct StubNetwork: Networking {    
+        private static let json =
+        "{" +
+            "\"list\": [" +
+                "{" +
+                    "\"id\": 2643743," +
+                    "\"name\": \"London\"," +
+                    "\"weather\": [" +
+                        "{" +
+                            "\"main\": \"Rain\"" +
+                        "}" +
+                    "]" +
+                "}," +
+                "{" +
+                    "\"id\": 3451190," +
+                    "\"name\": \"Rio de Janeiro\"," +
+                    "\"weather\": [" +
+                        "{" +
+                            "\"main\": \"Clear\"" +
+                        "}" +
+                    "]" +
+                "}" +
+            "]" +
+        "}"
+        
+        func request(response: NSData? -> ()) {
+            let data = StubNetwork.json.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)
+            response(data)
+        }
+    }
+    
     override func spec() {
+        let container = Container()
+        container.register(Networking.self) { _ in Network() }
+        container.register(WeatherFetcher.self) { r in
+            WeatherFetcher(networking: r.resolve(Networking.self)!)
+        }
+        container.register(Networking.self, name: "stub") { _ in StubNetwork() }
+        container.register(WeatherFetcher.self, name: "stub") { r in
+            WeatherFetcher(networking: r.resolve(Networking.self, name: "stub")!)
+        }
+        
         it("returns cities.") {
             var cities: [City]?
-            WeatherFetcher.fetch { cities = $0 }
+            let fetcher = container.resolve(WeatherFetcher.self)!
+            fetcher.fetch { cities = $0 }
 
             expect(cities).toEventuallyNot(beNil())
-            expect(cities?.count).toEventually(equal(12))
-            expect(cities?[0].id).toEventually(equal(6077243))
-            expect(cities?[0].name).toEventually(equal("Montreal"))
-            expect(cities?[0].weather).toEventually(equal("Clouds"))
+            expect(cities?.count).toEventually(beGreaterThan(0))
+        }
+        it("fills weather data.") {
+            var cities: [City]?
+            let fetcher = container.resolve(WeatherFetcher.self, name: "stub")!
+            fetcher.fetch { cities = $0 }
+            
+            expect(cities?[0].id).toEventually(equal(2643743))
+            expect(cities?[0].name).toEventually(equal("London"))
+            expect(cities?[0].weather).toEventually(equal("Rain"))
+            expect(cities?[1].id).toEventually(equal(3451190))
+            expect(cities?[1].name).toEventually(equal("Rio de Janeiro"))
+            expect(cities?[1].weather).toEventually(equal("Clear"))
         }
     }
 }