Add search parameter to theme retrieval methods

Author: pmusolino

Sources/WordPressKit/Services/ThemeServiceRemote.h

@@ -58,6 +58,7 @@ typedef void(^ThemeServiceRemoteFailureBlock)(NSError *error);
  *  @details    Includes premium themes even if not purchased.  Don't call this method if the list
  *              you want to retrieve is for a specific blog.  Use getThemesForBlogId instead.
  *
+ *  @param      search      Search term for filtering themes. Cannot be nil.
  *  @param      freeOnly    Only fetch free themes, if false all WP themes will be returned
  *  @param      page        Results page to return.
  *  @param      success     The success handler.  Can be nil.
@@ -66,6 +67,7 @@ typedef void(^ThemeServiceRemoteFailureBlock)(NSError *error);
  *  @returns    A progress object that can be used to track progress and/or cancel the task
  */
 - (NSProgress *)getWPThemesPage:(NSInteger)page
+                         search:(NSString *)search
                        freeOnly:(BOOL)freeOnly
                         success:(ThemeServiceRemoteThemesRequestSuccessBlock)success
                         failure:(ThemeServiceRemoteFailureBlock)failure;
@@ -79,13 +81,15 @@ typedef void(^ThemeServiceRemoteFailureBlock)(NSError *error);
  *              this method and not getThemes.
  *
  *  @param      blogId      The ID of the blog to get the themes for.  Cannot be nil.
+ *  @param      search      Search term for filtering themes. Cannot be nil.
  *  @param      page        Results page to return.
  *  @param      success     The success handler.  Can be nil.
  *  @param      failure     The failure handler.  Can be nil.
  *
  *  @returns    A progress object that can be used to track progress and/or cancel the task
  */
 - (NSProgress *)getThemesForBlogId:(NSNumber *)blogId
+                            search:(NSString *)search
                               page:(NSInteger)page
                            success:(ThemeServiceRemoteThemesRequestSuccessBlock)success
                            failure:(ThemeServiceRemoteFailureBlock)failure;

Sources/WordPressKit/Services/ThemeServiceRemote.m

@@ -13,6 +13,8 @@
 static NSString* const ThemeRequestNumberKey = @"number";
 static NSInteger const ThemeRequestNumberValue = 50;
 static NSString* const ThemeRequestPageKey = @"page";
+static NSString* const ThemeRequestSearchKey = @"search";
+static NSString* const ThemeRequestFilterKey = @"filter";
 
 @implementation ThemeServiceRemote
 
@@ -98,19 +100,22 @@ - (NSProgress *)getThemeId:(NSString*)themeId
 }
 
 - (NSProgress *)getWPThemesPage:(NSInteger)page
+                         search:(NSString *)search
                        freeOnly:(BOOL)freeOnly
                         success:(ThemeServiceRemoteThemesRequestSuccessBlock)success
                         failure:(ThemeServiceRemoteFailureBlock)failure
 {
     NSParameterAssert(page > 0);
+    NSParameterAssert([search isKindOfClass:[NSString class]]);
 
     NSString *requestUrl = [self pathForEndpoint:@"themes"
                                      withVersion:WordPressComRESTAPIVersion_1_2];
 
     NSDictionary *parameters = @{ThemeRequestTierKey: freeOnly ? ThemeRequestTierFreeValue : ThemeRequestTierAllValue,
                                  ThemeRequestNumberKey: @(ThemeRequestNumberValue),
                                  ThemeRequestPageKey: @(page),
-                                 };
+                                 ThemeRequestSearchKey: search
+                                };
 
     return [self getThemesWithRequestUrl:requestUrl
                                     page:page
@@ -143,17 +148,20 @@ - (NSProgress *)getThemesPage:(NSInteger)page
 }
 
 - (NSProgress *)getThemesForBlogId:(NSNumber *)blogId
-                               page:(NSInteger)page
-                            success:(ThemeServiceRemoteThemesRequestSuccessBlock)success
-                            failure:(ThemeServiceRemoteFailureBlock)failure
+                            search:(NSString *)search
+                              page:(NSInteger)page
+                           success:(ThemeServiceRemoteThemesRequestSuccessBlock)success
+                           failure:(ThemeServiceRemoteFailureBlock)failure
 {
     NSParameterAssert([blogId isKindOfClass:[NSNumber class]]);
+    NSParameterAssert([search isKindOfClass:[NSString class]]);
     NSParameterAssert(page > 0);
 
     NSProgress *progress = [self getThemesForBlogId:blogId
                                                page:page
                                          apiVersion:WordPressComRESTAPIVersion_1_2
-                                             params:@{ThemeRequestTierKey: ThemeRequestTierAllValue}
+                                             params:@{ThemeRequestTierKey: ThemeRequestTierAllValue,
+                                                      ThemeRequestFilterKey: [NSString stringWithFormat:@"subject:%@", search]}
                                             success:success
                                             failure:failure];
 

Tests/WordPressKitTests/Tests/ThemeServiceRemoteTests.m

@@ -224,6 +224,7 @@ - (void)testThatGetThemesWorks
     }];
 
     XCTAssertNoThrow([service getWPThemesPage:1
+                                       search:@""
                                      freeOnly:NO
                                       success:successBlock
                                       failure:nil]);
@@ -268,9 +269,10 @@ - (void)testThatGetThemesForBlogIdWorks
     }];
 
     XCTAssertNoThrow([service getThemesForBlogId:blogId
-                                            page:1
-                                         success:successBlock
-                                         failure:nil]);
+                                          search:@""
+                                           page:1
+                                        success:successBlock
+                                        failure:nil]);
 }
 
 - (void)testThatGetThemesForBlogIdThrowsExceptionWithoutBlogId