Merge branch 'release/v1.1.2'

.swift-version

@@ -1 +1 @@
-4.0
+4.2

.swiftlint.yml

@@ -54,3 +54,4 @@ identifier_name:
  - x
  - y
  - id
+ - vc

Cartfile.resolved

@@ -1,3 +1,3 @@
-github "Quick/Nimble" "v7.0.3"
-github "Quick/Quick" "v1.2.0"
+github "Quick/Nimble" "v7.3.1"
+github "Quick/Quick" "v1.3.2"
 github "jspahrsummers/xcconfigs" "bb795558a76e5daf3688500055bbcfe243bffa8d"

Sources/Endpoints/Comments.swift

@@ -8,7 +8,7 @@
 
 extension Instagram {
 
- // MARK: - Comment Endpoints
+ // MARK: Comment Endpoints
 
  /// Get a list of recent comments on a media object.
  ///
@@ -18,7 +18,7 @@ extension Instagram {
  ///
  /// - important: It requires *public_content* scope for media that does not belong to your own user.
  public func comments(fromMedia mediaId: String, success: SuccessHandler<[InstagramComment]>?, failure: FailureHandler?) {
- request("/media/\(mediaId)/comments", success: { data in success?(data!) }, failure: failure)
+ request("/media/\(mediaId)/comments", success: success, failure: failure)
  }
 
  /// Create a comment on a media object.
@@ -35,7 +35,7 @@ extension Instagram {
  /// - The comment cannot contain more than 1 URL.
  /// - The comment cannot consist of all capital letters.
  public func createComment(onMedia mediaId: String, text: String, success: SuccessHandler<InstagramComment>?, failure: FailureHandler?) {
- request("/media/\(mediaId)/comments", method: .post, parameters: ["text": text], success: { data in success?(data!) }, failure: failure)
+ request("/media/\(mediaId)/comments", method: .post, parameters: ["text": text], success: success, failure: failure)
  }
 
  /// Remove a comment either on the authenticated user's media object or authored by the authenticated user.
@@ -46,6 +46,6 @@ extension Instagram {
  ///
  /// - important: It requires *comments* scope. Also, *public_content* scope is required for media that does not belong to your own user.
  public func deleteComment(_ commentId: String, onMedia mediaId: String, success: EmptySuccessHandler?, failure: FailureHandler?) {
- request("/media/\(mediaId)/comments/\(commentId)", method: .delete, success: { (_: InstagramEmptyResponse!) in success?() }, failure: failure)
+ request("/media/\(mediaId)/comments/\(commentId)", method: .delete, success: { (_: InstagramEmptyResponse) in success?() }, failure: failure)
  }
 }

Sources/Endpoints/Likes.swift

@@ -8,7 +8,7 @@
 
 extension Instagram {
 
- // MARK: - Like Endpoints
+ // MARK: Like Endpoints
 
  /// Get a list of users who have liked this media.
  ///
@@ -18,7 +18,7 @@ extension Instagram {
  ///
  /// - important: It requires *public_content* scope for media that does not belong to your own user.
  public func likes(inMedia mediaId: String, success: SuccessHandler<[InstagramUser]>?, failure: FailureHandler?) {
- request("/media/\(mediaId)/likes", success: { data in success?(data!) }, failure: failure)
+ request("/media/\(mediaId)/likes", success: success, failure: failure)
  }
 
  /// Set a like on this media by the currently authenticated user.

Sources/Endpoints/Locations.swift

@@ -10,7 +10,7 @@ import CoreLocation
 
 extension Instagram {
 
- // MARK: - Location Endpoints
+ // MARK: Location Endpoints
 
  /// Get information about a location.
  ///
@@ -20,7 +20,7 @@ extension Instagram {
  ///
  /// - important: It requires *public_content* scope.
  public func location(_ locationId: String, success: SuccessHandler<InstagramLocation<String>>?, failure: FailureHandler?) {
- request("/locations/\(locationId)", success: { data in success?(data!) }, failure: failure)
+ request("/locations/\(locationId)", success: success, failure: failure)
  }
 
  /// Get a list of recent media objects from a given location.
@@ -37,13 +37,12 @@ extension Instagram {
  minId: String? = nil,
  success: SuccessHandler<[InstagramMedia]>?,
  failure: FailureHandler?) {
-
  var parameters = Parameters()
 
  parameters["max_id"] ??= maxId
  parameters["min_id"] ??= minId
 
- request("/locations/\(locationId)/media/recent", parameters: parameters, success: { data in success?(data!) }, failure: failure)
+ request("/locations/\(locationId)/media/recent", parameters: parameters, success: success, failure: failure)
  }
 
  /// Search for a location by geographic coordinate.
@@ -62,15 +61,14 @@ extension Instagram {
  facebookPlacesId: String? = nil,
  success: SuccessHandler<[InstagramLocation<String>]>?,
  failure: FailureHandler?) {
-
  var parameters = Parameters()
 
  parameters["lat"] ??= latitude
  parameters["lng"] ??= longitude
  parameters["distance"] ??= distance
  parameters["facebook_places_id"] ??= facebookPlacesId
 
- request("/locations/search", parameters: parameters, success: { data in success?(data!) }, failure: failure)
+ request("/locations/search", parameters: parameters, success: success, failure: failure)
  }
 
  /// Search for a location by geographic coordinate.
@@ -87,8 +85,11 @@ extension Instagram {
  facebookPlacesId: String? = nil,
  success: SuccessHandler<[InstagramLocation<String>]>?,
  failure: FailureHandler?) {
-
- searchLocation(latitude: coordinates?.latitude, longitude: coordinates?.longitude,
- distance: distance, facebookPlacesId: facebookPlacesId, success: success, failure: failure)
+ searchLocation(latitude: coordinates?.latitude,
+ longitude: coordinates?.longitude,
+ distance: distance,
+ facebookPlacesId: facebookPlacesId,
+ success: success,
+ failure: failure)
  }
 }

Sources/Endpoints/Media.swift

@@ -10,7 +10,7 @@ import CoreLocation
 
 extension Instagram {
 
- // MARK: - Media Endpoints
+ // MARK: Media Endpoints
 
  /// Get information about a media object.
  ///
@@ -20,7 +20,7 @@ extension Instagram {
  ///
  /// - important: It requires *public_content* scope.
  public func media(withId id: String, success: SuccessHandler<InstagramMedia>?, failure: FailureHandler?) {
- request("/media/\(id)", success: { data in success?(data!) }, failure: failure)
+ request("/media/\(id)", success: success, failure: failure)
  }
 
  /// Get information about a media object.
@@ -34,7 +34,7 @@ extension Instagram {
  /// - note: A media object's shortcode can be found in its shortlink URL.
  /// An example shortlink is http://instagram.com/p/tsxp1hhQTG/. Its corresponding shortcode is tsxp1hhQTG.
  public func media(withShortcode shortcode: String, success: SuccessHandler<InstagramMedia>?, failure: FailureHandler?) {
- request("/media/shortcode/\(shortcode)", success: { data in success?(data!) }, failure: failure)
+ request("/media/shortcode/\(shortcode)", success: success, failure: failure)
  }
 
  /// Search for recent media in a given area.
@@ -51,14 +51,13 @@ extension Instagram {
  distance: Int? = nil,
  success: SuccessHandler<[InstagramMedia]>?,
  failure: FailureHandler?) {
-
  var parameters = Parameters()
 
  parameters["lat"] ??= latitude
  parameters["lng"] ??= longitude
  parameters["distance"] ??= distance
 
- request("/media/search", parameters: parameters, success: { data in success?(data!) }, failure: failure)
+ request("/media/search", parameters: parameters, success: success, failure: failure)
  }
 
  /// Search for recent media in a given area.
@@ -73,7 +72,6 @@ extension Instagram {
  distance: Int? = nil,
  success: SuccessHandler<[InstagramMedia]>?,
  failure: FailureHandler?) {
-
  searchMedia(latitude: coordinates?.latitude, longitude: coordinates?.longitude, distance: distance, success: success, failure: failure)
  }
 }

Sources/Endpoints/Relationships.swift

@@ -8,7 +8,7 @@
 
 extension Instagram {
 
- // MARK: - Relationship Endpoints
+ // MARK: Relationship Endpoints
 
  /// Relationship actions currently supported by Instagram.
  private enum RelationshipAction: String {
@@ -22,7 +22,7 @@ extension Instagram {
  ///
  /// - important: It requires *follower_list* scope.
  public func userFollows(success: SuccessHandler<[InstagramUser]>?, failure: FailureHandler?) {
- request("/users/self/follows", success: { data in success?(data!) }, failure: failure)
+ request("/users/self/follows", success: success, failure: failure)
  }
 
  /// Get the list of users this user is followed by.
@@ -32,7 +32,7 @@ extension Instagram {
  ///
  /// - important: It requires *follower_list* scope.
  public func userFollowers(success: SuccessHandler<[InstagramUser]>?, failure: FailureHandler?) {
- request("/users/self/followed-by", success: { data in success?(data!) }, failure: failure)
+ request("/users/self/followed-by", success: success, failure: failure)
  }
 
  /// List the users who have requested this user's permission to follow.
@@ -42,7 +42,7 @@ extension Instagram {
  ///
  /// - important: It requires *follower_list* scope.
  public func userRequestedBy(success: SuccessHandler<[InstagramUser]>?, failure: FailureHandler?) {
- request("/users/self/requested-by", success: { data in success?(data!) }, failure: failure)
+ request("/users/self/requested-by", success: success, failure: failure)
  }
 
  /// Get information about a relationship to another user.
@@ -53,7 +53,7 @@ extension Instagram {
  ///
  /// - important: It requires *follower_list* scope.
  public func userRelationship(withUser userId: String, success: SuccessHandler<InstagramRelationship>?, failure: FailureHandler?) {
- request("/users/\(userId)/relationship", success: { data in success?(data!) }, failure: failure)
+ request("/users/\(userId)/relationship", success: success, failure: failure)
  }
 
  /// Modify the relationship between the current user and the target user.
@@ -69,7 +69,7 @@ extension Instagram {
  success: SuccessHandler<InstagramRelationship>?,
  failure: FailureHandler?) {
 
- request("/users/\(userId)/relationship", method: .post, parameters: ["action": action.rawValue], success: { data in success?(data!) }, failure: failure)
+ request("/users/\(userId)/relationship", method: .post, parameters: ["action": action.rawValue], success: success, failure: failure)
  }
 
  /// Follows the target user.

Sources/Endpoints/Tags.swift

@@ -8,7 +8,7 @@
 
 extension Instagram {
 
- // MARK: - Tag Endpoints
+ // MARK: Tag Endpoints
 
  /// Get information about a tag object.
  ///
@@ -18,7 +18,7 @@ extension Instagram {
  ///
  /// - important: It requires *public_content* scope.
  public func tag(_ tagName: String, success: SuccessHandler<InstagramTag>?, failure: FailureHandler?) {
- request("/tags/\(tagName)", success: { data in success?(data!) }, failure: failure)
+ request("/tags/\(tagName)", success: success, failure: failure)
  }
 
  /// Get a list of recently tagged media.
@@ -37,14 +37,13 @@ extension Instagram {
  count: Int? = nil,
  success: SuccessHandler<[InstagramMedia]>?,
  failure: FailureHandler?) {
-
  var parameters = Parameters()
 
  parameters["max_tag_id"] ??= maxTagId
  parameters["min_tag_id"] ??= minTagId
  parameters["count"] ??= count
 
- request("/tags/\(tagName)/media/recent", parameters: parameters, success: { data in success?(data!) }, failure: failure)
+ request("/tags/\(tagName)/media/recent", parameters: parameters, success: success, failure: failure)
  }
 
  /// Search for tags by name.
@@ -55,6 +54,6 @@ extension Instagram {
  ///
  /// - important: It requires *public_content* scope.
  public func search(tag query: String, success: SuccessHandler<[InstagramTag]>?, failure: FailureHandler?) {
- request("/tags/search", parameters: ["q": query], success: { data in success?(data!) }, failure: failure)
+ request("/tags/search", parameters: ["q": query], success: success, failure: failure)
  }
 }

Sources/Endpoints/Users.swift

@@ -8,7 +8,7 @@
 
 extension Instagram {
 
- // MARK: - User Endpoints
+ // MARK: User Endpoints
 
  /// Get information about a user.
  ///
@@ -18,7 +18,7 @@ extension Instagram {
  ///
  /// - important: It requires *public_content* scope when getting information about a user other than yours.
  public func user(_ userId: String, success: SuccessHandler<InstagramUser>?, failure: FailureHandler?) {
- request("/users/\(userId)", success: { data in success?(data!) }, failure: failure)
+ request("/users/\(userId)", success: success, failure: failure)
  }
 
  /// Get the most recent media published by a user.
@@ -37,14 +37,13 @@ extension Instagram {
  count: Int? = nil,
  success: SuccessHandler<[InstagramMedia]>?,
  failure: FailureHandler?) {
-
  var parameters = Parameters()
 
  parameters["max_id"] ??= maxId
  parameters["min_id"] ??= minId
  parameters["count"] ??= count
 
- request("/users/\(userId)/media/recent", parameters: parameters, success: { data in success?(data!) }, failure: failure)
+ request("/users/\(userId)/media/recent", parameters: parameters, success: success, failure: failure)
  }
 
  /// Get the list of recent media liked by the currently authenticated user.
@@ -61,7 +60,7 @@ extension Instagram {
  parameters["max_like_id"] ??= maxLikeId
  parameters["count"] ??= count
 
- request("/users/self/media/liked", parameters: parameters, success: { data in success?(data!) }, failure: failure)
+ request("/users/self/media/liked", parameters: parameters, success: success, failure: failure)
  }
 
  /// Get a list of users matching the query.
@@ -78,6 +77,6 @@ extension Instagram {
  parameters["q"] = query
  parameters["count"] ??= count
 
- request("/users/search", parameters: parameters, success: { data in success?(data!) }, failure: failure)
+ request("/users/search", parameters: parameters, success: success, failure: failure)
  }
 }