Skip to content

Rename Request.Parser to Request.DataParser #237

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

Merged
merged 1 commit into from
May 1, 2017
Merged

Rename Request.Parser to Request.DataParser #237

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions Sources/APIKit/Request.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Result
public protocol Request {
/// The response type associated with the request type.
associatedtype Response
associatedtype Parser: DataParser
associatedtype DataParser: APIKit.DataParser

/// The base URL.
var baseURL: URL { get }
Expand Down Expand Up @@ -42,7 +42,7 @@ public protocol Request {
var headerFields: [String: String] { get }

/// The parser object that states `Content-Type` to accept and parses response body.
var dataParser: Parser { get }
var dataParser: DataParser { get }

/// Intercepts `URLRequest` which is created by `Request.buildURLRequest()`. If an error is
/// thrown in this method, the result of `Session.send()` turns `.failure(.requestError(error))`.
Expand All @@ -54,12 +54,12 @@ public protocol Request {
/// The default implementation of this method is provided to throw `RequestError.unacceptableStatusCode`
/// if the HTTP status code is not in `200..<300`.
/// - Throws: `Error`
func intercept(object: Parser.Parsed, urlResponse: HTTPURLResponse) throws -> Parser.Parsed
func intercept(object: DataParser.Parsed, urlResponse: HTTPURLResponse) throws -> DataParser.Parsed

/// Build `Response` instance from raw response object. This method is called after
/// `intercept(object:urlResponse:)` if it does not throw any error.
/// - Throws: `Error`
func response(from object: Parser.Parsed, urlResponse: HTTPURLResponse) throws -> Response
func response(from object: DataParser.Parsed, urlResponse: HTTPURLResponse) throws -> Response
}

public extension Request {
Expand Down Expand Up @@ -92,7 +92,7 @@ public extension Request {
return urlRequest
}

public func intercept(object: Parser.Parsed, urlResponse: HTTPURLResponse) throws -> Parser.Parsed {
public func intercept(object: DataParser.Parsed, urlResponse: HTTPURLResponse) throws -> DataParser.Parsed {
guard 200..<300 ~= urlResponse.statusCode else {
throw ResponseError.unacceptableStatusCode(urlResponse.statusCode)
}
Expand Down