removing tunnelMiddleware in favor of the low level rpc middleware. m…

…oving fixtures and examples to use app.use() instead of application.json to define custom middleware.
YahooArchive · Feb 20, 2014 · 12993ef · 12993ef
1 parent d17b0da
commit 12993ef
Show file tree

Hide file tree

Showing 80 changed files with 36 additions and 133 deletions.
diff --git a/examples/developer-guide/adding_view_engines/app.js b/examples/developer-guide/adding_view_engines/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/binding_events/app.js b/examples/developer-guide/binding_events/app.js
@@ -12,15 +12,16 @@
 var debug = require('debug')('app'),
     express = require('express'),
     libmojito = require('../../../'),
+    customContextualizerMiddleware = require('./middleware/mojito-contextualizer.js'),
     app;
 
 app = express();
 app.set('port', process.env.PORT || 8666);
 libmojito.extend(app);
 
+app.use(customContextualizerMiddleware());
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/binding_events/application.json b/examples/developer-guide/binding_events/application.json
@@ -5,7 +5,6 @@
             "cache": false,
             "forceUpdate": true
         },
-        "middleware": ["middleware/mojito-contextualizer.js"],
         "specs": {
             "frame": {
                 "type": "HTMLFrameMojit",
@@ -18,5 +17,8 @@
             }
         }
     },
-    { "settings": [ "environment:development" ], "selector": "mocked" }
+    {
+        "settings": [ "environment:development" ],
+        "selector": "mocked"
+    }
 ]
