a_la_chart 0.0.11 → 0.1.0

data/configs/fusion/config.yml

@@ -1,4 +1,7 @@
 default: v3_1
+theme: :none
+themes:
+  none: {}
 v3_1:
   format: xml
   angular:

data/configs/fusion/v3_1/angular.xml.builder

@@ -1,5 +1,4 @@
-xml.instruct!
-xml.chart(chart_options.merge(:upperLimit => params[:upperLimit] || 100, :caption => params[:title])) do
+xml.chart(chart_options(:fusion, :angular).merge(:upperLimit => params[:upperLimit] || 100, :caption => params[:title])) do
   the_case = params[:case]
   xml.colorRange do
     xml.color :minValue => '0', :maxValue => '2', :code => 'FF654F'

data/configs/fusion/v3_1/bar.xml.builder

@@ -1,7 +1,6 @@
-xml.instruct!
-xml.chart(chart_options.merge(:caption => params[:title])) do
+xml.chart(chart_options(:fusion, :bar).merge(:caption => params[:title])) do
   the_case = params[:case]
   data(the_case).each do |record|
-    xml.set :value => value(record, :value, the_case), :label => value(record, :label, the_case), :link => value(record, :link, the_case), :color => next_color
+    xml.set :value => value(record, :value, the_case), :label => value(record, :label, the_case), :link => value(record, :link, the_case), :color => color_palette_next(:fusion, :bar)
   end
 end

data/configs/fusion/v3_1/bullet.xml.builder

@@ -1,5 +1,4 @@
-xml.instruct!
-xml.chart(chart_options.merge(:upperLimit => params[:upperLimit] || 100, :caption => params[:title])) do
+xml.chart(chart_options(:fusion, :bullet).merge(:upperLimit => params[:upperLimit] || 100, :caption => params[:title])) do
   the_case = params[:case]
   xml.colorRange do
     xml.color :minValue => '0', :maxValue => '2', :code => 'FF654F'

data/configs/fusion/v3_1/column.xml.builder

@@ -1,7 +1,6 @@
-xml.instruct!
-xml.chart(chart_options.merge(:caption => params[:title])) do
+xml.chart(chart_options(:fusion, :bar).merge(:caption => params[:title])) do
   the_case = params[:case]
   data(the_case).each do |record|
-    xml.set :value => value(record, :value, the_case), :label => value(record, :label, the_case), :link => value(record, :link, the_case), :color => next_color
+    xml.set :value => value(record, :value, the_case), :label => value(record, :label, the_case), :link => value(record, :link, the_case), :color => color_palette_next(:fusion, :column)
   end
 end

data/configs/fusion/v3_1/funnel.xml.builder

@@ -1,7 +1,6 @@
-xml.instruct!
-xml.chart(chart_options.merge(:caption => params[:title])) do
+xml.chart(chart_options(:fusion, :funnel).merge(:caption => params[:title])) do
   the_case = params[:case]
   data(the_case).each do |record|
-    xml.set :value => value(record, :value, the_case), :label => value(record, :label, the_case), :link => value(record, :link, the_case), :color => next_color
+    xml.set :value => value(record, :value, the_case), :label => value(record, :label, the_case), :link => value(record, :link, the_case), :color => color_palette_next(:fusion, :funnel)
   end
 end

data/configs/fusion/v3_1/line.xml.builder

@@ -1,5 +1,4 @@
-xml.instruct!
-xml.chart(chart_options.merge(:caption => params[:title])) do
+xml.chart(chart_options(:fusion, :line).merge(:caption => params[:title])) do
   the_case = params[:case]
   xml.dataset do |dataset|
     data(the_case).each do |set|

data/configs/fusion/v3_1/pie.xml.builder

@@ -1,7 +1,6 @@
-xml.instruct!
-xml.chart(chart_options.merge(:caption => params[:title])) do
+xml.chart(chart_options(:fusion, :pie).merge(:caption => params[:title])) do
   the_case = params[:case]
   data(the_case).each do |record|
-    xml.set :value => value(record, :value, the_case), :label => value(record, :label, the_case), :link => value(record, :link, the_case), :color => next_color
+    xml.set :value => value(record, :value, the_case), :label => value(record, :label, the_case), :link => value(record, :link, the_case), :color => color_palette_next(:fusion, :pie)
   end
 end

data/configs/fusion/v3_1/pyramid.xml.builder

@@ -1,7 +1,6 @@
-xml.instruct!
-xml.chart(chart_options.merge(:caption => params[:title])) do
+xml.chart(chart_options(:fusion, :pyramid).merge(:caption => params[:title])) do
   the_case = params[:case]
   data(the_case).each do |record|
-    xml.set :value => value(record, :value, the_case), :label => value(record, :label, the_case), :link => value(record, :link, the_case), :color => next_color
+    xml.set :value => value(record, :value, the_case), :label => value(record, :label, the_case), :link => value(record, :link, the_case), :color => color_palette_next(:fusion, :pyramid)
   end
 end

data/configs/fusion/v3_1/spark_column.xml.builder

@@ -1,5 +1,4 @@
-xml.instruct!
-xml.chart(chart_options.merge(:caption => params[:title])) do
+xml.chart(chart_options(:fusion, :spark_column).merge(:caption => params[:title])) do
   the_case = params[:case]
   xml.dataset do
     data(the_case).each do |record|

data/configs/fusion/v3_1/spark_line.xml.builder

@@ -1,5 +1,4 @@
-xml.instruct!
-xml.chart(chart_options.merge(:caption => params[:title])) do
+xml.chart(chart_options(:fusion, :spark_line).merge(:caption => params[:title])) do
   the_case = params[:case]
   xml.dataset do
     data(the_case).each do |record|

