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

Made failedRequest a static method #50

Merged
merged 1 commit into from
May 4, 2016
Merged

Made failedRequest a static method #50

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions Source/Request/RequestCreation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public extension Resource
{ return request(method, data: rawBody, contentType: "\(contentType); charset=\(encodingName)") }
else
{
return failedRequest(
return Resource.failedRequest(
Error(
userMessage: NSLocalizedString("Cannot send request", comment: "userMessage"),
cause: Error.Cause.UnencodableText(encodingName: encodingName as String, text: text)))
Expand All @@ -80,7 +80,7 @@ public extension Resource
{
guard NSJSONSerialization.isValidJSONObject(json) else
{
return failedRequest(
return Resource.failedRequest(
Error(
userMessage: NSLocalizedString("Cannot send request", comment: "userMessage"),
cause: Error.Cause.InvalidJSONObject()))
Expand All @@ -97,7 +97,7 @@ public extension Resource
// encoding to fail such that dataWithJSONObject() is declared “throws” (radar 21913397, Apple-rejected!),
// but we catch the exception anyway instead of using try! and crashing.

return failedRequest(
return Resource.failedRequest(
Error(
userMessage: NSLocalizedString("Cannot send request", comment: "userMessage"),
cause: error))
Expand Down Expand Up @@ -138,7 +138,7 @@ public extension Resource
}
catch
{
return failedRequest(
return Resource.failedRequest(
Error(
userMessage: NSLocalizedString("Cannot send request", comment: "userMessage"),
cause: error))
Expand All @@ -159,7 +159,7 @@ public extension Resource
Returns a request for this resource that immedately fails, without ever touching the network. Useful for creating
your own custom requests that perform pre-request validation.
*/
public func failedRequest(error: Error) -> Request
public static func failedRequest(error: Error) -> Request
{
return FailedRequest(error: error)
}
Expand Down
4 changes: 2 additions & 2 deletions Source/Support/Siesta-ObjC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ public extension Resource
guard let method = RequestMethod(rawValue: methodString) else
{
return _objc_Request(
failedRequest(
Resource.failedRequest(
Error(
userMessage: NSLocalizedString("Cannot create request", comment: "userMessage"),
cause: Error.Cause.InvalidRequestMethod(method: methodString))))
Expand All @@ -344,7 +344,7 @@ public extension Resource
guard let json = maybeJson as? NSJSONConvertible else
{
return _objc_Request(
failedRequest(
Resource.failedRequest(
Error(
userMessage: NSLocalizedString("Cannot send request", comment: "userMessage"),
cause: Error.Cause.InvalidJSONObject())))
Expand Down