Fixed Optional("string") sent in requests

sky-uk · May 10, 2019 · c3fb1b6 · c3fb1b6
1 parent 00a6f54
commit c3fb1b6
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 21 deletions.
diff --git a/ReactiveAPI.xcodeproj/project.pbxproj b/ReactiveAPI.xcodeproj/project.pbxproj
@@ -11,7 +11,6 @@
 		D195F1E522086DB200530339 /* ReactiveAPIRequestInterceptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = D195F1D622086DB100530339 /* ReactiveAPIRequestInterceptor.swift */; };
 		D195F1E622086DB200530339 /* JSONReactiveAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = D195F1D722086DB200530339 /* JSONReactiveAPI.swift */; };
 		D195F1E722086DB200530339 /* URLRequest+ReactiveAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = D195F1D922086DB200530339 /* URLRequest+ReactiveAPI.swift */; };
-		D195F1E822086DB200530339 /* Dictionary+compactMapValues.swift in Sources */ = {isa = PBXBuildFile; fileRef = D195F1DA22086DB200530339 /* Dictionary+compactMapValues.swift */; };
 		D195F1E922086DB200530339 /* Encodable+Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = D195F1DB22086DB200530339 /* Encodable+Dictionary.swift */; };
 		D195F1EA22086DB200530339 /* Array+CSV.swift in Sources */ = {isa = PBXBuildFile; fileRef = D195F1DC22086DB200530339 /* Array+CSV.swift */; };
 		D195F1EB22086DB200530339 /* ReactiveAPIError.swift in Sources */ = {isa = PBXBuildFile; fileRef = D195F1DD22086DB200530339 /* ReactiveAPIError.swift */; };
@@ -30,7 +29,6 @@
 		D195F1D622086DB100530339 /* ReactiveAPIRequestInterceptor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReactiveAPIRequestInterceptor.swift; sourceTree = "<group>"; };
 		D195F1D722086DB200530339 /* JSONReactiveAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONReactiveAPI.swift; sourceTree = "<group>"; };
 		D195F1D922086DB200530339 /* URLRequest+ReactiveAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "URLRequest+ReactiveAPI.swift"; sourceTree = "<group>"; };
-		D195F1DA22086DB200530339 /* Dictionary+compactMapValues.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Dictionary+compactMapValues.swift"; sourceTree = "<group>"; };
 		D195F1DB22086DB200530339 /* Encodable+Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Encodable+Dictionary.swift"; sourceTree = "<group>"; };
 		D195F1DC22086DB200530339 /* Array+CSV.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Array+CSV.swift"; sourceTree = "<group>"; };
 		D195F1DD22086DB200530339 /* ReactiveAPIError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReactiveAPIError.swift; sourceTree = "<group>"; };
@@ -101,7 +99,6 @@
 			isa = PBXGroup;
 			children = (
 				D195F1DC22086DB200530339 /* Array+CSV.swift */,
-				D195F1DA22086DB200530339 /* Dictionary+compactMapValues.swift */,
 				D195F1DB22086DB200530339 /* Encodable+Dictionary.swift */,
 				D195F1D922086DB200530339 /* URLRequest+ReactiveAPI.swift */,
 			);
@@ -204,7 +201,6 @@
 				D195F1F122086DB200530339 /* MaxAgeCache.swift in Sources */,
 				D195F1F022086DB200530339 /* ReactiveAPIDecoder.swift in Sources */,
 				D195F1E522086DB200530339 /* ReactiveAPIRequestInterceptor.swift in Sources */,
-				D195F1E822086DB200530339 /* Dictionary+compactMapValues.swift in Sources */,
 				D195F1E922086DB200530339 /* Encodable+Dictionary.swift in Sources */,
 				D195F1E622086DB200530339 /* JSONReactiveAPI.swift in Sources */,
 				D195F1EB22086DB200530339 /* ReactiveAPIError.swift in Sources */,

diff --git a/ReactiveAPI/Extensions/Array+CSV.swift b/ReactiveAPI/Extensions/Array+CSV.swift
@@ -2,6 +2,6 @@ import Foundation
 
 extension Array {
     public var csv: String {
-        return map { String(describing: $0) }.joined(separator: ",")
+        return compactMap { "\($0)" }.joined(separator: ",")
     }
 }
diff --git a/ReactiveAPI/Extensions/Dictionary+compactMapValues.swift b/ReactiveAPI/Extensions/Dictionary+compactMapValues.swift
diff --git a/ReactiveAPI/Extensions/URLRequest+ReactiveAPI.swift b/ReactiveAPI/Extensions/URLRequest+ReactiveAPI.swift
@@ -2,7 +2,10 @@ import Foundation
 
 extension URLRequest {
     public mutating func setHeaders(_ headers: [String: Any?]? = nil) {
-        headers?.forEach { setValue(String(describing: $1), forHTTPHeaderField: $0) }
+        headers?.compactMapValues({ $0 })
+            .forEach {
+                setValue("\($1)", forHTTPHeaderField: $0)
+        }
     }
 
     public static func createForJSON(with url: URL,
@@ -16,7 +19,7 @@ extension URLRequest {
         if let queryParams = queryParams {
                 urlComponents.queryItems = (urlComponents.queryItems ?? [URLQueryItem]()) + queryParams
                     .compactMapValues({ $0 })
-                    .compactMap({ URLQueryItem(name: $0, value: String(describing: $1)) })
+                    .compactMap({ URLQueryItem(name: $0, value: "\($1)") })
         }
 
         var request = URLRequest(url: urlComponents.url!)

diff --git a/ReactiveAPI/Info.plist b/ReactiveAPI/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.3</string>
+	<string>1.3.4</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

diff --git a/build b/build
@@ -0,0 +1,8 @@
+#!/bin/bash -e
+
+VERSION=$(cat "ReactiveAPI/Info.plist" | grep -A 1 "CFBundleShortVersionString" | tail -n 1 | tr '>' '\n' | tr '<' '\n' | head -n 3 | tail -n 1)
+
+rm -rf Carthage
+carthage bootstrap --platform iOS
+carthage build --archive
+hub release create -a ReactiveAPI.framework.zip -m "$VERSION" "$VERSION"