Merge pull request #38 from pocket7878/avoid-parsing-when-status-is-n…

…o-content Avoid parsing when status is 204.
ishkawa · May 23, 2015 · a5c01f7 · a5c01f7
2 parents 648e9a5 + 48f37ef
commit a5c01f7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/APIKit/API.swift b/APIKit/API.swift
@@ -105,7 +105,7 @@ public class API {
                         return .failure(error)
                     }
                 }
-
+                
                 dispatch_async(mainQueue) { handler(mappedResponse) }
             }
 

diff --git a/APIKit/ResponseBodyParser.swift b/APIKit/ResponseBodyParser.swift
@@ -25,6 +25,9 @@ public enum ResponseBodyParser {
     public func parseData(data: NSData) -> Result<AnyObject, NSError> {
         switch self {
         case .JSON(let readingOptions):
+            if data.length == 0 {
+                return .success([:])
+            }
             return try { error in
                 return NSJSONSerialization.JSONObjectWithData(data, options: readingOptions, error: error)
             }

diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,4 +1,4 @@
 github "antitypical/Assertions" "1.1"
 github "robrix/Box" "1.2.2"
-github "AliSoftware/OHHTTPStubs" "4.0.1"
-github "antitypical/Result" "0.4.1"
+github "AliSoftware/OHHTTPStubs" "4.0.2"
+github "antitypical/Result" "0.4.3"
diff --git a/Carthage/Checkouts/OHHTTPStubs b/Carthage/Checkouts/OHHTTPStubs
-Original file line number
+Diff line change
@@ Expand Up / @@ -105,7 +105,7 @@ public class API { @@
                             return .failure(error)
                         }
                     }
                     dispatch_async(mainQueue) { handler(mappedResponse) }
                 }
@@ Expand Down @@
+4 −0		CHANGELOG.md
+3 −3		Examples/ObjC/Podfile.lock
+2 −2		Examples/ObjC/Pods/Local Podspecs/OHHTTPStubs.podspec.json
+3 −3		Examples/ObjC/Pods/Manifest.lock
+184 −184		Examples/ObjC/Pods/Pods.xcodeproj/project.pbxproj
+1 −1		Examples/ObjC/Pods/Target Support Files/Pods/Pods-environment.h
+3 −3		Examples/Swift/Podfile.lock
+2 −2		Examples/Swift/Pods/Local Podspecs/OHHTTPStubs.podspec.json
+3 −3		Examples/Swift/Pods/Manifest.lock
+262 −262		Examples/Swift/Pods/Pods.xcodeproj/project.pbxproj
+1 −1		Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Info.plist
+1 −1		Examples/Swift/Pods/Target Support Files/Pods/Pods-environment.h
+1 −1		OHHTTPStubs.podspec
+12 −0		OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj
+1 −1		OHHTTPStubs/Sources/OHPathHelpers.m
+0 −0		OHHTTPStubs/UnitTests/Fixtures/empty.bundle/nothingtoseehere.json
+18 −0		OHHTTPStubs/UnitTests/OHPathHelpersTests.m
+1 −1		README.md