Merge pull request #27 from AnderGoig/develop

Version 1.1.1

Author: AnderGoig

.assets/Getting-Started.png

@@ -0,0 +1,5 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Declare files that will always have CRLF line endings on checkout.
+*.swift text eol=lf

.assets/Info.plist-File.png

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9
+osx_image: xcode9.3beta
 git:
   submodules: false
 env:
@@ -8,7 +8,7 @@ env:
   - LANG=en_US.UTF-8
   - WORKSPACE=SwiftInstagram.xcworkspace
   - SCHEME="SwiftInstagram-iOS"
-  - SDK=iphonesimulator11.0
+  - SDK=iphonesimulator11.3
   matrix:
   - TEST_TYPE=iOS
   - TEST_TYPE=Lint
@@ -45,7 +45,7 @@ script:
     set -o pipefail
     xcodebuild -version
     xcodebuild -showsdks
-    xcodebuild build -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -configuration Debug -destination "platform=iOS Simulator,name=iPhone 5" -destination "platform=iOS Simulator,name=iPhone 7 Plus" | xcpretty -c
+    xcodebuild build -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -configuration Debug -destination "platform=iOS Simulator,name=iPhone 8 Plus" | xcpretty -c
   elif [ "$TEST_TYPE" = Lint ]; then
     swiftlint lint
   elif [ "$TEST_TYPE" = CocoaPods ]; then

.assets/SwiftInstagram-Logo.png

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

.assets/SwiftInstagram-Logo.psd

