rename .name to .basename

Author: tj

lib/builder.js

@@ -39,7 +39,7 @@ function Builder(dir, parent) {
   this.dir = dir;
   this.root = ! parent;
   this.parent = parent;
-  this.name = basename(dir);
+  this.basename = basename(dir);
   this.paths = ['components'];
   this.ignored = {
     scripts: [],
@@ -197,7 +197,7 @@ Builder.prototype.lookup = function(name, fn){
     var path = paths[i++];
 
     // no more paths
-    if (!path) return fn(new Error('failed to lookup "' + self.name + '"\'s dependency "' + name + '"'));
+    if (!path) return fn(new Error('failed to lookup "' + self.basename + '"\'s dependency "' + name + '"'));
 
     // path
     var dir = join(path, name);
@@ -452,18 +452,18 @@ Builder.prototype.buildAliases = function(fn){
                 // TODO: remove special-casing root
                 var alias = self.root
                   ? self.conf.name + '/deps/' + name + '/' + script
-                  : self.name + '/deps/' + name + '/' + script;
+                  : self.basename + '/deps/' + name + '/' + script;
 
-                var js = 'require.alias("' + builder.name + '/' + script + '", "' + alias + '");\n';
+                var js = 'require.alias("' + builder.basename + '/' + script + '", "' + alias + '");\n';
                 return js;
               });
 
               if (main) {
                 var alias = self.root
                   ? self.conf.name + '/deps/' + name + '/index.js'
-                  : self.name + '/deps/' + name + '/index.js';
+                  : self.basename + '/deps/' + name + '/index.js';
 
-                aliases.push('require.alias("' + builder.name + '/' + main + '", "' + alias + '");\n');
+                aliases.push('require.alias("' + builder.basename + '/' + main + '", "' + alias + '");\n');
               }
 
               aliases = aliases.join('');
@@ -483,7 +483,7 @@ Builder.prototype.buildAliases = function(fn){
       var conf = self.conf;
       var name = self.root
         ? conf.name
-        : self.name;
+        : self.basename;
 
       if (conf.main) {
         res.push('require.alias("' + name + '/' + conf.main + '", "' + name + '/index.js");\n');
@@ -505,7 +505,7 @@ Builder.prototype.buildAliases = function(fn){
 
 Builder.prototype.buildType = function(type, fn, process){
   var self = this;
-  debug('building %s %s', this.name, type);
+  debug('building %s %s', this.basename, type);
 
   this.json(function(err, conf){
     if (err) return fn(err);
@@ -613,7 +613,7 @@ Builder.prototype.buildAsset = function(type, fn){
     if (conf[type]) {
       conf[type].forEach(function(file){
         var path = self.path(file);
-        var name = normalize(self.name);
+        var name = normalize(self.basename);
         var dest = join(self.assetsDest, name, file);
         batch.push(function(done){
           self.copyTo(path, dest, done);
@@ -793,7 +793,7 @@ function noop(builder, file, str){
 function register(builder, file, js){
   file =  builder.root
     ? builder.conf.name + '/' + file
-    : builder.name + '/' + file;
+    : builder.basename + '/' + file;
 
   if (builder.sourceUrls) {
     return 'require.register("' + file + '", Function("exports, require, module",\n'
@@ -834,7 +834,7 @@ function rewriteUrls(builder, file, css) {
     url = utils.stripQuotes(url);
     if (isData(url)) return orig;
     if (isAbsolute(url)) return orig;
-    var name = normalize(builder.name);
+    var name = normalize(builder.basename);
     url = join(builder.urlPrefix, '/', name, dirname(file), url);
     return 'url("' + url + '")';
   }

test/builder.js

@@ -43,7 +43,7 @@ describe('Builder', function(){
       builder.buildScripts(function(){});
       builder.on('dependency', function(builder){
         builder.dir.should.be.a('string');
-        builder.name.should.equal('component-emitter');
+        builder.basename.should.equal('component-emitter');
         done();
       });
     })
@@ -67,7 +67,7 @@ describe('Builder', function(){
       builder.buildStyles(function(){});
       builder.on('dependency', function(builder){
         builder.dir.should.be.a('string');
-        builder.name.should.equal('component-emitter');
+        builder.basename.should.equal('component-emitter');
         done();
       });
     })