a_la_chart 0.0.8 → 0.0.9

data/Manifest.txt

@@ -3,13 +3,20 @@ MIT-LICENSE
 Manifest.txt
 README.rdoc
 Rakefile
-configs/fusion/3.0/angular.xml.builder
-configs/fusion/3.0/bar.xml.builder
-configs/fusion/3.0/column.xml.builder
-configs/fusion/3.0/inline.html.erb
-configs/fusion/3.0/line.xml.builder
-configs/fusion/3.0/pie.xml.builder
-configs/fusion/3.0/stacked_column.xml.builder
+configs/fusion/3.1/angular.xml.builder
+configs/fusion/3.1/bar.xml.builder
+configs/fusion/3.1/bullet.xml.builder
+configs/fusion/3.1/column.xml.builder
+configs/fusion/3.1/funnel.xml.builder
+configs/fusion/3.1/inline.html.erb
+configs/fusion/3.1/line.xml.builder
+configs/fusion/3.1/pie.xml.builder
+configs/fusion/3.1/pyramid.xml.builder
+configs/fusion/3.1/remote.html.erb
+configs/fusion/3.1/spark_column.xml.builder
+configs/fusion/3.1/spark_line.xml.builder
+configs/fusion/3.1/spark_win_loss.xml.builder
+configs/fusion/3.1/stacked_column.xml.builder
 configs/fusion/config.yml
 configs/google/1.0/pie.html.erb
 configs/google/config.yml

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

@@ -0,0 +1,15 @@
+xml.instruct!
+xml.chart(chart_options.merge(:upperLimit => params[:upperLimit] || 100, :caption => params[:title])) do
+  the_case = params[:case]
+  xml.colorRange do
+    xml.color :minValue => '0', :maxValue => '2', :code => 'FF654F'
+    xml.color :minValue => '2', :maxValue => '4', :code => 'F6BD0F'
+    xml.color :minValue => '4', :maxValue => '5', :code => '8BBA00'
+  end
+  xml.value do
+    value(data, :value, the_case)
+  end
+  xml.target do
+    value(data, :target, the_case)
+  end
+end

data/configs/fusion/3.1/inline.html.erb

@@ -0,0 +1,27 @@
+<%
+  require 'builder'
+  chart_type = chart_type_config['chart_type']
+  chart_type = chart_style.to_s if chart_type.blank?
+  
+  chart_type = args[:vertical] ? chart_type_config['vertical'] || chart_type : chart_type
+  chart_type = args[:dimensions] == 3 ? chart_type_config['3d'] || chart_type : chart_type
+  
+  set_chart(chart_style)
+  
+  # TODO: create a seperate 'params' override
+  params[:case] = args[:case]
+  params[:title] = args[:title]
+%>
+<div>
+  <fusioncharts id="<%= div_id %>" 
+                chartType="<%= chart_type %>" 
+                swfPath="/FusionCharts/" 
+                width="<%= width %>" 
+                height="<%= height %>" 
+                registerWithJS="1" 
+                debugMode="0">
+    <data><!--[CDATA[
+      <%= render :file => data_template %>
+    ]]--></data>
+  </fusioncharts>
+</div>

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

