Skip to content

Commit

Permalink
[dist] Bump some dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
indexzero committed Dec 7, 2014
1 parent 6cef907 commit 6ece680
Show file tree
Hide file tree
Showing 15 changed files with 25 additions and 28 deletions.
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2011 Nodejitsu Inc.
Copyright (c) 2010 Charlie Robbins & the Contributors.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
THE SOFTWARE.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,7 @@ All tests are written with [vows][0] and should be run with [npm][1]:

(The MIT License)

Copyright (c) 2010-2012 Nodejitsu Inc. <http://www.twitter.com/nodejitsu>

Copyright (c) 2010-2012 Charlie Robbins & the Contributors
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
Expand Down
2 changes: 1 addition & 1 deletion lib/buffered-stream.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* (C) 2010, Mikeal Rogers
*
* Adapted for Flatiron
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins & the Contributors
* MIT LICENSE
*
*/
Expand Down
2 changes: 1 addition & 1 deletion lib/core.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* core.js: Core functionality for the Flatiron HTTP (with SPDY support) plugin.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins & the Contributors
* MIT LICENSE
*
*/
Expand Down
2 changes: 1 addition & 1 deletion lib/http-stream.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* http-stream.js: Idomatic buffered stream which pipes additional HTTP information.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins & the Contributors
* MIT LICENSE
*
*/
Expand Down
8 changes: 4 additions & 4 deletions lib/index.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
/*
* index.js: Top-level plugin exposing HTTP features in flatiron
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins & the Contributors
* MIT LICENSE
*
*/

var union = exports;

//
// Expose version information through `pkginfo`
// Expose version information
//
require('pkginfo')(module, 'version');
exports.version = require('../package.json').version;

//
// Expose core union components
Expand All @@ -21,4 +21,4 @@ union.HttpStream = require('./http-stream');
union.ResponseStream = require('./response-stream');
union.RoutingStream = require('./routing-stream');
union.createServer = require('./core').createServer;
union.errorHandler = require('./core').errorHandler;
union.errorHandler = require('./core').errorHandler;
2 changes: 1 addition & 1 deletion lib/request-stream.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* http-stream.js: Idomatic buffered stream which pipes additional HTTP information.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins & the Contributors
* MIT LICENSE
*
*/
Expand Down
2 changes: 1 addition & 1 deletion lib/response-stream.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* response-stream.js: A Stream focused on writing any relevant information to
* a raw http.ServerResponse object.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins & the Contributors
* MIT LICENSE
*
*/
Expand Down
2 changes: 1 addition & 1 deletion lib/routing-stream.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* routing-stream.js: A Stream focused on connecting an arbitrary RequestStream and
* ResponseStream through a given Router.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins & the Contributors
* MIT LICENSE
*
*/
Expand Down
12 changes: 5 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,30 @@
"name": "union",
"description": "A hybrid buffered / streaming middleware kernel backwards compatible with connect.",
"version": "0.4.3",
"author": "Nodejitsu Inc. <info@nodejitsu.com>",
"author": "Charlie Robbins <charlie.robbins@gmail.com>",
"maintainers": [
"indexzero <charlie@nodejitsu.com>",
"dscape <nuno@nodejitsu.com>"
],
"repository": {
"type": "git",
"url": "http://github.com/flatiron/union.git"
},
"dependencies": {
"pkginfo": "0.3.x",
"qs": "1.2.x"
"qs": "~2.3.3"
},
"devDependencies": {
"ecstatic": "0.5.x",
"director": "1.x.x",
"request": "2.x.x",
"vows": "0.7.x",
"request": "2.29.x",
"vows": "0.8.x",
"connect": "2.22.x"
},
"scripts": {
"test": "vows test/*-test.js --spec -i"
},
"main": "./lib",
"engines": {
"node": ">= 0.4.0"
"node": ">= 0.8.0"
}
}

2 changes: 1 addition & 1 deletion test/body-parser-test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* simple-test.js: Simple tests for basic streaming and non-streaming HTTP requests with union.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins & the Contributors
* MIT LICENSE
*
*/
Expand Down
6 changes: 3 additions & 3 deletions test/double-write-test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* simple-test.js: Simple tests for basic streaming and non-streaming HTTP requests with union.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins & the Contributors
* MIT LICENSE
*
*/
Expand All @@ -16,7 +16,7 @@ var assert = require('assert'),

var doubleWrite = false,
server;

server = union.createServer({
before: [
function (req, res) {
Expand All @@ -27,7 +27,7 @@ server = union.createServer({
doubleWrite = true;
res.json(200, { 'hello': 'world' });
res.emit('next');
}
}
]
});

Expand Down
2 changes: 1 addition & 1 deletion test/ecstatic-test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* simple-test.js: Simple tests for basic streaming and non-streaming HTTP requests with union.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins & the Contributors
* MIT LICENSE
*
*/
Expand Down
2 changes: 1 addition & 1 deletion test/helpers/macros.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* macros.js: Simple test macros
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins & the Contributors
* MIT LICENSE
*
*/
Expand Down
2 changes: 1 addition & 1 deletion test/simple-test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* simple-test.js: Simple tests for basic streaming and non-streaming HTTP requests with union.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins & the Contributors
* MIT LICENSE
*
*/
Expand Down

0 comments on commit 6ece680

Please sign in to comment.