Allow <name>.<ext> even with a namespace for default type in collection.

Based on rev.66.

Author: rwjblue

lib/models/file-info.js

@@ -1,5 +1,4 @@
 var path = require('path');
-var inflection = require('inflection');
 var CoreObject = require('core-object');
 var fse = require('fs-extra');
 var existsSync = require('exists-sync');
@@ -156,12 +155,10 @@ var FileInfo = CoreObject.extend({
       return true;
     }
 
-    var singularizedCollection = inflection.singularize(this.collection);
-    var isDefaultTypeForCollection = singularizedCollection === this.type;
-    var hasNamespace = !!this.namespace;
+    var isDefaultTypeForCollection = defaultTypeForCollection(this.collection) === this.type;
 
     // use <name>.<ext> in the root of a collection if it is the default type
-    return isDefaultTypeForCollection && !hasNamespace;
+    return isDefaultTypeForCollection;
   }
 });
 

lib/utils/default-type-for-collection.js

@@ -1,33 +1,5 @@
-module.exports = function(collection) {
-  switch(collection) {
-  case 'models':
-    return 'model';
-
-  case 'components':
-    return 'component';
-
-  case 'initializers':
-    return 'initializer';
-
-  case 'instance-initializers':
-    return 'instance-initializer';
-
-  //case 'partials':
-  //  return 'partial';
+var inflection = require('inflection');
 
-  case 'routes':
-    return 'route';
-
-  case 'services':
-    return 'service';
-
-  case 'transforms':
-    return 'transform';
-
-  case 'utils':
-    return 'util';
-
-  default:
-    return null;
-  }
+module.exports = function(collection) {
+  return inflection.singularize(collection);
 };

test/engines/classic-test.js

@@ -71,9 +71,9 @@ describe('classic engine', function() {
         'app/components/qux-derp/component.js': 'src/ui/components/qux-derp/component.js',
         'app/templates/components/foo-bar.hbs': 'src/ui/components/foo-bar/template.hbs',
         'app/components/qux-derp/template.hbs': 'src/ui/components/qux-derp/template.hbs',
-        'app/routes/post/index.js': 'src/ui/routes/post/index/route.js',
+        'app/routes/post/index.js': 'src/ui/routes/post/index.js',
         'app/templates/post/index.hbs': 'src/ui/routes/post/index/template.hbs',
-        'app/routes/foo/bar/baz.js': 'src/ui/routes/foo/bar/baz/route.js',
+        'app/routes/foo/bar/baz.js': 'src/ui/routes/foo/bar/baz.js',
         'app/templates/foo/bar/baz.hbs': 'src/ui/routes/foo/bar/baz/template.hbs',
         'app/adapters/post.js': 'src/data/models/post/adapter.js',
         'app/serializers/post.js': 'src/data/models/post/serializer.js',