data/configs/fusion/v3_1/spark_win_loss.xml.builder

@@ -1,9 +1,8 @@
-xml.instruct!
-xml.chart(chart_options.merge(:caption => params[:title])) do
+xml.chart(chart_options(:fusion, :spark_win_loss).merge(:caption => params[:title])) do
   the_case = params[:case]
   xml.dataset do
     data(the_case).each do |record|
-      xml.set :value => value(record, :value, the_case), :label => value(record, :label, the_case), :scoreless => value(record, :scoreless, the_case), :color => next_color
+      xml.set :value => value(record, :value, the_case), :label => value(record, :label, the_case), :scoreless => value(record, :scoreless, the_case), :color => color_palette_next(:fusion, :spark_win_loss)
     end
   end
 end

data/configs/fusion/v3_1/stacked_column.xml.builder

@@ -1,5 +1,4 @@
-xml.instruct!
-xml.chart(chart_options.merge(:caption => params[:title], :showLegend => '0')) do
+xml.chart(chart_options(:fusion, :stacked_column).merge(:caption => params[:title], :showLegend => '0')) do
   the_case = params[:case]
   xml.categories do
     data(the_case).map{|record| value(record, :label, the_case) }.uniq.compact.each do |label|
@@ -11,7 +10,7 @@ xml.chart(chart_options.merge(:caption => params[:title], :showLegend => '0')) d
     (data_by_category[value(record, :category, the_case)] ||= []) << record
   end
   data_by_category.each do |category, records|
-    xml.dataset(:seriesName => category, :color => value(records.first, :color, the_case) || next_color) do
+    xml.dataset(:seriesName => category, :color => value(records.first, :color, the_case) || color_palette_next(:fusion, :stacked_column)) do
       records.each do |record|
         xml.set :value => value(record, :value, the_case)
       end

data/configs/google/config.yml

@@ -1,4 +1,7 @@
 default: v1_0
+theme: :none
+themes:
+  none: {}
 v1_0:
   pie:
     inline: 'pie.html.erb'

data/configs/raphael/config.yml

@@ -1,4 +1,7 @@
 default: v1_2
+theme: :none
+themes:
+  none: {}
 v1_2:
   format: js
   impact:

data/lib/a_la_chart/a_la_chart_helper.rb

@@ -40,7 +40,7 @@ module ALaChartHelper
     
     url += args.to_param
     
-    div_id = "#{name}_#{Time.now.to_f.to_s.gsub('.','_')}"
+    div_id = "#{name}#{Time.now.to_f.to_s.gsub('.','')}"
     
     data_template_path = chart_type_config[:data]
     data_template = File.join(File.dirname(__FILE__), '..', '..', 'configs', chart_make.to_s, chart_make_version.to_s, data_template_path) if data_template_path.present?
@@ -55,46 +55,32 @@ module ALaChartHelper
     chart_template_erb.result(binding)
   end
   
-  # TODO: REMOVE all of this stuff... make this all external configurations
-  def color_palette
-    ["7BB465","B2B4B6","FEC35A","65A4B5","9E65B5","B57765","F7DF65","8F866C","B6A65F","C99D60","C1727A","8AABB9","65B584"]
+  def color_palette(chart_make, chart_style=nil)
+    theme(chart_make)[:color_palette] || []
   end
-
-  def next_color
-    @colors ||= color_palette
-    @colors.pop
+  
+  def color_palette_clear(chart_make, chart_style=nil)
+    @color_palette_ary = color_palette(chart_make, chart_style).clone
+  end
+  
+  def color_palette_next(chart_make, chart_style=nil)
+    @color_palette_ary ||= color_palette(chart_make, chart_style).clone
+    @color_palette_ary.pop
+  end
+  
+  # Merge with per-chart options
+  def chart_options(chart_make, chart_style=nil)
+    theme(chart_make)[:default_options] || {}
   end
-
-  def chart_options
-    {
-      :animation => '1',
-      :showBorder => '0',
-      :canvasBorderThickness => '1',
-      :canvasBorderColor => 'eeeeee',
-      :divLineThickness => '1',
-      :bgAlpha => '0',
-      :useRoundEdges => '0',
-      :alpha => '100',
-      :bgColor => 'ffffff',
-      :shadowXShift=>"1",
-      :shadowYShift=>"1",
-      :shadowAlpha=>"75",
-      # :numberprefix => '$',
-      :showValues => '0',
-      :showSum => '1',
-      :enableSmartLabels => '1',
-      :skipOverlapLabels => '1',
-      :decimalPrecision => "2",
-      :captionPadding => '3',
-      :chartLeftMargin => '0',
-      :formatNumber => '1',
-      :formatNumberScale => '0',
-      :baseFont => 'Helvetica, Arial, sans-serif',
-      :baseFontSize => '11',
-      :baseFontColor => '515151',
-      :showToolTip => '1',
-      :toolTipBgColor => 'ffffff'
-    }
+  
+private
+  
+  def theme_name(chart_make)
+    ALaChart::Config[chart_make][:theme]
+  end
+  
+  def theme(chart_make)
+    ALaChart::Config[chart_make][:themes][theme_name(chart_make)] || {}
   end
   
 end

data/lib/a_la_chart.rb

@@ -1,5 +1,5 @@
 module ALaChart
-  VERSION = '0.0.11'
+  VERSION = '0.1.0'
 end
 
 require File.join(File.dirname(__FILE__), 'a_la_chart', 'config')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: a_la_chart
 version: !ruby/object:Gem::Version 
-  version: 0.0.11
+  version: 0.1.0
 platform: ruby
 authors: 
 - Eric Redmond
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 -05:00
+date: 2010-01-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency