Fixes #21

Sources/Squid/Core/Request/HttpRequest.swift

@@ -107,8 +107,9 @@ extension HttpRequest {
 
                     // 2) Modify request to carry all required data
                     do {
+                        let secure = request.usesSecureProtocol ?? service.usesSecureProtocol
                         httpRequest = try httpRequest
-                            .with(scheme: request.usesSecureProtocol ? "https" : "http")
+                            .with(scheme: secure ? "https" : "http")
                             .with(method: request.method)
                             .with(route: request.routes)
                             .with(query: request.query)
@@ -144,8 +145,9 @@ extension HttpRequest {
 
                     // 2) Modify request to carry all required data
                     do {
+                        let secure = request.usesSecureProtocol ?? service.usesSecureProtocol
                         httpRequest = try httpRequest
-                            .with(scheme: request.usesSecureProtocol ? "wss" : "ws")
+                            .with(scheme: secure ? "wss" : "ws")
                             .with(method: .get)
                             .with(route: request.routes)
                             .with(query: request.query)

Sources/Squid/Request/NetworkRequest.swift

@@ -14,8 +14,9 @@ public protocol NetworkRequest {
 
     // MARK: Protocol
     /// Whether the request makes use of the secure counterpart of the protocol (e.g. "https" for
-    /// HTTP requests, "wss" for WebSockets).
-    var usesSecureProtocol: Bool { get }
+    /// HTTP requests, "wss" for WebSockets). If this option is set, it overrides the option set on
+    /// the service it is scheduled against.
+    var usesSecureProtocol: Bool? { get }
 
     // MARK: URL Manipulation
     /// The routing paths of the request.
@@ -40,8 +41,8 @@ extension NetworkRequest {
 
     /// By default, this is set to `true`. Think twice before setting this to `false` and allowing
     /// insecure network requests.
-    public var usesSecureProtocol: Bool {
-        return true
+    public var usesSecureProtocol: Bool? {
+        return nil
     }
 
     /// By default, no routing paths are used.

Sources/Squid/Service/HttpService.swift

@@ -25,6 +25,10 @@ public protocol HttpService {
     /// contain the scheme (e.g. "https://") as it might get overwritten unexpectedly by a request.
     var apiUrl: UrlConvertible { get }
 
+    /// Whether requests scheduled against this service use secure protocols (e.g. "https" for HTTP
+    /// requests, "wss" for WebSockets).
+    var usesSecureProtocol: Bool { get }
+
     /// A header that ought to be used by all requests issued against the API represented by this
     /// HTTP service. Most commonly, this header contains fields such as the API key or some form
     /// of Authorization. Request headers always overwrite header fields set by the HTTP service
@@ -62,6 +66,11 @@ public protocol HttpService {
 
 extension HttpService {
 
+    /// By default, requests are secured.
+    public var usesSecureProtocol: Bool {
+        return true
+    }
+
     /// By default, the HTTP service does not set any headers.
     public var header: HttpHeader {
         return [:]

Squid.xcodeproj/project.pbxproj

@@ -522,7 +522,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1130;
-				LastUpgradeCheck = 1130;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = "Oliver Borchert";
 				TargetAttributes = {
 					C911D3C123E7C2560065CD7D = {
@@ -708,6 +708,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -771,6 +772,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;

Squid.xcodeproj/xcshareddata/xcschemes/Squid.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"