Merge branch 'develop-perf' of git://github.com/yahoo/mojito into par…

…tials

docs/dev_guide/code_exs/route_config.rst

@@ -161,56 +161,45 @@ To set up and run ``configure_routing``:
    .. code-block:: javascript
 
       YUI.add('RoutingMojit', function(Y, NAME) {
-        Y.namespace('mojito.controllers')[NAME] = {   
-
-          index: function(ac) {
-            ac.done(route_info(ac));
-          },
-          show: function(ac){
-            ac.done(route_info(ac));
-          }
-        };
         // Builds object containing route information
         function route_info(ac) {
           var methods = "",
               name = "",
               action = ac.action,
-              path = ac.http.getRequest().url;
-          ac.url.getRouteMaker();
+              path = ac.http.getRequest().url,
+              routes = ac.config.getRoutes();
           if (action === "index" && path === "/") {
-            name = ac.app.routes.root_route.name;
-            Object.keys(ac.app.routes.root_route.verbs).forEach(function(n) {
+            name = "root_route";
+            routes.root_route.verbs.forEach(function(n) {
                 methods += n + ", ";
             });
-          } else if (action === "index") {
-            name = ac.app.routes.index_route.name;
-            Object.keys(ac.app.routes.index_route.verbs).forEach(function(n) {
-              methods += n + ", ";
+          } else if (action==="index") {
+            name = "index_route";
+            routes.index_route.verbs.forEach(function(n) {
+                methods += n + ", ";
             });
           } else {
-            name = ac.app.routes.show_route.name;
-            Object.keys(ac.app.routes.show_route.verbs).forEach(function(n) {
-              methods += n + ", ";
+            name = "show_route";
+            routes.show_route.verbs.forEach(function(n) {
+                methods += n + ", ";
             });
           }
+          methods = methods.toUpperCase();
           return {
             "path": path,
             "name": name,
             "methods": methods.replace(/, $/, "")
           };
         }
         Y.namespace('mojito.controllers')[NAME] = {
-          init: function  (config) {
-            this.config = config;
-          },
           index: function (ac) {
             ac.done(route_info(ac));
           },
-          show: function  (ac) {
+          show: function (ac) {
             ac.done(route_info(ac));
           }
         };
-      }, '0.0.1', {requires: ['mojito-url-addon', 'mojito-http-addon']});
+      }, '0.0.1', {requires: ['mojito-config-addon', 'mojito-http-addon']});
 
 #. To display your route information in your ``index`` template, replace the content of 
    ``index.hb.html`` with the following:
@@ -249,4 +238,3 @@ Source Code
 - `Route Configuration <http://github.com/yahoo/mojito/tree/master/examples/developer-guide/configure_routing/routes.json>`_
 - `Configure Routing Application <http://github.com/yahoo/mojito/tree/master/examples/developer-guide/configure_routing/>`_
 
-

docs/dev_guide/reference/mojito_troubleshooting.rst

@@ -38,7 +38,7 @@ an error or the value is not found.*
 **A:** 
 Try inspecting the ``spec`` object that is found in the ``ActionContext`` object for the 
 key. If ``ac`` is the ``ActionContext`` object, you can access the ``specs` object with the 
-following: ``ac.app.config.specs``. 
+following: ``ac.config.getAppConfig().specs``. 
 
 If you need to examine the entire ``ActionContext`` object, you can use the 
 ``console.log(ac)`` or the following code:

examples/developer-guide/adding_view_engines/mojits/myMojit/controller.server.js

@@ -2,18 +2,15 @@
 
 YUI.add('myMojit', function (Y, NAME) {
 
-    Y.mojito.controllers[NAME] = {
+    Y.namespace('mojito.controllers')[NAME] = {
 
-        init: function (config) {
-            this.config = config;
-        },
         default_ve: function (ac) {
             ac.done({
                 "title": "Handlebars at work!",
                 "view_engines": [
                     {"name": "EJS"},
                     {"name": "Jade"},
-                    {"name": "dust"},
+                    {"name": "Dust"},
                     {"name": "underscore" }
                 ],
                 "ul": { "title": 'Here are some of the other available rendering engines:' }
@@ -27,4 +24,4 @@ YUI.add('myMojit', function (Y, NAME) {
             });
         }
     };
-}, '0.0.1', {requires: ['mojito', 'myMojitModelFoo']});
+}, '0.0.1', {requires: ['mojito', 'myMojitModelFoo']});

examples/developer-guide/adding_view_engines/mojits/myMojit/models/foo.server.js

@@ -16,7 +16,7 @@ YUI.add('myMojitModelFoo', function(Y, NAME) {
      * @class myMojitModelFoo
      * @constructor
      */
-    Y.mojito.models[NAME] = {
+    Y.namespace('mojito.models')[NAME] = {
 
         init: function(config) {
             this.config = config;
@@ -34,4 +34,4 @@ YUI.add('myMojitModelFoo', function(Y, NAME) {
 
     };
 
-}, '0.0.1', {requires: ['mojito']});
+}, '0.0.1', {requires: []});

examples/developer-guide/binding_events/mojits/PagerMojit/controller.server.js

@@ -38,9 +38,6 @@ YUI.add('PagerMojit', function (Y, NAME) {
      * @constructor     
      */    
     Y.namespace('mojito.controllers')[NAME] = {
-        init: function(config) {
-            this.config = config;
-        },
         index: function(actionContext) {
             var page = 0,
                 start,

examples/developer-guide/binding_events/mojits/PagerMojit/models/model.server.js

@@ -6,19 +6,19 @@
 
 /*jslint anon:true, sloppy:true, nomen:true*/
 
-YUI.add('PagerMojitModel', function(Y) {
+YUI.add('PagerMojitModel', function(Y, NAME) {
     var API_KEY = '84921e87fb8f2fc338c3ff9bf51a412e';
 
     /** 
-     * The PagerMojitModel module.
-     * @module PagerMojitModel 
-     */
+    * The PagerMojitModel module.
+    * @module PagerMojitModel 
+    */
     /**
-     * Constructor for the Model class.
-     * @class Model 
-     * @constructor 
-     */
-    Y.mojito.models.PagerMojitModel = {
+    * Constructor for the Model class.
+    * @class Model 
+    * @constructor 
+    */
+    Y.namespace('mojito.models')[NAME] = {
         init: function(config) {
             this.config = config;
         },
@@ -57,8 +57,4 @@ YUI.add('PagerMojitModel', function(Y) {
             });
         }
     };
-}, '0.0.1', {requires: [
-    'mojito',
-    'mojito-models-addon',
-    'yql'
-]});
+}, '0.0.1', {requires: ['mojito', 'yql']});