Merge branch 'master' of https://github.com/pvzig/SlackKit

Swift 3.1 initial update

Cartfile

@@ -1,2 +1,2 @@
-github "https://github.com/daltoniam/Starscream" == 2.0.2
-github "https://github.com/pvzig/swifter.git" == 3.0.4
+github "https://github.com/daltoniam/Starscream" == 2.0.3
+github "https://github.com/httpswift/swifter" == 1.3.3

Cartfile.resolved

@@ -1,2 +0,0 @@
-github "daltoniam/Starscream" "2.0.2"
-github "pvzig/swifter" "3.0.4"

Package.swift

@@ -4,8 +4,7 @@ let package = Package(
     name: "SlackKit",
     targets: [],
     dependencies: [
-        .Package(url: "https://github.com/pvzig/swifter.git",
-                 majorVersion: 3, minor: 0),
-        .Package(url: "https://github.com/daltoniam/Starscream", majorVersion: 2, minor: 0)
+        .Package(url: "https://github.com/httpswift/swifter", majorVersion: 1),
+        .Package(url: "https://github.com/daltoniam/Starscream", majorVersion: 2)
     ]
 )

Podfile

@@ -3,16 +3,16 @@ source 'https://github.com/CocoaPods/Specs.git'
 use_frameworks!
 
 target 'SlackKit OS X' do
-	pod 'Starscream', '~> 2.0.2'
-	pod 'Swifter', :git => 'https://github.com/pvzig/swifter.git', :tag => '3.0.4'
+	pod 'Starscream', '~> 2.0.3'
+	pod 'Swifter', '~> 1.3.3'
 end
 
 target 'SlackKit iOS' do
-	pod 'Starscream', '~> 2.0.2'
-	pod 'Swifter', :git => 'https://github.com/pvzig/swifter.git', :tag => '3.0.4'
+	pod 'Starscream', '~> 2.0.3'
+	pod 'Swifter', '~> 1.3.3'
 end
 
 target 'SlackKit tvOS' do
-	pod 'Starscream', '~> 2.0.2'
-	pod 'Swifter', :git => 'https://github.com/pvzig/swifter.git', :tag => '3.0.4'
-end
+	pod 'Starscream', '~> 2.0.3'
+	pod 'Swifter', '~> 1.3.3'
+end

Podfile.lock

@@ -1,25 +0,0 @@
-PODS:
-  - Starscream (2.0.2)
-  - Swifter (1.3.2)
-
-DEPENDENCIES:
-  - Starscream (~> 2.0.2)
-  - Swifter (from `https://github.com/pvzig/swifter.git`, tag `3.0.4`)
-
-EXTERNAL SOURCES:
-  Swifter:
-    :git: https://github.com/pvzig/swifter.git
-    :tag: 3.0.4
-
-CHECKOUT OPTIONS:
-  Swifter:
-    :git: https://github.com/pvzig/swifter.git
-    :tag: 3.0.4
-
-SPEC CHECKSUMS:
-  Starscream: 6c135a34e0a6e60cedaa0b30db67a4c05cf7cd38
-  Swifter: dd1800ba8eb3e28b22b8bd20f91a8561a0110fac
-
-PODFILE CHECKSUM: cd86ea0f8422027c9d5fa3c40243ae7a816fb79a
-
-COCOAPODS: 1.1.0.rc.3

README.md

