updated for new exporter

Author: nginnever

src/cli/commands/files/cat.js

@@ -35,8 +35,9 @@ module.exports = Command.extend({
         if (err) {
           throw (err)
         }
+        console.log(res)
         if (res) {
-          res.on('file', (data) => {
+          res.on('data', (data) => {
             data.stream.pipe(process.stdout)
           })
         }

src/cli/commands/files/get.js

@@ -84,7 +84,7 @@ module.exports = Command.extend({
         if (err) {
           throw err
         }
-        result.on('file', fileHandler(result, dir))
+        result.on('data', fileHandler(result, dir))
       })
     })
   }

src/core/ipfs/files.js

@@ -44,8 +44,8 @@ module.exports = function files (self) {
         if (data.type === 'directory') {
           callback('This dag node is a directory', null)
         } else {
-          const exportEvent = Exporter(hash, self._dagS)
-          callback(null, exportEvent)
+          const exportStream = Exporter(hash, self._dagS)
+          callback(null, exportStream)
         }
       })
     },

src/http-api/resources/files.js

@@ -34,15 +34,15 @@ exports.cat = {
   handler: (request, reply) => {
     const key = request.pre.args.key
 
-    request.server.app.ipfs.files.cat(key, (err, ee) => {
+    request.server.app.ipfs.files.cat(key, (err, stream) => {
       if (err) {
         log.error(err)
         return reply({
           Message: 'Failed to cat file: ' + err,
           Code: 0
         }).code(500)
       }
-      ee.on('file', (data) => {
+      stream.on('data', (data) => {
         return reply(data.stream)
       })
     })

test/core-tests/test-files.js

@@ -37,7 +37,7 @@ describe('files', () => {
     const hash = 'QmT78zSuBmuS4z925WZfrqQ1qHaJ56DQaTfyMUF7F8ff5o'
     ipfs.files.cat(hash, (err, res) => {
       expect(err).to.not.exist
-      res.on('file', (data) => {
+      res.on('data', (data) => {
         data.stream.pipe(bl((err, bldata) => {
           expect(err).to.not.exist
           expect(bldata.toString()).to.equal('hello world\n')
@@ -52,7 +52,7 @@ describe('files', () => {
     const hash = 'QmT78zSuBmuS4z925WZfrqQ1qHaJ56DQaTfyMUF7F8ff5o'
     ipfs.files.get(hash, (err, res) => {
       expect(err).to.not.exist
-      res.on('file', (data) => {
+      res.on('data', (data) => {
         data.stream.pipe(bl((err, bldata) => {
           expect(err).to.not.exist
           expect(bldata.toString()).to.equal('hello world\n')

test/http-api-tests/test-files.js

@@ -36,12 +36,13 @@ module.exports = (httpAPI) => {
           })
         })
 
-        it('returns a stream', (done) => {
+        it('returns a buffer', (done) => {
           api.inject({
             method: 'GET',
             url: '/api/v0/cat?arg=QmT78zSuBmuS4z925WZfrqQ1qHaJ56DQaTfyMUF7F8ff5o'
           }, (res) => {
             expect(res.statusCode).to.equal(200)
+            expect(res.rawPayload).to.deep.equal(new Buffer('hello world' + '\n'))
             expect(res.payload).to.equal('hello world' + '\n')
             done()
           })
@@ -72,7 +73,7 @@ module.exports = (httpAPI) => {
           })
         })
 
-        it('returns a stream', (done) => {
+        it('returns a buffer', (done) => {
           ctl.cat('QmT78zSuBmuS4z925WZfrqQ1qHaJ56DQaTfyMUF7F8ff5o', (err, result) => {
             expect(err).to.not.exist
             expect(result).to.deep.equal(new Buffer('hello world' + '\n'))