Merge branch 'release/v2.2.5'

gigigoapps · Dec 2, 2016 · 681485b · 681485b
2 parents e939721 + 72338a8
commit 681485b
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 12 deletions.
diff --git a/App/Network/SwiftRequestVC.swift b/App/Network/SwiftRequestVC.swift
@@ -54,8 +54,12 @@ class SwiftRequestVC: UIViewController {
 	@IBAction func onButtonImageDownloadTap(_ sender: AnyObject) {
 		Request(
 			method: "GET",
-			baseUrl: "http://api-discover-mcd.s.gigigoapps.com/media/image/qLXSBtDE/100/185/90",
+			baseUrl: "http://api-discover-mcd.s.gigigoapps.com/media/image/qLXSBtDE/100/185/90?query1=1&query2=2",
 			endpoint: "",
+			urlParams: [
+				"query2": "2",
+				"query3": "3"
+			],
 			verbose: true
 		)
 		.fetch(completionHandler: processResponse)

diff --git a/GIGLibraryFramework/Info.plist b/GIGLibraryFramework/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.3</string>
+	<string>2.2.5</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/GiGLibrary.xcodeproj/project.pbxproj b/GiGLibrary.xcodeproj/project.pbxproj
@@ -2379,11 +2379,11 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = 2.2.3;
+				CURRENT_PROJECT_VERSION = 2.2.5;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 2.1;
-				DYLIB_CURRENT_VERSION = 2.2.3;
+				DYLIB_CURRENT_VERSION = 2.2.5;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "$(SRCROOT)/GIGLibraryFramework/Info.plist";
@@ -2407,10 +2407,10 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = 2.2.3;
+				CURRENT_PROJECT_VERSION = 2.2.5;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 2.1;
-				DYLIB_CURRENT_VERSION = 2.2.3;
+				DYLIB_CURRENT_VERSION = 2.2.5;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "$(SRCROOT)/GIGLibraryFramework/Info.plist";

diff --git a/Source/GIGUtils/String/StyledString.swift b/Source/GIGUtils/String/StyledString.swift
@@ -142,7 +142,16 @@ public extension NSAttributedString {
 
     public convenience init?(fromHTML html: String) {
 
-        try? self.init(data: html.data(using: String.Encoding.utf8)!, options: [NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType,
+        let htmlData: Data
+
+        if let data = html.data(using: String.Encoding.utf8) {
+            htmlData = data
+        } else {
+            htmlData = Data()
+            LogWarn("Could not convert to data from: " + html)
+        }
+
+        try? self.init(data: htmlData, options: [NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType,
                                                                                 NSCharacterEncodingDocumentAttribute: String.Encoding.utf8.rawValue], documentAttributes: nil)
     }
 
@@ -189,7 +198,7 @@ public struct StyledString {
 
     // MARK: PRIVATE
 
-    func attributedStringFrom(styledStringFraction: StyledStringFraction, font:UIFont) -> NSAttributedString {
+    func attributedStringFrom(styledStringFraction: StyledStringFraction, font: UIFont) -> NSAttributedString {
 
         let currentString = styledStringFraction.string
         let currentStyle = styledStringFraction.styles
@@ -206,7 +215,7 @@ public struct StyledString {
             string.addAttribute(key, value:value, range: NSMakeRange(0, string.length))
 
             if (key == NSFontAttributeName) {
-                currentFont = style.value(forFont: currentFont) as! UIFont
+                currentFont = style.value(forFont: currentFont) as? UIFont ?? UIFont.systemFont(ofSize: 14)
             }
             return string
         }
@@ -308,9 +317,18 @@ public enum Style {
         case .backgroundColor(let color):
             return color
         case .size(let pointSize):
-            return UIFont(name: font.fontName, size: pointSize)!
+            if let font = UIFont(name: font.fontName, size: pointSize) {
+                return font
+            } else {
+                return UIFont.systemFont(ofSize: pointSize)
+            }
         case .fontName(let fontName):
-            return UIFont(name: fontName, size: font.pointSize)!
+            if let font = UIFont(name: fontName, size: font.pointSize) {
+                return font
+            } else {
+                LogWarn("Could not find font with name: " + fontName)
+                return UIFont.systemFont(ofSize: font.pointSize)
+            }
         case .font(let font):
             return font
         case .underline:

diff --git a/Source/SwiftNetwork/Request.swift b/Source/SwiftNetwork/Request.swift
@@ -108,10 +108,12 @@ open class Request: Selfie {
 		var url = URLComponents(string: self.baseURL)
 		url?.path = (url?.path)! + self.endpoint
 
-		url?.queryItems = self.urlParams?.map { key, value in
+		let urlParams = self.urlParams?.map { key, value in
 			URLQueryItem(name: key, value: String(describing: value))
 		}
 
+		url?.queryItems = concat(url?.queryItems, urlParams)
+
 		return url?.string ?? "NOT VALID URL"
 	}
 
@@ -151,3 +153,16 @@ open class Request: Selfie {
 	}
 
 }
+
+
+func concat(_ lhs: [URLQueryItem]?, _ rhs: [URLQueryItem]?) -> [URLQueryItem] {
+	guard let left = lhs else {
+		return rhs ?? []
+	}
+
+	guard let right = rhs else {
+		return left
+	}
+
+	return left + right
+}