@@ -13,8 +13,13 @@ public class Instagram {
 
     // MARK: - Types
 
+    /// Empty success handler
     public typealias EmptySuccessHandler = () -> Void
+
+    /// Success handler
     public typealias SuccessHandler<T> = (_ data: T) -> Void
+
+    /// Failure handler
     public typealias FailureHandler = (_ error: Error) -> Void
 
     private enum API {
@@ -138,7 +143,9 @@ public class Instagram {
             if let data = data {
                 DispatchQueue.global(qos: .utility).async {
                     do {
-                        let object = try JSONDecoder().decode(InstagramResponse<T>.self, from: data)
+                        let jsonDecoder = JSONDecoder()
+                        jsonDecoder.keyDecodingStrategy = .convertFromSnakeCase
+                        let object = try jsonDecoder.decode(InstagramResponse<T>.self, from: data)
 
                         if let data = object.data {
                             DispatchQueue.main.async {

.codebeatignore

@@ -26,8 +26,7 @@ public struct InstagramComment: Decodable {
     // MARK: - Types
 
     private enum CodingKeys: String, CodingKey {
-        case id, text, from
-        case createdTime = "created_time"
+        case id, text, from, createdTime
     }
 
     // MARK: - Initializers

.gitattributes

@@ -28,8 +28,7 @@ public struct InstagramLocation<T: Decodable>: Decodable {
     // MARK: - Types
 
     private enum CodingKeys: String, CodingKey {
-        case id, name, latitude, longitude
-        case streetAddress = "street_address"
+        case id, name, streetAddress, latitude, longitude
     }
 
     // MARK: - Initializers

.github/CONTRIBUTING.md

@@ -97,12 +97,6 @@ public struct InstagramMedia: Decodable {
 
         /// A Resolution object that contains the width, height and URL of the standard resolution image.
         public let standardResolution: Resolution
-
-        private enum CodingKeys: String, CodingKey {
-            case thumbnail
-            case lowResolution = "low_resolution"
-            case standardResolution = "standard_resolution"
-        }
     }
 
     /// A struct cointaining the low and standard resolution videos of the media.
@@ -116,24 +110,25 @@ public struct InstagramMedia: Decodable {
 
         /// A Resolution object that contains the width, height and URL of the low bandwidth video.
         public let lowBandwidth: Resolution?
-
-        private enum CodingKeys: String, CodingKey {
-            case lowResolution = "low_resolution"
-            case standardResolution = "standard_resolution"
-            case lowBandwidth = "low_bandwidth"
-        }
     }
 
     /// A struct containing the user and its position on the image.
     public struct UserInPhoto: Decodable {
 
         /// The user that appears in the image.
-        public let user: InstagramUser
+        public let user: UserInPhotoUsername
 
         /// The position in points of the user in the image.
         public let position: Position
 
-        /// A struct that containing the value of the coordinate axes, 'x' and 'y'.
+        /// A struct containing the username of the tagged user.
+        public struct UserInPhotoUsername: Decodable {
+
+            /// The value of the x-axis.
+            public let username: String
+        }
+
+        /// A struct containing the value of the coordinate axes, 'x' and 'y'.
         public struct Position: Decodable {
 
             /// The value of the x-axis.
@@ -158,19 +153,11 @@ public struct InstagramMedia: Decodable {
 
         /// The type of media. It can be "image" or "video".
         public let type: String
-
-        private enum CodingKeys: String, CodingKey {
-            case images, videos, type
-            case usersInPhoto = "users_in_photo"
-        }
     }
 
     private enum CodingKeys: String, CodingKey {
-        case id, user, type, images, videos, caption, comments, likes, tags, filter, link, location, distance
-        case createdTime = "created_time"
-        case userHasLiked = "user_has_liked"
-        case usersInPhoto = "users_in_photo"
-        case carouselMedia = "carousel_media"
+        case id, user, createdTime, type, images, videos, caption, comments, likes, tags,
+        userHasLiked, filter, link, location, usersInPhoto, carouselMedia, distance
     }
 
     // MARK: - Initializers

.github/ISSUE_TEMPLATE.md

@@ -16,12 +16,4 @@ public struct InstagramRelationship: Decodable {
 
     /// A user's relationship to you. It can be "followed_by", "requested_by", "blocked_by_you" or "none".
     public let incomingStatus: String?
-
-    // MARK: - Types
-
-    private enum CodingKeys: String, CodingKey {
-        case outgoingStatus = "outgoing_status"
-        case incomingStatus = "incoming_status"
-    }
-
 }

.github/PULL_REQUEST_TEMPLATE.md

@@ -20,22 +20,11 @@ struct InstagramResponse<T: Decodable>: Decodable {
         let code: Int
         let errorType: String?
         let errorMessage: String?
-
-        private enum CodingKeys: String, CodingKey {
-            case code
-            case errorType = "error_type"
-            case errorMessage = "error_message"
-        }
     }
 
     struct Pagination: Decodable {
-        let nextURL: String?
+        let nextUrl: String?
         let nextMaxId: String?
-
-        private enum CodingKeys: String, CodingKey {
-            case nextURL = "next_url"
-            case nextMaxId = "next_max_id"
-        }
     }
 }
 

.gitignore

@@ -16,11 +16,4 @@ public struct InstagramTag: Decodable {
 
     /// The number of media in which the tag appears.
     public let mediaCount: Int
-
-    // MARK: - Types
-
-    private enum CodingKeys: String, CodingKey {
-        case name
-        case mediaCount = "media_count"
-    }
 }

.gitmodules

@@ -48,17 +48,5 @@ public struct InstagramUser: Decodable {
 
         /// The number of followers of the user.
         public let followedBy: Int
-
-        private enum CodingKeys: String, CodingKey {
-            case media, follows
-            case followedBy = "followed_by"
-        }
-    }
-
-    private enum CodingKeys: String, CodingKey {
-        case id, username, bio, website, counts
-        case profilePicture = "profile_picture"
-        case fullName = "full_name"
-        case isBusiness = "is_business"
     }
 }

.jazzy.yaml

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name                 = 'SwiftInstagram'
- s.version              = '1.1.0'
+ s.version              = '1.1.1'
  s.cocoapods_version    = '>= 1.1.0'
  s.authors              = { 'Ander Goig' => 'goig.ander@gmail.com' }
  s.license              = { :type => 'MIT', :file => 'LICENSE' }

.swift-version

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

.swiftlint.yml

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.0</string>
+	<string>1.1.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

.travis.yml

@@ -161,7 +161,7 @@ <h1>API</h1>
                         <h4>Declaration</h4>
                         <div class="language">
                           <p class="aside-title">Swift</p>
-                          <pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="kt">Instagram</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">class</span> <span class="kt">Instagram</span></code></pre>
 
                         </div>
                       </div>
@@ -176,8 +176,8 @@ <h4>Declaration</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2018 <a class="link" href="https://github.com/AnderGoig" target="_blank" rel="external">Ander Goig</a>. All rights reserved. (Last updated: 2018-01-21)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.8.4</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2018 <a class="link" href="https://github.com/AnderGoig" target="_blank" rel="external">Ander Goig</a>. All rights reserved. (Last updated: 2018-04-06)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.1</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
     </section>
   </body>
 </div>

CHANGELOG.md

@@ -161,7 +161,7 @@ <h1>Authentication</h1>
                         <h4>Declaration</h4>
                         <div class="language">
                           <p class="aside-title">Swift</p>
-                          <pre class="highlight"><code><span class="kd">public</span> <span class="kd">enum</span> <span class="kt">InstagramScope</span><span class="p">:</span> <span class="kt">String</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">enum</span> <span class="kt">InstagramScope</span><span class="p">:</span> <span class="kt">String</span></code></pre>
 
                         </div>
                       </div>
@@ -176,8 +176,8 @@ <h4>Declaration</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2018 <a class="link" href="https://github.com/AnderGoig" target="_blank" rel="external">Ander Goig</a>. All rights reserved. (Last updated: 2018-01-21)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.8.4</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2018 <a class="link" href="https://github.com/AnderGoig" target="_blank" rel="external">Ander Goig</a>. All rights reserved. (Last updated: 2018-04-06)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.1</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
     </section>
   </body>
 </div>