Changed API to allow for easier extension.

Signed-off-by: Nick Campbell <nicholas.j.campbell@gmail.com>
ncb000gt · Sep 30, 2011 · 783a57f · 783a57f
1 parent 5f834b5
commit 783a57f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/lib/queuestream.js b/lib/queuestream.js
@@ -152,7 +152,5 @@ QueueStream.prototype.currentResume = function() {
 }
 
 module.exports = {
-  QueueStream: function(opts) {
-    return new QueueStream(opts);
-  }
+  QueueStream: QueueStream
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "queuestream",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "author": "Nick Campbell (http://github.com/ncb000gt)",
   "description": "Queue streams for sequential streaming.",
   "main": "./lib/queuestream",

diff --git a/tests/test-convenience.js b/tests/test-convenience.js
@@ -4,7 +4,7 @@ var testCase = require('nodeunit').testCase,
 
 module.exports = testCase({
   "test length": function(assert) {
-    var stream = QueueStream();
+    var stream = new QueueStream();
     var test1 = fs.createReadStream(__dirname + '/files/test1.txt');
     stream.queue(test1);
     var test2 = fs.createReadStream(__dirname + '/files/test2.txt');
@@ -15,7 +15,7 @@ module.exports = testCase({
     assert.done();
   },
   "test current": function(assert) {
-    var stream = QueueStream();
+    var stream = new QueueStream();
     var test1 = fs.createReadStream(__dirname + '/files/test1.txt');
     stream.queue(test1);
     var test2 = fs.createReadStream(__dirname + '/files/test2.txt');
@@ -29,7 +29,7 @@ module.exports = testCase({
     assert.done();
   },
   "test queue": function(assert) {
-    var stream = QueueStream();
+    var stream = new QueueStream();
     var test1 = fs.createReadStream(__dirname + '/files/test1.txt');
     stream.queue(test1);
     var test2 = fs.createReadStream(__dirname + '/files/test2.txt');

diff --git a/tests/test-meat.js b/tests/test-meat.js
@@ -4,7 +4,7 @@ var testCase = require('nodeunit').testCase,
 
 module.exports = testCase({
   "test injecting": function(assert) {
-    var stream = QueueStream();
+    var stream = new QueueStream();
     var test1 = fs.createReadStream(__dirname + '/files/test1.txt');
     var test2 = fs.createReadStream(__dirname + '/files/test2.txt');
     stream.queue(test2);
@@ -19,7 +19,7 @@ module.exports = testCase({
     assert.done();
   },
   "test injecting nothing": function(assert) {
-    var stream = QueueStream();
+    var stream = new QueueStream();
     stream.inject();
 
     assert.equal(stream.length(), 0);
@@ -30,7 +30,7 @@ module.exports = testCase({
     assert.done();
   },
   "test injecting array": function(assert) {
-    var stream = QueueStream();
+    var stream = new QueueStream();
     var test0 = fs.createReadStream(__dirname + '/files/test1.txt');
     var test1 = fs.createReadStream(__dirname + '/files/test1.txt');
     var test2 = fs.createReadStream(__dirname + '/files/test2.txt');
@@ -47,7 +47,7 @@ module.exports = testCase({
     assert.done();
   },
   "test queuing": function(assert) {
-    var stream = QueueStream();
+    var stream = new QueueStream();
     var test1 = fs.createReadStream(__dirname + '/files/test1.txt');
     stream.queue(test1);
 
@@ -59,7 +59,7 @@ module.exports = testCase({
     assert.done();
   },
   "test queuing nothing": function(assert) {
-    var stream = QueueStream();
+    var stream = new QueueStream();
     stream.queue();
 
     assert.equal(stream.length(), 0);
@@ -70,7 +70,7 @@ module.exports = testCase({
     assert.done();
   },
   "test queuing array": function(assert) {
-    var stream = QueueStream();
+    var stream = new QueueStream();
     var test0 = fs.createReadStream(__dirname + '/files/test1.txt');
     var test1 = fs.createReadStream(__dirname + '/files/test1.txt');
     var test2 = fs.createReadStream(__dirname + '/files/test2.txt');
@@ -89,7 +89,7 @@ module.exports = testCase({
   "test data emits": function(assert) {
     assert.expect(6);
     var count = 0;
-    var stream = QueueStream();
+    var stream = new QueueStream();
 
     stream.on('error', function(err) {
       console.log('err: ' + err);
@@ -116,7 +116,7 @@ module.exports = testCase({
   "test data emits with small buffers": function(assert) {
     assert.expect(12);
     var count = 0;
-    var stream = QueueStream();
+    var stream = new QueueStream();
 
     stream.on('error', function(err) {
       console.log('err: ' + err);
@@ -143,7 +143,7 @@ module.exports = testCase({
   "test next": function(assert) {
     assert.expect(6);
     var count = 0;
-    var stream = QueueStream();
+    var stream = new QueueStream();
 
     var test1 = fs.createReadStream(__dirname + '/files/test1.txt');
     stream.queue(test1);