a_la_chart 0.0.10 → 0.0.11

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.0.11 2010-1-11
+
+* 1 major enhancement:
+  * app can now be configured externally
+
 === 0.0.10 2009-12-29
 
 * 2 major enhancement:

data/Manifest.txt

@@ -3,31 +3,32 @@ MIT-LICENSE
 Manifest.txt
 README.rdoc
 Rakefile
-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/v3_1/angular.xml.builder
+configs/fusion/v3_1/bar.xml.builder
+configs/fusion/v3_1/bullet.xml.builder
+configs/fusion/v3_1/column.xml.builder
+configs/fusion/v3_1/funnel.xml.builder
+configs/fusion/v3_1/inline.html.erb
+configs/fusion/v3_1/line.xml.builder
+configs/fusion/v3_1/pie.xml.builder
+configs/fusion/v3_1/pyramid.xml.builder
+configs/fusion/v3_1/remote.html.erb
+configs/fusion/v3_1/spark_column.xml.builder
+configs/fusion/v3_1/spark_line.xml.builder
+configs/fusion/v3_1/spark_win_loss.xml.builder
+configs/fusion/v3_1/stacked_column.xml.builder
 configs/fusion/config.yml
-configs/google/1.0/pie.html.erb
+configs/google/v1_0/pie.html.erb
 configs/google/config.yml
-configs/raphael/1.2/dot.html.erb
-configs/raphael/1.2/impact.js.erb
-configs/raphael/1.2/inline.html.erb
+configs/raphael/v1_2/dot.html.erb
+configs/raphael/v1_2/impact.js.erb
+configs/raphael/v1_2/inline.html.erb
 configs/raphael/config.yml
 init.rb
 lib/a_la_chart.rb
 lib/a_la_chart/a_la_chart_helper.rb
 lib/a_la_chart/a_la_chart.rb
+lib/a_la_chart/config.rb
 script/console
 script/destroy
 script/generate

data/configs/fusion/config.yml

@@ -1,5 +1,5 @@
-default: 3.1
-3.1:
+default: v3_1
+v3_1:
   format: xml
   angular:
     data: 'angular.xml.builder'
@@ -9,7 +9,7 @@ default: 3.1
   bar:
     data: 'bar.xml.builder'
     chart_type: Bar2D
-    3d: Bar3D
+    d3: Bar3D
     remote: 'remote.html.erb'
     inline: 'inline.html.erb'
   bullet:
@@ -21,25 +21,25 @@ default: 3.1
   column:
     data: 'column.xml.builder'
     chart_type: Column2D
-    3d: Column3D
+    d3: Column3D
     remote: 'remote.html.erb'
     inline: 'inline.html.erb'
   line:
     data: 'line.xml.builder'
     chart_type: Line2D
-    3d: Line3D
+    d3: Line3D
     remote: 'remote.html.erb'
     inline: 'inline.html.erb'
   pie:
     data: 'pie.xml.builder'
     chart_type: Pie2D
-    3d: Pie3D
+    d3: Pie3D
     remote: 'remote.html.erb'
     inline: 'inline.html.erb'
   stacked_column:
     data: 'stacked_column.xml.builder'
     chart_type: StackedColumn2D
-    3d: StackedColumn3D
+    d3: StackedColumn3D
     remote: 'remote.html.erb'
     inline: 'inline.html.erb'
   spark_line:

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

@@ -1,10 +1,10 @@
 <%
   require 'builder'
-  chart_type = chart_type_config['chart_type']
+  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
+  chart_type = args[:vertical] ? chart_type_config[:vertical] || chart_type : chart_type
+  chart_type = args[:dimensions] == 3 ? chart_type_config[:d3] || chart_type : chart_type
   
   set_chart(chart_style)
   

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

@@ -1,9 +1,9 @@
 <%