@@ -1,6 +1,6 @@
 ![SlackKit](https://cloud.githubusercontent.com/assets/8311605/10260893/5ec60f96-694e-11e5-91fd-da6845942201.png)
 
-![Swift Version](https://img.shields.io/badge/Swift-3.0-orange.svg) ![Plaforms](https://img.shields.io/badge/Platforms-macOS,iOS,tvOS-lightgrey.svg) ![License MIT](https://img.shields.io/badge/License-MIT-lightgrey.svg) [![CocoaPods compatible](https://img.shields.io/badge/CocoaPods-compatible-brightgreen.svg)](https://cocoapods.org) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-brightgreen.svg)](https://github.com/Carthage/Carthage) [![SwiftPM compatible](https://img.shields.io/badge/SwiftPM-compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager)
+![Swift Version](https://img.shields.io/badge/Swift-3.1.0-orange.svg) ![Plaforms](https://img.shields.io/badge/Platforms-macOS,iOS,tvOS-lightgrey.svg) ![License MIT](https://img.shields.io/badge/License-MIT-lightgrey.svg) [![CocoaPods compatible](https://img.shields.io/badge/CocoaPods-compatible-brightgreen.svg)](https://cocoapods.org) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-brightgreen.svg)](https://github.com/Carthage/Carthage) [![SwiftPM compatible](https://img.shields.io/badge/SwiftPM-compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager)
 ## SlackKit: A Swift Slack Client Library
 ### Description
 
@@ -18,7 +18,7 @@ To build the SlackKit project directly, first build the dependencies using Carth
 Add SlackKit to your pod file:
 ```
 use_frameworks!
-pod 'SlackKit', '~> 3.1.7'
+pod 'SlackKit'
 ```
 and run
 ```
@@ -30,7 +30,7 @@ pod install
 
 Add SlackKit to your Cartfile:
 ```
-github "https://github.com/pvzig/slackkit.git"
+github "pvzig/SlackKit"
 ```
 and run
 ```

SlackKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "SlackKit"
-  s.version          = "3.1.8"
+  s.version          = "3.1.11"
   s.summary          = "a Slack client library for OS X, iOS, and tvOS written in Swift"
   s.homepage         = "https://github.com/pvzig/SlackKit"
   s.license          = 'MIT'
@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = '10.10'
   s.tvos.deployment_target = '9.0'
   s.requires_arc = true
-  s.source_files = 'SlackKit/Sources/*.swift'  
+  s.source_files = 'Sources/SlackKit/**/*.swift'  
   s.frameworks = 'Foundation'
   s.dependency 'Starscream'
   s.dependency 'Swifter'

SlackKit.xcodeproj/project.pbxproj

@@ -159,8 +159,6 @@
 		263993D11CE90EED004A6E93 /* SlackKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SlackKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		2659FC1E1DADC4F2003F3930 /* Starscream.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Starscream.framework; path = Carthage/Build/iOS/Starscream.framework; sourceTree = "<group>"; };
 		2659FC211DADC4FC003F3930 /* Starscream.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Starscream.framework; path = Carthage/Build/tvOS/Starscream.framework; sourceTree = "<group>"; };
-		268E46131CE8F79D009F19CC /* Info-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-iOS.plist"; path = "Supporting Files/Info-iOS.plist"; sourceTree = "<group>"; };
-		268E46141CE8F79D009F19CC /* Info-tvOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-tvOS.plist"; path = "Supporting Files/Info-tvOS.plist"; sourceTree = "<group>"; };
 		268E46151CE8F79D009F19CC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = "Supporting Files/Info.plist"; sourceTree = "<group>"; };
 		269B47CB1D3AE5670042D137 /* Swifter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Swifter.framework; path = Carthage/Build/tvOS/Swifter.framework; sourceTree = "<group>"; };
 		26B30B6B1D289FA0004D4AB5 /* Swifter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Swifter.framework; path = Carthage/Build/Mac/Swifter.framework; sourceTree = "<group>"; };
@@ -293,8 +291,6 @@
 			children = (
 				26EAA8FA1E204DE6003F5423 /* SlackKit.h */,
 				268E46151CE8F79D009F19CC /* Info.plist */,
-				268E46131CE8F79D009F19CC /* Info-iOS.plist */,
-				268E46141CE8F79D009F19CC /* Info-tvOS.plist */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
@@ -781,7 +777,7 @@
 					"$(PROJECT_DIR)/Carthage/Build/Mac",
 				);
 				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info-iOS.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
@@ -808,7 +804,7 @@
 					"$(PROJECT_DIR)/Carthage/Build/Mac",
 				);
 				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info-iOS.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
@@ -836,7 +832,7 @@
 					"$(PROJECT_DIR)/Carthage/Build/iOS",
 				);
 				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info-iOS.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
@@ -867,7 +863,7 @@
 					"$(PROJECT_DIR)/Carthage/Build/iOS",
 				);
 				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info-iOS.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
@@ -897,7 +893,7 @@
 					"$(PROJECT_DIR)/Carthage/Build/tvOS",
 				);
 				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info-tvOS.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
@@ -927,7 +923,7 @@
 					"$(PROJECT_DIR)/Carthage/Build/tvOS",
 				);
 				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info-tvOS.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;

Sources/SlackKit/Model/Attachment.swift

