refactor(core): unify appname

42Zavattas · Feb 6, 2015 · 57697c3 · 57697c3
1 parent b479b34
commit 57697c3
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 18 deletions.
diff --git a/app/index.js b/app/index.js
@@ -15,7 +15,6 @@ var BangularGenerator = yeoman.generators.Base.extend({
   initializing: {
     getVars: function () {
       this.appname = this.appname || path.basename(process.cwd());
-      this.appname = this._.camelize(this._.slugify(this._.humanize(this.appname)));
       this.filters = {};
       this.pkg = require('../package.json');
     },
@@ -90,7 +89,7 @@ var BangularGenerator = yeoman.generators.Base.extend({
         checked: false
       }]
     }], function (props) {
-      self.appname = props.name;
+      self.appname = self._.camelize(self._.slugify(self._.humanize(props.name)));
       self.filters.backend = props.backend;
 
       if (props.modules.length) {

diff --git a/app/templates/client/app.js b/app/templates/client/app.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('<%= _.slugify(appname) %>', [
+angular.module('<%= appname %>', [
   'ngRoute'<% if (filters.ngCookies) { %>,
   'ngCookies'<% } %><% if (filters.ngResource) { %>,
   'ngResource'<% } %><% if (filters.ngSanitize) { %>,

diff --git a/app/templates/client/index.html b/app/templates/client/index.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<html ng-app="<%= _.slugify(appname) %>">
+<html ng-app="<%= appname %>">
   <head>
 
     <base href="/">
 
-    <title><%= _.slugify(appname) %></title>
+    <title><%= appname %></title>
 
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width">

diff --git a/app/templates/client/views/home/home.controller.js b/app/templates/client/views/home/home.controller.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('<%= _.slugify(appname) %>')
+angular.module('<%= appname %>')
   .controller('HomeCtrl', function () {
 
     var vm = this;

diff --git a/app/templates/client/views/home/home.js b/app/templates/client/views/home/home.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('<%= _.slugify(appname) %>')
+angular.module('<%= appname %>')
   .config(function ($routeProvider) {
     $routeProvider
       .when('/', {

diff --git a/app/templates/client/views/home/home.spec.js b/app/templates/client/views/home/home.spec.js
@@ -1,9 +1,8 @@
-/*global describe, beforeEach, it, inject, expect*/
 'use strict';
 
 describe('HomeCtrl', function () {
 
-  beforeEach(module('<%= _.slugify(appname) %>'));
+  beforeEach(module('<%= appname %>'));
 
   var HomeCtrl,
     scope;

diff --git a/directive/templates/directive.js b/directive/templates/directive.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('<%= _.camelize(appname) %>')
+angular.module('<%= appname %>')
   .directive('<%= camelName %>', function () {
     return {
       restrict: 'EA',

diff --git a/directive/templates/directive.spec.js b/directive/templates/directive.spec.js
@@ -2,7 +2,7 @@
 
 describe('Directive: <%= dashName %>', function () {
 
-  beforeEach(module('<%= _.camelize(appname) %>', 'templates'));
+  beforeEach(module('<%= appname %>', 'templates'));
 
   var element, scope;
 

diff --git a/filter/templates/filter.js b/filter/templates/filter.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('<%= _.camelize(appname) %>')
+angular.module('<%= appname %>')
   .filter('<%= camelName %>', function () {
     return function (input) {
       return input;

diff --git a/filter/templates/filter.spec.js b/filter/templates/filter.spec.js
@@ -2,7 +2,7 @@
 
 describe('<%= camelName %> filter', function () {
 
-  beforeEach(module('<%= _.camelize(appname) %>'));
+  beforeEach(module('<%= appname %>'));
 
   var <%= camelName %>;
 

diff --git a/route/templates/index.js b/route/templates/index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('<%= _.camelize(appname) %>')
+angular.module('<%= appname %>')
   .config(function ($routeProvider) {
     $routeProvider
       .when('<%= route %>', {

diff --git a/route/templates/spec.js b/route/templates/spec.js
@@ -2,7 +2,7 @@
 
 describe('Controller: <%= _.capitalize(_.camelize(name)) %>Ctrl', function () {
 
-  beforeEach(module('<%= _.camelize(appname) %>'));
+  beforeEach(module('<%= appname %>'));
 
   var MainCtrl,
     scope;

diff --git a/service/templates/service.js b/service/templates/service.js
@@ -1,5 +1,5 @@
 'use strict';
 
-angular.module('<%= _.camelize(appname) %>')
+angular.module('<%= appname %>')
   .service('<%= camelName %>', function () {
   });
diff --git a/service/templates/spec.js b/service/templates/spec.js
@@ -2,7 +2,7 @@
 
 describe('Service: <%= camelName %>', function () {
 
-  beforeEach(module('<%= _.camelize(appname) %>'));
+  beforeEach(module('<%= appname %>'));
 
   var <%= camelName %>;
 

diff --git a/test/test-app.js b/test/test-app.js
@@ -54,8 +54,9 @@ describe('Launching app generator tests', function () {
     it('should creates all the files', basicFileCheck);
 
     it('should check name in some files', function () {
-      assert.fileContent('client/index.html', 'ng-app="test"');
       assert.fileContent('README.md', '# test');
+      assert.fileContent('client/index.html', 'ng-app="test"');
+      assert.fileContent('client/app.js', 'angular.module(\'test\'');
     });
 
     it('should have mongo dependency', function () {