Merge pull request #18 from CSNW/update-legend

Update legend, build, and styling

Author: timhall

.gitignore

@@ -3,11 +3,11 @@ bower_components
 .grunt
 specs/index.html
 npm-debug.log
-example/data
 tmp/
 
 _site/
 .sass-cache
+_tasks/
 
 # OS Junk
 Thumbs.db

Gruntfile.js

@@ -1,79 +1,183 @@
 module.exports = function(grunt) {
-  // load-grunt-config does the following automatically
-  // - load tasks/options into config
-  // - load grunt-* npm tasks in package.json
-  var config = require('load-grunt-config')(grunt, {
-    configPath: require('path').join(process.cwd(), 'tasks/options'),
-    init: false,
-    loadGruntTasks: {
-      pattern: 'grunt-*',
-      config: require('./package.json'),
-      scope: 'devDependencies'
-    }
-  });
+  require('load-grunt-tasks')(grunt);
 
-  config.env = process.env;
-  config.pkg = grunt.file.readJSON('package.json');
-  config.meta = {
-    banner: '/*! <%= pkg.name %> - v<%= pkg.version %>\n' +
-      ' * <%= pkg.homepage %>\n' +
-      ' * License: <%= pkg.license %>\n' +
-      ' */\n',
-    srcFiles: [
-      // core
+  var src = {
+    core: [
       'src/helpers.js',
       'src/Base.js',
       'src/Chart.js',
       'src/Component.js',
-      'src/Multi.js',
-
-      // mixins
-      'src/mixins.js',
-
-      // library
-      'src/charts/XYLabels.js',
+      'src/Multi.js'
+    ],
+    mixins: [
+      'src/mixins.js'
+    ],
+    lib: [
+      'src/charts/Labels.js',
       'src/charts/Bars.js',
       'src/charts/Line.js',
       'src/components/Title.js',
       'src/components/Axis.js',
       'src/components/Legend.js',
       'src/extensions/xy.js'
+    ],
+    css: [
+      'src/css/base.css'
     ]
   };
-  grunt.initConfig(config);
 
-  grunt.loadTasks('tasks');
-  this.registerTask('default', ['test']);
+  grunt.initConfig({
+    env: process.env,
+    pkg: grunt.file.readJSON('package.json'),
+    meta: {
+      banner: '/*! <%= pkg.name %> - v<%= pkg.version %>\n' +
+        ' * <%= pkg.homepage %>\n' +
+        ' * License: <%= pkg.license %>\n' +
+        ' */\n',
+      src: src
+    },
+
+    concat: {
+      temp: {
+        options: {
+          sourceMap: true
+        },
+        files: {
+          'tmp/<%= pkg.name %>.js': src.core,
+          'tmp/<%= pkg.name %>-mixins.js': src.core.concat(src.mixins),
+          'tmp/<%= pkg.name %>-all.js': src.core.concat(src.mixins, src.lib),
+          'tmp/<%= pkg.name %>.css': src.css
+        }
+      },
+      release: {
+        options: {
+          banner: '<%= meta.banner %>'
+        },
+        files: {
+          'dist/<%= pkg.name %>.js': src.core,
+          'dist/<%= pkg.name %>-mixins.js': src.core.concat(src.mixins),
+          'dist/<%= pkg.name %>-all.js': src.core.concat(src.mixins, src.lib),
+          'dist/<%= pkg.name %>.css': src.css
+        }
+      }
+    },
+
+    connect: {
+      example: {
+        options: {
+          port: 4001,
+          base: ['.', 'example'],
+          open: true,
+          hostname: 'localhost'
+        }
+      }
+    },
+
+    jasmine: {
+      options: {
+        specs: ['specs/**/*.spec.js'],
+        helpers: [
+          'bower_components/jquery/dist/jquery.js',
+          'bower_components/jasmine-jquery/lib/jasmine-jquery.js'
+        ],
+        vendor: [
+          'bower_components/d3/d3.js',
+          'bower_components/underscore/underscore.js',
+          'bower_components/d3.chart/d3.chart.js'
+        ]
+      },
+
+      temp: {
+        src: 'tmp/<%= pkg.name %>-mixins.js',
+        options: {
+          outfile: 'specs/index.html',
+          keepRunner: true
+        }
+      },
+      release: {
+        src: 'dist/<%= pkg.name %>-mixins.js',
+        options: {
+          outfile: 'specs/index.html',
+          keepRunner: false
+        }
+      }
+    },
+
+    jshint: {
+      options: {
+        'jshintrc': '.jshintrc'
+      },
+
+      src: ['src/**/*.js'],
+      specs: ['specs/*.spec.js'],
+      temp: ['tmp/<%= pkg.name %>-all.js'],
+      release: ['dist/<%= pkg.name %>-all.js'],
+      grunt: ['Gruntfile.js']
+    },
 
-  this.registerTask('build', 'Temp build of the library', [
-    'concat:temp',
-    'copy:temp'
+    uglify: {
+      options: {
+        banner: '<%= meta.banner %>',
+        sourceMap: true,
+        mangle: {
+          except: ['d3']
+        }
+      },
+      release: {
+        files: {
+          'dist/<%= pkg.name %>.min.js': 'dist/<%= pkg.name %>.js',
+          'dist/<%= pkg.name %>-mixins.min.js': 'dist/<%= pkg.name %>-mixins.js',
+          'dist/<%= pkg.name %>-all.min.js': 'dist/<%= pkg.name %>-all.js'
+        }
+      }
+    },
+
+    watch: {
+      jshint: {
+        files: ['src/**/*.js'],
+        tasks: ['jshint:src']
+      },
+      test: {
+        files: ['src/**/*.js', 'src/**/*.css', 'specs/**/*.js'],
+        tasks: ['build', 'test']
+      },
+      build: {
+        files: ['src/**/*.js', 'src/**/*.css'],
+        tasks: ['build']
+      }
+    }
+  });
+
+  grunt.registerTask('default', ['test']);
+
+  grunt.registerTask('build', 'Temp build of the library', [
+    'concat:temp'
   ]);
 
-  this.registerTask('build:release', 'Release build of the library', [
+  grunt.registerTask('build:release', 'Release build of the library', [
     'concat:release',
-    'uglify:release',
-    'copy:release'
+    'uglify:release'
   ]);
 
-  this.registerTask('release', 'Builds a new release of the library', [
+  grunt.registerTask('release', 'Builds a new release of the library', [
     'build:release',
     'jshint:release',
     'jasmine:release'
   ]);
-  
-  this.registerTask('test', 'Lint and run specs', [
+
+  grunt.registerTask('test', 'Lint and run specs', [
     'jshint:src',
     'jshint:specs',
     'jasmine:temp'
   ]);
 
-  this.registerTask('server', 'Run example (at http://localhost:4001)', [
-    'connect:example:keepalive'
+  grunt.registerTask('serve', 'Run example with automatic build', [
+    'connect:example',
+    'watch:build'
   ]);
 
-  this.registerTask('debug', 'Run example with automatic build', [
+  grunt.registerTask('debug', 'Run example with automatic build and testing', [
     'connect:example',
-    'watch:build'
+    'watch:test'
   ]);
 };