use object tests from interface-ipfs-core

daviddias · daviddias · commit 11a75d17d637 · 2016-05-12T16:58:02.000+01:00
diff --git a/package.json b/package.json
@@ -9,6 +9,7 @@
     "detect-node": "^2.0.3",
     "flatmap": "0.0.3",
     "glob": "^7.0.3",
+    "ipfs-merkle-dag": "^0.5.1",
     "multiaddr": "^1.3.0",
     "multipart-stream": "^2.0.1",
     "ndjson": "^1.4.3",
@@ -93,4 +94,4 @@
       }
     }
   }
-}
+}
diff --git a/src/api/object.js b/src/api/object.js
@@ -1,15 +1,71 @@
 'use strict'
 
 const argCommand = require('../cmd-helpers').argCommand
+const DAGNode = require('ipfs-merkle-dag').DAGNode
 
 module.exports = (send) => {
   return {
     get: argCommand(send, 'object/get'),
-    put (file, encoding, cb) {
-      if (typeof encoding === 'function') {
-        return cb(null, new Error("Must specify an object encoding ('json' or 'protobuf')"))
+    put (obj, options, callback) {
+      if (typeof options === 'function') {
+        callback = options
+        options = {}
       }
-      return send('object/put', encoding, null, file, cb)
+      if (!options) {
+        options = {}
+      }
+
+      let tmpObj = {
+        Data: null,
+        Links: []
+      }
+
+      if (Buffer.isBuffer(obj)) {
+        if (!options.enc) {
+          tmpObj = { Data: obj.toString(), Links: [] }
+        } else {
+          tmpObj = JSON.parse(obj.toString())
+        }
+      } else if (obj.multihash) {
+        tmpObj = {
+          Data: obj.data.toString(),
+          Links: obj.links.map((l) => { return l.toJSON() })
+        }
+      } else if (typeof obj === 'object') {
+        tmpObj.Data = obj.Data.toString()
+      } else {
+        return callback(new Error('obj not recognized'))
+      }
+
+      const buf = new Buffer(JSON.stringify(tmpObj))
+      const enc = options.enc || 'json'
+
+      return send('object/put', enc, null, buf, (err, result) => {
+        if (err) {
+          return callback(err)
+        }
+
+        if (Buffer.isBuffer(obj)) {
+          if (!options.enc) {
+            obj = { Data: obj, Links: [] }
+          } else {
+            obj = JSON.parse(obj.toString())
+          }
+        }
+        let node
+        if (obj.multihash) {
+          node = obj
+          console.log('->', node)
+        } else {
+          node = new DAGNode(obj.Data, obj.Links)
+        }
+
+        if (node.toJSON().Hash !== result.Hash) {
+          return callback(new Error('Stored object was different from constructed object'))
+        }
+
+        callback(null, node)
+      })
     },
     data: argCommand(send, 'object/data'),
     links: argCommand(send, 'object/links'),
diff --git a/test/api/object.spec.js b/test/api/object.spec.js
@@ -1,237 +1,17 @@
 /* eslint-env mocha */
 /* globals apiClients */
-'use strict'
-
-const expect = require('chai').expect
-
-describe('.object', () => {
-  const testObject = Buffer(JSON.stringify({Data: 'testdata', Links: []}))
-  const testObjectHash = 'QmPTkMuuL6PD8L2SwTwbcs1NPg14U8mRzerB1ZrrBrkSDD'
-  const testPatchObject = Buffer(JSON.stringify({Data: 'new test data'}))
-  const testPatchObjectHash = 'QmWJDtdQWQSajQPx1UVAGWKaSGrHVWdjnrNhbooHP7LuF2'
-
-  it('object.put', (done) => {
-    apiClients.a.object.put(testObject, 'json', (err, res) => {
-      expect(err).to.not.exist
-      expect(res).to.have.a.property('Hash', testObjectHash)
-      expect(res.Links).to.be.empty
-      done()
-    })
-  })
-
-  it('object.get', (done) => {
-    apiClients.a.object.get(testObjectHash, (err, res) => {
-      expect(err).to.not.exist
-      expect(res).to.have.a.property('Data', 'testdata')
-      expect(res.Links).to.be.empty
-      done()
-    })
-  })
-
-  it('object.data', (done) => {
-    apiClients.a.object.data(testObjectHash, (err, res) => {
-      expect(err).to.not.exist
-
-      let buf = ''
-      res
-        .on('error', (err) => {
-          expect(err).to.not.exist
-        })
-        .on('data', (data) => {
-          buf += data
-        })
-        .on('end', () => {
-          expect(buf).to.equal('testdata')
-          done()
-        })
-    })
-  })
-
-  it('object.stat', (done) => {
-    apiClients.a.object.stat(testObjectHash, (err, res) => {
-      expect(err).to.not.exist
-      expect(res).to.be.eql({
-        Hash: 'QmPTkMuuL6PD8L2SwTwbcs1NPg14U8mRzerB1ZrrBrkSDD',
-        NumLinks: 0,
-        BlockSize: 10,
-        LinksSize: 2,
-        DataSize: 8,
-        CumulativeSize: 10
-      })
-      done()
-    })
-  })
-
-  it('object.links', (done) => {
-    apiClients.a.object.links(testObjectHash, (err, res) => {
-      expect(err).to.not.exist
 
-      expect(res).to.be.eql({
-        Hash: 'QmPTkMuuL6PD8L2SwTwbcs1NPg14U8mRzerB1ZrrBrkSDD'
-      })
-      done()
-    })
-  })
-
-  describe('object.patch', () => {
-    before((done) => {
-      apiClients.a.object.put(testPatchObject, 'json', (err, res) => {
-        expect(err).to.not.exist
-        done()
-      })
-    })
-
-    it('.addLink', (done) => {
-      apiClients.a.object.patch
-        .addLink(testObjectHash, 'next', testPatchObjectHash, (err, res) => {
-          expect(err).to.not.exist
-          expect(res).to.be.eql({
-            Hash: 'QmZFdJ3CQsY4kkyQtjoUo8oAzsEs5BNguxBhp8sjQMpgkd'
-          })
-          apiClients.a.object.get(res.Hash, (err, res) => {
-            expect(err).to.not.exist
-            expect(res).to.be.eql({
-              Data: 'testdata',
-              Links: [{
-                Name: 'next',
-                Hash: 'QmWJDtdQWQSajQPx1UVAGWKaSGrHVWdjnrNhbooHP7LuF2',
-                Size: 15
-              }]
-            })
-            done()
-          })
-        })
-    })
-
-    it('.rmLink', (done) => {
-      apiClients.a.object.patch
-        .rmLink('QmZFdJ3CQsY4kkyQtjoUo8oAzsEs5BNguxBhp8sjQMpgkd', 'next', (err, res) => {
-          expect(err).to.not.exist
-          expect(res).to.be.eql({
-            Hash: testObjectHash
-          })
-          apiClients.a.object.get(res.Hash, (err, res) => {
-            expect(err).to.not.exist
-            expect(res).to.be.eql({
-              Data: 'testdata',
-              Links: []
-            })
-            done()
-          })
-        })
-    })
-
-    it('.appendData', (done) => {
-      apiClients.a.object.patch
-        .appendData(testObjectHash, new Buffer(' hello'), (err, res) => {
-          expect(err).to.not.exist
-          expect(res).to.be.eql({
-            Hash: 'Qmcjhr2QztQxCAoEf8tJPTGTVkTsUrTQ36JurH14DNYNsc'
-          })
-          apiClients.a.object.get(res.Hash, (err, res) => {
-            expect(err).to.not.exist
-            expect(res).to.be.eql({
-              Data: 'testdata hello',
-              Links: []
-            })
-            done()
-          })
-        })
-    })
-    it('.setData', (done) => {
-      apiClients.a.object.patch
-        .setData(testObjectHash, new Buffer('hello world'), (err, res) => {
-          expect(err).to.not.exist
-          expect(res).to.be.eql({
-            Hash: 'QmU1Sq1B7RPQD2XcQNLB58qJUyJffVJqihcxmmN1STPMxf'
-          })
-          apiClients.a.object.get(res.Hash, (err, res) => {
-            expect(err).to.not.exist
-            expect(res).to.be.eql({
-              Data: 'hello world',
-              Links: []
-            })
-            done()
-          })
-        })
-    })
-  })
-
-  it('object.new', (done) => {
-    apiClients.a.object.new('unixfs-dir', (err, res) => {
-      expect(err).to.not.exist
-      expect(res).to.deep.equal({
-        Hash: 'QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn'
-      })
-      done()
-    })
-  })
-
-  describe('promise', () => {
-    it('object.put', () => {
-      return apiClients.a.object.put(testObject, 'json')
-        .then((res) => {
-          expect(res).to.have.a.property('Hash', testObjectHash)
-          expect(res.Links).to.be.empty
-        })
-    })
-
-    it('object.get', () => {
-      return apiClients.a.object.get(testObjectHash)
-        .then((res) => {
-          expect(res).to.have.a.property('Data', 'testdata')
-          expect(res.Links).to.be.empty
-        })
-    })
-
-    it('object.data', (done) => {
-      return apiClients.a.object.data(testObjectHash)
-        .then((res) => {
-          let buf = ''
-          res
-            .on('error', (err) => {
-              throw err
-            })
-            .on('data', (data) => {
-              buf += data
-            })
-            .on('end', () => {
-              expect(buf).to.equal('testdata')
-              done()
-            })
-        })
-    })
+'use strict'
 
-    it('object.stat', () => {
-      return apiClients.a.object.stat(testObjectHash)
-        .then((res) => {
-          expect(res).to.be.eql({
-            Hash: 'QmPTkMuuL6PD8L2SwTwbcs1NPg14U8mRzerB1ZrrBrkSDD',
-            NumLinks: 0,
-            BlockSize: 10,
-            LinksSize: 2,
-            DataSize: 8,
-            CumulativeSize: 10
-          })
-        })
-    })
+const test = require('interface-ipfs-core')
 
-    it('object.links', () => {
-      return apiClients.a.object.links(testObjectHash)
-        .then((res) => {
-          expect(res).to.be.eql({
-            Hash: 'QmPTkMuuL6PD8L2SwTwbcs1NPg14U8mRzerB1ZrrBrkSDD'
-          })
-        })
-    })
+const common = {
+  setup: function (cb) {
+    cb(null, apiClients.a)
+  },
+  teardown: function (cb) {
+    cb()
+  }
+}
 
-    it('object.new', () => {
-      return apiClients.a.object.new('unixfs-dir')
-        .then((res) => {
-          expect(res).to.deep.equal({
-            Hash: 'QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn'
-          })
-        })
-    })
-  })
-})
+test.object(common)

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`"detect-node": "^2.0.3",`
`10`	`10`	`"flatmap": "0.0.3",`
`11`	`11`	`"glob": "^7.0.3",`
	`12`	`+ "ipfs-merkle-dag": "^0.5.1",`
`12`	`13`	`"multiaddr": "^1.3.0",`
`13`	`14`	`"multipart-stream": "^2.0.1",`
`14`	`15`	`"ndjson": "^1.4.3",`
`@@ -93,4 +94,4 @@`
`93`	`94`	`}`
`94`	`95`	`}`
`95`	`96`	`}`
`96`		`-}`
	`97`	`+}`