@@ -0,0 +1,7 @@
+xml.instruct!
+xml.chart(chart_options.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
+  end
+end

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

@@ -0,0 +1,7 @@
+xml.instruct!
+xml.chart(chart_options.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
+  end
+end

data/configs/fusion/{3.0/inline.html.erb → 3.1/remote.html.erb}

@@ -1,3 +1,10 @@
+<%
+  chart_type = chart_type_config['chart_type']
+  chart_type = chart_style.to_s if chart_type.blank?
+  
+  chart_type = args[:vertical] ? chart_type_config['vertical'] || chart_type : chart_type
+  chart_type = args[:dimensions] == 3 ? chart_type_config['3d'] || chart_type : chart_type
+%>
 <div>
   <fusioncharts id="<%= div_id %>" 
                 chartType="<%= chart_type %>" 

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

@@ -0,0 +1,9 @@
+xml.instruct!
+xml.chart(chart_options.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)
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+xml.instruct!
+xml.chart(chart_options.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)
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+xml.instruct!
+xml.chart(chart_options.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
+    end
+  end
+end

data/configs/fusion/config.yml

@@ -1,27 +1,69 @@
-default: 3.0
-3.0:
+default: 3.1
+3.1:
   format: xml
   angular:
     data: 'angular.xml.builder'
     chart_type: AngularGauge
+    remote: 'remote.html.erb'
     inline: 'inline.html.erb'
   bar:
     data: 'bar.xml.builder'
     chart_type: Bar2D
+    3d: Bar3D
+    remote: 'remote.html.erb'
+    inline: 'inline.html.erb'
+  bullet:
+    data: 'bullet.xml.builder'
+    chart_type: HBullet
+    vertical: VBullet
+    remote: 'remote.html.erb'
     inline: 'inline.html.erb'
   column:
     data: 'column.xml.builder'
     chart_type: Column2D
+    3d: Column3D
+    remote: 'remote.html.erb'
     inline: 'inline.html.erb'
   line:
     data: 'line.xml.builder'
     chart_type: Line2D
+    3d: Line3D
+    remote: 'remote.html.erb'
     inline: 'inline.html.erb'
   pie:
     data: 'pie.xml.builder'
     chart_type: Pie2D
+    3d: Pie3D
+    remote: 'remote.html.erb'
     inline: 'inline.html.erb'
   stacked_column:
     data: 'stacked_column.xml.builder'
     chart_type: StackedColumn2D
+    3d: StackedColumn3D
+    remote: 'remote.html.erb'
+    inline: 'inline.html.erb'
+  spark_line:
+    data: 'spark_line.xml.builder'
+    chart_type: SparkLine
+    remote: 'remote.html.erb'
+    inline: 'inline.html.erb'
+  spark_column:
+    data: 'spark_column.xml.builder'
+    chart_type: SparkColumn
+    remote: 'remote.html.erb'
+    inline: 'inline.html.erb'
+  spark_win_loss:
+    data: 'spark_win_loss.xml.builder'
+    chart_type: SparkWL
+    remote: 'remote.html.erb'
+    inline: 'inline.html.erb'
+  pyramid:
+    data: 'pyramid.xml.builder'
+    chart_type: Pyramid
+    remote: 'remote.html.erb'
+    inline: 'inline.html.erb'
+  funnel:
+    data: 'funnel.xml.builder'
+    chart_type: Funnel
+    remote: 'remote.html.erb'
     inline: 'inline.html.erb'

data/lib/a_la_chart/a_la_chart.rb

@@ -3,17 +3,19 @@ module ALaChart
   module HelperMethods
     def meta(the_case=nil)
       if the_case.blank?
+        # (@metadata ||= {})['_'] ||= defined?(get_meta) ? get_meta : {}
         @metadata ||= defined?(get_meta) ? get_meta : {}
       else
+        # (@metadata ||= {})[the_case] ||= respond_to?("get_meta_#{the_case.to_s}") ? send("get_meta_#{the_case.to_s}") : []
         @metadata ||= respond_to?("get_meta_#{the_case.to_s}") ? send("get_meta_#{the_case.to_s}") : []
       end
     end
     
     def data(the_case=nil)
       if the_case.blank?
-        @data ||= defined?(get_data) ? get_data : []
+        (@data ||= {})['_'] ||= defined?(get_data) ? get_data : []
       else
-        @data ||= respond_to?("get_data_#{the_case.to_s}") ? send("get_data_#{the_case.to_s}") : []
+        (@data ||= {})[the_case] ||= respond_to?("get_data_#{the_case.to_s}") ? send("get_data_#{the_case.to_s}") : []
       end
     end
     
@@ -130,7 +132,7 @@ module ALaChart
         end
       end
     end
-  
+    
     def data(*attrs, &block)
       if attrs.size == 1
         attrs = attrs[0]

data/lib/a_la_chart/a_la_chart_helper.rb

@@ -16,9 +16,10 @@ module ALaChartHelper
     
     chart_type_config = chart_make_config[chart_style.to_s]
     raise "#{chart_style.to_s} is an unsupported chart style" if chart_type_config.blank?
-    chart_type = chart_type_config['chart_type']
-    chart_type = chart_style.to_s if chart_type.blank?
     inline_template = chart_type_config['inline']
+    remote_template = chart_type_config['remote']
+    
+    template = args[:inline] ? inline_template : remote_template || inline_template
     
     data_format = chart_type_config['format'] || chart_make_config['format']
     
@@ -37,7 +38,10 @@ module ALaChartHelper
     
     div_id = "#{name}_#{Time.now.to_f.to_s.gsub('.','_')}"
     
-    inline = ERB.new(File.read(File.join(File.dirname(__FILE__), '..', '..', 'configs', chart_make.to_s, chart_make_version.to_s, inline_template)))
+    data_template = chart_type_config['data']
+    data_template = File.join(File.dirname(__FILE__), '..', '..', 'configs', chart_make.to_s, chart_make_version.to_s, data_template) if data_template.present?
+    
+    inline = ERB.new(File.read(File.join(File.dirname(__FILE__), '..', '..', 'configs', chart_make.to_s, chart_make_version.to_s, template)))
     inline.result(binding)
   end
   

data/lib/a_la_chart.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: a_la_chart
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Eric Redmond
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-24 00:00:00 -05:00
+date: 2009-12-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,13 +38,20 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- configs/fusion/3.0/angular.xml.builder
-- configs/fusion/3.0/bar.xml.builder
-- configs/fusion/3.0/column.xml.builder
-- configs/fusion/3.0/inline.html.erb
-- configs/fusion/3.0/line.xml.builder
-- configs/fusion/3.0/pie.xml.builder
-- configs/fusion/3.0/stacked_column.xml.builder
+- configs/fusion/3.1/angular.xml.builder
+- configs/fusion/3.1/bar.xml.builder
+- configs/fusion/3.1/bullet.xml.builder
+- configs/fusion/3.1/column.xml.builder
+- configs/fusion/3.1/funnel.xml.builder
+- configs/fusion/3.1/inline.html.erb
+- configs/fusion/3.1/line.xml.builder
+- configs/fusion/3.1/pie.xml.builder
+- configs/fusion/3.1/pyramid.xml.builder
+- configs/fusion/3.1/remote.html.erb
+- configs/fusion/3.1/spark_column.xml.builder
+- configs/fusion/3.1/spark_line.xml.builder
+- configs/fusion/3.1/spark_win_loss.xml.builder
+- configs/fusion/3.1/stacked_column.xml.builder
 - configs/fusion/config.yml
 - configs/google/1.0/pie.html.erb
 - configs/google/config.yml