Merge pull request YahooArchive#1363 from zhouyaoji/code_exs-routing_…

…update [code_exs] Updated the routing for the examples to use app.js, not routes.json.
zhouyaoji · Mar 14, 2014 · f42c9d5 · f42c9d5
2 parents 037b096 + acf6433
commit f42c9d5
Show file tree

Hide file tree

Showing 45 changed files with 238 additions and 124 deletions.
diff --git a/docs/dev_guide/code_exs/route_config.rst b/docs/dev_guide/code_exs/route_config.rst
@@ -65,7 +65,7 @@ action is called from the ``custom-route`` instance.
 
    // Defining route `/custom-route` and executing (dispatching)
    // the action `index` of the mojit instance `mapped_mojit`.
-   app.get('/custom-route', libmojito.dispath('mapped_mojit.index'));
+   app.get('/custom-route', libmojito.dispatch('mapped_mojit.index'));
 
    app.listen(app.get('port'), function () {
       debug('Server listening on port ' + app.get('port') + ' ' +
@@ -104,7 +104,7 @@ for handling HTTP POST requests and calls the method ``post_params`` from the
 
    // Defining the route `/*` and executing (dispatching)
    // the action `post_params` of the mojit instance `post-route`.
-   app.post('/*', libmojito.dispath('post-route.post_params'));
+   app.post('/*', libmojito.dispatch('post-route.post_params'));
 
    app.listen(app.get('port'), function () {
       debug('Server listening on port ' + app.get('port') + ' ' +
@@ -169,15 +169,15 @@ To set up and run ``configure_routing``:
 
           // Defining route `GET /` and executing (dispatching)
           // the action `index` of the mojit instance `mapped_mojit`.
-          app.get('/', libmojito.dispath('mapped_mojit.index'));
+          app.get('/', libmojito.dispatch('mapped_mojit.index'));
 
           // Defining route `GET /index` and executing (dispatching)
           // the action `index` of the mojit instance `mapped_mojit`.
-          app.get('/index', libmojito.dispath('mapped_mojit.index'));
+          app.get('/index', libmojito.dispatch('mapped_mojit.index'));
 
           // Defining the route `POST /*` and executing (dispatching)
           // the action `post_params` of the mojit instance `post-route`.
-          app.post('/show', libmojito.dispath('mapped_mojit.show'));
+          app.post('/show', libmojito.dispatch('mapped_mojit.show'));
 
           app.get('/status', function (req, res) {
               res.send('200 OK');

diff --git a/examples/developer-guide/adding_view_engines/app.js b/examples/developer-guide/adding_view_engines/app.js
@@ -19,12 +19,17 @@ app.set('port', process.env.PORT || 8666);
 libmojito.extend(app);
 
 app.use(libmojito.middleware());
-app.mojito.attachRoutes();
+// To use the routing configured in `routes.json`, which
+// is deprecated, you uncomment this line.
+//app.mojito.attachRoutes();
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
 });
 
+app.get('/', libmojito.dispatch('myMojit.default_ve'));
+app.get('/ejs', libmojito.dispatch('myMojit.added_ve'));
+
 app.listen(app.get('port'), function () {
     debug('Server listening on port ' + app.get('port') + ' ' +
                'in ' + app.get('env') + ' mode');

diff --git a/examples/developer-guide/binding_events/app.js b/examples/developer-guide/binding_events/app.js
@@ -21,12 +21,19 @@ libmojito.extend(app);
 
 app.use(customContextualizerMiddleware());
 app.use(libmojito.middleware());
+
+// To use the routing configured in `routes.json`, which
+// is deprecated.
+// The controller uses the Url addon, which requires the
+// `routes.json` file.
 app.mojito.attachRoutes();
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
 });
 
+app.get('/', libmojito.dispatch('frame.index'));
+
 app.listen(app.get('port'), function () {
     debug('Server listening on port ' + app.get('port') + ' ' +
                'in ' + app.get('env') + ' mode');

diff --git a/examples/developer-guide/configure_routing/app.js b/examples/developer-guide/configure_routing/app.js
@@ -19,12 +19,27 @@ app.set('port', process.env.PORT || 8666);
 libmojito.extend(app);
 
 app.use(libmojito.middleware());
-app.mojito.attachRoutes();
+
+// To use the routing configured in `routes.json`, which
+// is deprecated, you uncomment this line.
+// app.mojito.attachRoutes();
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
 });
 
+// Defining route `GET /` and executing (dispatching)
+// the action `index` of the mojit instance `mapped_mojit`.
+app.get('/', libmojito.dispatch('mapped_mojit.index'));
+
+// Defining route `GET /index` and executing (dispatching)
+// the action `index` of the mojit instance `mapped_mojit`.
+app.get('/index', libmojito.dispatch('mapped_mojit.index'));
+
+// Defining the route `POST /*` and executing (dispatching)
+// the action `post_params` of the mojit instance `post-route`.
+app.post('/show', libmojito.dispatch('mapped_mojit.show'));
+
 app.listen(app.get('port'), function () {
     debug('Server listening on port ' + app.get('port') + ' ' +
                'in ' + app.get('env') + ' mode');

diff --git a/examples/developer-guide/dashboard/02_mojits/app.js b/examples/developer-guide/dashboard/02_mojits/app.js
@@ -19,12 +19,20 @@ app.set('port', process.env.PORT || 8666);
 libmojito.extend(app);
 
 app.use(libmojito.middleware());
-app.mojito.attachRoutes();
+
+// To use the routing configured in `routes.json`, which
+// is deprecated, you uncomment this line.
+// app.mojito.attachRoutes();
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
 });
 
+app.get('/', libmojito.dispatch('github.index'));
+app.get('/header', libmojito.dispatch('header.index'));
+app.get('/body', libmojito.dispatch('body.index'));
+app.get('/footer', libmojito.dispatch('footer.index'));
+
 app.listen(app.get('port'), function () {
     debug('Server listening on port ' + app.get('port') + ' ' +
                'in ' + app.get('env') + ' mode');

diff --git a/examples/developer-guide/dashboard/03_frame_mojits/app.js b/examples/developer-guide/dashboard/03_frame_mojits/app.js
@@ -19,12 +19,17 @@ app.set('port', process.env.PORT || 8666);
 libmojito.extend(app);
 
 app.use(libmojito.middleware());
-app.mojito.attachRoutes();
+
+// To use the routing configured in `routes.json`, which
+// is deprecated, you uncomment this line.
+// app.mojito.attachRoutes();
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
 });
 
+app.get('/', libmojito.dispatch('tribframe.index'));
+
 app.listen(app.get('port'), function () {
     debug('Server listening on port ' + app.get('port') + ' ' +
                'in ' + app.get('env') + ' mode');

diff --git a/examples/developer-guide/dashboard/04_composite_mojits/app.js b/examples/developer-guide/dashboard/04_composite_mojits/app.js
@@ -19,12 +19,17 @@ app.set('port', process.env.PORT || 8666);
 libmojito.extend(app);
 
 app.use(libmojito.middleware());
-app.mojito.attachRoutes();
+// To use the routing configured in `routes.json`, which
+// is deprecated, you uncomment this line.
+// app.mojito.attachRoutes();
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
 });
 
+app.get('/', libmojito.dispatch('tribframe.index'));
+
+
 app.listen(app.get('port'), function () {
     debug('Server listening on port ' + app.get('port') + ' ' +
                'in ' + app.get('env') + ' mode');

diff --git a/examples/developer-guide/dashboard/04_composite_mojits/routes.json b/examples/developer-guide/dashboard/04_composite_mojits/routes.json
@@ -4,20 +4,5 @@
         "verbs": ["get"],
         "path": "/",
         "call": "tribframe.index"
-    },
-    "header": {
-        "verbs":["get"],
-        "path": "/header",
-        "call": "header.index"
-    },
-    "body": {
-        "verbs": ["get"],
-        "path": "/body",
-        "call": "body.index"
-    },
-    "footer": {
-        "verbs": ["get"],
-        "path": "/footer",
-        "call": "footer.index"
     }
 }]
diff --git a/examples/developer-guide/dashboard/05_getting_data/app.js b/examples/developer-guide/dashboard/05_getting_data/app.js
@@ -19,12 +19,17 @@ app.set('port', process.env.PORT || 8666);
 libmojito.extend(app);
 
 app.use(libmojito.middleware());
-app.mojito.attachRoutes();
+
+// To use the routing configured in `routes.json`, which
+// is deprecated, you uncomment this line.
+// app.mojito.attachRoutes();
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
 });
 
+app.get('/', libmojito.dispatch('tribframe.index'));
+
 app.listen(app.get('port'), function () {
     debug('Server listening on port ' + app.get('port') + ' ' +
                'in ' + app.get('env') + ' mode');

diff --git a/examples/developer-guide/dashboard/05_getting_data/routes.json b/examples/developer-guide/dashboard/05_getting_data/routes.json
@@ -4,22 +4,5 @@
         "verbs": ["get"],
         "path": "/",
         "call": "tribframe.index"
-    },
-    "header": {
-        "verbs":["get"],
-        "path": "/header",
-        "call": "header.index"
-    },
-    "body": {
-        "verbs": ["get"],
-        "path": "/body",
-        "call": "body.index"
-    },
-    "footer": {
-        "verbs": ["get"],
-        "path": "/footer",
-        "call": "footer.index"
     }
-
-
 }]
diff --git a/examples/developer-guide/dashboard/06_testing/app.js b/examples/developer-guide/dashboard/06_testing/app.js
@@ -19,12 +19,17 @@ app.set('port', process.env.PORT || 8666);
 libmojito.extend(app);
 
 app.use(libmojito.middleware());
-app.mojito.attachRoutes();
+
+// To use the routing configured in `routes.json`, which
+// is deprecated, you uncomment this line.
+// app.mojito.attachRoutes();
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
 });
 
