Refactor/2.0.0 dev

.gitignore

@@ -25,3 +25,4 @@ Thumbs.db
 #  nodejs packages   #
 ######################
 node_modules
+bower_components

CHANGELOG

@@ -0,0 +1,5 @@
+# Breaking Changes
+
+1. `nv.model.pie().donut(true)` no longer valid, now use `nv.model.donut()`.
+1. `nv.model.pieChart().donut(true)` no longer valid, now use `nv.model.donutChart()`.
+

GruntFile.coffee

@@ -0,0 +1,120 @@
+module.exports = (grunt)->
+    flatten = (a, b)-> a.concat b
+
+    files = [
+        'core'
+        'utils'
+        'layer'
+        'interactiveLayer'
+        'tooltip'
+        'utils'
+        'models/axis'
+        'models/legend'
+        'models/distribution'
+        'chart'
+        'models/bar/**/*'
+        'models/bullet/**/*'
+        'models/line/**/*'
+        'models/pie/pie*'
+        'models/pie/donut'
+        'models/scatter/**/*'
+        'models/sparkline/**/*'
+        'models/stackedArea/**/*'
+    ]
+
+    # Project configuration.
+
+    gruntConfig =
+
+        pkg: grunt.file.readJSON('package.json')
+
+        concat:
+            options:
+                separator: '\n'
+                banner: '(function(){\n'
+                footer: '\n})();'
+            dist:
+                src: files,
+                dest: 'nv.d3.js'
+
+        uglify:
+            options:
+                banner: '/*! <%= pkg.name %> - v<%= pkg.version %> - ' +
+                    '<%= grunt.template.today("yyyy-mm-dd") %> */'
+            js:
+                files:
+                    'nv.d3.min.js': ['nv.d3.js']
+
+        jshint:
+            foo:
+                src: "src/**/*.js"
+            options:
+                jshintrc: '.jshintrc'
+        watch:
+            js:
+                files: ["src/**/*.js"],
+                tasks: ['concat']
+        copy:
+          css:
+            files: [
+              { src: 'src/nv.d3.css', dest: 'nv.d3.css' }
+            ]
+
+        cssmin:
+          dist:
+            files:
+              'nv.d3.min.css' : ['nv.d3.css']
+
+        mochaTest:
+          nvd3:
+            options:
+              reporter: 'spec'
+            src: ['test/runner/loadAll.coffee']
+
+        connect:
+          options:
+            port: 8808
+          test: {},
+          serve:
+            options:
+              keepalive: true
+        karma:
+            client:
+                options:
+                    browsers: ['Chrome']
+                    frameworks: [ 'mocha', 'sinon-chai' ]
+                    reporters: [ 'spec' ]
+                    singleRun: true
+                    preprocessors: {
+                        'test/**/*.coffee': ['coffee']
+                    }
+                    files: [
+                        'bower_components/d3/d3.js'
+                        'bower_components/jquery/dist/jquery.js'
+                        files.map (d)-> "src/#{d}.js"
+                        'test/tools/**/*.coffee'
+                        files.map (d)-> "test/unit/#{d}.coffee"
+                    ].reduce(flatten, [])
+                    coverageReporter:
+                        type: 'lcov'
+                        dir: 'build/coverage/'
+
+    grunt.initConfig gruntConfig
+
+    grunt.loadNpmTasks('grunt-contrib-watch')
+    grunt.loadNpmTasks('grunt-contrib-concat')
+    grunt.loadNpmTasks('grunt-contrib-jshint')
+    grunt.loadNpmTasks('grunt-contrib-uglify')
+    grunt.loadNpmTasks('grunt-contrib-copy')
+    grunt.loadNpmTasks('grunt-contrib-cssmin')
+    grunt.loadNpmTasks('grunt-contrib-connect')
+    grunt.loadNpmTasks('grunt-mocha-test')
+    grunt.loadNpmTasks('grunt-selenium-launcher')
+    grunt.loadNpmTasks('grunt-karma')
+
+    grunt.registerTask('test', ['connect:test', 'selenium-launch', 'mochaTest:nvd3'])
+
+    grunt.registerTask('default', ['karma', 'concat', 'copy', 'test'])
+    grunt.registerTask('production', ['concat', 'uglify', 'copy', 'cssmin'])
+    grunt.registerTask('release', ['production'])
+    grunt.registerTask('lint', ['jshint'])

README.md

