Merge remote-tracking branch 'origin/develop'

# Conflicts:
#	WordPressKit.podspec

Author: jkmassel

Podfile

@@ -9,7 +9,7 @@ plugin 'cocoapods-repo-update'
 def wordpresskit_pods
   pod 'Alamofire', '~> 4.7.3'
   pod 'CocoaLumberjack', '3.4.2'
-  pod 'WordPressShared', '~> 1.4'
+  pod 'WordPressShared', '~> 1.8.0-beta'
   pod 'NSObject-SafeExpectations', '~> 0.0.3'
   pod 'wpxmlrpc', '0.8.4'
   pod 'UIDeviceIdentifier', '~> 1.1.4'
@@ -30,5 +30,5 @@ target 'WordPressKitTests' do
   pod 'OHHTTPStubs', '6.1.0'
   pod 'OHHTTPStubs/Swift', '6.1.0'
   pod 'OCMock', '~> 3.4.2'
-  pod 'WordPressShared', '~> 1.4'
+  pod 'WordPressShared', '~> 1.8.0-beta'
 end

Podfile.lock

@@ -27,7 +27,7 @@ PODS:
   - OHHTTPStubs/Swift (6.1.0):
     - OHHTTPStubs/Default
   - UIDeviceIdentifier (1.1.4)
-  - WordPressShared (1.7.3):
+  - WordPressShared (1.8.0-beta.1):
     - CocoaLumberjack (~> 3.4)
     - FormatterKit/TimeIntervalFormatter (= 1.8.2)
   - wpxmlrpc (0.8.4)
@@ -40,7 +40,7 @@ DEPENDENCIES:
   - OHHTTPStubs (= 6.1.0)
   - OHHTTPStubs/Swift (= 6.1.0)
   - UIDeviceIdentifier (~> 1.1.4)
-  - WordPressShared (~> 1.4)
+  - WordPressShared (~> 1.8.0-beta)
   - wpxmlrpc (= 0.8.4)
 
 SPEC REPOS:
@@ -63,9 +63,9 @@ SPEC CHECKSUMS:
   OCMock: 43565190abc78977ad44a61c0d20d7f0784d35ab
   OHHTTPStubs: 1e21c7d2c084b8153fc53d48400d8919d2d432d0
   UIDeviceIdentifier: 8f8a24b257a4d978c8d40ad1e7355b944ffbfa8c
-  WordPressShared: 0853172642668b0fbf5c8d56e743896ebf9aae01
+  WordPressShared: c77c0fc4840d5694a1a684f8c541224dfdb147f2
   wpxmlrpc: 6ba55c773cfa27083ae4a2173e69b19f46da98e2
 
-PODFILE CHECKSUM: 2d40a9a3484ab5030d6ddd135b604a0be90271c8
+PODFILE CHECKSUM: db3bdf0c001097977876ad82d356303ac06e4c81
 
 COCOAPODS: 1.6.1

WordPressKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressKit"
-  s.version       = "4.1.0"
+  s.version       = "4.1.1"
   s.summary       = "WordPressKit offers a clean and simple WordPress.com and WordPress.org API."
 
   s.description   = <<-DESC
@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
 
   s.dependency 'Alamofire', '~> 4.7.3'
   s.dependency 'CocoaLumberjack', '~> 3.4'
-  s.dependency 'WordPressShared', '~> 1.4'
+  s.dependency 'WordPressShared', '~> 1.8.0'
   s.dependency 'NSObject-SafeExpectations', '0.0.3'
   s.dependency 'wpxmlrpc', '0.8.4'
   s.dependency 'UIDeviceIdentifier', '~> 1.1.4'

WordPressKit/PostServiceRemoteREST.h

@@ -24,4 +24,19 @@
            success:(void (^)(RemotePost *))success
            failure:(void (^)(NSError *))failure;
 
