Merge pull request #32 from danwrong/scripts_should_trigger_bundle_loads

Fix bundle loading for deferred scripts

component.json

@@ -1,6 +1,6 @@
 {
     "name": "loadrunner",
-    "version": "0.1.1",
+    "version": "0.1.2",
     "description": "Simple, flexible and sane JavaScript loader and build tool for browsers.",
     "contributors": [{ "name": "Dan Webb", "email": "dan@danwebb.net" }],
     "homepage": "https://github.com/danwrong/loadrunner",

src/loadrunner.js

@@ -150,22 +150,12 @@
       this.id = this.path = this.resolvePath(path);
     }
 
+    this.originalPath = path;
+
     this.force = !!force;
   }
   Script.autoFetch = true;
 
-  Script.prototype.start = function() {
-    var me = this, bundle;
-
-    if (bundle = findBundle(this.id)) {
-      bundle.then(function() {
-        me.start();
-      });
-    } else {
-      Dependency.prototype.start.call(this);
-    }
-  };
-
   Script.xhrTransport = function() {
     var xhr;
 
@@ -225,6 +215,22 @@
   }
 
   Script.prototype = new Dependency;
+
+  Script.prototype.start = function() {
+    var me = this, bundle;
+    if (def = Definition.provided[this.originalPath]) {
+      def.then(function() {
+        me.complete();
+      });
+    } else if (bundle = findBundle(this.originalPath)) {
+      bundle.then(function() {
+        me.start();
+      });
+    } else {
+      Dependency.prototype.start.call(this);
+    }
+  };
+
   Script.prototype.resolvePath = function(filePath) {
     filePath = filePath.replace(/^\$/, using.path.replace(/\/$/, '') + '/');
     return filePath;
@@ -238,7 +244,7 @@
   Script.prototype.fetch = Script.scriptTagTransport;
   Script.prototype.loaded = function() {
     this.complete();
-  }
+  };
 
   function Module(id, force) {
     this.id = id;
@@ -489,8 +495,8 @@
         this.entries[alias].push(b);
       }
     }
+  };
 
-  }
   Manifest.prototype.get = function(key) {
     if (typeof this.entries[key] == 'undefined') {
       return null;
@@ -503,8 +509,7 @@
     }
 
     return this.entries[key][0];
-  }
-
+  };
 
   function interactiveScript() {
     for (var i in scripts) {

test/deferred_test.html

@@ -45,6 +45,32 @@ <h2 id="qunit-userAgent"></h2>
           });
         });
       });
+
+      test('should be able load deferred scripts from a bundle', function() {
+        expect(2);
+        stop(2000);
+        loadrunner.reset();
+        window.bundleLoadedThing = false;
+        window.bundleLoadedAnother = false;
+        using.bundles.push({ 'javascripts/deferred_bundle.js': ['bundled_thing.js', 'bundled_another.js'] });
+        using('bundled_thing.js', function() {
+          equals(true, window.bundleLoadedThing);
+          equals(false, window.bundleLoadedAnother);
+          start();
+        });
+      });
+
+      test('should be able load modpath deferred scripts from a bundle', function() {
+        expect(1);
+        stop(2000);
+        loadrunner.reset();
+        window.bundleLoadedModpath = false;
+        using.bundles.push({ 'javascripts/deferred_bundle.js': ['$bundled_with_modpath.js'] });
+        using('$bundled_with_modpath.js', function() {
+          equals(true, window.bundleLoadedModpath);
+          start();
+        });
+      });
     </script>
   </body>
 </html>

test/javascripts/deferred_bundle.js

@@ -0,0 +1,11 @@
+deferred('bundled_thing.js', function() {
+  window.bundleLoadedThing = true;
+});
+
+deferred('bundled_another.js', function() {
+  window.bundleLoadedAnother = true;
+});
+
+deferred('$bundled_with_modpath.js', function() {
+  window.bundleLoadedModpath = true;
+});