Moving assets to public, Fixing jshint error, re-structuring demo application, adding karma testing skeleton

Author: busterbeans

README.md

@@ -1,6 +1,7 @@
 # [ng-breadcrumbs](http://ianwalter.github.io/ng-breadcrumbs/)
 *A better AngularJS service to help with breadcrumb-style navigation between views.*
 
+This project was built using [ng-boilerplate](https://github.com/ianwalter/ng-boilerplate)!
 
 #### Step 1: Install ng-breadcrumbs
 
@@ -64,4 +65,4 @@ That's it! You should now have breadcrumb navigation that can even handle nested
 
 I hope you find this useful!
 
-«–– [Ian](http://www.ianvonwalter.com)
+«–– [Ian](http://ianvonwalter.com)

assets/js/app.js

@@ -11,7 +11,7 @@
     "route"
   ],
   "authors": [
-    "Ian Kennington Walter <http://www.iankwalter.com>"
+    "Ian Kennington Walter (http://ianvonwalter.com)"
   ],
   "license": "MIT",
   "homepage": "http://ianwalter.github.io/ng-breadcrumbs/",

bower.json

@@ -2,7 +2,7 @@
  * ng-breadcrumb.js - v0.0.6 - A better AngularJS service to help with breadcrumb-style navigation between views
  * Based on https://github.com/angular-app/angular-app/blob/master/client/src/common/services/breadcrumbs.js
  *
- * @author Ian Kennington Walter (http://www.ianvonwalter.com)
+ * @author Ian Kennington Walter (http://ianvonwalter.com)
  */
 
 /* global angular */
@@ -13,14 +13,15 @@ angular
       breadcrumbs: [],
       get: function() {
         if (this.options) {
-          var self = this;
           for (var key in this.options) {
             if (this.options.hasOwnProperty(key)) {
-              angular.forEach(self.breadcrumbs, function(breadcrumb) {
-                if (breadcrumb.label === key) {
-                  breadcrumb.label = self.options[key];
+              for (var breadcrumb in this.breadcrumbs) {
+                if (this.breadcrumbs.hasOwnProperty(breadcrumb)) {
+                  if (breadcrumb.label === key) {
+                    this.breadcrumbs[breadcrumb].label = this.options[key];
+                  }
                 }
-              });
+              }
             }
           }
         }
@@ -39,7 +40,9 @@ angular
             if (re.test(route)) {
               param = value;
             }
-            if (value) route = route.replace(re, ':' + key);
+            if (value) {
+              route = route.replace(re, ':' + key);
+            }
           });
           return { path: route, param: param };
         };

dist/js/ng-breadcrumbs.min.js

@@ -1,88 +1,71 @@
 var path = require('path'),
     gulp = require('gulp'),
     uglify = require('gulp-uglify'),
-    less = require('gulp-less'),
-    htmlmin = require('gulp-htmlmin'),
     jshint = require('gulp-jshint'),
     concat = require('gulp-concat'),
+    karma = require('gulp-karma'),
     rename = require('gulp-rename');
 
 gulp.task('default', function() {
-  gulp.run('uglify-js', 'less', 'minify-template', 'lint');
+  gulp.run('uglify-js', 'lint');
 
-  gulp.watch('src/js/**/*.js', function(event) {
+  gulp.watch('src/**/*.js', function(event) {
     console.log('File ' + event.path + ' was ' + event.type + ', running tasks...');
     gulp.run('uglify-js');
   });
 
-  gulp.watch('src/less/**/*.less', function(event) {
-    console.log('File ' + event.path + ' was ' + event.type + ', running tasks...');
-    gulp.run('less');
-  });
-
-  gulp.watch('src/template/**/*.html', function(event) {
-    console.log('File ' + event.path + ' was ' + event.type + ', running tasks...');
-    gulp.run('minify-template');
-  });
+//  gulp.src(['undefined.js'])
+//    .pipe(karma({
+//      configFile: 'karma.conf.js',
+//      action: 'watch'
+//    }));
 });
 
 gulp.task('debug', function() {
-  gulp.run('copy-js', 'less', 'copy-template', 'lint');
+  gulp.run('copy-js', 'lint');
 
-  gulp.watch('src/js/**/*.js', function(event) {
+  gulp.watch('src/**/*.js', function(event) {
     console.log('File ' + event.path + ' was ' + event.type + ', running tasks...');
     gulp.run('copy-js');
   });
 
-  gulp.watch('src/less/**/*.less', function(event) {
-    console.log('File ' + event.path + ' was ' + event.type + ', running tasks...');
-    gulp.run('less');
-  });
-
-  gulp.watch('src/js/**/*.js', function(event) {
-    console.log('File ' + event.path + ' was ' + event.type + ', running tasks...');
-    gulp.run('copy-template');
-  });
+//  gulp.src(['undefined.js'])
+//    .pipe(karma({
+//      configFile: 'karma.conf.js',
+//      action: 'watch'
+//    }));
 });
 
 gulp.task('uglify-js', function() {
-  gulp.src('src/js/**/*.js')
+  gulp.src('src/**/*.js')
     .pipe(concat('ng-breadcrumbs.js'))
-    .pipe(gulp.dest('dist/js'))
+    .pipe(gulp.dest('dist'))
     .pipe(uglify())
     .pipe(rename('ng-breadcrumbs.min.js'))
-    .pipe(gulp.dest('dist/js'));
+    .pipe(gulp.dest('dist'));
 });
 
 gulp.task('copy-js', function() {
-  gulp.src('src/js/**/*.js')
+  gulp.src('src/**/*.js')
     .pipe(concat('ng-breadcrumbs.js'))
-    .pipe(gulp.dest('dist/js'))
+    .pipe(gulp.dest('dist'))
     .pipe(rename('ng-breadcrumbs.min.js'))
-    .pipe(gulp.dest('dist/js'));
-});
-
-gulp.task('minify-template', function() {
-  gulp.src('src/template/**/*.html')
-    .pipe(htmlmin({ collapseWhitespace: true }))
-    .pipe(gulp.dest('public/template'));
-});
-
-gulp.task('copy-template', function() {
-  gulp.src('src/template/**/*.html')
-    .pipe(gulp.dest('public/template'));
-});
-
-gulp.task('less', function() {
-  gulp.src('src/less/**/*.less')
-    .pipe(less({
-      paths: [ path.join(__dirname, 'public/less', 'includes') ]
-    }))
-    .pipe(gulp.dest('public/css'));
+    .pipe(gulp.dest('dist'));
 });
 
 gulp.task('lint', function() {
-  gulp.src('src/js/**/*.js')
+  gulp.src('src/**/*.js')
     .pipe(jshint())
     .pipe(jshint.reporter('default'));
-});
+});
+
+//gulp.task('test', function() {
+//  gulp.run('uglify-js');
+//
+//  // undefined.js: unfortunately necessary for now
+//  return gulp.src(['undefined.js'])
+//    .pipe(karma({
+//      configFile: 'karma.conf.js',
+//      action: 'run'
+//    }));
+//});

dist/js/ng-breadcrumbs.js dist/ng-breadcrumbs.js

@@ -20,7 +20,8 @@
     }
   </style>
 
-  <script src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.1.10/require.min.js" data-main="assets/js/app.js"></script>
+  <script src="public/js/requirejs-config.js" type="application/javascript"></script>
+  <script src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.1.10/require.min.js" data-main="public/js/main.js"></script>
 </head>
 <body ng-controller="HomeController">
 <a href="https://github.com/ianwalter/ng-breadcrumbs">
@@ -48,7 +49,7 @@ <h4>A better AngularJS service to help with breadcrumb-style navigation between
   <br>
   <p>
     I hope you find this useful!<br>
-    «–– <a href="http://www.iankwalter.com">Ian</a>
+    «–– <a href="http://ianvonwalter.com">Ian</a>
   </p>
   <br>
 </div>

dist/ng-breadcrumbs.min.js

@@ -0,0 +1,80 @@
+// Karma configuration
+// Generated on Tue Mar 11 2014 15:26:49 GMT-0400 (EDT)
+
+module.exports = function(config) {
+
+  var testFiles = [
+    'public/js/requirejs-config.js',
+    'test/unit/test-main.js',
+    { pattern: 'public/js/**/*.js', included: false },
+    { pattern: 'public/lib/**/*.js', included: false }
+  ];
+
+  if (process.argv[4]) { // TODO this should be more robust by checking the actual argument name
+    testFiles.push({ pattern: 'test/unit/' + process.argv[4], included: false });
+  } else {
+    testFiles.push({ pattern: 'test/unit/**/*.js', included: false });
+  }
+
+  config.set({
+
+    // base path that will be used to resolve all patterns (eg. files, exclude)
+    basePath: '',
+
+
+    // frameworks to use
+    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+    frameworks: ['requirejs', 'mocha', 'chai'],
+
+
+    // list of files / patterns to load in the browser
+    files: testFiles,
+
+
+    exclude: [
+
+    ],
+
+
+    // preprocess matching files before serving them to the browser
+    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
+    preprocessors: {
+    
+    },
+
+
+    // test results reporter to use
+    // possible values: 'dots', 'progress'
+    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+    reporters: ['progress'],
+
+
+    // web server port
+    port: 9876,
+
+
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
+
+
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    logLevel: config.LOG_INFO,
+
+
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch: false,
+
+
+    // start these browsers
+    // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+    browsers: ['Chrome'],
+
+
+    // Continuous Integration mode
+    // if true, Karma captures browsers, runs the tests and exits
+    singleRun: false,
+
+    captureTimeout: 60000
+  });
+};

gulpfile.js

@@ -6,11 +6,19 @@
   "devDependencies": {
     "gulp": "~3.5.1",
     "gulp-uglify": "~0.1.0",
-    "gulp-less": "~1.1.10",
-    "gulp-htmlmin": "~0.1.1",
     "gulp-jshint": "~1.3.4",
     "gulp-concat": "~2.1.7",
-    "gulp-rename": "~1.2.0"
+    "gulp-rename": "~1.2.0",
+    "karma": "~0.12.1",
+    "gulp-karma": "0.0.4",
+    "mocha": "~1.17.1",
+    "karma-mocha": "~0.1.1",
+    "requirejs": "~2.1.11",
+    "karma-requirejs": "~0.2.1",
+    "karma-phantomjs-launcher": "~0.1.2",
+    "karma-chrome-launcher": "~0.1.2",
+    "chai": "~1.9.0",
+    "karma-chai": "~0.1.0"
   },
   "scripts": {
     "test": "gulp test"
@@ -23,6 +31,6 @@
     "navigation",
     "route"
   ],
-  "author": "Ian Kennington Walter <http://www.iankwalter.com>",
+  "author": "Ian Kennington Walter (http://ianvonwalter.com)",
   "license": "MIT"
 }