Merge pull request #287 from bustoutsolutions/1.4.3

1.4.3

.travis.yml

@@ -5,7 +5,7 @@ branches:
 
 language: objective-c
 os: osx
-osx_image: xcode10
+osx_image: xcode10.1
 env:
   - scheme='Siesta macOS' platform='OS X'
   - scheme='Siesta iOS'   platform='iOS Simulator' ios_version='12.0'   ios_device='iPhone XR'

Cartfile.resolved

@@ -1,4 +1,4 @@
-github "Alamofire/Alamofire" "4.7.3"
-github "Quick/Nimble" "v7.3.1"
+github "Alamofire/Alamofire" "4.8.1"
+github "Quick/Nimble" "v8.0.1"
 github "pcantrell/Nocilla" "bd7ec7caa0576f08c00bbbf993a9204f93be16e3"
 github "pcantrell/Quick" "eeaddb112fc486b1e3699a5985e6a68dd5bc56d8"

Examples/GithubBrowser/GithubBrowser.xcodeproj/project.pbxproj

@@ -251,7 +251,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-GithubBrowser/Pods-GithubBrowser-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-GithubBrowser/Pods-GithubBrowser-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/Siesta/Siesta.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
@@ -260,7 +260,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GithubBrowser/Pods-GithubBrowser-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GithubBrowser/Pods-GithubBrowser-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

Examples/GithubBrowser/Podfile.lock

@@ -1,6 +1,6 @@
 PODS:
-  - Siesta/Core (1.4.2)
-  - Siesta/UI (1.4.2):
+  - Siesta/Core (1.4.3)
+  - Siesta/UI (1.4.3):
     - Siesta/Core
 
 DEPENDENCIES:
@@ -11,8 +11,8 @@ EXTERNAL SOURCES:
     :path: "../.."
 
 SPEC CHECKSUMS:
-  Siesta: 7e2d45576418ec5628948e35883d6b68edc146c7
+  Siesta: 1a4145880521005f6df9835c73358b3476951c6e
 
 PODFILE CHECKSUM: ae415ad9ad375272eab63ab45853da2148a7aa21
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.6.0.beta.1

README.md

@@ -13,7 +13,7 @@ Drastically simplifies app code by providing a client-side cache of observable m
 
 * **OS:** iOS 8+, macOS 10.11+
 * **Languages:** Written in Swift, supports apps in both Swift and Objective-C
-* **Tool requirements:** Xcode 9, Swift 4 (See `swift-2.x` and `swift-3` branches for legacy support)
+* **Tool requirements:** Xcode 10, Swift 4 (See `swift-2.x` and `swift-3` branches for legacy support)
 * **License:** MIT
 
 ## Table of Contents
@@ -120,7 +120,7 @@ _…in that order of priority._
 
 ## Installation
 
-Siesta requires Swift 4, so make sure you have [Xcode 9](https://developer.apple.com/xcode/downloads/). (Use the `swift-2.x` branches if you haven’t made the big migration yet.)
+Siesta requires Swift 4 and Xcode 10. (Use the `swift-2.x` and `swift-3` branches if you are still on an older version.)
 
 ### CocoaPods
 

Siesta.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "Siesta"
-  s.version      = "1.4.2"
+  s.version      = "1.4.3"
   s.summary      = "Swift REST client library"
 
   s.description  = <<-DESC
@@ -69,7 +69,7 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = "8.0"
   s.osx.deployment_target = "10.11"
 
-  s.source = { :git => "https://github.com/bustoutsolutions/siesta.git", :tag => "1.4.2" }
+  s.source = { :git => "https://github.com/bustoutsolutions/siesta.git", :tag => "1.4.3" }
 
   s.subspec "Core" do |s|
     s.source_files = "Source/Siesta/**/*"

Tests/Functional/ResponseDataHandlingSpec.swift

@@ -192,14 +192,17 @@ class ResponseDataHandlingSpec: ResourceSpecBase
                 service().configureTransformer("**", atStage: .parsing)
                     { try JSONSerialization.jsonObject(with: $0.content as Data, options: [.allowFragments]) }
 
-                for atom in ["17", "\"foo\"", "null"]
+                func expectJson<T: Equatable>(_ atom: String, toParseAs expectedValue: T)
                     {
                     _ = stubRequest(resource, "GET").andReturn(200)
                         .withHeader("Content-Type", "application/json")
                         .withBody(atom as NSString)
                     awaitNewData(resource().load())
-                    print(resource().latestData?.content)
+                    expect(resource().latestData?.content as? T) == expectedValue
                     }
+                expectJson("17",      toParseAs: 17)
+                expectJson("\"foo\"", toParseAs: "foo")
+                expectJson("null",    toParseAs: NSNull())
                 }
 
             it("transforms error responses")