Merge pull request #327 from drewfish/redesign-rs

redesigned resource store

examples/developer-guide/device_assets/application.json

@@ -13,5 +13,6 @@
         }
       }
     }
-  }
+  },
+  { "settings": [ "device:iphone" ], "selector": "iphone" }
 ]

examples/developer-guide/device_views/application.json

@@ -7,6 +7,9 @@
         "type" : "device"
       }
     }
-  }
+  },
+  { "settings": [ "device:android" ], "selector": "android" },
+  { "settings": [ "device:blackberry" ], "selector": "blackberry" },
+  { "settings": [ "device:iphone" ], "selector": "iphone" }
 ]
 

examples/developer-guide/scroll_views/application.json

@@ -1,23 +1,24 @@
 [
     {
-    "settings": [ "master" ],
-    "specs": {
-        "frame" : {
-            "type" : "HTMLFrameMojit",
-            "config": {
-                "deploy": true,
-                "child" : {
-                    "type" : "scroll"
-                },
-                "assets": { 
-                    "top": {
-                        "css":[
-                            "/static/scroll/assets/index.css"
-                        ]
+        "settings": [ "master" ],
+        "specs": {
+            "frame" : {
+                "type" : "HTMLFrameMojit",
+                "config": {
+                    "deploy": true,
+                    "child" : {
+                        "type" : "scroll"
+                    },
+                    "assets": { 
+                        "top": {
+                            "css":[
+                                "/static/scroll/assets/index.css"
+                            ]
+                        }
                     }
                 }
             }
         }
-    }
-}
+    },
+    { "settings": [ "device:iphone" ], "selector": "iphone" }
 ]

examples/getting-started-guide/part4/paged-yql/application.json

@@ -23,5 +23,17 @@
                 "type": "PagedFlickr"
             }
         }
+    },
+    {
+        "settings": [ "device:iphone" ],
+        "selector": "iphone"
+    },
+    {
+        "settings": [ "device:android" ],
+        "selector": "droid"
+    },
+    {
+        "settings": [ "device:android", "environment:dev" ],
+        "selector": "devdroid"
     }
 ]

examples/getting-started-guide/part5/flickr-list/application.json

@@ -50,5 +50,6 @@
                 "type": "FlickrDetail"
             }
         }
-    }
+    },
+    { "settings": [ "device:iphone" ], "selector": "iphone" }
 ]

examples/getting-started-guide/part5/flickr-list/routes.json

@@ -11,7 +11,7 @@
         "flickr_base": {
             "verbs": ["get"],
             "path": "/flickr",
-            "param": "page=1&image=0",
+            "params": "page=1&image=0",
             "call": "flickr.index"
         }
 

examples/newsboxes/application.json

@@ -68,4 +68,6 @@
             }
         }
     }
-}]
+},
+{ "settings": [ "device:opera-mini" ], "selector": "opera-mini" }
+]

examples/sandbox/ex1/application.json

@@ -40,5 +40,6 @@
                 "action": "jsonReturn"
             }
         }
-    }
+    },
+    { "settings": [ "device:iphone" ], "selector": "iphone" }
 ]

source/lib/app/addons/ac/deploy.server.js

