Merge pull request #4 from patr1ck/master

Updates to work with Swift 1.2 / Xcode 6.3

Author: ColinEberhardt

ReactiveSwiftFlickrSearch/AppDelegate.swift

@@ -11,13 +11,11 @@ import UIKit
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
-  var window: UIWindow!
+  var window: UIWindow?
 
   var navigationController: UINavigationController!
 
-
-  func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: NSDictionary?) -> Bool {
-    
+  func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject : AnyObject]?) -> Bool {
     navigationController = UINavigationController()
     navigationController.navigationBar.barTintColor = UIColor.darkGrayColor()
     navigationController.navigationBar.titleTextAttributes = [NSForegroundColorAttributeName : UIColor.whiteColor()]
@@ -30,8 +28,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
 
     window = UIWindow(frame: UIScreen.mainScreen().bounds)
-    window.rootViewController = navigationController
-    window.makeKeyAndVisible()
+    window!.rootViewController = navigationController
+    window!.makeKeyAndVisible()
 
     return true
   }

ReactiveSwiftFlickrSearch/Model/FlickrSearchImpl.swift

@@ -33,7 +33,7 @@ class FlickrSearchImpl : NSObject, FlickrSearch, OFFlickrAPIRequestDelegate {
   func flickrSearchSignal(searchString: String) -> RACSignal {
 
     func photosFromDictionary (response: NSDictionary) -> FlickrSearchResults {
-      let photoArray = response.valueForKeyPath("photos.photo") as [[String: String]]
+      let photoArray = response.valueForKeyPath("photos.photo") as! [[String: String]]
       let photos = photoArray.map {
         (photoDict) -> FlickrPhoto in
         let url = self.flickrContext.photoSourceURLFromDictionary(photoDict, size: OFFlickrSmallSize)
@@ -55,13 +55,13 @@ class FlickrSearchImpl : NSObject, FlickrSearch, OFFlickrAPIRequestDelegate {
       arguments: ["photo_id": photoId]) {
         // String is not AnyObject?
         (response: NSDictionary) -> NSString in
-        return response.valueForKeyPath("photo.total") as NSString
+        return response.valueForKeyPath("photo.total") as! NSString
       }
 
     let commentsSignal = signalFromAPIMethod("flickr.photos.getInfo",
       arguments: ["photo_id": photoId]) {
         (response: NSDictionary) -> NSString in
-        return response.valueForKeyPath("photo.comments._text") as NSString
+        return response.valueForKeyPath("photo.comments._text") as! NSString
     }
 
     return RACSignalEx.combineLatestAs([favouritesSignal, commentsSignal]) {
@@ -89,7 +89,7 @@ class FlickrSearchImpl : NSObject, FlickrSearch, OFFlickrAPIRequestDelegate {
 
         sucessSignal
           // filter to only include responses from this request
-          .filterAs { (tuple: RACTuple) -> Bool in tuple.first as NSObject == flickrRequest }
+          .filterAs { (tuple: RACTuple) -> Bool in tuple.first as! NSObject == flickrRequest }
           // extract the second tuple argument, which is the response dictionary
           .mapAs { (tuple: RACTuple) -> AnyObject in tuple.second }
           // transform with the given function

ReactiveSwiftFlickrSearch/Util/RACSignal+Extensions.swift

@@ -14,31 +14,31 @@ extension RACSignal {
   func subscribeNextAs<T>(nextClosure:(T) -> ()) -> () {
     self.subscribeNext {
       (next: AnyObject!) -> () in
-      let nextAsT = next! as T
+      let nextAsT = next! as! T
       nextClosure(nextAsT)
     }
   }
 
   func mapAs<T: AnyObject, U: AnyObject>(mapClosure:(T) -> U) -> RACSignal {
     return self.map {
       (next: AnyObject!) -> AnyObject! in
-      let nextAsT = next as T
+      let nextAsT = next as! T
       return mapClosure(nextAsT)
     }
   }
 
   func filterAs<T: AnyObject>(filterClosure:(T) -> Bool) -> RACSignal {
     return self.filter {
       (next: AnyObject!) -> Bool in
-      let nextAsT = next as T
+      let nextAsT = next as! T
       return filterClosure(nextAsT)
     }
   }
 
   func doNextAs<T: AnyObject>(nextClosure:(T) -> ()) -> RACSignal {
     return self.doNext {
       (next: AnyObject!) -> () in
-      let nextAsT = next as T
+      let nextAsT = next as! T
       nextClosure(nextAsT)
     }
   }
@@ -48,7 +48,7 @@ class RACSignalEx {
   class func combineLatestAs<T, U, R: AnyObject>(signals:[RACSignal], reduce:(T,U) -> R) -> RACSignal {
     return RACSignal.combineLatest(signals).mapAs {
       (tuple: RACTuple) -> R in
-      return reduce(tuple.first as T, tuple.second as U)
+      return reduce(tuple.first as! T, tuple.second as! U)
     }
   }
 }

ReactiveSwiftFlickrSearch/Util/TableViewBindingHelper.swift

@@ -35,14 +35,14 @@ class TableViewBindingHelper: NSObject, UITableViewDataSource, UITableViewDelega
     let nib = UINib(nibName: nibName, bundle: nil)
 
     // create an instance of the template cell and register with the table view
-    templateCell = nib.instantiateWithOwner(nil, options: nil)[0] as UITableViewCell
+    templateCell = nib.instantiateWithOwner(nil, options: nil)[0] as! UITableViewCell
     tableView.registerNib(nib, forCellReuseIdentifier: templateCell.reuseIdentifier!)
 
     super.init()
 
     sourceSignal.subscribeNext {
       (d:AnyObject!) -> () in
-      self.data = d as [AnyObject]
+      self.data = d as! [AnyObject]
       self.tableView.reloadData()
     }
 
@@ -58,7 +58,7 @@ class TableViewBindingHelper: NSObject, UITableViewDataSource, UITableViewDelega
 
   func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
     let item: AnyObject = data[indexPath.row]
-    let cell = tableView.dequeueReusableCellWithIdentifier(templateCell.reuseIdentifier!) as UITableViewCell
+    let cell = tableView.dequeueReusableCellWithIdentifier(templateCell.reuseIdentifier!) as! UITableViewCell
     if let reactiveView = cell as? ReactiveView {
       reactiveView.bindViewModel(item)
     }

ReactiveSwiftFlickrSearch/View/FlickrSearchViewController.swift

@@ -41,9 +41,9 @@ class FlickrSearchViewController: UIViewController {
 
     searchTextField.rac_textSignal() ~> RAC(viewModel, "searchText")
 
-    viewModel.executeSearch.executing.NOT() ~> RAC(loadingIndicator, "hidden")
+    viewModel.executeSearch!.executing.NOT() ~> RAC(loadingIndicator, "hidden")
 
-    viewModel.executeSearch.executing ~> RAC(UIApplication.sharedApplication(), "networkActivityIndicatorVisible")
+    viewModel.executeSearch!.executing ~> RAC(UIApplication.sharedApplication(), "networkActivityIndicatorVisible")
 
     searchButton.rac_command = viewModel.executeSearch
 
@@ -60,7 +60,7 @@ class FlickrSearchViewController: UIViewController {
     func hideKeyboard(any: AnyObject!) {
       self.searchTextField.resignFirstResponder()
     }
-    viewModel.executeSearch.executionSignals.subscribeNext(hideKeyboard)
+    viewModel.executeSearch!.executionSignals.subscribeNext(hideKeyboard)
   }
 
 }

ReactiveSwiftFlickrSearch/View/RecentSearchItemTableViewCell.swift

@@ -16,7 +16,7 @@ class RecentSearchItemTableViewCell: UITableViewCell, ReactiveView {
   @IBOutlet var recentSearchLabel: UILabel!
 
   func bindViewModel(viewModel: AnyObject) {
-    let previousSearch = viewModel as PreviousSearchViewModel
+    let previousSearch = viewModel as! PreviousSearchViewModel
     recentSearchLabel.text = previousSearch.searchString
     totalResultsLabel.text = "\(previousSearch.totalResults)"
 

ReactiveSwiftFlickrSearch/View/SearchResultsTableViewCell.swift

@@ -18,7 +18,7 @@ class SearchResultsTableViewCell: UITableViewCell, ReactiveView {
   @IBOutlet var titleLabel: UILabel!
 
   func bindViewModel(viewModel: AnyObject) {
-    let photo = viewModel as SearchResultsItemViewModel
+    let photo = viewModel as! SearchResultsItemViewModel
     titleLabel.text = photo.title
 
     self.clipsToBounds = true

ReactiveSwiftFlickrSearch/View/SearchResultsViewController.swift

@@ -38,7 +38,7 @@ class SearchResultsViewController: UIViewController, UITableViewDelegate {
 
   func scrollViewDidScroll(scrollView: UIScrollView!) {
     let cells = searchResultsTable.visibleCells()
-    for cell in cells as [SearchResultsTableViewCell] {
+    for cell in cells as! [SearchResultsTableViewCell] {
       let value = -40.0 + (cell.frame.origin.y - searchResultsTable.contentOffset.y) / 5.0;
       cell.setParallax(value)
     }

ReactiveSwiftFlickrSearch/ViewModel/FlickrSearchViewModel.swift

@@ -17,10 +17,10 @@ class FlickrSearchViewModel: NSObject {
 
   dynamic var searchText = ""
   dynamic var previousSearches: [PreviousSearchViewModel]
-  let executeSearch: RACCommand!
+  var executeSearch: RACCommand?
   let title = "Flickr Search"
-  let previousSearchSelected: RACCommand!
-  let connectionErrors: RACSignal!
+  var previousSearchSelected: RACCommand!
+  var connectionErrors: RACSignal!
 
   private let services: ViewModelServices
 
@@ -42,14 +42,15 @@ class FlickrSearchViewModel: NSObject {
       (any:AnyObject!) -> RACSignal in
       return self.executeSearchSignal()
     }
-    connectionErrors = executeSearch.errors
+    connectionErrors = executeSearch!.errors
 
     previousSearchSelected = RACCommand() {
       (any:AnyObject!) -> RACSignal in
-      let previousSearch = any as PreviousSearchViewModel
+      let previousSearch = any as! PreviousSearchViewModel
       self.searchText = previousSearch.searchString
       return self.executeSearchSignal()
     }
+    
   }
 
   //MARK: Private methods