vendor/open_flash_chart_lazy/specs/open_flash_chart_lazy_helper_spec.rb @@ -21,19 +21,19 @@ bar =<<-EOS bar_chart = OpenFlashChartLazy::Bar.new("Income") topics=OpenFlashChartLazy::Serie.new(income,{:title=>"Media"}) bar_chart.add_serie(topics) - bar_chart.x_axis[:labels][:rotate]="vertical" + bar_chart.x_axis.labels.rotate="vertical" bar_chart.bg_colour="#FFFFFF" - bar_chart.x_axis[:colour]="#808080" + bar_chart.x_axis.colour="#808080" bar_chart.x_axis["grid-colour"]="#A0A0A0" - bar_chart.x_axis[:stroke]=1 + bar_chart.x_axis.stroke=1 - bar_chart.y_axis[:colour]="#808080" - bar_chart.y_axis[:stroke]=1 + bar_chart.y_axis.colour="#808080" + bar_chart.y_axis.stroke=1 bar_chart.y_axis["grid-colour"]="#A0A0A0" - bar_chart.y_axis[:min]=0 - bar_chart.y_axis[:max]=80000 - bar_chart.y_axis[:steps]=25000 + bar_chart.y_axis.min=0 + bar_chart.y_axis.max=80000 + bar_chart.y_axis.steps=25000 bar_chart.to_json EOS bar3d =<<-EOS @@ -43,19 +43,19 @@ bar3d =<<-EOS bar_chart.add_serie(topics) bar_chart.bg_colour="#FFFFFF" - bar_chart.x_axis[:colour]="#808080" + bar_chart.x_axis.colour="#808080" bar_chart.x_axis["grid-colour"]="#A0A0A0" # add this setting here because will be placed first to work bar_chart.x_axis["3d"]=10 - bar_chart.y_axis[:colour]="#808080" + bar_chart.y_axis.colour="#808080" bar_chart.y_axis["grid-colour"]="#A0A0A0" - bar_chart.y_axis[:min]=0 - bar_chart.y_axis[:max]=80000 - bar_chart.y_axis[:steps]=25000 + bar_chart.y_axis.min=0 + bar_chart.y_axis.max=80000 + bar_chart.y_axis.steps=25000 #adding tip an color to a bar - bar_chart.elements.last[:values][2]={"top"=> income[2][1], "colour"=> "#D54C78",:tip=>"look here"} + bar_chart.elements.last.values[2]={"top"=> income[2][1], "colour"=> "#D54C78",:tip=>"look here"} bar_chart.to_json EOS @@ -66,15 +66,14 @@ line =<<-EOS line_graph.add_serie(active_users) line_graph.add_serie(users) - line_graph.x_axis[:labels][:rotate]="vertical" - line_graph.x_axis[:labels][:rotate]="vertical" + line_graph.x_axis.labels.rotate="vertical" line_graph.bg_colour="#FFFFFF" - line_graph.x_axis[:colour]="#808080" + line_graph.x_axis.colour="#808080" line_graph.x_axis["grid-colour"]="#A0A0A0" - line_graph.x_axis[:stroke]=0.5 + line_graph.x_axis.stroke=0.5 - line_graph.y_axis[:colour]="#808080" - line_graph.y_axis[:stroke]=0.5 + line_graph.y_axis.colour="#808080" + line_graph.y_axis.stroke=0.5 line_graph.y_axis["grid-colour"]="#A0A0A0" line_graph.to_json EOS ofc2.rb public/open-flash-chart.swf vendor/open_flash_chart_lazy/assets/swf/open-flash-chart.swf @@ -1,3 +1,4 @@ +require 'mash' require File.join(File.dirname(__FILE__),'open_flash_chart_lazy/open_flash_chart_lazy') # dumb hack to support sinatra @@ -11,3 +12,4 @@ rescue require File.join(File.dirname(__FILE__),'open_flash_chart_lazy/open_flash_chart_lazy_sinatra') #not rails end + vendor/open_flash_chart_lazy/lib/open_flash_chart_lazy.rb @@ -11,7 +11,7 @@ module OpenFlashChartLazy attr_accessor :max attr_accessor :min attr_accessor :steps - def initialize(data,options={}) + def initialize(data,options=Mash.new) @data = data # the labels @labels = [] @@ -23,7 +23,7 @@ module OpenFlashChartLazy #default options @steps = 1 @options = {:date_label_formatter=>"%b %Y",:date_key_formatter=>"%Y-%m",:title=>"Untitled"} - if @data.is_a?(Hash) + if @data.is_a?(Hash) or @data.is_a?(Mash) @items = data.length else @options.merge!({:items => data.length}) @@ -48,7 +48,7 @@ module OpenFlashChartLazy period = Time.mktime(new_period.year,new_period.month,new_period.day) @labels[i] = period.strftime(@options[:date_label_formatter]) @keys[i] = period.strftime(@options[:date_key_formatter]) - elsif @data.is_a?(Hash) + elsif @data.is_a?(Hash) or @data.is_a?(Mash) @labels[i] = "#{@data.keys[i]}" @keys[i] = @data.keys[i] elsif @data.is_a?(Array) @@ -90,7 +90,7 @@ module OpenFlashChartLazy @values[i]=data end end - when "Hash" + when "Hash","Mash" @values = @data.values end end @@ -106,9 +106,9 @@ module OpenFlashChartLazy def initialize(title="Untitled") @series = [] @elements = [] - @title = {:text=>title} - @y_axis = {} - @x_axis = {:labels => []} + @title = Mash.new({:text=>title}) + @y_axis = Mash.new({}) + @x_axis = Mash.new({:labels => []}) end def method_missing(method, value) self.instance_variable_set( "@#{method.to_s[0..-2]}".to_sym,value) @@ -120,12 +120,12 @@ module OpenFlashChartLazy LINE_COLORS = %w{#33ff33 #ff33ff #dd00ee} EXCLUDED_ATTRIBUTES = %w{series} - def add_serie(serie,options={}) + def add_serie(serie,options=Mash.new()) @elements << {:type=>"bar",:text=>serie.title} @elements.last.merge!(options) @series << serie @elements.last[:values] = serie.values - @x_axis[:labels] = {:labels => @series.last.labels } + @x_axis[:labels] = Mash.new({:labels => @series.last.labels }) end def to_graph_json self.to_json(:except=>EXCLUDED_ATTRIBUTES) @@ -137,12 +137,12 @@ module OpenFlashChartLazy LINE_COLORS = %w{#33ff33 #ff33ff #dd00ee} EXCLUDED_ATTRIBUTES = %w{series} - def add_serie(serie,options={}) - @elements << {:type=>"bar_3d",:text=>serie.title} + def add_serie(serie,options=Mash.new) + @elements << Mash.new({:type=>"bar_3d",:text=>serie.title}) @elements.last.merge!(options) @series << serie @elements.last[:values] = serie.values - @x_axis[:labels] = {"3d"=>10,:colour=>"#909090",:labels => @series.last.labels } + @x_axis[:labels] = Mash.new({"3d"=>10,:colour=>"#909090",:labels => @series.last.labels }) end def to_graph_json self.to_json(:except=>EXCLUDED_ATTRIBUTES) @@ -161,11 +161,11 @@ module OpenFlashChartLazy LINE_COLORS = %w{#33ff33 #ff33ff #dd00ee} def initialize(title="Untitled") super - @y_axis = {:min =>0,:max=>0,:steps=>1}.merge(@y_axis) + @y_axis = Mash.new({:min =>0,:max=>0,:steps=>1}.merge(@y_axis)) end - def add_serie(serie,options={}) - @elements << {:text=>serie.title,:type=>"line_dot",:width=>4,:dot_size=>5} + def add_serie(serie,options=Mash.new) + @elements << Mash.new({:text=>serie.title,:type=>"line_dot",:width=>4,:dot_size=>5}) @elements.last.merge!(options) @series << serie @elements.last[:values] = serie.values @@ -188,7 +188,7 @@ module OpenFlashChartLazy super @x_axis = "null" end - def add_serie(serie,options={}) + def add_serie(serie,options=Mash.new) @elements << {:text=>serie.title, :type=>"pie", :border=>2, @@ -200,7 +200,7 @@ module OpenFlashChartLazy @elements.last[:values] = [] @series << serie serie.values.each_with_index do |v,i| - @elements.last[:values]<< {:text => serie.labels[i], :value => v} + @elements.last[:values]<< Mash.new({:text => serie.labels[i], :value => v}) end end def to_graph_json vendor/open_flash_chart_lazy/lib/open_flash_chart_lazy/open_flash_chart_lazy.rb @@ -5,6 +5,47 @@ %p I want to know if you are using this plugin, please email me pedro.visintin [[at]] gmail com +%h1 Some news + +%p + Open Flash Chart Lazy now requires + %a{:href=>"http://rubyforge.org/projects/mash-hash/"} + Mash + This is helpful to set the parameters as methods. + +%p + Before you have to set: + +%pre>< + %code.ruby>< + - code="#previous version\n" + - code << "bar_chart.y_axis[:min]=0\n" + - code << "bar_chart.y_axis[:max]=1000\n" + - code << "bar_chart.y_axis[:steps]=100\n" + =preserve(code) + +%p + With the new version, is compatible with previous but if you fill confortable you can set the values as standard methods. + But remember that some non-standard name parameters as "grid-colour" will still be setted as previous ["grid-colour"] + +%pre>< + %code.ruby>< + - code="#new version\n" + - code << "bar_chart.y_axis.min=0\n" + - code << "bar_chart.y_axis.max=1000\n" + - code << "bar_chart.y_axis[:steps]=100\n" + - code << "# or \n" + - code << "bar_chart.y_axis.steps=100\n" + =preserve(code) + +%p + Also the new beta version of Open Flash Chart + %a{:href=>"http://teethgrinder.co.uk/open-flash-chart-2/downloads.php"} + Alpha8 + is now embbeded. + +%p Enjoy + %h1 What is %p Is a ruby library to use views/index.haml cdf86e81147f842c140a1cbc40e93c624068450d Pedro Visintin pedro.visintin@gmail.com http://github.com/peterpunk/open_flash_chart_lazy_samples/commit/4877898ecdfa0e3b6ed82457aa8034b5edcb6911 4877898ecdfa0e3b6ed82457aa8034b5edcb6911 2008-08-30T11:07:53-07:00 2008-08-30T11:07:53-07:00 Mash required and new version alpha 8 8778dfabb7635380598aa2b88423568aa7a239f1 Pedro Visintin pedro.visintin@gmail.com