Swift Corrections

Updated accessibility on WebAPI static structs; Corrected NSNull
checking on NSBundle.

Author: Richard Piazza

CodeQuickKit-Swift/NSBundle.swift

@@ -121,22 +121,22 @@ public extension NSBundle {
 
     public func moduleClass(forClassNamed classNamed: String) -> AnyClass {
         var moduleClass: AnyClass? = NSClassFromString(classNamed)
-        if moduleClass != nil {
+        if moduleClass != nil && moduleClass != NSNull.self {
             return moduleClass!
         }
 
         if let prefix = bundleDisplayName {
             let underscored = prefix.stringByReplacingOccurrencesOfString(" " , withString: "_")
             moduleClass = NSClassFromString("\(underscored).\(classNamed)")
-            if moduleClass != nil {
+            if moduleClass != nil && moduleClass != NSNull.self {
                 return moduleClass!
             }
         }
 
         if let prefix = bundleName {
             let underscored = prefix.stringByReplacingOccurrencesOfString(" " , withString: "_")
             moduleClass = NSClassFromString("\(underscored).\(classNamed)")
-            if moduleClass != nil {
+            if moduleClass != nil && moduleClass != NSNull.self {
                 return moduleClass!
             }
         }
@@ -146,7 +146,7 @@ public extension NSBundle {
 
     public func singularizedModuleClass(forClassNamed classNamed: String) -> AnyClass {
         var moduleClass: AnyClass? = self.moduleClass(forClassNamed: classNamed)
-        if moduleClass != nil {
+        if moduleClass != nil && moduleClass != NSNull.self {
             return moduleClass!
         }
 
@@ -160,7 +160,7 @@ public extension NSBundle {
         }
 
         moduleClass = self.moduleClass(forClassNamed: singular)
-        if moduleClass != nil {
+        if moduleClass != nil && moduleClass != NSNull.self {
             return moduleClass!
         }
 

CodeQuickKit-Swift/WebAPI.swift

@@ -37,17 +37,17 @@ public enum WebAPIRequestMethod: String {
 }
 
 public struct WebAPIHeaderKey {
-    static let Accept = "Accept"
-    static let Date = "Date"
-    static let ContentType = "Content-Type"
-    static let ContentMD5 = "Content-MD5"
-    static let ContentLength = "Content-Length"
-    static let Authorization = "Authorization"
+    public static let Accept = "Accept"
+    public static let Date = "Date"
+    public static let ContentType = "Content-Type"
+    public static let ContentMD5 = "Content-MD5"
+    public static let ContentLength = "Content-Length"
+    public static let Authorization = "Authorization"
 }
 
 public struct WebAPIHeaderValue {
-    static let ApplicationJson = "application/json"
-    static let ImagePNG = "image/png"
+    public static let ApplicationJson = "application/json"
+    public static let ImagePNG = "image/png"
 }
 
 public struct WebAPIInjectedResponse {
@@ -104,7 +104,7 @@ public class WebAPI {
     public var baseURL: NSURL?
     public var injectedResponses: [String : WebAPIInjectedResponse] = [String : WebAPIInjectedResponse]()
     public var sessionDelegate: NSURLSessionDelegate?
-    private lazy var session: NSURLSession = {
+    public lazy var session: NSURLSession = {
         [unowned self] in
         let configuration = NSURLSessionConfiguration.defaultSessionConfiguration()
         return NSURLSession(configuration: configuration, delegate: self.sessionDelegate, delegateQueue: nil)
@@ -117,19 +117,19 @@ public class WebAPI {
 
     // MARK: - Convenience Methods
 
-    public final func get(path: String, queryItems: [NSURLQueryItem]?, completion: WebAPICompletion) {
+    public final func get(path: String, queryItems: [NSURLQueryItem]? = nil, completion: WebAPICompletion) {
         execute(path, queryItems: queryItems, method: .Get, data: nil, completion: completion)
     }
 
-    public final func put(data: NSData?, path: String, queryItems: [NSURLQueryItem]?, completion: WebAPICompletion) {
+    public final func put(data: NSData?, path: String, queryItems: [NSURLQueryItem]? = nil, completion: WebAPICompletion) {
         execute(path, queryItems: queryItems, method: .Put, data: data, completion: completion)
     }
 
-    public final func post(data: NSData?, path: String, queryItems: [NSURLQueryItem]?, completion: WebAPICompletion) {
+    public final func post(data: NSData?, path: String, queryItems: [NSURLQueryItem]? = nil, completion: WebAPICompletion) {
         execute(path, queryItems: queryItems, method: .Post, data: data, completion: completion)
     }
 
-    public final func delete(path: String, queryItems: [NSURLQueryItem]?, completion: WebAPICompletion) {
+    public final func delete(path: String, queryItems: [NSURLQueryItem]? = nil, completion: WebAPICompletion) {
         execute(path, queryItems: queryItems, method: .Delete, data: nil, completion: completion)
     }
 

CodeQuickKit.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "CodeQuickKit"
-  s.version          = "2.0.1"
+  s.version          = "2.0.2"
   s.summary          = "An iOS Library simplifying some everyday tasks."
   s.description      = <<-DESC
   CodeQuickKit is a collection of Swift extensions and classes designed to