Merge pull request #94 from contentful/bugfix/swapped-sync-spaces

Always send diffs to persistence integration after a sync page fetched

.env

@@ -1 +1 @@
-CONTENTFUL_SDK_VERSION=0.7.2
+CONTENTFUL_SDK_VERSION=0.7.3

.envrc

@@ -1 +1 @@
-export CONTENFUL_SDK_VERSION=0.7.2
+export CONTENFUL_SDK_VERSION=0.7.3

CHANGELOG.md

@@ -10,14 +10,22 @@ This project adheres to [Semantic Versioning](http://semver.org/) starting from
 ## Table of contents
 
 #### 0.x Releases
-- `0.7.x` Releases - [0.7.0](#070) | [0.7.1](#071) | [0.7.2](#072)
+- `0.7.x` Releases - [0.7.0](#070) | [0.7.1](#071) | [0.7.2](#072)) | [0.7.3](#073)
 - `0.6.x` Releases - [0.6.0](#060) | [0.6.1](#061)
 - `0.5.x` Releases - [0.5.0](#050)
 - `0.4.x` Releases - [0.4.0](#040) | [0.4.1](#041)
 - `0.3.x` Releases - [0.3.0](#030) | [0.3.1](#031)
 
 ---
 
+## [`0.7.3`](https://github.com/contentful/contentful.swift/releases/tag/0.7.3)
+Released on 2017-07-17
+
+#### Fixed
+- Delta messages from `/sync` endpoint were only being sent for last page when a sync was returned on multiple pages.
+
+---
+
 ## [`0.7.2`](https://github.com/contentful/contentful.swift/releases/tag/0.7.2)
 Released on 2017-07-12
 

Config.xcconfig

@@ -1 +1 @@
-CONTENTFUL_SDK_VERSION=0.7.2
+CONTENTFUL_SDK_VERSION=0.7.3

README.md

@@ -80,7 +80,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', '~> 0.7.2' 
+pod 'Contentful', '~> 0.7.3' 
 ```
 
 Note that for Swift 2.3 support (contentful.swift `v0.2.3`) you will need to add a post-install script to your Podfile if installing with Cocoapods:
@@ -100,7 +100,7 @@ end
 You can also use [Carthage][8] for integration by adding the following to your `Cartfile`:
 
 ```
-github "contentful/contentful.swift" ~> 0.7.2
+github "contentful/contentful.swift" ~> 0.7.3
 ```
 
 ## License

Sources/Client.swift

@@ -694,7 +694,7 @@ extension Client {
 
                 // Send messages to persistence layer about the diffs (pre-merge state).
                 // Must send messages for the first sync space that was originally passed in.
-                self.sendDiffMessagesToPersistenceIntegration(for: syncSpace, resolvingLinksWith: newSyncSpace)
+                self.sendDiffMessagesToPersistenceIntegration(for: newSyncSpace, resolvingLinksWith: syncSpace)
                 syncSpace.updateWithDiffs(from: newSyncSpace)
 
                 completion(Result.success(syncSpace))
@@ -743,13 +743,16 @@ extension Client {
     fileprivate func sync(matching: [String: Any] = [:], completion: @escaping ResultsHandler<SyncSpace>) -> URLSessionDataTask? {
 
         return fetch(url: URL(forComponent: "sync", parameters: matching)) { (result: Result<SyncSpace>) in
+
             if let syncSpace = result.value {
 
+                // Whenever we get a page, send the diffs to the persistence integration.
+                self.sendDiffMessagesToPersistenceIntegration(for: syncSpace, resolvingLinksWith: nil)
+
                 if syncSpace.hasMorePages == true { // multipage sync.
                     self.nextSync(for: syncSpace, matching: matching, completion: completion)
                 } else {
-                    // Either a single page sync, or, in the recursive case of a multipage sync, the last page.
-                    self.sendDiffMessagesToPersistenceIntegration(for: syncSpace, resolvingLinksWith: nil)
+                    // Merge all the sync spaces together.
                     completion(Result.success(syncSpace))
                 }
             } else {