Update more tests.

Author: NeoTeo

SwiftIpfsApi/HttpIo.swift

@@ -18,9 +18,8 @@ enum HttpIoError : Error {
 public struct HttpIo : NetworkIo {
 
     public func receiveFrom(_ source: String, completionHandler: @escaping (Data) throws -> Void) throws {
-        
         guard let url = URL(string: source) else { throw HttpIoError.urlError("Invalid URL") }
-        
+        print("HttpIo receiveFrom url is \(url)")
         let task = URLSession.shared.dataTask(with: url) {
             (data: Data?, response: URLResponse?, error: Error?) in
 

SwiftIpfsApi/IpfsApi.swift

@@ -80,9 +80,9 @@ extension IpfsApiClient {
                 return
             }
 
-//			print("The data:",NSString(data: data, encoding: String.Encoding.utf8.rawValue))
-//			let fixedData: Data = fixStreamJson(data)
-//			print("The fixed data:",NSString(data: fixedData, encoding: String.Encoding.utf8.rawValue))
+            print("The data:",NSString(data: data, encoding: String.Encoding.utf8.rawValue))
+            let fixedData: Data = fixStreamJson(data)
+            print("The fixed data:",NSString(data: fixedData, encoding: String.Encoding.utf8.rawValue))
 
 			var json: Any
 			do {
@@ -151,7 +151,6 @@ enum IpfsCmdString : String {
     case Path    = "Path"
     case Version = "Version"
     case Name    = "Name"
-    case Pinned  = "Pinned"
     case Keys    = "Keys"
     case Peers   = "Peers"
     case ID      = "ID"

SwiftIpfsApi/Subcommands/IpfsObject.swift

@@ -97,14 +97,45 @@ public class IpfsObject : ClientSubCommand {
         try parent!.fetchBytes("object/data?stream-channels=true&arg=" + b58String(hash), completionHandler: completionHandler)
     }
 
+//    public func patch(_ root: Multihash, cmd: ObjectPatchCommand, args: String..., completionHandler: @escaping (MerkleNode) throws -> Void) throws {
+//
+//        var request: String = "object/patch?arg=\(b58String(root))&arg=\(cmd.rawValue)&"
+//
+//        if cmd == .AddLink && args.count != 2 {
+//            throw IpfsApiError.ipfsObjectError("Wrong number of arguments to \(cmd.rawValue)")
+//        }
+//
+//        request += buildArgString(args)
+//
+//        try parent!.fetchJson(request) {
+//            result in
+//            try completionHandler(try merkleNodeFromJson2(result))
+//        }
+//    }
+    // change root to String ?
     public func patch(_ root: Multihash, cmd: ObjectPatchCommand, args: String..., completionHandler: @escaping (MerkleNode) throws -> Void) throws {
 
-        var request: String = "object/patch?arg=\(b58String(root))&arg=\(cmd.rawValue)&"
-        
-        if cmd == .AddLink && args.count != 2 {
-            throw IpfsApiError.ipfsObjectError("Wrong number of arguments to \(cmd.rawValue)")
+        var request: String = "object/patch"
+        switch cmd {
+        case .AddLink:
+            print("patch add link")
+            guard args.count == 2 else {
+                throw IpfsApiError.ipfsObjectError("Wrong number of arguments to \(cmd.rawValue)")
+            }
+            request += "/add-link"
+        case .RmLink:
+            print("patch remove link")
+            request += "/rm-link"
+        case .SetData:
+            print("patch set data")
+            request += "/set-data"
+        case .AppendData:
+            print("patch append data")
+            request += "/append-data"
         }
 
+        request += "?arg=\(b58String(root))&"
+        
         request += buildArgString(args)
 
         try parent!.fetchJson(request) {

SwiftIpfsApi/Subcommands/Name.swift

@@ -17,16 +17,40 @@ public class Name : ClientSubCommand {
 
     var parent: IpfsApiClient?
 
+    public enum NamePublishArgType {
+        case path
+        case resolve
+        case lifetime
+        case ttl
+        case key
+    }
+    
     public func publish(_ hash: Multihash, completionHandler: @escaping (JsonType) -> Void) throws {
         try self.publish(nil, hash: hash, completionHandler: completionHandler)
     }
 
     public func publish(_ id: String? = nil, hash: Multihash, completionHandler: @escaping (JsonType) -> Void) throws {
         var request = "name/publish?arg="
         if id != nil { request += id! + "&arg=" }
-        try parent!.fetchJson(request + "/ipfs/" + b58String(hash), completionHandler: completionHandler)
+//        try parent!.fetchJson(request + "/ipfs/" + b58String(hash), completionHandler: completionHandler)
+        try parent!.fetchJson(request + b58String(hash), completionHandler: completionHandler)
     }
 
+    public func publish(ipfsPath: String, args: [NamePublishArgType : Any]? = nil, completionHandler: @escaping (JsonType) -> Void) throws {
+        // strip the prefix
+//        let path = ipfsPath.replacingOccurrences(of: "/ipfs/", with: "")
+        let path = ipfsPath.replacingOccurrences(of: "/", with: "%2F")
+        var request = "name/publish?arg=\(path)"
+
+        
+        let lifetime = args?[.lifetime] ?? "24h"
+        let resolve = args?[.resolve] ?? "true"
+        
+        request += "&lifetime=\(lifetime)&resolve=\(resolve)"
+        
+        try parent!.fetchJson(request, completionHandler: completionHandler)
+    }
+
     public func resolve(_ hash: Multihash? = nil, completionHandler: @escaping (String) -> Void) throws {
 
         var request = "name/resolve"

SwiftIpfsApi/Subcommands/Pin.swift

@@ -19,7 +19,7 @@ public class Pin : ClientSubCommand {
         try parent!.fetchJson("pin/add?stream-channels=true&arg=\(b58String(hash))") {
             result in
 
-            guard let objects = result.object?[IpfsCmdString.Pinned.rawValue]?.array else {
+            guard let objects = result.object?["Pins"]?.array else {
                 throw IpfsApiError.pinError("Pin.add error: No Pinned objects in JSON data.")
             }
 
@@ -70,7 +70,7 @@ public class Pin : ClientSubCommand {
         try parent!.fetchJson("pin/rm?stream-channels=true&r=\(recursive)&arg=\(b58String(hash))") {
             result in
 
-            guard let objects = result.object?[IpfsCmdString.Pinned.rawValue]?.array else {
+            guard let objects = result.object?["Pins"]?.array else {
                 throw IpfsApiError.pinError("Pin.rm error: No Pinned objects in JSON data.")
             }