Merge pull request #36 from benjaminettori/master

Return stream from import.js

Author: mels065

index.js

@@ -11,6 +11,6 @@ function Jawn (opts) {
   this.db = this.core.db
 }
 
-Jawn.prototype.createImportPipeline = function (opts, callback) {
-  return createImportPipeline(this, opts, callback)
+Jawn.prototype.createImportPipeline = function (opts) {
+  return createImportPipeline(this, opts)
 }

lib/import.js

@@ -7,15 +7,13 @@ module.exports = importPipeline
 // Returns the parser at the beginning of the pipeline
 // When the pipeline finishes, it calls `callback(feedId, err)`.
 //   If there were no errors, err will be undefined.
-function importPipeline (jawn, opts, callback) {
+function importPipeline (jawn, opts) {
   if (!opts) opts = {}
   var writeStream = jawn.core.createWriteStream(opts)
   var parser = parseInputStream(opts)
   var transform = through.obj(stringifyData, end)
 
-  miss.pipe(parser, transform, writeStream, function done (err) {
-    callback(err, writeStream.id)
-  })
+  var importStream = miss.pipeline(parser, transform, writeStream)
 
   function stringifyData (data, enc, next) {
     this.push(JSON.stringify(data))
@@ -26,5 +24,7 @@ function importPipeline (jawn, opts, callback) {
     done()
   }
 
-  return parser
+  importStream.writeStream = writeStream
+
+  return importStream
 }

test/import.js

@@ -6,14 +6,18 @@ var memdb = require('memdb')
 
 test('import json to jawn', function (t) {
   var jawn = freshJawn()
-  importFromFile(jawn, 'dummy.json', {'format': 'json'}, verify)
+  var importStream = importFromFile(jawn, 'dummy.json', {'format': 'json'})
   var expected = [
     '{"foo":"bar","name":"josie","age":"35"}',
     '{"foo":"baz","name":"eloise","age":"71"}',
     '{"foo":"baz","name":"francoise","age":"5"}'
   ]
-  function verify (err, feedId) {
+
+  importStream.on('finish', verify)
+
+  function verify (err) {
     if (err) { console.log(err) }
+    var feedId = importStream.writeStream.id
     var rs = jawn.core.createReadStream(feedId)
     rs.on('data', function (block) {
       t.same(block.toString(), expected.shift(), 'block matches imported line')
@@ -25,16 +29,20 @@ test('import json to jawn', function (t) {
 
 test('import csv to jawn', function (t) {
   var jawn = freshJawn()
-  importFromFile(jawn, 'sample.csv', {'format': 'csv'}, verify)
+  importFromFile(jawn, 'sample.csv', {'format': 'csv'})
+  var importStream = importFromFile(jawn, 'sample.csv', {'format': 'csv'}, verify)
   var expected = [
     '{"Type of Experience":"Writing software in any programming language","Little/No Experience":"1","Some Experience":"5","Very Familiar":"4"}',
     '{"Type of Experience":"Frontend Web Development","Little/No Experience":"4","Some Experience":"3","Very Familiar":"3"}',
     '{"Type of Experience":"Server-side (“backend”) Web Development","Little/No Experience":"4","Some Experience":"4","Very Familiar":"2"}',
     '{"Type of Experience":"Using Git to track changes and share code (add, commit, push, pull)","Little/No Experience":"2","Some Experience":"5","Very Familiar":"3"}'
   ]
 
-  function verify (err, feedId) {
+  importStream.on('finish', verify)
+
+  function verify (err) {
     if (err) { console.log(err) }
+    var feedId = importStream.writeStream.id
     var rs = jawn.core.createReadStream(feedId)
     rs.on('data', function (block) {
       t.same(block.toString(), expected.shift(), 'block matches imported line')
@@ -54,8 +62,9 @@ function freshJawn () {
   return new Jawn({db: memdb()})
 }
 
-function importFromFile (jawn, file, opts, callback) {
-  var importPipeline = jawn.createImportPipeline(opts, callback)
+function importFromFile (jawn, file, opts) {
+  var importPipeline = jawn.createImportPipeline(opts)
   var data = fs.createReadStream(fixture(file))
   data.pipe(importPipeline)
+  return importPipeline
 }