Merge pull request #50 from VDKA/master

Made failedRequest a static method
bustoutsolutions · May 4, 2016 · bca0a13 · bca0a13
2 parents 7fa4b9e + 20f8c00
commit bca0a13
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Source/Request/RequestCreation.swift b/Source/Request/RequestCreation.swift
@@ -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)))
@@ -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()))
@@ -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))
@@ -138,7 +138,7 @@ public extension Resource
             }
         catch
             {
-            return failedRequest(
+            return Resource.failedRequest(
                 Error(
                     userMessage: NSLocalizedString("Cannot send request", comment: "userMessage"),
                     cause: error))
@@ -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)
         }

diff --git a/Source/Support/Siesta-ObjC.swift b/Source/Support/Siesta-ObjC.swift
@@ -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))))
@@ -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())))