Merge pull request #67 from Subtletree/add-undefined-podmoduleprefix

Migrate pods with undefined podModulePrefix

Author: rwjblue

lib/index.js

@@ -144,7 +144,7 @@ var Engine = CoreObject.extend({
     var fileInfo = this.engine.buildFor(path, {
       projectRoot: this.projectRoot,
       projectName: this.projectName,
-      podModulePrefix: this.podModulePrefix !== undefined ? this.podModulePrefix : 'pods',
+      podModulePrefix: this.podModulePrefix || '',
       _fileInfoCollection: this._fileInfoCollection
     });
 

lib/models/file-info.js

@@ -76,8 +76,6 @@ var FileInfo = CoreObject.extend({
     var pathParts = this.sourceRelativePath.split('/');
     var typeFolder = pathParts[1];
 
-
-
     var podType = typeForPodFile(this.sourceRelativePath);
     var arePodsNamespaced = hasPodNamespace(this.podModulePrefix);
 
@@ -96,16 +94,19 @@ var FileInfo = CoreObject.extend({
       }
     }
 
+    strippedRelativePath = this.sourceRelativePath;
+
     // default/classic/namespaced-pods
-    pathRootRegex = new RegExp('(app\/)?' + this.podModulePrefix + '\/(components\/)?');
+    if (this.podModulePrefix) {
+      pathRootRegex = new RegExp('(app\/)?' + this.podModulePrefix + '\/(components\/)?');
+      strippedRelativePath = strippedRelativePath.replace(pathRootRegex, ''); // don't care if path begins with pods;
+    }
 
-    strippedRelativePath = this.sourceRelativePath
-      .replace(pathRootRegex, '') // don't care if path begins with pods
+    strippedRelativePath = strippedRelativePath
       .replace(new RegExp('^' + this.sourceRoot + '/' + typeFolder + '/'), '') // remove leading type dir
       .replace(new RegExp(this.ext + '$'), '') // remove extension
       .replace(new RegExp('/' + this.type + '$'), ''); // remove trailing type
 
-
     if (!arePodsNamespaced) {
       if (podType) {
         fileName = pathParts[pathParts.length - 1];
@@ -122,23 +123,6 @@ var FileInfo = CoreObject.extend({
           .replace(new RegExp(this.ext + '$'), '') // remove extension
           .replace(new RegExp('/' + this.type + '$'), ''); // remove trailing type
       }
-
-      // for other files (adapters, serializers, helpers, initializers, etc)
-      if (type === undefined){
-        pathRootRegex = new RegExp('(app\/)?');
-        type = pathParts[1];
-        fileName = pathParts[pathParts.length - 1];
-        typeFolder = inflection.pluralize(type);
-
-
-        strippedRelativePath = this.sourceRelativePath
-          .replace(pathRootRegex, '')
-          .replace(new RegExp(type + '/'), '')
-          .replace(new RegExp('^' + this.sourceRoot + '/' + typeFolder + '/'), '') // remove leading type dir
-          .replace(new RegExp(this.ext + '$'), '') // remove extension
-          .replace(new RegExp('/' + this.type), ''); // remove trailing type
-
-      }
     }
 
     var parts = strippedRelativePath.split('/');

test/fixtures/classic-acceptance/input.js

@@ -111,6 +111,13 @@ module.exports = {
     }
   },
 
+  'config': {
+    'environment.js': '"ENV"',
+    'foo': {
+      'baz.sh': 'yolo'
+    }
+  },
+
   'tests': {
     'acceptance': {
       'post-test.js': '"post acceptance test"'

test/fixtures/classic-acceptance/output.js

@@ -140,6 +140,12 @@ module.exports = {
       }
     }
   },
+  'config': {
+    'environment.js': '"ENV"',
+    'foo': {
+      'baz.sh': 'yolo'
+    }
+  },
   'tests': {
     'acceptance': {
       'post-test.js': '"post acceptance test"'

test/fixtures/pods-acceptance/config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  podModulePrefix: 'pods'
+};

test/fixtures/pods-acceptance/input.js

@@ -110,6 +110,12 @@ module.exports = {
       'blahzorz.js': '"blahzorz validator"'
     }
   },
+  'config': {
+    'environment.js': '"ENV"',
+    'foo': {
+      'baz.sh': 'yolo'
+    }
+  },
   'tests': {
     'acceptance': {
       'post-test.js': '"post acceptance test"'

test/fixtures/pods-custom-name-acceptance/input.js

@@ -110,6 +110,12 @@ module.exports = {
       'blahzorz.js': '"blahzorz validator"'
     }
   },
+  'config': {
+    'environment.js': '"ENV"',
+    'foo': {
+      'baz.sh': 'yolo'
+    }
+  },
   'tests': {
     'acceptance': {
       'post-test.js': '"post acceptance test"'

test/fixtures/pods-private-components/config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  podModulePrefix: 'pods'
+};

test/fixtures/pods-relative-imports/config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  podModulePrefix: 'pods'
+};

test/fixtures/pods-with-undefined-namespace-acceptance/config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  podModulePrefix: undefined
+};