a_la_chart 0.1.1 → 0.1.2

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.1.2 2010-1-14
+
+* 2 major enhancement:
+  * Chart specific themes can now be created and configured
+  * Added ability to pass options through the chart
+
 === 0.1.0 2010-1-13
 
 * 1 major enhancement:

data/README.rdoc

@@ -10,9 +10,10 @@
 
 Note: very much in alpha development
 
-* Google Charts 1.0 (partial)
-* Fusion Charts 3.x (partial)
-* gRaphaël 1.2 (partial)
+* Google Charts 1.0 (partial) [http://code.google.com/apis/chart]
+* Fusion Charts 3.x (partial) [http://www.fusioncharts.com]
+* amCharts 1.6.4 (coming soon) [http://www.amcharts.com]
+* gRaphaël 1.2 (coming soon) [http://g.raphaeljs.com]
 
 == INSTALL:
 

data/lib/a_la_chart/a_la_chart_helper.rb

@@ -30,6 +30,8 @@ module ALaChartHelper
     append_url = chart_type_config[:url] || ".chart#{data_format}"
     url += "#{append_url}?"
     
+    options = args.delete(:options) || {}
+    
     explicit_args = args[:args].present? ? params.merge(args[:args]) : params
     args.reject!{ |k,v| [:name,:width,:height,:base_url].include?(k) }
     args.merge!(explicit_args)
@@ -37,6 +39,8 @@ module ALaChartHelper
     args.reject!{ |k,v| ['action','controller'].include?(k) }
     args[:cm] = chart_make.to_s
     args[:ct] = chart_style.to_s
+    # This feels a little too hacky for my taste... try better encoding
+    args[:co] = encode_options(options)
     
     url += args.to_param
     
@@ -55,6 +59,16 @@ module ALaChartHelper
     chart_template_erb.result(binding)
   end
   
+  def encode_options(options)
+    options.map{|k,v| "#{CGI::escape(k.to_s)}~#{CGI::escape(v.to_s)}"}.join("|")
+  end
+  
+  def decode_options(options_str)
+    hash = Hash[ *(options_str.to_s.split(/[|~]/)) ]
+    hash.each{|k,v| hash[CGI::unescape(k).to_sym] = CGI::unescape(hash.delete(k)) }
+    hash
+  end
+  
   def color_palette(chart_make, chart_style=nil)
     theme(chart_make)[:color_palette] || []
   end
@@ -68,9 +82,11 @@ module ALaChartHelper
     @color_palette_ary.pop
   end
   
-  # Merge with per-chart options
   def chart_options(chart_make, chart_style=nil)
-    theme(chart_make)[:default_options] || {}
+    default_options = theme(chart_make)[:default_options] || {}
+    options = decode_options(params[:co])
+    chart_style_options = (theme(chart_make)[:options] || {})[chart_style] || {}
+    default_options.merge(options).merge(chart_style_options)
   end
   
 private

data/lib/a_la_chart.rb

@@ -1,5 +1,5 @@
 module ALaChart
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 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.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Eric Redmond
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-13 00:00:00 -05:00
+date: 2010-01-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency