Merge branch 'merge/custom-requestBodyBuilder-for-individual-request'

ishkawa · ishkawa · commit 4bc001a21d94 · 2015-05-05T14:22:33.000+09:00
diff --git a/APIKit/API.swift b/APIKit/API.swift
@@ -35,7 +35,7 @@ public class API {
     )
 
     // build NSURLRequest
-    public class func URLRequest(method: Method, _ path: String, _ parameters: [String: AnyObject] = [:]) -> NSURLRequest? {
+    public class func URLRequest(method: Method, _ path: String, _ parameters: [String: AnyObject] = [:], requestBodyBuilder: RequestBodyBuilder = requestBodyBuilder) -> NSURLRequest? {
         if let components = NSURLComponents(URL: baseURL, resolvingAgainstBaseURL: true) {
             let request = NSMutableURLRequest()
             
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,3 +1,3 @@
 github "antitypical/Assertions" "19bac03828dcb2f9b9ecb7f829e09bb3900886e5"
 github "LlamaKit/LlamaKit" "v0.6.0"
-github "AliSoftware/OHHTTPStubs" "4.0.0"
+github "AliSoftware/OHHTTPStubs" "4.0.1"
diff --git a/Carthage/Checkouts/OHHTTPStubs b/Carthage/Checkouts/OHHTTPStubs
@@ -1 +1 @@
-Subproject commit 390daf9988c01317a4a0c124d5d979d60b6f9201
+Subproject commit eadda22ca4e47dcf160b95ba0d4b951898ed8a9d

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public class API {`
`35`	`35`	`)`
`36`	`36`
`37`	`37`	`// build NSURLRequest`
`38`		`- public class func URLRequest(method: Method, _ path: String, _ parameters: [String: AnyObject] = [:]) -> NSURLRequest? {`
	`38`	`+ public class func URLRequest(method: Method, _ path: String, _ parameters: [String: AnyObject] = [:], requestBodyBuilder: RequestBodyBuilder = requestBodyBuilder) -> NSURLRequest? {`
`39`	`39`	`if let components = NSURLComponents(URL: baseURL, resolvingAgainstBaseURL: true) {`
`40`	`40`	`let request = NSMutableURLRequest()`
`41`	`41`