Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
white49
Alamofire
提交
92bbee0e
A
Alamofire
项目概览
white49
/
Alamofire
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
Alamofire
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
92bbee0e
编写于
7月 15, 2015
作者:
C
Christian Noon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Unified the global request, upload and download external parameters convention.
上级
84330a92
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
12 deletion
+12
-12
Source/Alamofire.swift
Source/Alamofire.swift
+9
-9
Tests/DownloadTests.swift
Tests/DownloadTests.swift
+1
-1
Tests/UploadTests.swift
Tests/UploadTests.swift
+2
-2
未找到文件。
Source/Alamofire.swift
浏览文件 @
92bbee0e
...
...
@@ -144,7 +144,7 @@ public func request(URLRequest: URLRequestConvertible) -> Request {
:returns: The created upload request.
*/
public
func
upload
(
method
:
Method
,
URLString
:
URLStringConvertible
,
headers
:
[
String
:
String
]?
=
nil
,
file
:
NSURL
)
->
Request
{
public
func
upload
(
method
:
Method
,
URLString
:
URLStringConvertible
,
headers
:
[
String
:
String
]?
=
nil
,
#
file
:
NSURL
)
->
Request
{
return
Manager
.
sharedInstance
.
upload
(
method
,
URLString
,
headers
:
headers
,
file
:
file
)
}
...
...
@@ -156,7 +156,7 @@ public func upload(method: Method, URLString: URLStringConvertible, headers: [St
:returns: The created upload request.
*/
public
func
upload
(
URLRequest
:
URLRequestConvertible
,
file
:
NSURL
)
->
Request
{
public
func
upload
(
URLRequest
:
URLRequestConvertible
,
#
file
:
NSURL
)
->
Request
{
return
Manager
.
sharedInstance
.
upload
(
URLRequest
,
file
:
file
)
}
...
...
@@ -172,7 +172,7 @@ public func upload(URLRequest: URLRequestConvertible, file: NSURL) -> Request {
:returns: The created upload request.
*/
public
func
upload
(
method
:
Method
,
URLString
:
URLStringConvertible
,
headers
:
[
String
:
String
]?
=
nil
,
data
:
NSData
)
->
Request
{
public
func
upload
(
method
:
Method
,
URLString
:
URLStringConvertible
,
headers
:
[
String
:
String
]?
=
nil
,
#
data
:
NSData
)
->
Request
{
return
Manager
.
sharedInstance
.
upload
(
method
,
URLString
,
headers
:
headers
,
data
:
data
)
}
...
...
@@ -184,7 +184,7 @@ public func upload(method: Method, URLString: URLStringConvertible, headers: [St
:returns: The created upload request.
*/
public
func
upload
(
URLRequest
:
URLRequestConvertible
,
data
:
NSData
)
->
Request
{
public
func
upload
(
URLRequest
:
URLRequestConvertible
,
#
data
:
NSData
)
->
Request
{
return
Manager
.
sharedInstance
.
upload
(
URLRequest
,
data
:
data
)
}
...
...
@@ -200,7 +200,7 @@ public func upload(URLRequest: URLRequestConvertible, data: NSData) -> Request {
:returns: The created upload request.
*/
public
func
upload
(
method
:
Method
,
URLString
:
URLStringConvertible
,
headers
:
[
String
:
String
]?
=
nil
,
stream
:
NSInputStream
)
->
Request
{
public
func
upload
(
method
:
Method
,
URLString
:
URLStringConvertible
,
headers
:
[
String
:
String
]?
=
nil
,
#
stream
:
NSInputStream
)
->
Request
{
return
Manager
.
sharedInstance
.
upload
(
method
,
URLString
,
headers
:
headers
,
stream
:
stream
)
}
...
...
@@ -212,7 +212,7 @@ public func upload(method: Method, URLString: URLStringConvertible, headers: [St
:returns: The created upload request.
*/
public
func
upload
(
URLRequest
:
URLRequestConvertible
,
stream
:
NSInputStream
)
->
Request
{
public
func
upload
(
URLRequest
:
URLRequestConvertible
,
#
stream
:
NSInputStream
)
->
Request
{
return
Manager
.
sharedInstance
.
upload
(
URLRequest
,
stream
:
stream
)
}
...
...
@@ -284,7 +284,7 @@ public func upload(
:returns: The created download request.
*/
public
func
download
(
method
:
Method
,
URLString
:
URLStringConvertible
,
headers
:
[
String
:
String
]?
=
nil
,
destination
:
Request
.
DownloadFileDestination
)
->
Request
{
public
func
download
(
method
:
Method
,
URLString
:
URLStringConvertible
,
headers
:
[
String
:
String
]?
=
nil
,
#
destination
:
Request
.
DownloadFileDestination
)
->
Request
{
return
Manager
.
sharedInstance
.
download
(
method
,
URLString
,
headers
:
headers
,
destination
:
destination
)
}
...
...
@@ -296,7 +296,7 @@ public func download(method: Method, URLString: URLStringConvertible, headers: [
:returns: The created download request.
*/
public
func
download
(
URLRequest
:
URLRequestConvertible
,
destination
:
Request
.
DownloadFileDestination
)
->
Request
{
public
func
download
(
URLRequest
:
URLRequestConvertible
,
#
destination
:
Request
.
DownloadFileDestination
)
->
Request
{
return
Manager
.
sharedInstance
.
download
(
URLRequest
,
destination
:
destination
)
}
...
...
@@ -310,6 +310,6 @@ public func download(URLRequest: URLRequestConvertible, destination: Request.Dow
:returns: The created download request.
*/
public
func
download
(
resumeData
data
:
NSData
,
destination
:
Request
.
DownloadFileDestination
)
->
Request
{
public
func
download
(
resumeData
data
:
NSData
,
#
destination
:
Request
.
DownloadFileDestination
)
->
Request
{
return
Manager
.
sharedInstance
.
download
(
data
,
destination
:
destination
)
}
Tests/DownloadTests.swift
浏览文件 @
92bbee0e
...
...
@@ -46,7 +46,7 @@ class DownloadResponseTestCase: BaseTestCase {
var
error
:
NSError
?
// When
Alamofire
.
download
(
.
GET
,
URLString
,
destination
)
Alamofire
.
download
(
.
GET
,
URLString
,
destination
:
destination
)
.
response
{
responseRequest
,
responseResponse
,
_
,
responseError
in
request
=
responseRequest
response
=
responseResponse
...
...
Tests/UploadTests.swift
浏览文件 @
92bbee0e
...
...
@@ -37,7 +37,7 @@ class UploadDataTestCase: BaseTestCase {
var
error
:
NSError
?
// When
Alamofire
.
upload
(
.
POST
,
URLString
,
data
)
Alamofire
.
upload
(
.
POST
,
URLString
,
data
:
data
)
.
response
{
responseRequest
,
responseResponse
,
_
,
responseError
in
request
=
responseRequest
response
=
responseResponse
...
...
@@ -76,7 +76,7 @@ class UploadDataTestCase: BaseTestCase {
var
responseError
:
NSError
?
// When
let
upload
=
Alamofire
.
upload
(
.
POST
,
URLString
,
data
)
let
upload
=
Alamofire
.
upload
(
.
POST
,
URLString
,
data
:
data
)
upload
.
progress
{
bytesWritten
,
totalBytesWritten
,
totalBytesExpectedToWrite
in
let
bytes
=
(
bytes
:
bytesWritten
,
totalBytes
:
totalBytesWritten
,
totalBytesExpected
:
totalBytesExpectedToWrite
)
byteValues
.
append
(
bytes
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录