Update dag command to actually use dag over block

Make MerkleNode accept JS formatted Cids

Author: ianopolous

src/main/java/io/ipfs/api/IPFS.java

@@ -40,7 +40,7 @@ public enum PinType {all, direct, indirect, recursive}
     public final Stats stats = new Stats();
     public final Name name = new Name();
     public final Pubsub pubsub = new Pubsub();
-    
+
     public IPFS(String host, int port) {
         this(host, port, "/api/v0/", false);
     }
@@ -56,13 +56,13 @@ public IPFS(MultiAddress addr) {
     public IPFS(String host, int port, String version, boolean ssl) {
         this.host = host;
         this.port = port;
-        
+
         if(ssl) {
             this.protocol = "https";
         } else {
             this.protocol = "http";
         }
-        
+
         this.version = version;
         // Check IPFS is sufficiently recent
         try {
@@ -73,7 +73,7 @@ public IPFS(String host, int port, String version, boolean ssl) {
             throw new RuntimeException(e);
         }
     }
-    
+
     public List<MerkleNode> add(NamedStreamable file) throws IOException {
         return add(file, false);
     }
@@ -493,7 +493,7 @@ public Map disconnect(String multiAddr) throws IOException {
 
     public class Dag {
         public byte[] get(Cid cid) throws IOException {
-            return retrieve("block/get?stream-channels=true&arg=" + cid);
+            return retrieve("dag/get?stream-channels=true&arg=" + cid);
         }
 
         public MerkleNode put(byte[] object) throws IOException {
@@ -509,9 +509,8 @@ public MerkleNode put(byte[] object, String outputFormat) throws IOException {
         }
 
         public MerkleNode put(String inputFormat, byte[] object, String outputFormat) throws IOException {
-            block.put(Arrays.asList(object));
-            String prefix = protocol +"://" + host + ":" + port + version;
-            Multipart m = new Multipart(prefix + "block/put/?stream-channels=true&input-enc=" + inputFormat + "&f=" + outputFormat, "UTF-8");
+            String prefix = protocol + "://" + host + ":" + port + version;
+            Multipart m = new Multipart(prefix + "dag/put/?stream-channels=true&input-enc=" + inputFormat + "&f=" + outputFormat, "UTF-8");
             m.addFilePart("file", Paths.get(""), new NamedStreamable.ByteArrayWrapper(object));
             String res = m.finish();
             return MerkleNode.fromJSON(JSONParser.parse(res));
@@ -724,7 +723,7 @@ private static final byte[] readFully(InputStream in) throws IOException {
             resp.write(buf, 0, r);
         return resp.toByteArray();
     }
-    
+
     private static boolean detectSSL(MultiAddress multiaddress) {
         return multiaddress.toString().contains("/https");
     }

src/main/java/io/ipfs/api/MerkleNode.java

@@ -60,6 +60,8 @@ public static MerkleNode fromJSON(Object rawjson) {
         String hash = (String)json.get("Hash");
         if (hash == null)
             hash = (String)json.get("Key");
+        if (hash == null)
+            hash = (String)(((Map)json.get("Cid")).get("/"));
         Optional<String> name = json.containsKey("Name") ?
                 Optional.of((String) json.get("Name")) :
                 Optional.empty();

src/test/java/io/ipfs/api/APITest.java

@@ -381,6 +381,27 @@ public void bulkBlockTest() throws IOException {
         System.out.println();
     }
 
+    @Test
+    public void publish() throws Exception {
+        // JSON document
+        String json = "{\"name\":\"blogpost\",\"documents\":[]}";
+
+        // Add a DAG node to IPFS
+        MerkleNode merkleNode = ipfs.dag.put("json", json.getBytes());
+        Assert.assertEquals("expected to be zdpuAknRh1Kro2r2xBDKiXyTiwA3Nu5XcmvjRPA1VNjH41NF7" , "zdpuAknRh1Kro2r2xBDKiXyTiwA3Nu5XcmvjRPA1VNjH41NF7", merkleNode.hash.toString());
+
+        // Get a DAG node
+        byte[] res = ipfs.dag.get((Cid) merkleNode.hash);
+        Assert.assertEquals("Should be equals", JSONParser.parse(json), JSONParser.parse(new String(res)));
+
+        // Publish to IPNS
+        Map result = ipfs.name.publish(merkleNode.hash);
+
+        // Resolve from IPNS
+        String resolved = ipfs.name.resolve(Multihash.fromBase58((String) result.get("Name")));
+        Assert.assertEquals("Should be equals", resolved, "/ipfs/" + merkleNode.hash.toString());
+    }
+
     @Test
     public void pubsubSynchronous() throws Exception {
         String topic = "topic" + System.nanoTime();