-  chart_type = chart_type_config['chart_type']
+  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
+  chart_type = args[:vertical] ? chart_type_config[:vertical] || chart_type : chart_type
+  chart_type = args[:dimensions] == 3 ? chart_type_config[:d3] || chart_type : chart_type
 %>
 <div>
   <fusioncharts id="<%= div_id %>" 

data/configs/fusion/{3.1 → v3_1}/stacked_column.xml.builder

@@ -1,5 +1,5 @@
 xml.instruct!
-xml.chart(chart_options.merge(:caption => params[:title])) do
+xml.chart(chart_options.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|

data/configs/google/config.yml

@@ -1,4 +1,4 @@
-default: 1.0
-1.0:
+default: v1_0
+v1_0:
   pie:
     inline: 'pie.html.erb'

data/configs/raphael/config.yml

@@ -1,5 +1,5 @@
-default: 1.2
-1.2:
+default: v1_2
+v1_2:
   format: js
   impact:
     data: 'impact.js.erb'

data/lib/a_la_chart/a_la_chart.rb

@@ -41,21 +41,6 @@ module ALaChart
     def set_chart(chart_type)
       send "set_chart_#{chart_type}"
     end
-    
-    def a_la_chart_config
-      unless defined?(@@alachart_config)
-        require 'yaml'
-        
-        @@alachart_config = {}
-        Dir.foreach(File.join(File.dirname(__FILE__), '..', '..', 'configs')) do |dir|
-          config_path = File.join(File.dirname(__FILE__), '..', '..', 'configs', dir, 'config.yml')
-          if File.exists?(config_path)
-            @@alachart_config[dir.to_sym] = YAML.load_file(config_path)
-          end
-        end
-      end
-      @@alachart_config
-    end
   end
   
   module InstanceMethods
@@ -66,10 +51,10 @@ module ALaChart
       chart_type = params[:ct]
       
       chart_type_config, chart_make_version = nil, nil
-      if !chart_make.nil? && (chart_make_config = a_la_chart_config[chart_make.to_sym])
-        chart_make_version = chart_make_version || chart_make_config['default']
-        chart_make_config = chart_make_config[chart_make_version]
-        chart_type_config = chart_make_config[chart_type.to_s]
+      if !chart_make.nil? && (chart_make_config = ALaChart::Config[chart_make])
+        chart_make_version = chart_make_version || chart_make_config[:default]
+        chart_make_config = chart_make_version.nil? ? nil : chart_make_config[chart_make_version.to_sym]
+        chart_type_config = chart_make_config.nil? || chart_type.nil? ? nil : chart_make_config[chart_type.to_sym]
       end
       
       return if chart_type_config.nil? || !respond_to?("set_chart_#{chart_type}")
@@ -85,16 +70,16 @@ module ALaChart
 
     def render_style(chart_make, chart_type, chart_make_version=nil, chart_type_config=nil)
       if chart_type_config.nil?
-        unless !chart_make.nil? && (chart_make_config = a_la_chart_config[chart_make.to_sym])
-          raise "Unknown chart_make. Valid type are: #{a_la_chart_config.keys.map{|v|v.to_sym.inspect}.join(', ')}"
+        unless !chart_make.nil? && (chart_make_config = ALaChart::Config[chart_make])
+          raise "Unknown chart_make. Valid type are: #{ALaChart::Config.keys.map{|v|v.inspect}.join(', ')}"
         end
         
-        chart_make_version = chart_make_version || chart_make_config['default']
-        chart_make_config = chart_make_config[chart_make_version]
-        chart_type_config = chart_make_config[chart_type.to_s]
+        chart_make_version = chart_make_version || chart_make_config[:default]
+        chart_make_config = chart_make_version.nil? ? nil : chart_make_config[chart_make_version.to_sym]
+        chart_type_config = chart_make_config.nil? || chart_type.nil? ? {} : chart_make_config[chart_type.to_sym]
       end
       
-      data_template = chart_type_config['data']
+      data_template = chart_type_config[:data]
       
       send "set_chart_#{chart_type}"
       render File.join(File.dirname(__FILE__), '..', '..', 'configs', chart_make.to_s, chart_make_version.to_s, data_template)
@@ -116,7 +101,7 @@ module ALaChart
       self.before_filter(:provide_chart_data, :only => [:index, :show])
       
       # Namespace this stuff??
-      [:data, :fields, :meta, :value, :a_la_chart_config, :set_chart].each do |method|
+      [:data, :fields, :meta, :value, :set_chart].each do |method|
         master_helper_module.module_eval <<-end_eval
           def #{method}(*args, &block)                    # def current_user(*args, &block)
             controller.send(%(#{method}), *args, &block)  #   controller.send(%(current_user), *args, &block)

data/lib/a_la_chart/a_la_chart_helper.rb

@@ -1,6 +1,10 @@
 module ALaChartHelper
   require "erb"
   
+  def inline_chart_tag(chart_make, chart_style, args={})
+    chart_tag(chart_make, chart_style, args.merge(:inline => true))
+  end
+  
   def chart_tag(chart_make, chart_style, args={})
     width = args[:width] || 400
     height = args[:height] || 300
@@ -10,20 +14,20 @@ module ALaChartHelper
     
     chart_make = chart_make.to_sym
     
-    chart_make_config = a_la_chart_config[chart_make]
-    chart_make_version = chart_make_version || chart_make_config['default']
-    chart_make_config = chart_make_config[chart_make_version]
+    chart_make_config = ALaChart::Config[chart_make]
+    chart_make_version = chart_make_version || chart_make_config[:default]
+    chart_make_config = chart_make_config[chart_make_version.to_sym]
     
-    chart_type_config = chart_make_config[chart_style.to_s]
+    chart_type_config = chart_make_config[chart_style.to_sym]
     raise "#{chart_style.to_s} is an unsupported chart style" if chart_type_config.blank?
-    inline_template = chart_type_config['inline']
-    remote_template = chart_type_config['remote']
+    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']
+    data_format = chart_type_config[:format] || chart_make_config[:format]
     
-    append_url = chart_type_config['url'] || ".chart#{data_format}"
+    append_url = chart_type_config[:url] || ".chart#{data_format}"
     url += "#{append_url}?"
     
     explicit_args = args[:args].present? ? params.merge(args[:args]) : params
@@ -38,11 +42,17 @@ module ALaChartHelper
     
     div_id = "#{name}_#{Time.now.to_f.to_s.gsub('.','_')}"
     
-    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?
+    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?
+    # If we cannot find the file, try it as a relative path
+    data_template = File.join(RAILS_ROOT, data_template_path) if data_template_path.present? && !File.exists?(data_template) && defined?(RAILS_ROOT)
+    
+    chart_template = File.join(File.dirname(__FILE__), '..', '..', 'configs', chart_make.to_s, chart_make_version.to_s, template)
+    # If we cannot find the file, try it as a relative path
+    chart_template = File.join(RAILS_ROOT, template) if !File.exists?(chart_template) && defined?(RAILS_ROOT)
     
-    inline = ERB.new(File.read(File.join(File.dirname(__FILE__), '..', '..', 'configs', chart_make.to_s, chart_make_version.to_s, template)))
-    inline.result(binding)
+    chart_template_erb = ERB.new(File.read(chart_template))
+    chart_template_erb.result(binding)
   end
   
   # TODO: REMOVE all of this stuff... make this all external configurations

data/lib/a_la_chart/config.rb

@@ -0,0 +1,67 @@
+module ALaChart
+  module Config
+    
+    # Internally, this config is represented as:
+    #  config = {
+    #    :fusion => {
+    #      :default => :v31,
+    #      :v3_1 => {
+    #        :format => 'xml',
+    #        :pie => {
+    #          :data => 'pie.xml.builder',
+    #          :chart_type => 'Pie2D',
+    #          :remote => 'remote.html.erb',
+    #          :inline => 'inline.html.erb'
+    #        }
+    #      }
+    #    }
+    #  }
+    # Internal configs can be overridden in rails environment configs. For example,
+    # to use a custom :inline ERB template (paths are based on RAILS_ROOT):
+    # 
+    #  ALaChart::Config[:fusion][:v3_1][:pie][:data] = 'app/views/reports/a_la_chart/custom_inline.html.erb'
+    # 
+    # Then just copy the original template from the gem config dir, and make the desired changes
+    def self.config
+      unless defined?(@@data)
+        require 'yaml'
+        
+        def self.symbolize_keys!(yaml_data)
+          if yaml_data.is_a?(Hash)
+            yaml_data.each do |k,v|
+              unless k.is_a?(Symbol)
+                yaml_data[k.to_sym] ||= yaml_data.delete(k)
+              end
+              if v.is_a?(Array)
+                v.each {|e| self.symbolize_keys!(e) }
+              else
+                self.symbolize_keys!(v)
+              end
+            end
+          end
+        end
+        
+        @@data = {}
+        Dir.foreach(File.join(File.dirname(__FILE__), '..', '..', 'configs')) do |dir|
+          config_path = File.join(File.dirname(__FILE__), '..', '..', 'configs', dir, 'config.yml')
+          if File.exists?(config_path)
+            make = dir.to_sym
+            yaml_data = YAML.load_file(config_path)
+            # Deep clone the yaml data
+            @@data[make] = Marshal::load(Marshal.dump(yaml_data))
+            self.symbolize_keys!(@@data[make])
+          end
+        end
+      end
+      @@data
+    end
+    
+    def self.[](make)
+      self.config[make.to_sym]
+    end
+    
+    def self.keys
+      self.config.keys
+    end
+  end
+end

data/lib/a_la_chart.rb

@@ -1,7 +1,8 @@
 module ALaChart
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end
 
+require File.join(File.dirname(__FILE__), 'a_la_chart', 'config')
 require File.join(File.dirname(__FILE__), 'a_la_chart', 'a_la_chart')
 require File.join(File.dirname(__FILE__), 'a_la_chart', 'a_la_chart_helper')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: a_la_chart
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - Eric Redmond
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-29 00:00:00 -05:00
+date: 2010-01-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,31 +38,32 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- 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/v3_1/angular.xml.builder
+- configs/fusion/v3_1/bar.xml.builder
+- configs/fusion/v3_1/bullet.xml.builder
+- configs/fusion/v3_1/column.xml.builder
+- configs/fusion/v3_1/funnel.xml.builder
+- configs/fusion/v3_1/inline.html.erb
+- configs/fusion/v3_1/line.xml.builder
+- configs/fusion/v3_1/pie.xml.builder
+- configs/fusion/v3_1/pyramid.xml.builder
+- configs/fusion/v3_1/remote.html.erb
+- configs/fusion/v3_1/spark_column.xml.builder
+- configs/fusion/v3_1/spark_line.xml.builder
+- configs/fusion/v3_1/spark_win_loss.xml.builder
+- configs/fusion/v3_1/stacked_column.xml.builder
 - configs/fusion/config.yml
-- configs/google/1.0/pie.html.erb
+- configs/google/v1_0/pie.html.erb
 - configs/google/config.yml
-- configs/raphael/1.2/dot.html.erb
-- configs/raphael/1.2/impact.js.erb
-- configs/raphael/1.2/inline.html.erb
+- configs/raphael/v1_2/dot.html.erb
+- configs/raphael/v1_2/impact.js.erb
+- configs/raphael/v1_2/inline.html.erb
 - configs/raphael/config.yml
 - init.rb
 - lib/a_la_chart.rb
 - lib/a_la_chart/a_la_chart_helper.rb
 - lib/a_la_chart/a_la_chart.rb
+- lib/a_la_chart/config.rb
 - script/console
 - script/destroy
 - script/generate