Merge pull request #1256 from apollographql/update/namespacing

Adopt `.apollo.method()` namespacing for extensions

Author: designatednerd

Apollo.xcodeproj/project.pbxproj

@@ -57,7 +57,7 @@ public final class ApolloStore {
       self.cacheLock.withWriteLock {
           self.cache.clearPromise()
         }.andThen {
-          DispatchQueue.apollo_returnResultAsyncIfNeeded(on: callbackQueue,
+          DispatchQueue.apollo.returnResultAsyncIfNeeded(on: callbackQueue,
                                                          action: completion,
                                                          result: .success(()))
       }
@@ -115,12 +115,12 @@ public final class ApolloStore {
         Promise(fulfilled: try body($0))
       }
       .andThen { object in
-        DispatchQueue.apollo_returnResultAsyncIfNeeded(on: callbackQueue,
+        DispatchQueue.apollo.returnResultAsyncIfNeeded(on: callbackQueue,
                                                        action: completion,
                                                        result: .success(object))
       }
       .catch { error in
-        DispatchQueue.apollo_returnResultAsyncIfNeeded(on: callbackQueue,
+        DispatchQueue.apollo.returnResultAsyncIfNeeded(on: callbackQueue,
                                                        action: completion,
                                                        result: .failure(error))
     }
@@ -153,12 +153,12 @@ public final class ApolloStore {
         Promise(fulfilled: try body($0))
       }
       .andThen { object in
-        DispatchQueue.apollo_returnResultAsyncIfNeeded(on: callbackQueue,
+        DispatchQueue.apollo.returnResultAsyncIfNeeded(on: callbackQueue,
                                                        action: completion,
                                                        result: .success(object))
       }
       .catch { error in
-        DispatchQueue.apollo_returnResultAsyncIfNeeded(on: callbackQueue,
+        DispatchQueue.apollo.returnResultAsyncIfNeeded(on: callbackQueue,
                                                        action: completion,
                                                        result: .failure(error))
       }

Sources/Apollo/ApolloStore.swift

@@ -1,13 +1,16 @@
 import Foundation
+import ApolloCore
 
-extension Bundle {
+extension Bundle: ApolloCompatible {}
+
+extension ApolloExtension where Base == Bundle {
 
   /// Type-safe getter for info dictionary key objects
   ///
   /// - Parameter key: The key to try to grab an object for
   /// - Returns: The object of the desired type, or nil if it is not present or of the incorrect type.
   func bundleValue<T>(forKey key: String) -> T? {
-    return object(forInfoDictionaryKey: key) as? T
+    return base.object(forInfoDictionaryKey: key) as? T
   }
 
   /// The bundle identifier of this bundle, or nil if not present.

Sources/Apollo/Bundle+Helpers.swift

@@ -1,40 +1,5 @@
 import Foundation
 
-// MARK: - Emptiness + Optionality
-
-extension Collection {
-
-  /// Convenience helper to make `guard` statements more readable
-  ///
-  /// - returns: `true` if the collection has contents.
-  var isNotEmpty: Bool {
-    return !self.isEmpty
-  }
-}
-
-extension Optional where Wrapped: Collection {
-
-  /// - returns: `true` if the collection is empty or nil
-  var isEmptyOrNil: Bool {
-    switch self {
-    case .none:
-      return true
-    case .some(let collection):
-      return collection.isEmpty
-    }
-  }
-  
-  /// - returns: `true` if the collection is non-nil AND has contents.
-  var isNotEmpty: Bool {
-    switch self {
-    case .none:
-      return false
-    case .some(let collection):
-      return collection.isNotEmpty
-    }
-  }
-}
-
 // MARK: - Unzipping
 // MARK: Arrays of tuples to tuples of arrays
 

Sources/Apollo/Collection+Helpers.swift

@@ -1,8 +1,11 @@
 import Foundation
+import ApolloCore
 
-public extension DispatchQueue {
+extension DispatchQueue: ApolloCompatible {}
 
-  static func apollo_performAsyncIfNeeded(on callbackQueue: DispatchQueue?, action: @escaping () -> Void) {
+public extension ApolloExtension where Base == DispatchQueue {
+
+  static func performAsyncIfNeeded(on callbackQueue: DispatchQueue?, action: @escaping () -> Void) {
     if let callbackQueue = callbackQueue {
       // A callback queue was provided, perform the action on that queue
       callbackQueue.async {
@@ -14,14 +17,14 @@ public extension DispatchQueue {
     }
   }
 
-  static func apollo_returnResultAsyncIfNeeded<T>(on callbackQueue: DispatchQueue?,
-                                                  action: ((Result<T, Error>) -> Void)?,
-                                                  result: Result<T, Error>) {
+  static func returnResultAsyncIfNeeded<T>(on callbackQueue: DispatchQueue?,
+                                           action: ((Result<T, Error>) -> Void)?,
+                                           result: Result<T, Error>) {
     guard let action = action else {
       return
     }
 
-    self.apollo_performAsyncIfNeeded(on: callbackQueue) {
+    self.performAsyncIfNeeded(on: callbackQueue) {
       action(result)
     }
   }

Sources/Apollo/DispatchQueue+Optional.swift

@@ -55,7 +55,7 @@ public struct GraphQLHTTPResponseError: Error, LocalizedError {
       return "[Empty response body]"
     }
 
-    guard let description = String(data: body, encoding: response.textEncoding ?? .utf8) else {
+    guard let description = String(data: body, encoding: response.apollo.textEncoding ?? .utf8) else {
       return "[Unreadable response body]"
     }
 
@@ -69,7 +69,7 @@ public struct GraphQLHTTPResponseError: Error, LocalizedError {
 
       return "\(kind.description): \(description)"
     } else {
-      return "\(kind.description) (\(response.statusCode) \(response.statusCodeDescription)): \(bodyDescription)"
+      return "\(kind.description) (\(response.statusCode) \(response.apollo.statusCodeDescription)): \(bodyDescription)"
     }
   }
 }

Sources/Apollo/GraphQLHTTPResponseError.swift

@@ -1,3 +1,5 @@
+import ApolloCore
+
 public typealias ResultMap = [String: Any?]
 
 public protocol GraphQLSelectionSet {
@@ -56,7 +58,7 @@ public struct GraphQLField: GraphQLSelection {
   func cacheKey(with variables: [String: JSONEncodable]?) throws -> String {
     if
       let argumentValues = try arguments?.evaluate(with: variables),
-      argumentValues.isNotEmpty {
+      argumentValues.apollo.isNotEmpty {
         let argumentsKey = orderIndependentKey(for: argumentValues)
         return "\(name)(\(argumentsKey))"
     } else {

Sources/Apollo/GraphQLSelectionSet.swift

@@ -173,7 +173,7 @@ public class HTTPNetworkTransport {
                                 response: nil,
                                 completionHandler: completionHandler)
       case .success(let (data, httpResponse)):
-        guard httpResponse.isSuccessful == true else {
+        guard httpResponse.apollo.isSuccessful == true else {
           let unsuccessfulError = GraphQLHTTPResponseError(body: data,
                                                            response: httpResponse,
                                                            kind: .errorResponse)
@@ -226,7 +226,7 @@ public class HTTPNetworkTransport {
     guard
       let delegate = self.delegate as? HTTPNetworkTransportGraphQLErrorDelegate,
       let graphQLErrors = response.parseErrorsOnlyFast(),
-      graphQLErrors.isNotEmpty else {
+      graphQLErrors.apollo.isNotEmpty else {
         completionHandler(.success(response))
         return
     }
@@ -391,7 +391,7 @@ public class HTTPNetworkTransport {
       do {
         if
           let files = files,
-          files.isNotEmpty {
+          files.apollo.isNotEmpty {
             let formData = try requestCreator.requestMultipartFormData(
               for: operation,
               files: files,

Sources/Apollo/HTTPNetworkTransport.swift

@@ -1,16 +1,19 @@
 import Foundation
+import ApolloCore
 
-extension HTTPURLResponse {
+extension HTTPURLResponse: ApolloCompatible {}
+
+extension ApolloExtension where Base == HTTPURLResponse {
   var isSuccessful: Bool {
-    return (200..<300).contains(statusCode)
+    return (200..<300).contains(base.statusCode)
   }
 
   var statusCodeDescription: String {
-    return HTTPURLResponse.localizedString(forStatusCode: statusCode)
+    return HTTPURLResponse.localizedString(forStatusCode: base.statusCode)
   }
 
   var textEncoding: String.Encoding? {
-    guard let encodingName = textEncodingName else { return nil }
+    guard let encodingName = base.textEncodingName else { return nil }
 
     return String.Encoding(rawValue: CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding(encodingName as CFString)))
   }

Sources/Apollo/HTTPURLResponse+Helpers.swift

@@ -14,7 +14,7 @@ public final class InMemoryNormalizedCache: NormalizedCache {
     self.recordsLock.lock()
     let records = keys.map { self.records[$0] }
     self.recordsLock.unlock()
-    DispatchQueue.apollo_returnResultAsyncIfNeeded(on: callbackQueue,
+    DispatchQueue.apollo.returnResultAsyncIfNeeded(on: callbackQueue,
                                                    action: completion,
                                                    result: .success(records))
   }
@@ -25,7 +25,7 @@ public final class InMemoryNormalizedCache: NormalizedCache {
     self.recordsLock.lock()
     let cacheKeys = self.records.merge(records: records)
     self.recordsLock.unlock()
-    DispatchQueue.apollo_returnResultAsyncIfNeeded(on: callbackQueue,
+    DispatchQueue.apollo.returnResultAsyncIfNeeded(on: callbackQueue,
                                                    action: completion,
                                                    result: .success(cacheKeys))
   }
@@ -38,7 +38,7 @@ public final class InMemoryNormalizedCache: NormalizedCache {
       return
     }
 
-    DispatchQueue.apollo_returnResultAsyncIfNeeded(on: callbackQueue,
+    DispatchQueue.apollo.returnResultAsyncIfNeeded(on: callbackQueue,
                                                    action: completion,
                                                    result: .success(()))
   }