+app.get('/', libmojito.dispatch('tribframe.index'));
+
 app.listen(app.get('port'), function () {
     debug('Server listening on port ' + app.get('port') + ' ' +
                'in ' + app.get('env') + ' mode');

diff --git a/examples/developer-guide/dashboard/06_testing/routes.json b/examples/developer-guide/dashboard/06_testing/routes.json
@@ -4,22 +4,5 @@
         "verbs": ["get"],
         "path": "/",
         "call": "tribframe.index"
-    },
-    "header": {
-        "verbs":["get"],
-        "path": "/header",
-        "call": "header.index"
-    },
-    "body": {
-        "verbs": ["get"],
-        "path": "/body",
-        "call": "body.index"
-    },
-    "footer": {
-        "verbs": ["get"],
-        "path": "/footer",
-        "call": "footer.index"
     }
-
-
 }]
diff --git a/examples/developer-guide/dashboard/07_binders/app.js b/examples/developer-guide/dashboard/07_binders/app.js
@@ -19,12 +19,17 @@ app.set('port', process.env.PORT || 8666);
 libmojito.extend(app);
 
 app.use(libmojito.middleware());
-app.mojito.attachRoutes();
+
+// To use the routing configured in `routes.json`, which
+// is deprecated, you uncomment this line.
+// app.mojito.attachRoutes();
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
 });
 
