chore(gen): revert modular project structure

Reverted until more fleshed out.

Revert "feat(gen): generate a more modular project stucture"

This reverts commit 84d2e4e.

Conflicts:
	view/index.js

Author: passy

app/index.js

@@ -61,7 +61,7 @@ var Generator = module.exports = function Generator(args, options) {
         coffee: this.options.coffee,
         travis: true,
         'skip-install': this.options['skip-install']
-      }
+       }
     }
   });
 
@@ -162,7 +162,7 @@ Generator.prototype.bootstrapFiles = function bootstrapFiles() {
   });
 };
 
-Generator.prototype.bootstrapJs = function bootstrapJs() {
+Generator.prototype.bootstrapJS = function bootstrapJS() {
   if (!this.bootstrap) {
     return;  // Skip if disabled.
   }

constant/index.js

@@ -2,6 +2,7 @@
 var path = require('path');
 var util = require('util');
 var ScriptBase = require('../script-base.js');
+var angularUtils = require('../util.js');
 
 
 module.exports = Generator;
@@ -13,6 +14,7 @@ function Generator() {
 util.inherits(Generator, ScriptBase);
 
 Generator.prototype.createServiceFiles = function createServiceFiles() {
-  this.appTemplate('service/constant');
-  this.testTemplate('spec/service');
+  this.appTemplate('service/constant', 'scripts/services/' + this.name);
+  this.testTemplate('spec/service', 'services/' + this.name);
+  this.addScriptToIndex('services/' + this.name);
 };

controller/index.js

@@ -19,6 +19,7 @@ function Generator() {
 util.inherits(Generator, ScriptBase);
 
 Generator.prototype.createControllerFiles = function createControllerFiles() {
-  this.appTemplate('controller');
-  this.testTemplate('spec/controller');
+  this.appTemplate('controller', 'scripts/controllers/' + this.name);
+  this.testTemplate('spec/controller', 'controllers/' + this.name);
+  this.addScriptToIndex('controllers/' + this.name);
 };

decorator/index.js

@@ -14,7 +14,7 @@ Generator.prototype.askForOverwrite = function askForOverwrite() {
   var cb = this.async();
 
   // TODO: Any yeoman.util function to handle this?
-  var fileExists = fs.existsSync(this.env.cwd + '/app/scripts/' + buildRelativePath(this.fileName) + '.js');
+  var fileExists = fs.existsSync(this.env.cwd + '/app/scripts/' + buildRelativePath(this.fileName) + ".js");
   if (fileExists) {
     var prompts = [{
       type: 'confirm',
@@ -28,8 +28,10 @@ Generator.prototype.askForOverwrite = function askForOverwrite() {
 
       cb();
     }.bind(this));
-  } else {
+  }
+  else{
     cb();
+    return;
   }
 };
 
@@ -40,18 +42,19 @@ Generator.prototype.askForNewName = function askForNewName() {
     cb();
     return;
   }
+  else {
+    var prompts = [];
+    prompts.push({
+      name: 'decoratorName',
+      message: 'Alternative name for the decorator'
+    });
 
-  var prompts = [];
-  prompts.push({
-    name: 'decoratorName',
-    message: 'Alternative name for the decorator'
-  });
-
-  this.prompt(prompts, function (props) {
-    this.fileName = props.decoratorName;
+    this.prompt(prompts, function (props) {
+      this.fileName = props.decoratorName;
 
-    cb();
-  }.bind(this));
+      cb();
+    }.bind(this));
+  }
 };
 
 Generator.prototype.createDecoratorFiles = function createDecoratorFiles() {
@@ -60,5 +63,5 @@ Generator.prototype.createDecoratorFiles = function createDecoratorFiles() {
 };
 
 function buildRelativePath(fileName){
-  return 'decorators/' + fileName + 'Decorator';
+  return 'decorators/' + fileName + "Decorator";
 }

directive/index.js

@@ -14,6 +14,7 @@ function Generator() {
 util.inherits(Generator, ScriptBase);
 
 Generator.prototype.createDirectiveFiles = function createDirectiveFiles() {
-  this.appTemplate('directive');
-  this.testTemplate('spec/directive');
+  this.appTemplate('directive', 'scripts/directives/' + this.name);
+  this.testTemplate('spec/directive', 'directives/' + this.name);
+  this.addScriptToIndex('directives/' + this.name);
 };

factory/index.js

@@ -14,6 +14,7 @@ function Generator() {
 util.inherits(Generator, ScriptBase);
 
 Generator.prototype.createServiceFiles = function createServiceFiles() {
-  this.appTemplate('service/factory');
-  this.testTemplate('spec/service');
+  this.appTemplate('service/factory', 'scripts/services/' + this.name);
+  this.testTemplate('spec/service', 'services/' + this.name);
+  this.addScriptToIndex('services/' + this.name);
 };

provider/index.js

@@ -14,6 +14,7 @@ function Generator() {
 util.inherits(Generator, ScriptBase);
 
 Generator.prototype.createServiceFiles = function createServiceFiles() {
-  this.appTemplate('service/provider');
-  this.testTemplate('spec/service');
+  this.appTemplate('service/provider', 'scripts/services/' + this.name);
+  this.testTemplate('spec/service', 'services/' + this.name);
+  this.addScriptToIndex('services/' + this.name);
 };

route/index.js

@@ -15,34 +15,27 @@ function Generator() {
 util.inherits(Generator, ScriptBase);
 
 Generator.prototype.rewriteAppJs = function () {
-  var htmlTemplatePath = this.name + '.html',
-    splicable,
-    filePath = path.join(this.env.options.appPath, 'scripts/app.');
-
-  if (htmlTemplatePath.indexOf('/') === -1) {
-    htmlTemplatePath = 'views/' + htmlTemplatePath;
-  }
-
   if (this.env.options.coffee) {
-    splicable = [
-      '.when \'/' + this.name + '\',',
-      '  templateUrl: \'' + htmlTemplatePath + '\',',
-      '  controller: \'' + this._.classify(this.name) + 'Ctrl\''
-    ];
-    filePath += 'coffee';
-  } else {
-    splicable = [
-      '.when(\'/' + this.name + '\', {',
-      '  templateUrl: \'' + htmlTemplatePath + '\',',
-      '  controller: \'' + this._.classify(this.name) + 'Ctrl\'',
-      '})'
-    ];
-    filePath += 'js';
+    angularUtils.rewriteFile({
+      file: path.join(this.env.options.appPath, 'scripts/app.coffee'),
+      needle: '.otherwise',
+      splicable: [
+        '.when \'/' + this.name + '\',',
+        '  templateUrl: \'views/' + this.name + '.html\',',
+        '  controller: \'' + this._.classify(this.name) + 'Ctrl\''
+      ]
+    });
+  }
+  else {
+    angularUtils.rewriteFile({
+      file: path.join(this.env.options.appPath, 'scripts/app.js'),
+      needle: '.otherwise',
+      splicable: [
+        '.when(\'/' + this.name + '\', {',
+        '  templateUrl: \'views/' + this.name + '.html\',',
+        '  controller: \'' + this._.classify(this.name) + 'Ctrl\'',
+        '})'
+      ]
+    });
   }
-
-  angularUtils.rewriteFile({
-    file: filePath,
-    needle: '.otherwise',
-    splicable: splicable
-  });
 };

script-base.js

@@ -60,64 +60,43 @@ function Generator() {
   }
 
   this.sourceRoot(path.join(__dirname, sourceRoot));
-
-  this.moduleName = this._.camelize(this.appname) + 'App';
-
-  this.namespace = [];
-  if (this.name.indexOf('/') !== -1) {
-    this.namespace = this.name.split('/');
-    this.name = this.namespace.pop();
-
-    this.moduleName += '.' + this.namespace.join('.'); // add to parent ?
-  }
-
 }
 
 util.inherits(Generator, yeoman.generators.NamedBase);
 
-Generator.prototype._dest = function (src) {
-  if (src.indexOf('spec/') === 0) {
-    src = src.substr(5);
-  } else if (src.indexOf('service/') === 0) {
-    src = src.substr(8);
-  }
-  return path.join((this.namespace.join('/') || src), this.name);
-};
-
-Generator.prototype.appTemplate = function (src) {
+Generator.prototype.appTemplate = function (src, dest) {
   yeoman.generators.Base.prototype.template.apply(this, [
     src + this.scriptSuffix,
-    path.join(this.env.options.appPath, this._dest(src)) + this.scriptSuffix
+    path.join(this.env.options.appPath, dest) + this.scriptSuffix
   ]);
-  this.addScriptToIndex(src);
 };
 
-Generator.prototype.testTemplate = function (src) {
+Generator.prototype.testTemplate = function (src, dest) {
   yeoman.generators.Base.prototype.template.apply(this, [
     src + this.scriptSuffix,
-    path.join(this.env.options.testPath, this._dest(src)) + this.scriptSuffix
+    path.join(this.env.options.testPath, dest) + this.scriptSuffix
   ]);
 };
 
-Generator.prototype.htmlTemplate = function (src) {
+Generator.prototype.htmlTemplate = function (src, dest) {
   yeoman.generators.Base.prototype.template.apply(this, [
     src,
-    path.join(this.env.options.appPath, this._dest(src))
+    path.join(this.env.options.appPath, dest)
   ]);
 };
 
-Generator.prototype.addScriptToIndex = function (src) {
+Generator.prototype.addScriptToIndex = function (script) {
   try {
     var appPath = this.env.options.appPath;
     var fullPath = path.join(appPath, 'index.html');
     angularUtils.rewriteFile({
       file: fullPath,
       needle: '<!-- endbuild -->',
       splicable: [
-        '<script src="' + this._dest(src) + '.js"></script>'
+        '<script src="scripts/' + script + '.js"></script>'
       ]
     });
   } catch (e) {
-    console.log('\nUnable to find '.yellow + fullPath + '. Reference to '.yellow + this._dest(src) + '.js ' + 'not added.\n'.yellow);
+    console.log('\nUnable to find '.yellow + fullPath + '. Reference to '.yellow + script + '.js ' + 'not added.\n'.yellow);
   }
 };

service/index.js

@@ -14,6 +14,7 @@ function Generator() {
 util.inherits(Generator, ScriptBase);
 
 Generator.prototype.createServiceFiles = function createServiceFiles() {
-  this.appTemplate('service/service');
-  this.testTemplate('spec/service');
+  this.appTemplate('service/service', 'scripts/services/' + this.name);
+  this.testTemplate('spec/service', 'services/' + this.name);
+  this.addScriptToIndex('services/' + this.name);
 };