Basic app structure and Grunt build modifications

snagi · Sep 8, 2012 · f47cde7 · f47cde7
1 parent c344126
commit f47cde7
Show file tree

Hide file tree

Showing 12 changed files with 82 additions and 20 deletions.
diff --git a/grunt.js b/grunt.js
@@ -15,9 +15,6 @@ module.exports = function (grunt) {
     lint:{
       files:['grunt.js', 'src/**/*.js', 'test/unit/**/*.js']
     },
-    test:{
-      files:['test/unit/**/*.js']
-    },
     concat:{
       dist:{
         src:['<banner:meta.banner>', 'src/**/*.js'],
@@ -31,8 +28,8 @@ module.exports = function (grunt) {
       }
     },
     watch:{
-      files:'<config:lint.files>',
-      tasks:'lint test'
+      files:['<config:lint.files>', 'src/**/*.html'],
+      tasks:'lint test concat min concatPartials index'
     },
     jshint:{
       options:{
@@ -51,16 +48,20 @@ module.exports = function (grunt) {
     uglify:{}
   });
 
+  grunt.registerTask('index', 'Process index.html', function(){
+     grunt.file.copy('src/index.html', 'dist/index.html', {process:grunt.template.process});
+  });
+
   // Default task.
-  grunt.registerTask('default', 'lint concat min');
+  grunt.registerTask('default', 'lint test concat  min concatPartials index');
 
   grunt.registerTask('server', 'start testacular server', function () {
     //Mark the task as async but never call done, so the server stays up
     var done = this.async();
-    testacular.server.start({configFile : 'test/config/test-config.js'});
+    testacular.server.start({configFile:'test/config/test-config.js'});
   });
 
-  grunt.registerTask('test', 'start testacular test', function () {
+  grunt.registerTask('test', 'run testacular tests', function () {
 
     var specDone = this.async();
     var testacularCmd = process.platform === 'win32' ? 'testacular.cmd' : 'testacular';
@@ -76,4 +77,30 @@ module.exports = function (grunt) {
     child.stderr.pipe(process.stderr);
   });
 
-};
+  grunt.registerTask('concatPartials', 'concat partials', function () {
+    //TODO: horrible implementation, to be fixed, but this Grunt task makes sense for the AngularJS community!
+    var content = '', partials = grunt.file.expandFiles('src/modules/*/partials/**/*.tpl.html');
+    for (var i=0; i<partials.length; i++){
+      var partialFile = partials[i];
+      var partialel = partialFile.split('/');
+      var partial = "<script type='text/ng-template' id='"+partialel[partialel.length-1]+"'>"+grunt.file.read(partialFile)+"</script>\n";
+      content += partial;
+    }
+    grunt.file.write('dist/partials.tpl.html', content);
+  });
+
+  grunt.registerTask('module', 'create new module', function () {
+    var moduleName = this.args[0];
+    grunt.log.debug("Creating new module: " + moduleName);
+    var srcPath = 'src/modules/' + moduleName + '/';
+    var testPath = 'test/modules/' + moduleName + '/';
+
+    //js
+    //main module file
+    grunt.file.write(srcPath + moduleName + '.js', "angular.module('" + moduleName + "',[]);\nangular.module('" + moduleName + "').controller('" + moduleName + "Controller', function($scope){\n});");
+    //tests
+    grunt.file.write(testPath + '/unit/' + moduleName + 'Spec.js', "//jasmine template here");
+    //partials
+    grunt.file.write(srcPath + 'partials/' + moduleName + '.tpl.html', '<div>' + moduleName + '</div>');
+  });
+};
diff --git a/src/app.js b/src/app.js
diff --git a/src/index.html b/src/index.html
@@ -1,9 +1,16 @@
-<html>
+<html ng-app="app">
 <head>
     <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.0.1/angular.js"></script>
-    <script type="text/javascript" src="app.js"></script>
+    <script type="text/javascript" src="angular-app.min.js"></script>
+
+<!-- partials start -->
+<%= grunt.file.read('dist/partials.tpl.html') %>
+<!-- partials end -->
+
 </head>
-<body ng-app="app" ng-controller="MainController">
-    Hello, {{hello}}!
+<body ng-controller="AppController">
+    Hello, {{user || 'Anonymous'}}! You are here: {{location.path()}}
+    <hr>
+    <div ng-view></div>
 </body>
 </html>
diff --git a/src/modules/app/app.js b/src/modules/app/app.js
@@ -0,0 +1,11 @@
+angular.module('app', ['signin', 'dashboard']);
+
+angular.module('app').config(['$routeProvider', function ($routeProvider) {
+  $routeProvider.when('/signin', {templateUrl:'signin.form.tpl.html', controller:'SignInController'});
+  $routeProvider.when('/dashboard', {templateUrl:'dashboard.tpl.html', controller:'DashboardController'});
+  $routeProvider.otherwise({redirectTo:'/signin'});
+}]);
+
+angular.module('app').controller('AppController', ['$scope', '$location', function ($scope, $location) {
+  $scope.location = $location;
+}]);
diff --git a/src/modules/dashboard/dashboard.js b/src/modules/dashboard/dashboard.js
@@ -0,0 +1,3 @@
+angular.module('dashboard',[]);
+angular.module('dashboard').controller('DashboardController', ['$scope', function($scope){
+}]);
diff --git a/src/modules/dashboard/partials/dashboard.tpl.html b/src/modules/dashboard/partials/dashboard.tpl.html
@@ -0,0 +1 @@
+<div>Dashboard!</div>
diff --git a/src/modules/signin/partials/signin.form.tpl.html b/src/modules/signin/partials/signin.form.tpl.html
@@ -0,0 +1,5 @@
+<form name="signin">
+    login: <input name="login" ng-model="user.login"><br>
+    pass: <input name="pass" ng-model="user.pass"><br>
+    <a href="#/dashboard">Sign in</a>
+</form>
diff --git a/src/modules/signin/signin.js b/src/modules/signin/signin.js
@@ -0,0 +1,4 @@
+angular.module('signin', []);
+angular.module('signin').controller('SignInController', ['$scope', function($scope){
+  $scope.user = {};
+}]);
diff --git a/test/config/test-config.js b/test/config/test-config.js
@@ -12,7 +12,7 @@ files = [
   'test/lib/angular/angular.js',
   'test/lib/angular/angular-mocks.js',
   'src/**/*.js',
-  'test/unit/**/*Spec.js'
+  'test/**/unit/**/*Spec.js'
 ];
 
 // list of files to exclude

diff --git a/test/unit/appSpec.js → test/modules/app/unit/appSpec.js b/test/unit/appSpec.js → test/modules/app/unit/appSpec.js
@@ -9,7 +9,7 @@ describe('hello world scenario', function () {
   }));
 
   it('should say hello to a hello in scope', function () {
-    $controller('MainController', {$scope:scope});
-    expect(scope.hello).toEqual('World');
+    $controller('AppController', {$scope:scope});
+    expect(scope.user).toBeUndefined();
   });
 });
diff --git a/test/modules/dashboard/unit/dashboardSpec.js b/test/modules/dashboard/unit/dashboardSpec.js
@@ -0,0 +1 @@
+//jasmine template here
diff --git a/todo.txt b/todo.txt
@@ -0,0 +1,7 @@
+- There is no npm module for AngularJS, so its version is hard-coded, libs checked-in (for tests) etc.
+
+Nice to have
+-----------------------------------------------------------------------
+- grunt task to:
+    - create new modules
+    - concat partials (globally or per-module?)