first pass at modularizing suave-charts so we only take up a single v…

…ar in the global namespace

build/build.sh

@@ -1,3 +1,9 @@
 #!/usr/bin/env bash
 coffee --bare --compile --output target/coffeescript/ src/coffeescript/
-java -jar build/compiler.jar  --js target/coffeescript/**.js --js_output_file dist/suave-charts.min.js
+java \
+  -jar build/compiler.jar \
+  --js target/coffeescript/**.js \
+  --js_output_file dist/suave-charts.min.js \
+  --entry_point target/coffeescript/suave_charts \
+  --process_common_js_modules \
+  --output_wrapper "(function(){%output%})();"

examples/basic-bar-chart.html

@@ -63,7 +63,7 @@ <h3>CSS</h3>
     <script src="../dist/suave-charts.min.js"></script>
     <script id="js1">
 // Create a bar chart
-var chart = new BarChart("#chart")
+var chart = new Suave.BarChart("#chart")
 
 // Draw the chart
 chart.draw([ 

examples/basic-donut-chart.html

@@ -67,7 +67,7 @@ <h3>CSS</h3>
     <script src="../dist/suave-charts.min.js"></script>
     <script id="js1">
 // Create a donut chart
-var chart = new DonutChart("#chart", {
+var chart = new Suave.DonutChart("#chart", {
   // Controls how much of a donut this is (0 to 100%)
   // For a pie chart, set this to 0
   holeSize: 0.5 

examples/basic-line-chart.html

@@ -74,7 +74,7 @@ <h3>CSS</h3>
 }
 
 // Create a line chart
-chart = new LineChart("#chart")
+chart = new Suave.LineChart("#chart")
 
 // Draw the chart
 chart.draw({ 

examples/time-series-chart.html

@@ -102,7 +102,7 @@ <h3>CSS</h3>
 var data2 = data.map(function(d) { return d * 3 })
 
 // Create a line chart
-chart = new LineChart("#chart", {
+chart = new Suave.LineChart("#chart", {
   xScale: "time",
   xLabelInterval: "days",
   xLabelFormat: "%d/%m/%Y"

src/coffeescript/abstract_chart.coffee

@@ -1,4 +1,9 @@
+defaults = require('./defaults')
+Svg = require('./svg')
+
 class AbstractChart
   constructor: (selector, defaultOptions = {}, options = {}) ->
-    @options = mergeOptions(defaultOptions, options)
+    @options = defaults.mergeOptions(defaultOptions, options)
     @svg = new Svg(selector, @options.aspectRatio, @options.margin)
+
+module.exports = AbstractChart

src/coffeescript/axes.coffee

@@ -37,3 +37,5 @@ class Axes
       .scale(scale)
       .orient(orientation)
       .tickPadding(@options.tickPadding)
+
+module.exports = Axes

src/coffeescript/bar_chart.coffee

@@ -1,3 +1,8 @@
+AbstractChart = require('./abstract_chart')
+MarginCalculator = require('./margin_calculator')
+Tooltip = require('./tooltip')
+defaultBarOptions = require('./defaults').barOptions
+
 class BarChart extends AbstractChart
   constructor: (selector, options = {}) ->
     super(selector, defaultBarOptions, options)
@@ -58,3 +63,4 @@ class BarChart extends AbstractChart
     @bars.on("mouseout", (d) -> tip.hide())
     @render()
 
+module.exports = BarChart

src/coffeescript/defaults.coffee

@@ -55,4 +55,9 @@ defaultDonutOptions = {
   }
 }
 
-
+module.exports = {
+  mergeOptions: mergeOptions
+  lineOptions: defaultLineOptions
+  barOptions: defaultBarOptions
+  donutOptions: defaultDonutOptions
+}

src/coffeescript/donut_chart.coffee

@@ -1,3 +1,6 @@
+AbstractChart = require('./abstract_chart')
+defaultDonutOptions = require('./defaults').donutOptions
+
 class DonutChart extends AbstractChart
   constructor: (selector, options = {}) ->
       super(selector, defaultDonutOptions, options)
@@ -37,7 +40,5 @@ class DonutChart extends AbstractChart
 
     @render()
 
-#g.append("text")
-#.attr("transform", (d) => "translate(#{arc.centroid(d)})")
-#.attr("dy", ".35em")
-#.text((d) -> d[1])
+
+module.exports = DonutChart

src/coffeescript/line_chart.coffee

@@ -1,8 +1,9 @@
-# TODOS:
-# multi axis
-# Grouped bar charts
-# Column charts
-# transitions/animations
+AbstractChart = require('./abstract_chart')
+Axes = require('./axes')
+MarginCalculator = require('./margin_calculator')
+Scales = require('./scales')
+Tooltip = require('./tooltip')
+defaultLineOptions = require('./defaults').lineOptions
 
 class LineChart extends AbstractChart
   constructor: (selector, options = {}) ->
@@ -138,3 +139,5 @@ class LineChart extends AbstractChart
 
     @createTooltip() if @options.tooltips
     @render()
+
+module.exports = LineChart

src/coffeescript/margin_calculator.coffee

@@ -21,3 +21,5 @@ class MarginCalculator
 
     fauxSelection.remove()
     margin
+
+module.exports = MarginCalculator

src/coffeescript/scales.coffee

@@ -5,3 +5,5 @@ class Scales
       when "log" then d3.scale.log()
       when "time" then d3.time.scale()
       when "ordinal" then d3.scale.ordinal()
+
+module.exports = Scales

src/coffeescript/suave_charts.coffee

@@ -0,0 +1,5 @@
+m = {}
+m.LineChart = require('./line_chart')
+m.BarChart = require('./bar_chart')
+m.DonutChart = require('./donut_chart')
+window.Suave = m

src/coffeescript/svg.coffee

@@ -22,3 +22,5 @@ class Svg
       .attr("height", newHeight)
 
     @chart.attr("transform", "translate(#{margin.left},#{margin.top})")
+
+module.exports = Svg

src/coffeescript/tooltip.coffee

@@ -34,4 +34,4 @@ class Tooltip
     { top: nodeCoords.top - (tipHeight + 10) + window.scrollY, left: nodeCenter - (tipWidth / 2) + window.scrollX }
 
 
-
+module.exports = Tooltip