@@ -80,11 +80,11 @@ YUI.add('mojito-deploy-addon', function(Y, NAME) {
 
             var store = this.rs,
                 contextServer = this.ac.context,
-                appConfigServer = store.getAppConfig(contextServer,
-                    'application'),
+                appConfigServer = store.getAppConfig(contextServer),
                 contextClient,
                 appConfigClient,
                 yuiConfig = {},
+                fwConfig,
                 yuiConfigEscaped,
                 yuiConfigStr,
                 yuiModules,
@@ -97,7 +97,6 @@ YUI.add('mojito-deploy-addon', function(Y, NAME) {
                 binder,
                 i,
                 id,
-                instances = {},
                 clientConfig = {},
                 clientConfigEscaped,
                 clientConfigStr,
@@ -109,11 +108,12 @@ YUI.add('mojito-deploy-addon', function(Y, NAME) {
                 type,
                 module,
                 path,
-                pathToRoot;
+                pathToRoot,
+                urls;
 
             contextClient = Y.mojito.util.copy(contextServer);
             contextClient.runtime = 'client';
-            appConfigClient = store.getAppConfig(contextClient, 'application');
+            appConfigClient = store.getAppConfig(contextClient);
             clientConfig.context = contextClient;
 
             if (appConfigClient.yui && appConfigClient.yui.config) {
@@ -137,8 +137,7 @@ YUI.add('mojito-deploy-addon', function(Y, NAME) {
                 yuiConfig.loaderPath = appConfigClient.yui.loader;
             }
 
-            clientConfig.store = store.serializeClientStore(contextClient,
-                instances);
+            clientConfig.store = store.serializeClientStore(contextClient);
 
             usePrecomputed = appConfigServer.yui &&
                 appConfigServer.yui.dependencyCalculations && (-1 !==
@@ -154,6 +153,8 @@ YUI.add('mojito-deploy-addon', function(Y, NAME) {
                 useOnDemand = true;
             }
 
+            urls = store.store.getAllURLs();
+
             // Set the YUI URL to use on the client (This has to be done
             // before any other scripts are added)
             if (appConfigClient.yui && appConfigClient.yui.url) {
@@ -176,6 +177,7 @@ YUI.add('mojito-deploy-addon', function(Y, NAME) {
                 yuiModules = ['yui'];
                 yuiJsUrlContains.yui = true;
                 if (useOnDemand) {
+                    fwConfig = store.store.getFrameworkConfig();
                     yuiModules.push('get');
                     yuiJsUrlContains.get = true;
                     yuiModules.push('loader-base');
@@ -184,10 +186,8 @@ YUI.add('mojito-deploy-addon', function(Y, NAME) {
                     yuiJsUrlContains['loader-rollup'] = true;
                     yuiModules.push('loader-yui3');
                     yuiJsUrlContains['loader-yui3'] = true;
-                    for (i = 0; i < store.store._fwConfig.
-                            ondemandBaseYuiModules.length; i += 1) {
-                        module =
-                            store.store._fwConfig.ondemandBaseYuiModules[i];
+                    for (i = 0; i < fwConfig.ondemandBaseYuiModules.length; i += 1) {
+                        module = fwConfig.ondemandBaseYuiModules[i];
                         yuiModules.push(module);
                         yuiJsUrlContains[module] = true;
                     }
@@ -209,7 +209,7 @@ YUI.add('mojito-deploy-addon', function(Y, NAME) {
                                 path = binder.needs[module];
                                 // Anything we don't know about we'll assume is
                                 // a YUI library module.
-                                if (!store.fileFromStaticHandlerURL(path)) {
+                                if (!urls[path]) {
                                     yuiModules.push(module);
                                     yuiJsUrlContains[module] = true;
                                 }
@@ -240,10 +240,10 @@ YUI.add('mojito-deploy-addon', function(Y, NAME) {
             // fw & app scripts.
             if (useOnDemand) {
                 // add all framework-level and app-level code
-                this.addScripts('bottom', store.getYuiConfigFw('client',
-                    contextClient).modules);
-                this.addScripts('bottom', store.getYuiConfigApp('client',
-                    contextClient).modules);
+                this.addScripts('bottom', store.store.yui.getConfigShared(
+                    'client',
+                    contextClient
+                ).modules, false);
             }
 
             // add binders' dependencies
@@ -312,7 +312,7 @@ YUI.add('mojito-deploy-addon', function(Y, NAME) {
 
             // Add all the scripts we have collected
             assetHandler.addAssets(
-                this.getScripts(appConfigServer.embedJsFilesInHtmlFrame)
+                this.getScripts(appConfigServer.embedJsFilesInHtmlFrame, urls)
             );
             // Add the boot script
             assetHandler.addAsset('blob', 'bottom', initializer);
@@ -344,10 +344,14 @@ YUI.add('mojito-deploy-addon', function(Y, NAME) {
          * @private
          * @param {bool} embed Should returned scripts be embedded in script
          *     tags.
+         * @param {object} urls Mapping of URLs to filesystem paths.  The keys
+         *      are the URLs, and the values are the cooresponding filesystem
+         *      paths.
          * @return {object} An object containing script descriptors.
          */
-        getScripts: function(embed) {
+        getScripts: function(embed, urls) {
             var i,
+                path,
                 x,
                 assets = {},
                 blob = {
@@ -359,16 +363,14 @@ YUI.add('mojito-deploy-addon', function(Y, NAME) {
             // Walk over the scripts and check what we can do
             for (i in this.scripts) {
                 if (this.scripts.hasOwnProperty(i)) {
-                    if (embed && this.rs._staticURLs[i]) {
-                        //blob.content+= fs.readFileSync(this.rs._staticURLs[i],
-                        //      'utf8');
-                        //delete this.scripts[i];
+                    path = urls[i];
+                    if (embed && path) {
                         this.scripts[i] = {
                             type: 'blob',
                             position: 'bottom',
                             content: '<script type="text/javascript">' +
-                                minify(fs.readFileSync(this.rs._staticURLs[i],
-                                    'utf8')) + '</script>'
+                                minify(fs.readFileSync(path, 'utf8')) +
+                                    '</script>'
                         };
                     } else {
                         this.scripts[i] = {