Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added correct way of default parameters #804

Merged
merged 9 commits into from
Oct 3, 2019
Merged

Added correct way of default parameters #804

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e8085f0
Added correct way of default parameters
kimdv Oct 2, 2019
6e4cc7f
Remove default parameter
kimdv Oct 2, 2019
4ef637c
Remove default parameters
kimdv Oct 2, 2019
04fd12f
Renamed to RequestCreatorTests to match what it is doing. Added reque…
kimdv Oct 2, 2019
8db2e1c
Move TestRequestCreator -> TestCustomRequestCreator
kimdv Oct 2, 2019
686fb75
Removed fileprivate and made import testable
kimdv Oct 3, 2019
28bfb0b
Made method public as it was missing
kimdv Oct 3, 2019
3036c97
Fixed tests
kimdv Oct 3, 2019
8574ab9
Made tests pass. Becaue TestCustomrequestCreator uses a dictionary we…
kimdv Oct 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion Sources/Apollo/RequestCreator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@ public protocol RequestCreator {
}

extension RequestCreator {
/// Creates a `GraphQLMap` out of the passed-in operation
///
/// - Parameters:
/// - operation: The operation to use
/// - Returns: The created `GraphQLMap`
public func requestBody<Operation: GraphQLOperation>(for operation: Operation) -> GraphQLMap {
return requestBody(for: operation, sendOperationIdentifiers: false)
designatednerd marked this conversation as resolved.
Show resolved Hide resolved
}

/// Creates a `GraphQLMap` out of the passed-in operation
///
/// - Parameters:
Expand All @@ -52,6 +61,26 @@ extension RequestCreator {
return body
}

/// Creates multi-part form data to send with a request
///
/// - Parameters:
/// - operation: The operation to create the data for.
/// - files: An array of files to use.
/// - sendOperationIdentifiers: True if operation identifiers should be sent, false if not.
/// - serializationFormat: The format to use to serialize data.
/// - Returns: The created form data
/// - Throws: Errors creating or loading the form data
public func requestMultipartFormData<Operation: GraphQLOperation>(for operation: Operation,
files: [GraphQLFile],
sendOperationIdentifiers: Bool,
serializationFormat: JSONSerializationFormat.Type) throws -> MultipartFormData {
return try requestMultipartFormData(for: operation,
files: files,
sendOperationIdentifiers: sendOperationIdentifiers,
serializationFormat: serializationFormat,
manualBoundary: nil)
designatednerd marked this conversation as resolved.
Show resolved Hide resolved
}

/// Creates multi-part form data to send with a request
///
/// - Parameters:
Expand All @@ -66,7 +95,7 @@ extension RequestCreator {
files: [GraphQLFile],
sendOperationIdentifiers: Bool,
serializationFormat: JSONSerializationFormat.Type,
manualBoundary: String? = nil) throws -> MultipartFormData {
manualBoundary: String?) throws -> MultipartFormData {
let formData: MultipartFormData

if let boundary = manualBoundary {
Expand Down