feat(generic): make it spec compliant

Author: daviddias

package.json

@@ -5,9 +5,9 @@
   "main": "lib/index.js",
   "jsnext:main": "src/index.js",
   "scripts": {
-    "test": "gulp test",
+    "test": "node --max_old_space_size=4096 node_modules/.bin/gulp test",
     "test:node": "gulp test:node",
-    "test:browser": "gulp test:browser",
+    "test:browser": "node --max_old_space_size=4096 node_modules/.bin/gulp test:browser",
     "lint": "aegir-lint",
     "build": "gulp build",
     "release": "gulp release",
@@ -47,7 +47,7 @@
     "chai": "^3.5.0",
     "gulp": "^3.9.1",
     "hapi": "^14.1.0",
-    "interface-ipfs-core": "^0.9.0",
+    "interface-ipfs-core": "^0.11.0",
     "ipfsd-ctl": "^0.14.0",
     "passthrough-counter": "^1.0.0",
     "pre-commit": "^1.1.3",

src/api/id.js

@@ -1,14 +1,28 @@
 'use strict'
 
+const promisify = require('promisify-es6')
+
 module.exports = (send) => {
-  return function id (opts, callback) {
+  return promisify((opts, callback) => {
     if (typeof opts === 'function') {
       callback = opts
       opts = undefined
     }
-    return send({
+    send({
       path: 'id',
       args: opts
-    }, callback)
-  }
+    }, (err, result) => {
+      if (err) {
+        return callback(err)
+      }
+      const identity = {
+        id: result.ID,
+        publicKey: result.PublicKey,
+        addresses: result.Addresses,
+        agentVersion: result.AgentVersion,
+        protocolVersion: result.ProtocolVersion
+      }
+      callback(null, identity)
+    })
+  })
 }

src/api/version.js

@@ -1,15 +1,27 @@
 'use strict'
 
+const promisify = require('promisify-es6')
+
 module.exports = (send) => {
-  return (opts, callback) => {
+  return promisify((opts, callback) => {
     if (typeof opts === 'function') {
       callback = opts
       opts = {}
     }
 
-    return send({
+    send({
       path: 'version',
       qs: opts
-    }, callback)
-  }
+    }, (err, result) => {
+      if (err) {
+        return callback(err)
+      }
+      const version = {
+        version: result.Version,
+        commit: result.Commit,
+        repo: result.Repo
+      }
+      callback(null, version)
+    })
+  })
 }

test/interface-ipfs-core/generic.spec.js

@@ -0,0 +1,20 @@
+/* eslint-env mocha */
+
+'use strict'
+
+const test = require('interface-ipfs-core')
+const FactoryClient = require('../factory/factory-client')
+
+let fc
+
+const common = {
+  setup: function (callback) {
+    fc = new FactoryClient()
+    callback(null, fc)
+  },
+  teardown: function (callback) {
+    fc.dismantle(callback)
+  }
+}
+
+test.generic(common)

test/interface-ipfs-core/id.spec.js

@@ -9,7 +9,7 @@ describe('.ping', () => {
     apiClients.b.id((err, id) => {
       expect(err).to.not.exist
 
-      apiClients.a.ping(id.ID, (err, res) => {
+      apiClients.a.ping(id.id, (err, res) => {
         expect(err).to.not.exist
         expect(res).to.have.a.property('Success')
         done()
@@ -21,7 +21,7 @@ describe('.ping', () => {
     it('ping another peer', () => {
       return apiClients.b.id()
         .then((id) => {
-          return apiClients.a.ping(id.ID)
+          return apiClients.a.ping(id.id)
         })
         .then((res) => {
           expect(res).to.have.a.property('Success')

test/interface-ipfs-core/ping.spec.js

@@ -14,8 +14,8 @@ describe('ipfsAPI constructor tests', () => {
       client.id((err, id) => {
         expect(err).to.not.exist
 
-        expect(id).to.have.a.property('ID')
-        expect(id).to.have.a.property('PublicKey')
+        expect(id).to.have.a.property('id')
+        expect(id).to.have.a.property('publicKey')
         done()
       })
     }

test/interface-ipfs-core/version.spec.js

@@ -18,7 +18,7 @@ function connectNodes (done) {
         throw err
       }
       // note to self: HTTP API port !== Node port
-      addrs[key] = id.Addresses[0]
+      addrs[key] = id.addresses[0]
       cb()
     })
   }