[refactor] s/node-http-proxy/http-proxy

`node-` is redundant in `lib`.
http-party · Sep 24, 2012 · 3abac2b · 3abac2b
1 parent a89a5b8
commit 3abac2b
Show file tree

Hide file tree

Showing 28 changed files with 871 additions and 31 deletions.
diff --git a/bin/node-http-proxy b/bin/node-http-proxy
@@ -4,7 +4,7 @@ var path = require('path'),
     fs = require('fs'),
     util  = require('util'),
     argv = require('optimist').argv,
-    httpProxy = require('../lib/node-http-proxy');
+    httpProxy = require('../');
 
 var help = [
     "usage: node-http-proxy [options] ",

diff --git a/examples/balancer/simple-balancer.js b/examples/balancer/simple-balancer.js
@@ -1,4 +1,4 @@
-var httpProxy = require('../../lib/node-http-proxy');
+var httpProxy = require('../../');
 //
 // A simple round-robin load balancing strategy.
 // 
@@ -33,4 +33,4 @@ httpProxy.createServer(function (req, res, proxy) {
   addresses.push(target);
 }).listen(8000);
 
-// Rinse; repeat; enjoy.
+// Rinse; repeat; enjoy.
diff --git a/examples/http/basic-proxy.js b/examples/http/basic-proxy.js
@@ -27,7 +27,7 @@
 var util = require('util'),
     colors = require('colors'),
     http = require('http'),
-    httpProxy = require('../../lib/node-http-proxy');
+    httpProxy = require('../../');
 
 var welcome = [
   '#    # ##### ##### #####        #####  #####   ####  #    # #   #',

diff --git a/examples/http/concurrent-proxy.js b/examples/http/concurrent-proxy.js
@@ -27,7 +27,7 @@
 var util = require('util'),
     colors = require('colors'),
     http = require('http'),
-    httpProxy = require('../../lib/node-http-proxy');
+    httpProxy = require('../../');
 
 //
 // Basic Http Proxy Server

diff --git a/examples/http/custom-proxy-error.js b/examples/http/custom-proxy-error.js
@@ -27,7 +27,7 @@
 var util = require('util'),
     colors = require('colors'),
     http = require('http'),
-    httpProxy = require('../../lib/node-http-proxy');
+    httpProxy = require('../../');
 
 //
 // Http Proxy Server with Latency
@@ -51,4 +51,4 @@ server.proxy.on('proxyError', function (err, req, res) {
 });
 
 
-util.puts('http proxy server '.blue + 'started '.green.bold + 'on port '.blue + '8002 '.yellow + 'with custom error message'.magenta.underline);
+util.puts('http proxy server '.blue + 'started '.green.bold + 'on port '.blue + '8002 '.yellow + 'with custom error message'.magenta.underline);
diff --git a/examples/http/forward-proxy.js b/examples/http/forward-proxy.js
@@ -27,7 +27,7 @@
 var util = require('util'),
     colors = require('colors'),
     http = require('http'),
-    httpProxy = require('../../lib/node-http-proxy');
+    httpProxy = require('../../');
 
 //
 // Setup proxy server with forwarding
@@ -60,4 +60,4 @@ http.createServer(function (req, res) {
 
 util.puts('http proxy server '.blue + 'started '.green.bold + 'on port '.blue + '8003 '.yellow + 'with forward proxy'.magenta.underline);
 util.puts('http server '.blue + 'started '.green.bold + 'on port '.blue + '9000 '.yellow);
-util.puts('http forward server '.blue + 'started '.green.bold + 'on port '.blue + '9001 '.yellow);
+util.puts('http forward server '.blue + 'started '.green.bold + 'on port '.blue + '9001 '.yellow);
diff --git a/examples/http/latent-proxy.js b/examples/http/latent-proxy.js
@@ -27,7 +27,7 @@
 var util = require('util'),
     colors = require('colors'),
     http = require('http'),
-    httpProxy = require('../../lib/node-http-proxy');
+    httpProxy = require('../../');
 
 //
 // Http Proxy Server with Latency

diff --git a/examples/http/proxy-https-to-http.js b/examples/http/proxy-https-to-http.js
@@ -28,7 +28,7 @@ var https = require('https'),
     http = require('http'),
     util = require('util'),
     colors = require('colors'),
-    httpProxy = require('../../lib/node-http-proxy'),
+    httpProxy = require('../../'),
     helpers = require('../../test/helpers');
 
 //

diff --git a/examples/http/proxy-https-to-https.js b/examples/http/proxy-https-to-https.js
@@ -28,7 +28,7 @@ var https = require('https'),
     http = require('http'),
     util = require('util'),
     colors = require('colors'),
-    httpProxy = require('../../lib/node-http-proxy'),
+    httpProxy = require('../../'),
     helpers = require('../../test/helpers');
 
 //

diff --git a/examples/http/proxy-table.js b/examples/http/proxy-table.js
@@ -27,7 +27,7 @@
 var util = require('util'),
     colors = require('colors'),
     http = require('http'),
-    httpProxy = require('../../lib/node-http-proxy');
+    httpProxy = require('../../');
 
 //
 // Http Proxy Server with Proxy Table

diff --git a/examples/http/standalone-proxy.js b/examples/http/standalone-proxy.js
@@ -27,7 +27,7 @@
 var util = require('util'),
     colors = require('colors'),
     http = require('http'),
-    httpProxy = require('../../lib/node-http-proxy');
+    httpProxy = require('../../');
 
 //
 // Http Server with proxyRequest Handler and Latency

diff --git a/examples/middleware/bodyDecoder-middleware.js b/examples/middleware/bodyDecoder-middleware.js
@@ -42,7 +42,7 @@ http.createServer(new Store().handler()).listen(7531, function () {
     //don't worry about incoming contont type
     //bodyParser.parse[''] = JSON.parse
 
-    require('../../lib/node-http-proxy').createServer(
+    require('../../').createServer(
       //refactor the body parser and re-streamer into a separate package
       bodyParser(),
       //body parser absorbs the data and end events before passing control to the next

diff --git a/examples/middleware/gzip-middleware-proxytable.js b/examples/middleware/gzip-middleware-proxytable.js
@@ -27,7 +27,7 @@
 var util = require('util'),
     colors = require('colors'),
     http = require('http'),
-    httpProxy = require('../../lib/node-http-proxy');
+    httpProxy = require('../../');
 
 //
 // Basic Http Proxy Server

diff --git a/examples/middleware/gzip-middleware.js b/examples/middleware/gzip-middleware.js
@@ -27,7 +27,7 @@
 var util = require('util'),
     colors = require('colors'),
     http = require('http'),
-    httpProxy = require('../../lib/node-http-proxy');
+    httpProxy = require('../../');
 
 //
 // Basic Http Proxy Server

diff --git a/examples/middleware/jsonp-middleware.js b/examples/middleware/jsonp-middleware.js
@@ -24,7 +24,7 @@ var Store = require('../helpers/store')
 
 http.createServer(new Store().handler()).listen(7531)
 
-require('../../lib/node-http-proxy').createServer(
+require('../../').createServer(
   require('connect-jsonp')(true),
   'localhost', 7531
 ).listen(1337)
diff --git a/examples/middleware/modifyResponse-middleware.js b/examples/middleware/modifyResponse-middleware.js
@@ -27,7 +27,7 @@
 var util = require('util'),
     colors = require('colors'),
     http = require('http'),
-    httpProxy = require('../../lib/node-http-proxy');
+    httpProxy = require('../../');
 
 //
 // Basic Http Proxy Server

diff --git a/examples/middleware/url-middleware.js b/examples/middleware/url-middleware.js
@@ -27,7 +27,7 @@
 var util = require('util'),
     colors = require('colors'),
     http = require('http'),
-    httpProxy = require('../../lib/node-http-proxy');
+    httpProxy = require('../../');
 
 //
 // Now we set up our proxy.

diff --git a/examples/middleware/url-middleware2.js b/examples/middleware/url-middleware2.js
@@ -1,7 +1,7 @@
 var util = require('util'),
     colors = require('colors'),
     http = require('http'),
-    httpProxy = require('../../lib/node-http-proxy'),
+    httpProxy = require('../../');
     Store = require('../helpers/store') 
 
 http.createServer(new Store().handler()).listen(7531)

diff --git a/examples/websocket/latent-websocket-proxy.js b/examples/websocket/latent-websocket-proxy.js
@@ -27,7 +27,7 @@
 var util = require('util'),
     http = require('http'),
     colors = require('colors'),
-    httpProxy = require('../../lib/node-http-proxy');
+    httpProxy = require('../../');
 
 try {
   var io = require('socket.io'),

diff --git a/examples/websocket/standalone-websocket-proxy.js b/examples/websocket/standalone-websocket-proxy.js
@@ -27,7 +27,7 @@
 var util = require('util'),
     http = require('http'),
     colors = require('colors'),
-    httpProxy = require('../../lib/node-http-proxy');
+    httpProxy = require('../../');
 
 try {
   var io = require('socket.io'),

diff --git a/examples/websocket/websocket-proxy.js b/examples/websocket/websocket-proxy.js
@@ -27,7 +27,7 @@
 var util = require('util'),
     http = require('http'),
     colors = require('colors'),
-    httpProxy = require('../../lib/node-http-proxy');
+    httpProxy = require('../../');
 
 try {
   var io = require('socket.io'),

diff --git a/lib/node-http-proxy.js → lib/http-proxy.js b/lib/node-http-proxy.js → lib/http-proxy.js
@@ -38,9 +38,9 @@ require('pkginfo')(module, 'version');
 //
 // ### Export the relevant objects exposed by `node-http-proxy`
 //
-var HttpProxy    = exports.HttpProxy    = require('./node-http-proxy/http-proxy').HttpProxy,
-    ProxyTable   = exports.ProxyTable   = require('./node-http-proxy/proxy-table').ProxyTable,
-    RoutingProxy = exports.RoutingProxy = require('./node-http-proxy/routing-proxy').RoutingProxy;
+var HttpProxy    = exports.HttpProxy    = require('./http-proxy/http-proxy').HttpProxy,
+    ProxyTable   = exports.ProxyTable   = require('./http-proxy/proxy-table').ProxyTable,
+    RoutingProxy = exports.RoutingProxy = require('./http-proxy/routing-proxy').RoutingProxy;
 
 //
 // ### function createServer ([port, host, options, handler])
@@ -392,4 +392,4 @@ exports._getBase = function _getBase (options) {
   }
 
   return result;
-};
+};
diff --git a/lib/node-http-proxy/http-proxy.js → lib/http-proxy/http-proxy.js b/lib/node-http-proxy/http-proxy.js → lib/http-proxy/http-proxy.js
@@ -27,7 +27,7 @@
 var events = require('events'),
     http = require('http'),
     util = require('util'),
-    httpProxy = require('../node-http-proxy');
+    httpProxy = require('../../');
 
 //
 // ### function HttpProxy (options)