refactored examples. integrated new charts data structure which power…

…s examples, tests, and chart wizard

Gruntfile.js

@@ -47,6 +47,33 @@ module.exports = function(grunt) {
     'src/Formatter.js'
   ];
 
+  var allChartFiles = [
+    'examples/src/charts.js',
+
+    // data
+    'examples/data/line-series-data.js',
+    'examples/data/bar-series-data.js',
+    'examples/data/bar-dual-series-data.js',
+
+    // line charts
+    'examples/src/line-chart.js',
+    'examples/src/line-spark-chart.js',
+    'examples/src/line-chart-with-top-legend.js',
+    'examples/src/line-chart-with-right-legend.js',
+    'examples/src/line-chart-with-title.js',
+    'examples/src/line-chart-with-grid.js',
+    'examples/src/line-chart-with-horizontal-lines.js',
+    'examples/src/line-chart-with-vertical-lines.js',
+    'examples/src/line-chart-with-bottom-slider.js',
+
+    // bar charts
+    'examples/src/bar-chart.js',
+    'examples/src/bar-spark-chart.js',
+    'examples/src/bar-dual-chart.js',
+    'examples/src/bar-chart-with-top-legend.js',
+    'examples/src/bar-chart-with-right-legend.js'
+  ];
+
   // Project configuration.
   var config = {
     pkg: grunt.file.readJSON('package.json'),
@@ -73,7 +100,11 @@ module.exports = function(grunt) {
       prodMinLicense: {
         src: ['license.js', 'dist/meteorcharts-v<%= pkg.version %>.min.js'],
         dest: 'dist/meteorcharts-v<%= pkg.version %>.min.js'
-      }
+      },
+      examples: {
+        src: allChartFiles,
+        dest: 'examples/dist/all-charts.js'
+      },
     },
     uglify: {
       build: {
@@ -107,22 +138,6 @@ module.exports = function(grunt) {
           dest: 'dist/meteorcharts-dev.js'
         }]
       },
-      examples: {
-        options: {
-          variables: {
-            LINE_SERIES_DATA: grunt.file.read('examples/data/line-series-data.json'),
-            BAR_SERIES_DATA: grunt.file.read('examples/data/bar-series-data.json'),
-            BAR_SERIES_DUAL_DATA: grunt.file.read('examples/data/bar-series-dual-data.json')
-          },
-          prefix: '@@'
-        },
-
-        files: [{
-          expand: true, flatten: true,
-          src: ['examples/src/*.js'],
-          dest: 'examples/dist/'
-        }]
-      },
       prodSrcLicense: {
         options: {
           variables: {
@@ -165,20 +180,12 @@ module.exports = function(grunt) {
     },
     watch: {
       src: {
-        files: ['src/**/*.js'],
-        tasks: ['dev'],
+        files: ['src/**/*.js', 'examples/**/*.js'],
+        tasks: ['dev', 'examples'],
         options: {
           spawn: false,
         },
       }
-    },
-    copy: {
-      examples: {
-        flatten: true,
-        expand: true,
-        src: ['examples/src/*'],
-        dest: 'examples/dist/',
-      }
     }
   };
 
@@ -196,7 +203,7 @@ module.exports = function(grunt) {
 
   // Tasks
   grunt.registerTask('dev', ['clean:dist', 'concat:dev', 'concat:dev2', 'replace:dev']);
-  grunt.registerTask('examples', ['clean:examples', 'copy:examples:', 'replace:examples']);
+  grunt.registerTask('examples', ['clean:examples', 'concat:examples']);
   grunt.registerTask('full', ['clean:dist', 'concat:prodSrc', 'uglify', 'concat:prodSrcLicense', 'concat:prodMinLicense', 'replace:prodSrcLicense', 'replace:prodMinLicense']);
   grunt.registerTask('test', ['simplemocha']);
   grunt.registerTask('devtest', ['dev', 'test']);

examples/chart.html

@@ -15,11 +15,9 @@
 
     <script src="../../../lib/three.min.js"></script>
     <script src="../../../lib/moment.min.js"></script>
+    <script src="../../../lib/underscore.js"></script>
     <script src="../../../dist/meteorcharts-dev.js"></script>
-
-    <script>
-      var CHARTS = [];
-    </script>
+    <script src="dist/all-charts.js"></script>
 
     <script type="text/javascript">
       var QUERY_STRING = function () {
@@ -46,10 +44,20 @@
       } ();
 
 
-      var js = document.createElement('script');
-      js.type = 'text/javascript';
-      js.src = 'dist/' + QUERY_STRING.chart + '.js';
-      document.body.appendChild(js);
+
+      // QUERY_STRING.chart
+      for (var n=0; n<CHARTS.length; n++) {
+        if (CHARTS[n].id === QUERY_STRING.chart) {
+          var config = _.clone(CHARTS[n].config);
+          config.container = 'container';
+          config.width = 445;
+          config.height = 250;
+          config.theme = MeteorChart.Themes.CoteAzur;
+
+          var chart = new MeteorChart(config);
+          break;
+        }
+      }
     </script>
   </body>
 </html>

examples/data/bar-dual-series-data.js

@@ -0,0 +1,67 @@
+DATA.BAR_DUAL_SERIES = [
+  {
+    title: 'Califonia',
+    bars: [
+      {
+        title: 'Republicans',
+        value: 5
+      },
+      {
+        title: 'Democrats',
+        value: 95
+      }
+    ]
+  },
+  {
+    title: 'New York',
+    bars: [
+      {
+        title: 'Republicans',
+        value: 15
+      },
+      {
+        title: 'Democrats',
+        value: 85
+      }
+    ]
+  },
+  {
+    title: 'Colorado',
+    bars: [
+      {
+        title: 'Republicans',
+        value: 25
+      },
+      {
+        title: 'Democrats',
+        value: 75
+      }
+    ]
+  },
+  {
+    title: 'Florida',
+    bars: [
+      {
+        title: 'Republicans',
+        value: 45
+      },
+      {
+        title: 'Democrats',
+        value: 55
+      }
+    ]
+  },
+  {
+    title: 'Texas',
+    bars: [
+      {
+        title: 'Republicans',
+        value: 85
+      },
+      {
+        title: 'Democrats',
+        value: 15
+      }
+    ]
+  }
+]

examples/data/bar-series-data.js

@@ -0,0 +1,47 @@
+DATA.BAR_SERIES = [
+  {
+    title: 'Califonia',
+    bars: [
+      {
+        title: 'Republicans',
+        value: 10
+      }
+    ]
+  },
+  {
+    title: 'New York',
+    bars: [
+      {
+        title: 'Republicans',
+        value: 15
+      }
+    ]
+  },
+  {
+    title: 'Colorado',
+    bars: [
+      {
+        title: 'Republicans',
+        value: 25
+      }
+    ]
+  },
+  {
+    title: 'Florida',
+    bars: [
+      {
+        title: 'Republicans',
+        value: 45
+      }
+    ]
+  },
+  {
+    title: 'Texas',
+    bars: [
+      {
+        title: 'Republicans',
+        value: 85
+      }
+    ]
+  }
+]

examples/data/line-series-data.js

@@ -0,0 +1,19 @@
+DATA.LINE_SERIES = [
+  {
+    title: 'Series 1',
+    points: [
+      -100, -100,
+      100, 100,
+      200, 50
+    ]
+  },
+  {
+    title: 'Series 2',
+    points: [
+      0, 100,
+      100, 200,
+      200, 150,
+      300, 200
+    ]
+  }
+];