@@ -1,6 +1,6 @@
-# NVD3 - v1.1.15-beta
-## Release notes for version 1.1.15 beta
-* Various fixes across the board
+# NVD3 - v1.2.0-beta
+## Release notes for version 1.2.0 beta
+* Major internal refactoring, with no API changes.
 
 ## Overview
 A reusable chart library for d3.js.
@@ -14,8 +14,10 @@ You can also check out the [examples page](http://nvd3.org/ghpages/examples.html
 
 # Current development focus
 
-- Getting documentation up.
-- Unifying common API functions between charts.
+- Refactor to a more sane chart structure.
+  - **Composable**: Unify common API functions between charts.
+  - **Reliable**: Impose an automated testing scheme.
+  - **Extensible**:
 - Bug fixes that come up.
 
 ---
@@ -42,24 +44,6 @@ We are currently changing our branch structure so that master will be gauranteed
 
 ## Minifying your fork:
 
-### Using Make
-The Makefile requires [UglifyJS](https://github.com/mishoo/UglifyJS) and [CSSMin](https://github.com/jbleuzen/node-cssmin)
-
-The easiest way to install UglifyJS and CSSMin is via npm. Run `npm install -g uglify-js cssmin`. After installing verify the setup by running `uglifyjs --version` and `cssmin --help`.
-
-Once you have the `uglifyjs` and `cssmin` commands available, running `make` from your
-fork's root directory will rebuild both `nv.d3.js` and `nv.d3.min.js`.
-
-    make # build nv.d3.js and nv.d3.css and minify
-    make nv.d3.js # Build nv.d3.js
-    make nv.d3.min.js # Minify nv.d3.js into nv.d3.min.js
-    make nv.d3.css # Build nv.d3.css
-    make nv.d3.min.css # Minify nv.d3.css into nv.d3.min.css
-    make clean # Delete nv.d3.*js and nv.d3.*css
-
-
-*Without UglifyJS of CSSMin, you won't get the minified versions when running make.**
-
 ### Using Grunt
 
 You can use grunt instead of makefile to build js file. See more about [grunt](http://gruntjs.com/).
@@ -73,12 +57,13 @@ Then, you can use these commands:
     grunt watch # watch file changes in src/, and rebuild nv.d3.js, it's very helpful when delevop NVD3
     grunt lint # run jshint on src/**/*.js
 
-**We ask that you DO NOT minify pull requests...
+**We ask that you DO NOT minify pull requests!**
 If you need to minify please build pull request in separate branch, and
 merge and minify in your master.
 
 ## Supported Browsers
 NVD3 runs best on WebKit based browsers.
+(We will remove this caveat as we begin testing on other browsers.)
 
 * **Google Chrome: latest version (preferred)**
 * **Opera 15+ (preferred)**

bower.json

@@ -9,7 +9,10 @@
     "Frank Shao"
   ],
   "description": "Re-usable charts and chart components for d3.",
-  "main": ["nv.d3.js", "src/nv.d3.css"],
+  "main": [
+    "nv.d3.js",
+    "src/nv.d3.css"
+  ],
   "keywords": [
     "d3",
     "visualization",
@@ -20,7 +23,7 @@
   "dependencies": {
     "d3": "~3.3.13"
   },
-  "ignore" : [
+  "ignore": [
     "**/.*",
     "node_modules",
     "bower_components",
@@ -31,5 +34,8 @@
     "lib",
     "examples",
     "deprecated"
-  ]
+  ],
+  "devDependencies": {
+    "jquery": "~2.1.1"
+  }
 }

examples/bullet.html

@@ -16,8 +16,6 @@
 
 <script src="../lib/d3.v3.js"></script>
 <script src="../nv.d3.js"></script>
-<script src="../src/utils.js"></script>
-<script src="../src/models/bullet.js"></script>
 <script>
 
 var width = 960,

examples/bulletChart.html

@@ -13,17 +13,14 @@
 
 <br> <br> <br> <br> <br>
 
-Normal Bullet Chart 
+Normal Bullet Chart
 <div class="gallery with-transitions" id="chart"></div>
 
 Bullet Chart with Custom Labels
 <div class='gallery with-transitions' id='chart2'></div>
 
 <script src="../lib/d3.v3.js"></script>
 <script src="../nv.d3.js"></script>
-<script src="../src/utils.js"></script>
-<script src="../src/models/bullet.js"></script>
-<script src="../src/models/bulletChart.js"></script>
 <script>
 
 var width = 960,