+/**
+ *  @brief      Saves a post.
+ *
+ *
+ *  @discussion Drafts and auto-drafts are just overwritten by autosave for the same
+                user if the post is not locked.
+ *              Non drafts or other users drafts are not overwritten.
+ *  @param      post        The post to save.  Cannot be nil.
+ *  @param      success     The block that will be executed on success.  Can be nil.
+ *  @param      failure     The block that will be executed on failure.  Can be nil.
+ */
+- (void)autoSave:(RemotePost *)post
+         success:(void (^)(RemotePost *post, NSString *previewURL))success
+         failure:(void (^)(NSError *error))failure;
+
 @end

WordPressKit/PostServiceRemoteREST.m

@@ -183,6 +183,33 @@ - (void)updatePost:(RemotePost *)post
            }];
 }
 
+- (void)autoSave:(RemotePost *)post
+         success:(void (^)(RemotePost *, NSString *))success
+         failure:(void (^)(NSError *))failure
+{
+    NSParameterAssert([post isKindOfClass:[RemotePost class]]);
+    
+    NSString *path = [NSString stringWithFormat:@"sites/%@/posts/%@/autosave", self.siteID, post.postID];
+    NSString *requestUrl = [self pathForEndpoint:path
+                                     withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
+    
+    NSDictionary *parameters = [self parametersWithRemotePost:post];
+    
+    [self.wordPressComRestApi POST:requestUrl
+                        parameters:parameters
+                           success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
+                               RemotePost *post = [self remotePostFromJSONDictionary:responseObject];
+                               NSString *previewURL = responseObject[@"preview_URL"];
+                               if (success) {
+                                   success(post, previewURL);
+                               }
+                           } failure:^(NSError *error, NSHTTPURLResponse *httpResponse) {
+                               if (failure) {
+                                   failure(error);
+                               }
+                           }];
+}
+
 - (void)deletePost:(RemotePost *)post
            success:(void (^)(void))success
            failure:(void (^)(NSError *))failure

WordPressKitTests/PostServiceRemoteRESTTests.m

@@ -218,6 +218,51 @@ - (void)testThatUpdatePostThrowsExceptionWithoutPost
                                 failure:^(NSError *error) {}]);
 }
 
+#pragma mark - Autosaving posts
+
+- (void)testThatAutoSavePostWorks
+{
+    NSNumber *dotComID = @10;
+    WordPressComRestApi *api = OCMStrictClassMock([WordPressComRestApi class]);
+    PostServiceRemoteREST *service = nil;
+    
+    RemotePost *post = OCMClassMock([RemotePost class]);
+    OCMStub([post postID]).andReturn(@1);
+    OCMStub([post title]).andReturn(@"Title");
+    OCMStub([post content]).andReturn(@"Content");
+    OCMStub([post status]).andReturn(@"Status");
+    OCMStub([post password]).andReturn(@"Password");
+    OCMStub([post type]).andReturn(@"Type");
+    OCMStub([post metadata]).andReturn(@[]);
+    OCMStub([post isStickyPost]).andReturn(@0);
+    OCMStub([post parentID]).andReturn(nil);
+    
+    XCTAssertNoThrow(service = [[PostServiceRemoteREST alloc] initWithWordPressComRestApi:api siteID:dotComID]);
+    
+    NSString *endpoint = [NSString stringWithFormat:@"sites/%@/posts/%@/autosave", dotComID, post.postID];
+    NSString *url = [service pathForEndpoint:endpoint
+                                 withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
+    
+    OCMStub([api POST:[OCMArg isEqual:url]
+           parameters:[OCMArg isKindOfClass:[NSDictionary class]]
+              success:[OCMArg isNotNil]
+              failure:[OCMArg isNotNil]]);
+    
+    [service autoSave:post
+                success:^(RemotePost *post, NSString *previewURL) {}
+                failure:^(NSError *error) {}];
+}
+
+- (void)testThatAutoSavePostThrowsExceptionWithoutPost
+{
+    PostServiceRemoteREST *service = nil;
+    
+    XCTAssertNoThrow(service = [self service]);
+    XCTAssertThrows([service autoSave:nil
+                                success:^(RemotePost *post, NSString *previewURL) {}
+                                failure:^(NSError *error) {}]);
+}
+
 #pragma mark - Deleting posts
 
 - (void)testThatDeletePostWorks