Merge pull request #150 from vimeo/release/2.0.0

Merging Release 2.0.0

.swift-version

@@ -1 +1 @@
-2.3
+3.1

Podfile

@@ -23,11 +23,3 @@ target 'VimeoNetworkingExample-tvOS' do
     	inherit! :search_paths
 	end
 end
-
-post_install do |installer|
-    installer.pods_project.targets.each do |target|
-        target.build_configurations.each do |config|
-                config.build_settings['SWIFT_VERSION'] = "2.3"
-        end
-    end
-end

Podfile.lock

@@ -29,6 +29,6 @@ SPEC CHECKSUMS:
   AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
   VimeoNetworking: 17f8d451e4a168044f619315d0cd821669676e67
 
-PODFILE CHECKSUM: 9f9867bb3720cc28bbfeab258d411b2ca6ee7bef
+PODFILE CHECKSUM: a8a935f97d6d50906dbff286cd02db46fdd6f52c
 
 COCOAPODS: 1.1.1

VimeoNetworking/Sources/AccountStore.swift

@@ -33,20 +33,20 @@ final class AccountStore
     enum AccountType
     {
         /// Client credentials accounts can access only public resources
-        case ClientCredentials
+        case clientCredentials
 
         /// User accounts have an authenticated user and can act on the user's behalf
-        case User
+        case user
 
         func keychainKey() -> String
         {
             switch self
             {
-            case .ClientCredentials:
+            case .clientCredentials:
 
                 return "ClientCredentialsAccountKey"
 
-            case .User:
+            case .user:
 
                 return "UserAccountKey"
             }
@@ -55,7 +55,10 @@ final class AccountStore
 
     // MARK: - 
 
-    private static let ErrorDomain = "AccountStoreErrorDomain"
+    private struct Constants
+    {
+        static let ErrorDomain = "AccountStoreErrorDomain"
+    }
 
     // MARK: - 
 
@@ -85,14 +88,14 @@ final class AccountStore
 
      - throws: an error if the data could not be saved
      */
-    func saveAccount(account: VIMAccount, type: AccountType) throws
+    func save(_ account: VIMAccount, ofType type: AccountType) throws
     {
         let data = NSMutableData()
-        let archiver = NSKeyedArchiver(forWritingWithMutableData: data)
-        archiver.encodeObject(account)
+        let archiver = NSKeyedArchiver(forWritingWith: data)
+        archiver.encode(account)
         archiver.finishEncoding()
 
-        try self.keychainStore.setData(data, forKey: type.keychainKey())
+        try self.keychainStore.set(data: data, forKey: type.keychainKey())
     }
 
     /**
@@ -104,17 +107,17 @@ final class AccountStore
 
      - returns: an account of the specified type, if one was found
      */
-    func loadAccount(type: AccountType) throws -> VIMAccount?
+    func loadAccount(ofType type: AccountType) throws -> VIMAccount?
     {
         do
         {
-            guard let data = try self.keychainStore.dataForKey(type.keychainKey())
+            guard let data = try self.keychainStore.data(for: type.keychainKey())
             else
             {
                 return nil
             }
 
-            let unarchiver = NSKeyedUnarchiver(forReadingWithData: data)
+            let unarchiver = NSKeyedUnarchiver(forReadingWith: data)
             var decodedAccount: VIMAccount? = nil
             try ExceptionCatcher.doUnsafe
             {
@@ -125,21 +128,21 @@ final class AccountStore
             else
             {
                 let description = "Received corrupted VIMAccount data from keychain"
-                let error = NSError(domain: self.dynamicType.ErrorDomain, code: LocalErrorCode.AccountCorrupted.rawValue, userInfo: [NSLocalizedDescriptionKey: description])
+                let error = NSError(domain: Constants.ErrorDomain, code: LocalErrorCode.accountCorrupted.rawValue, userInfo: [NSLocalizedDescriptionKey: description])
 
                 throw error
             }
 
-            if let userJSON = account.userJSON as? VimeoClient.ResponseDictionary
+            if let userJSON = account.userJSON
             {
-                try account.user = VIMObjectMapper.mapObject(userJSON) as VIMUser
+                try account.user = VIMObjectMapper.mapObject(responseDictionary: userJSON) as VIMUser
             }
 
             return account
         }
         catch let error
         {
-            _ = try? self.removeAccount(type)
+            _ = try? self.removeAccount(ofType: type)
 
             throw error
         }
@@ -152,8 +155,8 @@ final class AccountStore
 
      - throws: an error if the data exists but could not be removed
      */
-    func removeAccount(type: AccountType) throws
+    func removeAccount(ofType type: AccountType) throws
     {
-        try self.keychainStore.deleteDataForKey(type.keychainKey())
+        try self.keychainStore.deleteData(for: type.keychainKey())
     }
 }