Skip to content
This repository was archived by the owner on Oct 14, 2018. It is now read-only.

Commit 0a5b52b

Browse files
AnderGoigAnderGoig
committed
Merge branch 'release/v1.1.2'
2 parents 71a9428 + 5170c9e commit 0a5b52b

File tree

77 files changed

+1742
-1416
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+1742
-1416
lines changed

‎.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0
1+
4.2

‎.swiftlint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,4 @@ identifier_name:
5454
- x
5555
- y
5656
- id
57+
- vc

‎Cartfile.resolved

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "Quick/Nimble" "v7.0.3"
2-
github "Quick/Quick" "v1.2.0"
1+
github "Quick/Nimble" "v7.3.1"
2+
github "Quick/Quick" "v1.3.2"
33
github "jspahrsummers/xcconfigs" "bb795558a76e5daf3688500055bbcfe243bffa8d"

‎Carthage/Checkouts/Nimble

Submodule Nimble updated 72 files

‎Carthage/Checkouts/Quick

Submodule Quick updated 54 files

‎Sources/Endpoints/Comments.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
extension Instagram {
1010

11-
// MARK: - Comment Endpoints
11+
// MARK: Comment Endpoints
1212

1313
/// Get a list of recent comments on a media object.
1414
///
@@ -18,7 +18,7 @@ extension Instagram {
1818
///
1919
/// - important: It requires *public_content* scope for media that does not belong to your own user.
2020
public func comments(fromMedia mediaId: String, success: SuccessHandler<[InstagramComment]>?, failure: FailureHandler?) {
21-
request("/media/\(mediaId)/comments", success: { data in success?(data!) }, failure: failure)
21+
request("/media/\(mediaId)/comments", success: success, failure: failure)
2222
}
2323

2424
/// Create a comment on a media object.
@@ -35,7 +35,7 @@ extension Instagram {
3535
/// - The comment cannot contain more than 1 URL.
3636
/// - The comment cannot consist of all capital letters.
3737
public func createComment(onMedia mediaId: String, text: String, success: SuccessHandler<InstagramComment>?, failure: FailureHandler?) {
38-
request("/media/\(mediaId)/comments", method: .post, parameters: ["text": text], success: { data in success?(data!) }, failure: failure)
38+
request("/media/\(mediaId)/comments", method: .post, parameters: ["text": text], success: success, failure: failure)
3939
}
4040

4141
/// Remove a comment either on the authenticated user's media object or authored by the authenticated user.
@@ -46,6 +46,6 @@ extension Instagram {
4646
///
4747
/// - important: It requires *comments* scope. Also, *public_content* scope is required for media that does not belong to your own user.
4848
public func deleteComment(_ commentId: String, onMedia mediaId: String, success: EmptySuccessHandler?, failure: FailureHandler?) {
49-
request("/media/\(mediaId)/comments/\(commentId)", method: .delete, success: { (_: InstagramEmptyResponse!) in success?() }, failure: failure)
49+
request("/media/\(mediaId)/comments/\(commentId)", method: .delete, success: { (_: InstagramEmptyResponse) in success?() }, failure: failure)
5050
}
5151
}

‎Sources/Endpoints/Likes.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
extension Instagram {
1010

11-
// MARK: - Like Endpoints
11+
// MARK: Like Endpoints
1212

1313
/// Get a list of users who have liked this media.
1414
///
@@ -18,7 +18,7 @@ extension Instagram {
1818
///
1919
/// - important: It requires *public_content* scope for media that does not belong to your own user.
2020
public func likes(inMedia mediaId: String, success: SuccessHandler<[InstagramUser]>?, failure: FailureHandler?) {
21-
request("/media/\(mediaId)/likes", success: { data in success?(data!) }, failure: failure)
21+
request("/media/\(mediaId)/likes", success: success, failure: failure)
2222
}
2323

2424
/// Set a like on this media by the currently authenticated user.

‎Sources/Endpoints/Locations.swift

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import CoreLocation
1010

1111
extension Instagram {
1212

13-
// MARK: - Location Endpoints
13+
// MARK: Location Endpoints
1414

1515
/// Get information about a location.
1616
///
@@ -20,7 +20,7 @@ extension Instagram {
2020
///
2121
/// - important: It requires *public_content* scope.
2222
public func location(_ locationId: String, success: SuccessHandler<InstagramLocation<String>>?, failure: FailureHandler?) {
23-
request("/locations/\(locationId)", success: { data in success?(data!) }, failure: failure)
23+
request("/locations/\(locationId)", success: success, failure: failure)
2424
}
2525

2626
/// Get a list of recent media objects from a given location.
@@ -37,13 +37,12 @@ extension Instagram {
3737
minId: String? = nil,
3838
success: SuccessHandler<[InstagramMedia]>?,
3939
failure: FailureHandler?) {
40-
4140
var parameters = Parameters()
4241

4342
parameters["max_id"] ??= maxId
4443
parameters["min_id"] ??= minId
4544

46-
request("/locations/\(locationId)/media/recent", parameters: parameters, success: { data in success?(data!) }, failure: failure)
45+
request("/locations/\(locationId)/media/recent", parameters: parameters, success: success, failure: failure)
4746
}
4847

4948
/// Search for a location by geographic coordinate.
@@ -62,15 +61,14 @@ extension Instagram {
6261
facebookPlacesId: String? = nil,
6362
success: SuccessHandler<[InstagramLocation<String>]>?,
6463
failure: FailureHandler?) {
65-
6664
var parameters = Parameters()
6765

6866
parameters["lat"] ??= latitude
6967
parameters["lng"] ??= longitude
7068
parameters["distance"] ??= distance
7169
parameters["facebook_places_id"] ??= facebookPlacesId
7270

73-
request("/locations/search", parameters: parameters, success: { data in success?(data!) }, failure: failure)
71+
request("/locations/search", parameters: parameters, success: success, failure: failure)
7472
}
7573

7674
/// Search for a location by geographic coordinate.
@@ -87,8 +85,11 @@ extension Instagram {
8785
facebookPlacesId: String? = nil,
8886
success: SuccessHandler<[InstagramLocation<String>]>?,
8987
failure: FailureHandler?) {
90-
91-
searchLocation(latitude: coordinates?.latitude, longitude: coordinates?.longitude,
92-
distance: distance, facebookPlacesId: facebookPlacesId, success: success, failure: failure)
88+
searchLocation(latitude: coordinates?.latitude,
89+
longitude: coordinates?.longitude,
90+
distance: distance,
91+
facebookPlacesId: facebookPlacesId,
92+
success: success,
93+
failure: failure)
9394
}
9495
}

‎Sources/Endpoints/Media.swift

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import CoreLocation
1010

1111
extension Instagram {
1212

13-
// MARK: - Media Endpoints
13+
// MARK: Media Endpoints
1414

1515
/// Get information about a media object.
1616
///
@@ -20,7 +20,7 @@ extension Instagram {
2020
///
2121
/// - important: It requires *public_content* scope.
2222
public func media(withId id: String, success: SuccessHandler<InstagramMedia>?, failure: FailureHandler?) {
23-
request("/media/\(id)", success: { data in success?(data!) }, failure: failure)
23+
request("/media/\(id)", success: success, failure: failure)
2424
}
2525

2626
/// Get information about a media object.
@@ -34,7 +34,7 @@ extension Instagram {
3434
/// - note: A media object's shortcode can be found in its shortlink URL.
3535
/// An example shortlink is http://instagram.com/p/tsxp1hhQTG/. Its corresponding shortcode is tsxp1hhQTG.
3636
public func media(withShortcode shortcode: String, success: SuccessHandler<InstagramMedia>?, failure: FailureHandler?) {
37-
request("/media/shortcode/\(shortcode)", success: { data in success?(data!) }, failure: failure)
37+
request("/media/shortcode/\(shortcode)", success: success, failure: failure)
3838
}
3939

4040
/// Search for recent media in a given area.
@@ -51,14 +51,13 @@ extension Instagram {
5151
distance: Int? = nil,
5252
success: SuccessHandler<[InstagramMedia]>?,
5353
failure: FailureHandler?) {
54-
5554
var parameters = Parameters()
5655

5756
parameters["lat"] ??= latitude
5857
parameters["lng"] ??= longitude
5958
parameters["distance"] ??= distance
6059

61-
request("/media/search", parameters: parameters, success: { data in success?(data!) }, failure: failure)
60+
request("/media/search", parameters: parameters, success: success, failure: failure)
6261
}
6362

6463
/// Search for recent media in a given area.
@@ -73,7 +72,6 @@ extension Instagram {
7372
distance: Int? = nil,
7473
success: SuccessHandler<[InstagramMedia]>?,
7574
failure: FailureHandler?) {
76-
7775
searchMedia(latitude: coordinates?.latitude, longitude: coordinates?.longitude, distance: distance, success: success, failure: failure)
7876
}
7977
}

‎Sources/Endpoints/Relationships.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
extension Instagram {
1010

11-
// MARK: - Relationship Endpoints
11+
// MARK: Relationship Endpoints
1212

1313
/// Relationship actions currently supported by Instagram.
1414
private enum RelationshipAction: String {
@@ -22,7 +22,7 @@ extension Instagram {
2222
///
2323
/// - important: It requires *follower_list* scope.
2424
public func userFollows(success: SuccessHandler<[InstagramUser]>?, failure: FailureHandler?) {
25-
request("/users/self/follows", success: { data in success?(data!) }, failure: failure)
25+
request("/users/self/follows", success: success, failure: failure)
2626
}
2727

2828
/// Get the list of users this user is followed by.
@@ -32,7 +32,7 @@ extension Instagram {
3232
///
3333
/// - important: It requires *follower_list* scope.
3434
public func userFollowers(success: SuccessHandler<[InstagramUser]>?, failure: FailureHandler?) {
35-
request("/users/self/followed-by", success: { data in success?(data!) }, failure: failure)
35+
request("/users/self/followed-by", success: success, failure: failure)
3636
}
3737

3838
/// List the users who have requested this user's permission to follow.
@@ -42,7 +42,7 @@ extension Instagram {
4242
///
4343
/// - important: It requires *follower_list* scope.
4444
public func userRequestedBy(success: SuccessHandler<[InstagramUser]>?, failure: FailureHandler?) {
45-
request("/users/self/requested-by", success: { data in success?(data!) }, failure: failure)
45+
request("/users/self/requested-by", success: success, failure: failure)
4646
}
4747

4848
/// Get information about a relationship to another user.
@@ -53,7 +53,7 @@ extension Instagram {
5353
///
5454
/// - important: It requires *follower_list* scope.
5555
public func userRelationship(withUser userId: String, success: SuccessHandler<InstagramRelationship>?, failure: FailureHandler?) {
56-
request("/users/\(userId)/relationship", success: { data in success?(data!) }, failure: failure)
56+
request("/users/\(userId)/relationship", success: success, failure: failure)
5757
}
5858

5959
/// Modify the relationship between the current user and the target user.
@@ -69,7 +69,7 @@ extension Instagram {
6969
success: SuccessHandler<InstagramRelationship>?,
7070
failure: FailureHandler?) {
7171

72-
request("/users/\(userId)/relationship", method: .post, parameters: ["action": action.rawValue], success: { data in success?(data!) }, failure: failure)
72+
request("/users/\(userId)/relationship", method: .post, parameters: ["action": action.rawValue], success: success, failure: failure)
7373
}
7474

7575
/// Follows the target user.

‎Sources/Endpoints/Tags.swift

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
extension Instagram {
1010

11-
// MARK: - Tag Endpoints
11+
// MARK: Tag Endpoints
1212

1313
/// Get information about a tag object.
1414
///
@@ -18,7 +18,7 @@ extension Instagram {
1818
///
1919
/// - important: It requires *public_content* scope.
2020
public func tag(_ tagName: String, success: SuccessHandler<InstagramTag>?, failure: FailureHandler?) {
21-
request("/tags/\(tagName)", success: { data in success?(data!) }, failure: failure)
21+
request("/tags/\(tagName)", success: success, failure: failure)
2222
}
2323

2424
/// Get a list of recently tagged media.
@@ -37,14 +37,13 @@ extension Instagram {
3737
count: Int? = nil,
3838
success: SuccessHandler<[InstagramMedia]>?,
3939
failure: FailureHandler?) {
40-
4140
var parameters = Parameters()
4241

4342
parameters["max_tag_id"] ??= maxTagId
4443
parameters["min_tag_id"] ??= minTagId
4544
parameters["count"] ??= count
4645

47-
request("/tags/\(tagName)/media/recent", parameters: parameters, success: { data in success?(data!) }, failure: failure)
46+
request("/tags/\(tagName)/media/recent", parameters: parameters, success: success, failure: failure)
4847
}
4948

5049
/// Search for tags by name.
@@ -55,6 +54,6 @@ extension Instagram {
5554
///
5655
/// - important: It requires *public_content* scope.
5756
public func search(tag query: String, success: SuccessHandler<[InstagramTag]>?, failure: FailureHandler?) {
58-
request("/tags/search", parameters: ["q": query], success: { data in success?(data!) }, failure: failure)
57+
request("/tags/search", parameters: ["q": query], success: success, failure: failure)
5958
}
6059
}

‎Sources/Endpoints/Users.swift

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
extension Instagram {
1010

11-
// MARK: - User Endpoints
11+
// MARK: User Endpoints
1212

1313
/// Get information about a user.
1414
///
@@ -18,7 +18,7 @@ extension Instagram {
1818
///
1919
/// - important: It requires *public_content* scope when getting information about a user other than yours.
2020
public func user(_ userId: String, success: SuccessHandler<InstagramUser>?, failure: FailureHandler?) {
21-
request("/users/\(userId)", success: { data in success?(data!) }, failure: failure)
21+
request("/users/\(userId)", success: success, failure: failure)
2222
}
2323

2424
/// Get the most recent media published by a user.
@@ -37,14 +37,13 @@ extension Instagram {
3737
count: Int? = nil,
3838
success: SuccessHandler<[InstagramMedia]>?,
3939
failure: FailureHandler?) {
40-
4140
var parameters = Parameters()
4241

4342
parameters["max_id"] ??= maxId
4443
parameters["min_id"] ??= minId
4544
parameters["count"] ??= count
4645

47-
request("/users/\(userId)/media/recent", parameters: parameters, success: { data in success?(data!) }, failure: failure)
46+
request("/users/\(userId)/media/recent", parameters: parameters, success: success, failure: failure)
4847
}
4948

5049
/// Get the list of recent media liked by the currently authenticated user.
@@ -61,7 +60,7 @@ extension Instagram {
6160
parameters["max_like_id"] ??= maxLikeId
6261
parameters["count"] ??= count
6362

64-
request("/users/self/media/liked", parameters: parameters, success: { data in success?(data!) }, failure: failure)
63+
request("/users/self/media/liked", parameters: parameters, success: success, failure: failure)
6564
}
6665

6766
/// Get a list of users matching the query.
@@ -78,6 +77,6 @@ extension Instagram {
7877
parameters["q"] = query
7978
parameters["count"] ??= count
8079

81-
request("/users/search", parameters: parameters, success: { data in success?(data!) }, failure: failure)
80+
request("/users/search", parameters: parameters, success: success, failure: failure)
8281
}
8382
}

0 commit comments

Comments
 (0)