JustinLove / Module / changeset / b78712a46b9e

Up to file-list qunit/index.html:

@@ -39,25 +39,25 @@ test("Can construct a dependency", funct
   ok(new CGD.Dependency('pass'));
 });
-test("has identifier property", function()
+test("has id property", function()
+{
-  ok(new CGD.Dependency('pass').identifier);
+  ok(new CGD.Dependency('pass').id);
 });
-test("has canonicalPath property", function()
+test("has uri property", function()
+{
-  ok(new CGD.Dependency('pass').canonicalPath);
+  ok(new CGD.Dependency('pass').uri);
 });
 test("Can construct a dependency with a full path", function() {
-  equals(new CGD.Dependency('pass').canonically('full/pass.js').canonicalPath, 'full/pass.js');
+  equals(new CGD.Dependency('pass').canonically('full/pass.js').uri, 'full/pass.js');
 });
 test("registers itself", function() {
   var files = {};
   var x = new CGD.Dependency('x').register(files);
   equals(files[x.identifier], x, 'identifier is registered');
   equals(files[x.canonicalPath], x, 'canonicalPath is registered');
   equals(files[x.id], x, 'id is registered');
   equals(files[x.uri], x, 'uri is registered');
 });
 test("can track whether it's loaded", function() {
@@ -83,8 +83,8 @@ test("defaults to script type", function
 });
 test("infer file extension", function() {
   equals(extension(new CGD.Dependency('type', 'text/javascript').canonicalPath), 'js');
   equals(extension(new CGD.Dependency('type', 'text/css').canonicalPath), 'css');
   equals(extension(new CGD.Dependency('type', 'text/javascript').uri), 'js');
   equals(extension(new CGD.Dependency('type', 'text/css').uri), 'css');
 });
 test("makes matching element", function() {
@@ -98,10 +98,10 @@ test("includes a file", function() {
   setTimeout(start, CGD.test.timeout);
 });
-test("improves canonicalPath", function() {
+test("improves uri", function() {
   file = new CGD.Dependency('subdir/../el');
   file.element();
-  ok(file.canonicalPath.match('qunit/el'), file.canonicalPath);
+  ok(file.uri.match('qunit/el'), file.uri);
 });
 QUnit.module("Module");
@@ -130,7 +130,7 @@ test("includes a file twice", function()
 test("detects static script files", function() {
   for (var i in CGD.mod.files) {
-    if (CGD.mod.files[i].canonicalPath.match(/qunit.js/)) {
+    if (CGD.mod.files[i].uri.match(/qunit.js/)) {
       ok(true, 'found static file');
       return;
+    }
@@ -140,7 +140,7 @@ test("detects static script files", func
 test("has the proper type for static script files", function() {
   for (var i in CGD.mod.files) {
-    if (CGD.mod.files[i].canonicalPath.match(/qunit.js/)) {
+    if (CGD.mod.files[i].uri.match(/qunit.js/)) {
       equals(CGD.mod.files[i].type, 'text/javascript');
       return;
+    }
@@ -149,7 +149,7 @@ test("has the proper type for static scr
 test("detects static style files", function() {
   for (var i in CGD.mod.files) {
-    if (CGD.mod.files[i].canonicalPath.match(/qunit.css/)) {
+    if (CGD.mod.files[i].uri.match(/qunit.css/)) {
       ok(true, 'found static file');
       return;
+    }
@@ -159,7 +159,7 @@ test("detects static style files", funct
 test("has the proper type for static style files", function() {
   for (var i in CGD.mod.files) {
-    if (CGD.mod.files[i].canonicalPath.match(/qunit.css/)) {
+    if (CGD.mod.files[i].uri.match(/qunit.css/)) {
       equals(CGD.mod.files[i].type, 'text/css');
       return;
+    }
@@ -179,7 +179,7 @@ test("fileFromIdentifier gets proper fil
 });
 test("fileFromIdentifier gets a file with proper extension", function() {
-  equals(extension(CGD.mod.fileFromIdentifier('blarg', 'text/css').file.canonicalPath), 'css');
+  equals(extension(CGD.mod.fileFromIdentifier('blarg', 'text/css').file.uri), 'css');
 });
 test("require includes a file only once", function() {

Up to file-list script/cgd/Module.js:

@@ -45,9 +45,9 @@ CGD.god = window;
   };
   CGD.Dependency = function(identifier, type) {
-    this.identifier = identifier;
+    this.id = identifier;
     this.type = type || 'text/javascript';
-    this.canonicalPath = identifier + CGD.Dependency.guessFileExtension(this.type);
+    this.uri = identifier + CGD.Dependency.guessFileExtension(this.type);
     this.load = {status: 'new'};
     this.exports = {};
   };
@@ -55,16 +55,16 @@ CGD.god = window;
   CGD.Dependency.prototype = {
     constructor: CGD.Dependency,
     canonically: function(fullPath) {
-      this.canonicalPath = fullPath;
+      this.uri = fullPath;
       return this;
     },
     under: function(root) {
-      this.canonicalPath = root + this.canonicalPath;
+      this.uri = root + this.uri;
       return this;
     },
     register: function(files) {
       files[this.identifier] = this;
       files[this.canonicalPath] = this;
       files[this.id] = this;
       files[this.uri] = this;
       return this;
     },
     status: function() {
@@ -96,13 +96,13 @@ CGD.god = window;
       switch (type) {
         case 'text/javascript':
           var element = CGD.html.makeTag('script',
             {src: this.canonicalPath, type: type, language: 'javascript'});
           this.canonicalPath = element.src;
             {src: this.uri, type: type, language: 'javascript'});
           this.uri = element.src;
           return element;
         case 'text/css':
           var element = CGD.html.makeTag('link',
             {href: this.canonicalPath, type: type, rel: 'stylesheet'});
           this.canonicalPath = element.href;
             {href: this.uri, type: type, rel: 'stylesheet'});
           this.uri = element.href;
           return element;
         default:
           throw "Don't know how to include " + type;
@@ -128,7 +128,7 @@ CGD.god = window;
     var module = this;
     var path = CGD.Module.pathTo(identifier);
     var file = new CGD.Dependency(identifier);
-    var filename = file.canonicalPath;
+    var filename = file.uri;
     var fullPath = CGD.html.findMe('script', 'src', filename);
     this.queued = 0;
     if (fullPath) {
@@ -136,7 +136,7 @@ CGD.god = window;
       this.root = fullPath.slice(0, -filename.length);
+    }
     this.cd(path);
-    this.id = file.identifier;
+    this.id = file.id;
     this.uri = fullPath;
     window.exports = file.exports;
     window.require = function(identifier, type) {return module.require(identifier, type);};
@@ -194,7 +194,7 @@ CGD.god = window;
         case 'pending':
           x.file.count = (x.file.count || 0) + 1;
           if (x.file.count > 20) {
-            throw new CGD.Module.UnmetDependency(x.file.canonicalPath);
+            throw new CGD.Module.UnmetDependency(x.file.uri);
+          }
           this.queued++;
           return null;
@@ -206,7 +206,7 @@ CGD.god = window;
       var file = this.files[identifier] ||
         new CGD.Dependency(identifier, type).under(this.root);
       var element = file.element(type);
-      file = this.files[file.canonicalPath] || file;
+      file = this.files[file.uri] || file;
       return {file: file, element: element};
     },
     absoluteIdentifier: function(identifier) {

commit 206:	b78712a46b9e
parent 205:	5733e5f2a035
branch:	default