Merge branch 'develop' into master

Author: stevebaranski

WordPressKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressKit"
-  s.version       = "2.1.0.1"
+  s.version       = "2.1.1-beta.2"
   s.summary       = "WordPressKit offers a clean and simple WordPress.com and WordPress.org API."
 
   s.description   = <<-DESC

WordPressKit.xcodeproj/project.pbxproj

@@ -123,7 +123,7 @@ public class AccountSettingsRemote: ServiceRemoteWordPressComREST {
         })
     }
 
-    fileprivate func settingsFromResponse(_ responseObject: AnyObject) throws -> AccountSettings {
+    private func settingsFromResponse(_ responseObject: AnyObject) throws -> AccountSettings {
         guard let
             response = responseObject as? [String: AnyObject],
             let firstName = response["first_name"] as? String,
@@ -158,7 +158,7 @@ public class AccountSettingsRemote: ServiceRemoteWordPressComREST {
                                tracksOptOut: tracksOptOut)
     }
 
-    fileprivate func fieldNameForChange(_ change: AccountSettingsChange) -> String {
+    private func fieldNameForChange(_ change: AccountSettingsChange) -> String {
         switch change {
         case .firstName:
             return "first_name"

WordPressKit/AccountSettingsRemote.swift

@@ -93,7 +93,7 @@ open class GravatarServiceRemote {
 
     /// Returns a new (randomized) Boundary String
     ///
-    fileprivate func boundaryForRequest() -> String {
+    private func boundaryForRequest() -> String {
         return "Boundary-" + UUID().uuidString
     }
 
@@ -107,7 +107,7 @@ open class GravatarServiceRemote {
     ///
     /// - Returns: A NSData instance, containing the Request's Payload.
     ///
-    fileprivate func bodyWithGravatarData(_ gravatarData: Data, account: String, boundary: String) -> Data {
+    private func bodyWithGravatarData(_ gravatarData: Data, account: String, boundary: String) -> Data {
         let body = NSMutableData()
 
         // Image Payload
@@ -131,7 +131,7 @@ open class GravatarServiceRemote {
 
 
     // MARK: - Private Structs
-    fileprivate struct UploadParameters {
+    private struct UploadParameters {
         static let endpointURL          = "https://api.gravatar.com/v1/upload-image"
         static let HTTPMethod           = "POST"
         static let contentType          = "application/octet-stream"

WordPressKit/GravatarServiceRemote.swift

@@ -7,7 +7,7 @@ open class HTTPAuthenticationAlertController {
 
     public typealias AuthenticationHandler = (URLSession.AuthChallengeDisposition, URLCredential?) -> Void
 
-    fileprivate static var onGoingChallenges = [URLProtectionSpace: [AuthenticationHandler]]()
+    private static var onGoingChallenges = [URLProtectionSpace: [AuthenticationHandler]]()
 
     static public func controller(for challenge: URLAuthenticationChallenge, handler: @escaping AuthenticationHandler) -> UIAlertController? {
         if var handlers = onGoingChallenges[challenge.protectionSpace] {
@@ -35,7 +35,7 @@ open class HTTPAuthenticationAlertController {
         onGoingChallenges.removeValue(forKey: challenge.protectionSpace)
     }
 
-    static fileprivate func controllerForServerTrustChallenge(_ challenge: URLAuthenticationChallenge) -> UIAlertController {
+    private static func controllerForServerTrustChallenge(_ challenge: URLAuthenticationChallenge) -> UIAlertController {
         let title = NSLocalizedString("Certificate error", comment: "Popup title for wrong SSL certificate.")
         let message = String(format: NSLocalizedString("The certificate for this server is invalid. You might be connecting to a server that is pretending to be “%@” which could put your confidential information at risk.\n\nWould you like to trust the certificate anyway?", comment: ""), challenge.protectionSpace.host)
         let controller =  UIAlertController(title: title, message: message, preferredStyle: .alert)
@@ -58,7 +58,7 @@ open class HTTPAuthenticationAlertController {
         return controller
     }
 
-    static fileprivate func controllerForUserAuthenticationChallenge(_ challenge: URLAuthenticationChallenge) -> UIAlertController {
+    private static func controllerForUserAuthenticationChallenge(_ challenge: URLAuthenticationChallenge) -> UIAlertController {
         let title = String(format: NSLocalizedString("Authentication required for host: %@", comment: "Popup title to ask for user credentials."), challenge.protectionSpace.host)
         let message = NSLocalizedString("Please enter your credentials", comment: "Popup message to ask for user credentials (fields shown below).")
         let controller =  UIAlertController(title: title,

WordPressKit/HTTPAuthenticationAlertController.swift

@@ -7,9 +7,9 @@ public struct StatsAllTimesInsight {
 }
 
 
-extension StatsAllTimesInsight: InsightProtocol {
+extension StatsAllTimesInsight: StatsInsightData {
 
-    //MARK: - InsightProtocol Conformance
+    //MARK: - StatsInsightData Conformance
     public init?(jsonDictionary: [String: AnyObject]) {
         guard
             let statsDict = jsonDictionary["stats"] as? [String: AnyObject],

WordPressKit/Insights/StatsAllTimesInsight.swift

@@ -24,7 +24,7 @@ public struct StatsAnnualAndMostPopularTimeInsight {
     public let annualInsightsAverageImagesCount: Double
 }
 
-extension StatsAnnualAndMostPopularTimeInsight: InsightProtocol {
+extension StatsAnnualAndMostPopularTimeInsight: StatsInsightData {
     public static var pathComponent: String {
         return "stats/insights"
     }

WordPressKit/Insights/StatsAnnualAndMostPopularTimeInsight.swift

@@ -3,9 +3,9 @@ public struct StatsCommentsInsight {
     public let topAuthors: [StatsTopCommentsAuthor]
 }
 
-extension StatsCommentsInsight: InsightProtocol {
+extension StatsCommentsInsight: StatsInsightData {
 
-    //MARK: - InsightProtocol Conformance
+    //MARK: - StatsInsightData Conformance
     public static var pathComponent: String {
         return "stats/comments"
     }

WordPressKit/Insights/StatsCommentsInsight.swift

@@ -3,9 +3,9 @@ public struct StatsDotComFollowersInsight {
     public let topDotComFollowers: [StatsFollower]
 }
 
-extension StatsDotComFollowersInsight: InsightProtocol {
+extension StatsDotComFollowersInsight: StatsInsightData {
 
-    //MARK: - InsightProtocol Conformance
+    //MARK: - StatsInsightData Conformance
     public static var queryProperties: [String: String] {
         return ["type": "wpcom",
                 "max": "7"]

WordPressKit/Insights/StatsDotComFollowersInsight.swift

@@ -3,9 +3,9 @@ public struct StatsEmailFollowersInsight {
     public let topEmailFollowers: [StatsFollower]
 }
 
-extension StatsEmailFollowersInsight: InsightProtocol {
+extension StatsEmailFollowersInsight: StatsInsightData {
 
-    //MARK: - InsightProtocol Conformance
+    //MARK: - StatsInsightData Conformance
     public static var queryProperties: [String: String] {
         return ["type": "email",
                 "max": "7"]