+app.get('/', libmojito.dispatch('tribframe.index'));
+
 app.listen(app.get('port'), function () {
     debug('Server listening on port ' + app.get('port') + ' ' +
                'in ' + app.get('env') + ' mode');

diff --git a/examples/developer-guide/dashboard/07_binders/mojits/Blog/controller.server.js b/examples/developer-guide/dashboard/07_binders/mojits/Blog/controller.server.js
@@ -25,7 +25,7 @@ YUI.add('blog', function (Y, NAME) {
             var view_type = "yui", feedURL = "http://www.yuiblog.com/blog/feed/", title = "YUI Blog Posts";
 
 
-            ac.models.get('model').getData({}, feedURL, function (data) {
+            ac.models.get('blog').getData({}, feedURL, function (data) {
                 // add mojit specific css
                 ac.assets.addCss('./index.css');
 

diff --git a/examples/developer-guide/dashboard/07_binders/routes.json b/examples/developer-guide/dashboard/07_binders/routes.json
@@ -4,22 +4,5 @@
         "verbs": ["get"],
         "path": "/",
         "call": "tribframe.index"
-    },
-    "header": {
-        "verbs":["get"],
-        "path": "/header",
-        "call": "header.index"
-    },
-    "body": {
-        "verbs": ["get"],
-        "path": "/body",
-        "call": "body.index"
-    },
-    "footer": {
-        "verbs": ["get"],
-        "path": "/footer",
-        "call": "footer.index"
     }
-
-
 }]
diff --git a/examples/developer-guide/dashboard/08_adv_config/app.js b/examples/developer-guide/dashboard/08_adv_config/app.js
@@ -19,6 +19,9 @@ app.set('port', process.env.PORT || 8666);
 libmojito.extend(app);
 
 app.use(libmojito.middleware());
+// To use the routing configured in `routes.json`, which
+// is deprecated, you uncomment this line.
+// app.mojito.attachRoutes();
 
 app.get('/', function (req, res, next) {
     req.params.view_type = "yui";

diff --git a/examples/developer-guide/dashboard/09_hb_templates/app.js b/examples/developer-guide/dashboard/09_hb_templates/app.js
@@ -19,6 +19,9 @@ app.set('port', process.env.PORT || 8666);
 libmojito.extend(app);
 
 app.use(libmojito.middleware());
+// To use the routing configured in `routes.json`, which
+// is deprecated, you uncomment this line.
+// app.mojito.attachRoutes();
 
 app.get('/', function (req, res, next) {
     req.params.view_type = "yui";

diff --git a/examples/developer-guide/dashboard/10_localization/app.js b/examples/developer-guide/dashboard/10_localization/app.js
@@ -18,6 +18,10 @@ app = express();
 app.set('port', process.env.PORT || 8666);
 libmojito.extend(app);
 
+// To use the routing configured in `routes.json`, which
+// is deprecated, you uncomment this line.
+// app.mojito.attachRoutes();
+
 app.use(libmojito.middleware());
 
 app.get('/', function (req, res, next) {

diff --git a/...ples/developer-guide/dashboard/10_localization/mojits/PageLayout/lang/PageLayout_en-US.js b/...ples/developer-guide/dashboard/10_localization/mojits/PageLayout/lang/PageLayout_en-US.js
@@ -9,7 +9,7 @@
 
 YUI.add("lang/PageLayout_en-US", function (Y) {
     Y.Intl.add(
-        "PageLayout",  // associated module
+        "pagelayout",  // associated module
         "en-US",    // BCP 47 language tag  
         // key-value pairs for this module and language
         {

diff --git a/...les/developer-guide/dashboard/10_localization/mojits/PageLayout/lang/PageLayout_es-419.js b/...les/developer-guide/dashboard/10_localization/mojits/PageLayout/lang/PageLayout_es-419.js
@@ -8,7 +8,7 @@
 
 YUI.add("lang/PageLayout_es-419", function (Y) {
     Y.Intl.add(
-        "PageLayout",  // associated module 
+        "pagelayout",  // associated module 
         "es-419",    // BCP 47 language tag
         // key-value pairs for this module and language
         {

diff --git a/...es/developer-guide/dashboard/10_localization/mojits/PageLayout/lang/PageLayout_zh-Hans.js b/...es/developer-guide/dashboard/10_localization/mojits/PageLayout/lang/PageLayout_zh-Hans.js
@@ -8,7 +8,7 @@
 
 YUI.add("lang/PageLayout_zh-Hans", function (Y) {
     Y.Intl.add(
-        "PageLayout",  // associated module
+        "pagelayout",  // associated module
         "zh-Hans",    // BCP 47 language tag 
         // key-value pairs for this module and language
         {