Merge pull request #52 from mstrzele/master

Add SwiftLint configuration and correct warnings and errors

Author: JakeLin

.swiftlint.yml

@@ -0,0 +1,2 @@
+excluded:
+  - Pods

SwiftWeather/AppDelegate.swift

@@ -10,36 +10,46 @@ import UIKit
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
-  
+
   var window: UIWindow?
-  
-  
-  func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+
+
+  func application(application: UIApplication,
+      didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
     // Override point for customization after application launch.
     return true
   }
-  
+
   func applicationWillResignActive(application: UIApplication) {
-    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-    // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
+    // Sent when the application is about to move from active to inactive state. This can occur for
+    // certain types of temporary interruptions (such as an incoming phone call or SMS message) or
+    // when the user quits the application and it begins the transition to the background state.
+    // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame
+    // rates. Games should use this method to pause the game.
   }
-  
+
   func applicationDidEnterBackground(application: UIApplication) {
-    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-    // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+    // Use this method to release shared resources, save user data, invalidate timers, and store
+    // enough application state information to restore your application to its current state in case
+    // it is terminated later.
+    // If your application supports background execution, this method is called instead of
+    // applicationWillTerminate: when the user quits.
   }
-  
+
   func applicationWillEnterForeground(application: UIApplication) {
-    // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
+    // Called as part of the transition from the background to the inactive state; here you can undo
+    // many of the changes made on entering the background.
   }
-  
+
   func applicationDidBecomeActive(application: UIApplication) {
-    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+    // Restart any tasks that were paused (or not yet started) while the application was inactive.
+    // If the application was previously in the background, optionally refresh the user interface.
   }
-  
+
   func applicationWillTerminate(application: UIApplication) {
-    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+    // Called when the application is about to terminate. Save data if appropriate. See also
+    // applicationDidEnterBackground:.
   }
-  
-  
+
+
 }

SwiftWeather/Error.swift

@@ -12,6 +12,6 @@ struct Error {
     case JSONSerializationFailed  = -6002
     case JSONParsingFailed        = -6003
   }
-  
+
   let errorCode: Code
-}
+}

SwiftWeather/ForecastDateTime.swift

@@ -7,11 +7,11 @@ import Foundation
 
 struct ForecastDateTime {
   let rawDate: Double
-  
+
   init(_ date: Double) {
     rawDate = date
   }
-  
+
   var shortTime: String {
     let dateFormatter = NSDateFormatter()
     dateFormatter.dateFormat = "HH:mm"

SwiftWeather/ForecastView.swift

@@ -8,30 +8,32 @@ import UIKit
 @IBDesignable class ForecastView: UIView {
   // Our custom view from the XIB file
   var view: UIView!
-  
+
   @IBOutlet weak var timeLabel: UILabel!
   @IBOutlet weak var iconLabel: UILabel!
   @IBOutlet weak var temperatureLabel: UILabel!
-  
+
   // MARK: - init
   override init(frame: CGRect) {
     super.init(frame: frame)
     view = loadViewFromNib()
   }
-  
+
   required init?(coder aDecoder: NSCoder) {
     super.init(coder: aDecoder)
     view = loadViewFromNib()
   }
-  
+
   func loadViewFromNib() -> UIView {
     let bundle = NSBundle(forClass: self.dynamicType)
     let nib = UINib(nibName: nibName(), bundle: bundle)
+    // swiftlint:disable force_cast
     let view = nib.instantiateWithOwner(self, options: nil)[0] as! UIView
-    
+    // swiftlint:enable force_cast
+
     view.frame = bounds
     view.autoresizingMask = [.FlexibleWidth, .FlexibleHeight]
-    addSubview(view);
+    addSubview(view)
     return view
   }
 
@@ -58,78 +60,78 @@ import UIKit
   func loadViewModel(viewModel: ForecastViewModel) {
     self.viewModel = viewModel
   }
-  
+
   // MARK: - IBInspectable
   @IBInspectable var time: String? {
     get {
       return timeLabel.text
     }
-    
+
     set {
       timeLabel.text = newValue
     }
   }
-  
+
   @IBInspectable var icon: String? {
     get {
       return iconLabel.text
     }
-    
+
     set {
       iconLabel.text = newValue
     }
   }
-  
+
   @IBInspectable var temperature: String? {
     get {
       return temperatureLabel.text
     }
-    
+
     set {
       temperatureLabel.text = newValue
     }
   }
-  
+
   @IBInspectable var timeColor: UIColor {
     get {
       return timeLabel.textColor
     }
-    
+
     set {
       timeLabel.textColor = newValue
     }
   }
-  
+
   @IBInspectable var iconColor: UIColor {
     get {
       return iconLabel.textColor
     }
-    
+
     set {
       iconLabel.textColor = newValue
     }
   }
-  
+
   @IBInspectable var temperatureColor: UIColor {
     get {
       return temperatureLabel.textColor
     }
-    
+
     set {
       temperatureLabel.textColor = newValue
     }
   }
-  
+
   @IBInspectable var bgColor: UIColor {
     get {
       return view.backgroundColor!
     }
-    
+
     set {
       view.backgroundColor = newValue
     }
   }
-  
+
   // MARK: - Private
   private func nibName() -> String {
     return String(self.dynamicType)

SwiftWeather/ForecastViewModel.swift

@@ -9,7 +9,7 @@ struct ForecastViewModel {
   let time: Observable<String>
   let iconText: Observable<String>
   let temperature: Observable<String>
-  
+
   init(_ forecast: Forecast) {
     time = Observable(forecast.time)
     iconText = Observable(forecast.iconText)

SwiftWeather/LocationService.swift

@@ -10,18 +10,18 @@ protocol LocationServiceDelegate {
   func locationDidUpdate(service: LocationService, location: CLLocation)
 }
 
-class LocationService : NSObject {
+class LocationService: NSObject {
   var delegate: LocationServiceDelegate?
-  
+
   private let locationManager = CLLocationManager()
-  
+
   override init() {
     super.init()
-    
+
     locationManager.delegate = self
     locationManager.desiredAccuracy = kCLLocationAccuracyHundredMeters
   }
-  
+
   func requestLocation() {
     locationManager.requestWhenInUseAuthorization()
     locationManager.requestLocation()
@@ -33,11 +33,11 @@ extension LocationService : CLLocationManagerDelegate {
   func locationManager(manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
     if let location = locations.first {
       print("Current location: \(location)")
-      delegate?.locationDidUpdate(self, location: location);
+      delegate?.locationDidUpdate(self, location: location)
     }
   }
-  
+
   func locationManager(manager: CLLocationManager, didFailWithError error: NSError) {
     print("Error finding location: \(error.localizedDescription)")
   }
-}
+}

SwiftWeather/Observable.swift

@@ -8,19 +8,19 @@ import Foundation
 class Observable<T> {
   typealias Observer = T -> Void
   var observer: Observer?
-  
+
   func observe(observer: Observer?) {
     self.observer = observer
     observer?(value)
   }
-  
+
   var value: T {
     didSet {
       observer?(value)
     }
   }
-  
-  init(_ v: T) {
-    value = v
+
+  init(_ value: T) {
+    self.value = value
   }
 }