Merge pull request #168 from contentful/bugfix/asset-url-scheme

Debug https not being prepending to urls always

.env

@@ -1 +1 @@
-CONTENTFUL_SDK_VERSION=1.0.0
+CONTENTFUL_SDK_VERSION=1.0.1

.envrc

@@ -1 +1 @@
-export CONTENFUL_SDK_VERSION=1.0.0
+export CONTENFUL_SDK_VERSION=1.0.1

CHANGELOG.md

@@ -10,7 +10,7 @@ This project adheres to [Semantic Versioning](http://semver.org/) starting from
 ## Table of contents
 
 #### 1.x Releases
-- `1.0.0` Releases - [1.0.0](#100)
+- `1.0.0` Releases - [1.0.0](#100) | [1.0.1](#101)
 - `1.0.0-betax` Releases - [1.0.0-beta1](#100-beta1) | [1.0.0-beta2](#100-beta2) | [1.0.0-beta3](#100-beta3) | [1.0.0-beta4](#100-beta4) | [1.0.0-beta5](#100-beta5)
 
 #### 0.x Releases
@@ -26,6 +26,14 @@ This project adheres to [Semantic Versioning](http://semver.org/) starting from
 
 ---
 
+## [`1.0.1`](https://github.com/contentful/contentful.swift/releases/tag/1.0.1)
+Released on 2017-01-31
+
+#### Fixed
+- `String` extension to generate an image url that didn't always prepend the "https" scheme to the url.
+
+---
+
 ## [`1.0.0`](https://github.com/contentful/contentful.swift/releases/tag/1.0.0)
 Released on 2017-01-25
 

Config.xcconfig

@@ -1 +1 @@
-CONTENTFUL_SDK_VERSION=1.0.0
+CONTENTFUL_SDK_VERSION=1.0.1

README.md

@@ -156,7 +156,7 @@ pod 'Contentful'
 You can specify a specific version of Contentful depending on your needs. To learn more about operators for dependency versioning within a Podfile, see the [CocoaPods doc on the Podfile][7].
 
 ```ruby
-pod 'Contentful', '~> 1.0.0'
+pod 'Contentful', '~> 1.0.1' 
 ```
 
 Note that for Swift 3 support (contentful.swift versions [`0.3.0` - `0.9.3`]) you will need to add a post-install script to your Podfile if installing with Cocoapods:
@@ -176,7 +176,7 @@ end
 You can also use [Carthage][8] for integration by adding the following to your `Cartfile`:
 
 ```
-github "contentful/contentful.swift" ~> 1.0.0
+github "contentful/contentful.swift" ~> 1.0.1
 ```
 
 ## License

Sources/Contentful/Asset.swift

@@ -8,13 +8,24 @@
 
 import Foundation
 
-public extension String {
+internal extension String {
 
     /**
      Will make a `URL` from the current `String` instance if possible.
      */
-    public func url() throws -> URL {
-        guard let url = URL(string: self) else { throw SDKError.invalidURL(string: self) }
+    internal func url() throws -> URL {
+        guard var urlComponents = URLComponents(string: self) else {
+            throw SDKError.invalidURL(string: self)
+        }
+
+        // Append https scheme if not present.
+        if urlComponents.scheme == nil {
+            urlComponents.scheme = "https"
+        }
+
+        guard let url = urlComponents.url else {
+            throw SDKError.invalidURL(string: self)
+        }
         return url
     }
 }

Sources/Contentful/ImageOptions.swift

@@ -63,10 +63,6 @@ public extension String {
             throw SDKError.invalidURL(string: urlString)
         }
 
-        if urlComponents.scheme == nil {
-            urlComponents.scheme = "https"
-        }
-
         urlComponents.queryItems = try imageOptions.flatMap { option in
             try option.urlQueryItems()
         }