Merge pull request #53 from bennlich/master

Fixed promised-io require statements
nrstott · Sep 12, 2012 · 593eccc · 593eccc
2 parents a50d223 + 8a40dc5
commit 593eccc
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 16 deletions.
diff --git a/lib/bogart.js b/lib/bogart.js
@@ -1,6 +1,6 @@
 var
   path         = require('path'),
-  Q            = require('promised-io/lib/promise'),
+  Q            = require('promised-io/promise'),
   util         = require('./util'),
   Router       = require('./router').Router,
   middleware   = require('./middleware'),

diff --git a/lib/forEachStream.js b/lib/forEachStream.js
@@ -1,6 +1,6 @@
 var util   = require('util')
   , Stream = require('stream').Stream
-  , Q      = require('promised-io/lib/promise');
+  , Q      = require('promised-io/promise');
 
 function ForEachStream(forEachable) {
   if (!(this instanceof ForEachStream)) return new ForEachStream(forEachable);
@@ -59,4 +59,4 @@ function ForEachStream(forEachable) {
 
 require('util').inherits(ForEachStream, Stream);
 
-module.exports = ForEachStream;
+module.exports = ForEachStream;
diff --git a/lib/middleware.js b/lib/middleware.js
@@ -1,4 +1,4 @@
-var Q = require('promised-io/lib/promise'),
+var Q = require('promised-io/promise'),
     when = Q.when,
     fs = require('fs'),
     path = require('path'),

diff --git a/lib/router.js b/lib/router.js
@@ -1,7 +1,7 @@
 var
   util         = require('./util'),
   EventEmitter = require('events').EventEmitter,
-  Q            = require('promised-io/lib/promise'),
+  Q            = require('promised-io/promise'),
   when         = Q.when,
   inherits     = require('util').inherits,
   slice        = Array.prototype.slice;

diff --git a/lib/session/session.js b/lib/session/session.js
@@ -1,4 +1,4 @@
-var Q = require('promised-io/lib/promise'),
+var Q = require('promised-io/promise'),
     when = Q.when,
     DefaultIdProvider = require("./idProvider").IdProvider,
     DefaultDataProvider = require("./dataProvider").DataProvider;

diff --git a/lib/stream.js b/lib/stream.js
@@ -1,4 +1,4 @@
-var Q             = require('promised-io/lib/promise')
+var Q             = require('promised-io/promise')
   , Stream        = require('stream').Stream
   , util          = require('util')
   , ForEachStream = require('./forEachStream');

diff --git a/lib/view.js b/lib/view.js
@@ -3,7 +3,7 @@ var
   http      = require('http'),
   fs        = require('fs'),
   extname   = path.extname,
-  promise   = require('promised-io/lib/promise'),
+  promise   = require('promised-io/promise'),
   when      = promise.when,
   util = require('util'),
   engines   = {},

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "bogart",
     "description": "Fast JSGI web framework taking inspiration from Sinatra",
-    "version": "0.3.38",
+    "version": "0.3.39",
     "keywords": ["bogart", "framework", "sinatra", "REST"],
     "author": "Nathan Stott <nrstott@gmail.com>",
     "email": "nathan.stott@whiteboard-it.com",

diff --git a/test/middleware.test.js b/test/middleware.test.js
@@ -1,5 +1,5 @@
 var bogart    = require('../lib/bogart')
-  , Q         = require("promised-io/lib/promise")
+  , Q         = require("promised-io/promise")
   , path      = require('path')
   , fs        = require('fs')
   , security  = require("../lib/security")

diff --git a/test/response-builder.test.js b/test/response-builder.test.js
@@ -1,6 +1,6 @@
 var bogart = require('../lib/bogart')
   , assert = require('assert')
-  , Q      = require('promised-io/lib/promise')
+  , Q      = require('promised-io/promise')
   , fs     = require('fs')
   , path   = require('path')
   , test   = require('tap').test

diff --git a/test/response-helpers.test.js b/test/response-helpers.test.js
@@ -1,5 +1,5 @@
 var bogart = require('../lib/bogart')
-  , Q      = require('promised-io/lib/promise')
+  , Q      = require('promised-io/promise')
   , when   = Q.when
   , path   = require('path')
   , fs     = require('fs')

diff --git a/test/router.test.js b/test/router.test.js
@@ -1,5 +1,5 @@
 var bogart = require('../lib/bogart')
-  , Q      = require('promised-io/lib/promise')
+  , Q      = require('promised-io/promise')
   , when   = Q.when
   , jsgi   = require('jsgi')
   , test   = require('tap').test

diff --git a/test/stream.test.js b/test/stream.test.js
@@ -1,7 +1,7 @@
 var bogart        = require('../lib/bogart')
   , test          = require('tap').test
   , plan          = require('tap').plan
-  , Q             = require('promised-io/lib/promise')
+  , Q             = require('promised-io/promise')
   , fs            = require('fs')
   , ForEachStream = require('../lib/forEachStream')
   , zlib          = require('zlib');

diff --git a/test/util.test.js b/test/util.test.js
@@ -1,5 +1,5 @@
 var bogart = require('../lib/bogart')
-  , Q = require("promised-io/lib/promise")
+  , Q = require("promised-io/promise")
   , path = require('path')
   , security = require("../lib/security")
   , test = require('tap').test

diff --git a/test/view.test.js b/test/view.test.js
@@ -1,7 +1,7 @@
 var bogart       = require('../lib/bogart')
   , view         = require('../lib/view')
   , jsgi         = require('jsgi')
-  , when         = require('promised-io/lib/promise').when
+  , when         = require('promised-io/promise').when
   , path         = require('path')
   , test         = require('tap').test
   , plan         = require('tap').plan