diff --git a/examples/developer-guide/binding_events/middleware/mojito-contextualizer.js b/examples/developer-guide/binding_events/middleware/mojito-contextualizer.js
@@ -1,4 +1,4 @@
-module.exports = function(config) {
+module.exports = function() {
     var url = require('url'),
         query;
     return function(req, res, next) {

diff --git a/examples/developer-guide/configure_routing/app.js b/examples/developer-guide/configure_routing/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/dashboard/02_mojits/app.js b/examples/developer-guide/dashboard/02_mojits/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/dashboard/03_frame_mojits/app.js b/examples/developer-guide/dashboard/03_frame_mojits/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/dashboard/04_composite_mojits/app.js b/examples/developer-guide/dashboard/04_composite_mojits/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/dashboard/05_getting_data/app.js b/examples/developer-guide/dashboard/05_getting_data/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/dashboard/06_testing/app.js b/examples/developer-guide/dashboard/06_testing/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/dashboard/07_binders/app.js b/examples/developer-guide/dashboard/07_binders/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/dashboard/trib/app.js b/examples/developer-guide/dashboard/trib/app.js
@@ -12,12 +12,14 @@
 var debug = require('debug')('app'),
     express = require('express'),
     libmojito = require('../../../../'),
+    customContextualizerMiddleware = require('./middleware/mojito-contextualizer.js'),
     app;
 
 app = express();
 app.set('port', process.env.PORT || 8666);
 libmojito.extend(app);
 
+app.use(customContextualizerMiddleware());
 app.use(libmojito.middleware());
 
 app.get('/', function (req, res, next) {

diff --git a/examples/developer-guide/dashboard/trib/application.json b/examples/developer-guide/dashboard/trib/application.json
@@ -2,7 +2,6 @@
     {
         "settings": [ "master" ],
         "appPort": "8666",
-        "middleware": ["middleware/mojito-contextualizer.js"],
         "staticHandling": {
           "appName": "trib"
         },

diff --git a/examples/developer-guide/dashboard/trib/application.yaml b/examples/developer-guide/dashboard/trib/application.yaml
@@ -2,8 +2,6 @@
 - settings:
   - master
   appPort: '8666'
-  middleware: 
-  - middleware/mojito-contextualizer.js
   staticHandling:
     appName: trib
   yui:

diff --git a/examples/developer-guide/device_assets/app.js b/examples/developer-guide/device_assets/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/device_views/app.js b/examples/developer-guide/device_views/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/framed_assets/app.js b/examples/developer-guide/framed_assets/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/framed_config/app.js b/examples/developer-guide/framed_config/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/generating_urls/app.js b/examples/developer-guide/generating_urls/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/global_assets/app.js b/examples/developer-guide/global_assets/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/hello/app.js b/examples/developer-guide/hello/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/htmlframe_mojit/app.js b/examples/developer-guide/htmlframe_mojit/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/inter-mojit/app.js b/examples/developer-guide/inter-mojit/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/locale_i18n/app.js b/examples/developer-guide/locale_i18n/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/model_yql/app.js b/examples/developer-guide/model_yql/app.js
@@ -12,15 +12,16 @@
 var debug = require('debug')('app'),
     express = require('express'),
     libmojito = require('../../../'),
+    customContextualizerMiddleware = require('./middleware/mojito-contextualizer.js'),
     app;
 
 app = express();
 app.set('port', process.env.PORT || 8666);
 libmojito.extend(app);
 
+app.use(customContextualizerMiddleware());
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/model_yql/application.json b/examples/developer-guide/model_yql/application.json
@@ -1,7 +1,6 @@
 [
     {
         "settings": [ "master" ],
-        "middleware": ["middleware/mojito-contextualizer.js"],
         "specs": {
             "frame": {
                 "type": "HTMLFrameMojit", 
@@ -21,5 +20,8 @@
             }
         }
     },
-    { "settings": [ "environment:development" ], "selector": "mocked" }
+    {
+        "settings": [ "environment:development" ],
+        "selector": "mocked"
+    }
 ]
diff --git a/examples/developer-guide/multiple_mojits/app.js b/examples/developer-guide/multiple_mojits/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/scroll_views/app.js b/examples/developer-guide/scroll_views/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/simple_assets/app.js b/examples/developer-guide/simple_assets/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/simple_config/app.js b/examples/developer-guide/simple_config/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/simple_logging/app.js b/examples/developer-guide/simple_logging/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/simple_view/app.js b/examples/developer-guide/simple_view/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/unittest_model_controller/app.js b/examples/developer-guide/unittest_model_controller/app.js
@@ -12,15 +12,16 @@
 var debug = require('debug')('app'),
     express = require('express'),
     libmojito = require('../../../'),
+    customContextualizerMiddleware = require('./middleware/mojito-contextualizer.js'),
     app;
 
 app = express();
 app.set('port', process.env.PORT || 8666);
 libmojito.extend(app);
 
+app.use(customContextualizerMiddleware());
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/unittest_model_controller/application.json b/examples/developer-guide/unittest_model_controller/application.json
@@ -1,7 +1,6 @@
 [
     {
         "settings": [ "master" ],
-        "middleware": [ "middleware/mojito-contextualizer.js" ],
         "specs": {
             "frame": {
                 "type": "HTMLFrameMojit", 
@@ -21,5 +20,8 @@
             }
         }
     },
-    { "settings": [ "environment:development" ], "selector": "mocked" }
+    {
+        "settings": [ "environment:development" ],
+        "selector": "mocked"
+    }
 ]
diff --git a/examples/developer-guide/using_configs/app.js b/examples/developer-guide/using_configs/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/using_cookies/app.js b/examples/developer-guide/using_cookies/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/using_parameters/app.js b/examples/developer-guide/using_parameters/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/developer-guide/yui_module/app.js b/examples/developer-guide/yui_module/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/input/cookies/app.js b/examples/input/cookies/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');

diff --git a/examples/input/get/app.js b/examples/input/get/app.js
@@ -20,8 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
-
 
 // Example usage on how to execute anonymous mojit. 
 app.get('/:mojitType/:mojitAction', function (req, res, next) {

diff --git a/examples/input/merged/app.js b/examples/input/merged/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 // "root": {
 //     "verbs": ["post"],