Merge pull request #60 from pusher/Noobish1/improvements

Noobish1/improvements

Author: hamchapman

.travis.yml

@@ -33,12 +33,13 @@ before_install:
       brew install carthage;
     fi
   - gem install cocoapods
+  - gem install xcpretty
 install:
   - pod update
   - pod install
 before_deploy:
-  - carthage build --no-skip-current --verbose
-  - carthage archive PusherSwift
+  - carthage build --no-skip-current --project-directory PusherSwift
+  - carthage archive PusherSwift --project-directory PusherSwift
 deploy:
   provider: releases
   api_key:

Example/ViewController.swift

@@ -14,15 +14,18 @@ class ViewController: UIViewController, ConnectionStateChangeDelegate {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        // Only use your secret here for testing or if you're sure that there's
+        // no security risk
+        let pusherClientOptions = PusherClientOptions(authMethod: .Internal(secret: "YOUR_APP_SECRET"))
+        let pusher = Pusher(key: "YOUR_APP_KEY", options: pusherClientOptions)
+
         // remove the debugLogger from the client options if you want to remove the
         // debug logging, or just change the function below
         let debugLogger = { (text: String) in debugPrint(text) }
-
-        // Only use your secret here for testing or if you're sure that there's
-        // no security risk
-        let pusher = Pusher(key: "YOUR_APP_KEY", options: ["secret": "YOUR_APP_SECRET", "debugLogger": debugLogger])
+        pusher.connection.debugLogger = debugLogger
 
         pusher.connection.stateChangeDelegate = self
+
         pusher.connect()
 
         pusher.bind({ (message: AnyObject?) in
@@ -43,7 +46,7 @@ class ViewController: UIViewController, ConnectionStateChangeDelegate {
             print(data)
             pusher.subscribe("presence-channel", onMemberAdded: onMemberAdded)
 
-            if let data = data as? Dictionary<String, AnyObject> {
+            if let data = data as? [String : AnyObject] {
                 if let testVal = data["test"] as? String {
                     print(testVal)
                 }

Podfile

@@ -10,19 +10,19 @@ def import_test_pods
 end
 
 target 'PusherSwiftTests-iOS' do
-  project 'PusherSwift'
+  project 'PusherSwift/PusherSwift'
   platform :ios, '9.0'
   import_test_pods
 end
 
 target 'PusherSwiftTests-tvOS' do
-  project 'PusherSwift'
+  project 'PusherSwift/PusherSwift'
   platform :tvos, '9.0'
   import_test_pods
 end
 
 target 'PusherSwiftTests-OSX' do
-  project 'PusherSwift'
+  project 'PusherSwift/PusherSwift'
   platform :osx, '10.11'
   import_test_pods
 end

Podfile.lock

@@ -10,6 +10,6 @@ SPEC CHECKSUMS:
   Nimble: 0f3c8b8b084cda391209c3c5efbb48bedeeb920a
   Quick: 18d057bc66451eedd5d1c8dc99ba2a5db6e60226
 
-PODFILE CHECKSUM: 9b40e2712dd31189185ad3bb0207ec9d0cf0d7ba
+PODFILE CHECKSUM: d258825b2c6c072be15fe94234a10cb44a5a8293
 
 COCOAPODS: 1.0.1