Error message improvements

Author: dethi

README.md

@@ -868,15 +868,15 @@ You can easily copy or rename an existing index using the `copy` and `move` comm
 
 ```swift
 // Rename MyIndex in MyIndexNewName
-client.moveIndex("MyIndex", dstIndexName: "MyIndexNewName", block: { (JSON, error) -> Void in
+client.moveIndex("MyIndex", to: "MyIndexNewName", block: { (JSON, error) -> Void in
 	if let error = error {
 		println("Move failure: \(error)")
 	} else {
 		println("Move success: \(JSON)")
 	}
 })
 // Copy MyIndex in MyIndexCopy
-client.copyIndex("MyIndex", dstIndexName: "MyIndexCopy", block: { (JSON, error) -> Void in
+client.copyIndex("MyIndex", to: "MyIndexCopy", block: { (JSON, error) -> Void in
 	if let error = error {
 		println("Copy failure: \(error)")
 	} else {

Source/Client.swift

@@ -161,7 +161,7 @@ public class Client {
     ///
     /// :param: srcIndexName the name of index to move.
     /// :param: dstIndexName the new index name that will contains sourceIndexName (destination will be overriten if it already exist).
-    public func moveIndex(srcIndexName: String, dstIndexName: String, block: CompletionHandler? = nil) {
+    public func moveIndex(srcIndexName: String, to dstIndexName: String, block: CompletionHandler? = nil) {
         let path = "1/indexes/\(srcIndexName.urlEncode())/operation"
         let request = [
             "destination": dstIndexName,
@@ -175,7 +175,7 @@ public class Client {
     ///
     /// :param: srcIndexName the name of index to copy.
     /// :param: dstIndexName the new index name that will contains a copy of sourceIndexName (destination will be overriten if it already exist).
-    public func copyIndex(srcIndexName: String, dstIndexName: String, block: CompletionHandler? = nil) {
+    public func copyIndex(srcIndexName: String, to dstIndexName: String, block: CompletionHandler? = nil) {
         let path = "1/indexes/\(srcIndexName.urlEncode())/operation"
         let request = [
             "destination": dstIndexName,
@@ -361,7 +361,8 @@ public class Client {
                     case 200, 201:
                         block(JSON: (data as [String: AnyObject]), error: nil)
                     case 400:
-                        block(JSON: nil, error: NSError(domain: "Bad request argument", code: 400, userInfo: nil))
+                        let errorMessage = data!["message"] as String
+                        block(JSON: nil, error: NSError(domain: "Bad request argument: \(errorMessage)", code: 400, userInfo: nil))
                     case 403:
                         block(JSON: nil, error: NSError(domain: "Invalid Application-ID or API-Key", code: 403, userInfo: nil))
                     case 404:

Tests/ClientTests.swift

@@ -115,7 +115,7 @@ class ClientTests: XCTestCase {
                     } else {
                         XCTAssertEqual(JSON!["status"] as String, "published", "Wait task failed")
 
-                        self.client.moveIndex(self.index.indexName, dstIndexName: "algol?à-swift2", block: { (JSON, error) -> Void in
+                        self.client.moveIndex(self.index.indexName, to: "algol?à-swift2", block: { (JSON, error) -> Void in
                             if let error = error {
                                 XCTFail("Error during moveIndex: \(error)")
                                 expecation.fulfill()
@@ -175,7 +175,7 @@ class ClientTests: XCTestCase {
                     } else {
                         XCTAssertEqual(JSON!["status"] as String, "published", "Wait task failed")
 
-                        self.client.copyIndex(self.index.indexName, dstIndexName: "algol?à-swift2", block: { (JSON, error) -> Void in
+                        self.client.copyIndex(self.index.indexName, to: "algol?à-swift2", block: { (JSON, error) -> Void in
                             if let error = error {
                                 XCTFail("Error during copyIndex: \(error)")
                                 expecation.fulfill()