@@ -41,6 +41,8 @@ public struct Attachment {
     public let footer: String?
     public let footerIcon: String?
     public let ts: Int?
+    
+    public let markdownEnabledFields: Set<AttachmentTextField>?
 
     internal init(attachment: [String: Any]?) {
         fallback = attachment?["fallback"] as? String
@@ -61,9 +63,11 @@ public struct Attachment {
         ts = attachment?["ts"] as? Int
         fields = (attachment?["fields"] as? [[String: Any]])?.map { AttachmentField(field: $0) }
         actions = (attachment?["actions"] as? [[String: Any]])?.map { Action(action: $0) }
+        
+        markdownEnabledFields = (attachment?["mrkdwn_in"] as? [String]).map { Set($0.flatMap(AttachmentTextField.init)) }
     }
     
-    public init(fallback: String, title:String, callbackID: String? = nil, type: String? = nil, colorHex: String? = nil, pretext: String? = nil, authorName: String? = nil, authorLink: String? = nil, authorIcon: String? = nil, titleLink: String? = nil, text: String? = nil, fields: [AttachmentField]? = nil, actions: [Action]? = nil, imageURL: String? = nil, thumbURL: String? = nil, footer: String? = nil, footerIcon:String? = nil, ts:Int? = nil) {
+    public init(fallback: String, title: String?, callbackID: String? = nil, type: String? = nil, colorHex: String? = nil, pretext: String? = nil, authorName: String? = nil, authorLink: String? = nil, authorIcon: String? = nil, titleLink: String? = nil, text: String? = nil, fields: [AttachmentField]? = nil, actions: [Action]? = nil, imageURL: String? = nil, thumbURL: String? = nil, footer: String? = nil, footerIcon:String? = nil, ts:Int? = nil, markdownFields: Set<AttachmentTextField>? = nil) {
         self.fallback = fallback
         self.callbackID = callbackID
         self.type = type
@@ -82,6 +86,7 @@ public struct Attachment {
         self.footer = footer
         self.footerIcon = footerIcon
         self.ts = ts
+        self.markdownEnabledFields = markdownFields
     }
     
     internal var dictionary: [String: Any] {
@@ -91,7 +96,7 @@ public struct Attachment {
         attachment["attachment_type"] = type
         attachment["color"] = color
         attachment["pretext"] = pretext
-        attachment["authorName"] = authorName
+        attachment["author_name"] = authorName
         attachment["author_link"] = authorLink
         attachment["author_icon"] = authorIcon
         attachment["title"] = title
@@ -104,6 +109,7 @@ public struct Attachment {
         attachment["footer"] = footer
         attachment["footer_icon"] = footerIcon
         attachment["ts"] = ts
+        attachment["mrkdwn_in"] = markdownEnabledFields?.map { $0.rawValue }
         return attachment
     }
 }
@@ -113,3 +119,13 @@ public enum AttachmentColor: String {
     case warning = "warning"
     case danger = "danger"
 }
+
+public enum AttachmentTextField: String {
+    case fallback = "fallback"
+    case pretext = "pretext"
+    case authorName = "author_name"
+    case title = "title"
+    case text = "text"
+    case fields = "fields"
+    case footer = "footer"
+}

Sources/SlackKit/Model/AttachmentField.swift

@@ -33,9 +33,9 @@ public struct AttachmentField {
         short = field?["short"] as? Bool
     }
     
-    public init(title:String, value:String, short: Bool? = nil) {
+    public init(title: String?, value: String?, short: Bool? = nil) {
         self.title = title
-        self.value = value.slackFormatEscaping
+        self.value = value?.slackFormatEscaping
         self.short = short
     }
     

Sources/SlackKit/NetworkInterface.swift

@@ -48,7 +48,7 @@ internal struct NetworkInterface {
     }
     
     internal func customRequest(_ url: String, data: Data, success: @escaping (Bool)->Void, errorClosure: @escaping (SlackError)->Void) {
-        guard let url =  URL(string: url.removePercentEncoding()) else {
+        guard let string = url.removingPercentEncoding, let url =  URL(string: string) else {
             errorClosure(SlackError.clientNetworkError)
             return
         }
@@ -72,7 +72,7 @@ internal struct NetworkInterface {
         if parameters.count > 0 {
             components?.queryItems = filterNilParameters(parameters).map { URLQueryItem(name: $0.0, value: "\($0.1)") }
         }
-        guard let url = components?.url else {
+        guard let url = components?.url, let filename = parameters["filename"] as? String, let filetype = parameters["filetype"] as? String else {
             errorClosure(SlackError.clientNetworkError)
             return
         }
@@ -82,8 +82,8 @@ internal struct NetworkInterface {
         let contentType = "multipart/form-data; boundary=" + boundaryConstant
         let boundaryStart = "--\(boundaryConstant)\r\n"
         let boundaryEnd = "--\(boundaryConstant)--\r\n"
-        let contentDispositionString = "Content-Disposition: form-data; name=\"file\"; filename=\"\(parameters["filename"])\"\r\n"
-        let contentTypeString = "Content-Type: \(parameters["filetype"])\r\n\r\n"
+        let contentDispositionString = "Content-Disposition: form-data; name=\"file\"; filename=\"\(filename)\"\r\n"
+        let contentTypeString = "Content-Type: \(filetype)\r\n\r\n"
         
         var requestBodyData: Data = Data()
         requestBodyData.append(boundaryStart.data(using: String.Encoding.utf8)!)

Sources/SlackKit/OAuthServer.swift

@@ -80,7 +80,10 @@ public struct OAuthServer {
     
     private func oauthURLRequest(_ authorize: AuthorizeRequest) -> URLRequest? {
         var components = URLComponents(string: "\(oauthURL)")
-        components?.queryItems = [URLQueryItem(name: "client_id", value: "\(authorize.clientID)")]
+        components?.queryItems = [
+            URLQueryItem(name: "client_id", value: "\(authorize.clientID)"),
+            URLQueryItem(name: "scope", value: "\(authorize.scope)"),
+        ]
         guard let url = components?.url else {
             return nil
         }

Supporting Files/Info-iOS.plist

@@ -1,28 +0,0 @@
-<?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>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>3.1.8</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2016 Peter Zignego. All rights reserved.</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-</dict>
-</plist>

Supporting Files/Info-tvOS.plist

@@ -1,28 +0,0 @@
-<?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>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>3.1.8</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2016 Peter Zignego. All rights reserved.</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-</dict>
-</plist>

Supporting Files/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.7</string>
+	<string>3.1.12</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>