lib/yui4rails/widgets/chart.rb spec/models/chart_spec.rb @@ -7,4 +7,4 @@ ActionView::Base.send(:include, Yui4Rails::IncludeExtension) ActionView::Base.send(:include, Yui4Rails::HelpersExtension) ActionController::Base.send(:prepend_before_filter) do Yui4Rails::AssetManager.reset -end +end \ No newline at end of file lib/yui4rails.rb @@ -39,49 +39,17 @@ module Yui4Rails def process_components @yui_stylesheets = [] - @yui_javascript = [] - + @yui_javascript = [] + @components.flatten! @components.uniq! - - @yui_stylesheets << "reset/reset-min" if @components.include?(:reset) - @yui_stylesheets << "fonts/fonts-min" if @components.include?(:fonts) - @components.each{ |c| add_component(c) } - - add_datatable_includes if @components.include?(:datatable) - add_charts_includes if @components.include?(:charts) - add_carousel_includes if @components.include?(:carousel) + # A future enhancement would be to look at individual components that can be combined into a more efficient library + # such as how yahoo, dom and event are commonly included as the yahoo-dom-event @stylesheets = @yui_stylesheets.flatten.uniq @javascripts = @yui_javascript.flatten.uniq - end - - - def add_datatable_includes - @yui_stylesheets << "datatable/assets/skins/sam/datatable" - @yui_javascript << "utilities/utilities" - @yui_javascript << "datasource/datasource-min" - @yui_javascript << "datatable/datatable-min" - end - - def add_charts_includes - @yui_javascript << "utilities/utilities" - @yui_javascript << "yahoo-dom-event/yahoo-dom-event" - @yui_javascript << "json/json-min" - @yui_javascript << "element/element-beta-min.js" - @yui_javascript << "datasource/datasource-min" - @yui_javascript << "charts/charts-experimental-min" - add_script %{YAHOO.widget.Chart.SWFURL = "/yui/charts/assets/charts.swf";} - end - - def add_carousel_includes - @yui_stylesheets << "carousel/assets/carousel" - @yui_javascript << "yahoo-dom-event/yahoo-dom-event" - @yui_javascript << "animation/animation-min" - @yui_javascript << "container/container-min" - @yui_javascript << "carousel/carousel_min" - end + end def add_component(component) return false unless COMPONENTS.has_key?(component) @@ -92,6 +60,12 @@ module Yui4Rails end COMPONENTS = { + :reset => { + :css => ["reset/reset-min"] + }, + :fonts => { + :css => ["fonts/fonts-min"] + }, :panel => { :css => ["container/assets/skins/sam/container"], :js => ["yahoo-dom-event/yahoo-dom-event", "animation/animation-min", "container/container-min"] @@ -99,7 +73,42 @@ module Yui4Rails :tooltip => { :css => ["container/assets/container"], :js => ["yahoo-dom-event/yahoo-dom-event", "animation/animation-min", "container/container-min"] + }, + :datatable => { + :css => ["datatable/assets/skins/sam/datatable"], + :js => ["utilities/utilities", "datasource/datasource-min", "datatable/datatable-min"] + }, + :charts => { + :js => ["utilities/utilities", "yahoo-dom-event/yahoo-dom-event", "json/json-min", "element/element-beta-min", "datasource/datasource-min", "charts/charts-experimental-min"] + }, + :carousel => { + :css => ["carousel/assets/carousel"], + :js => ["yahoo-dom-event/yahoo-dom-event", "animation/animation-min", "container/container-min", "carousel/carousel_min"] } } end + + def add_datatable_includes + @yui_stylesheets << "datatable/assets/skins/sam/datatable" + @yui_javascript << "utilities/utilities" + @yui_javascript << "datasource/datasource-min" + @yui_javascript << "datatable/datatable-min" + end + + def add_charts_includes + @yui_javascript << "utilities/utilities" + @yui_javascript << "yahoo-dom-event/yahoo-dom-event" + @yui_javascript << "json/json-min" + @yui_javascript << "element/element-beta-min.js" + @yui_javascript << "datasource/datasource-min" + @yui_javascript << "charts/charts-experimental-min" + end + + def add_carousel_includes + @yui_stylesheets << "carousel/assets/carousel" + @yui_javascript << "yahoo-dom-event/yahoo-dom-event" + @yui_javascript << "animation/animation-min" + @yui_javascript << "container/container-min" + @yui_javascript << "carousel/carousel_min" + end end lib/yui4rails/asset_manager.rb @@ -10,7 +10,11 @@ module Yui4Rails end def yui_chart(chart_type, chart_id, rows, options = {}) - Yui4Rails::Widgets::Chart.new(chart_type, chart_id, rows, options).render_chart + # Redo fields as an option in data + @fields = rows.map{ |row| row.keys.map(&:to_s) }.flatten.uniq + data = {:fields => @fields, :rows => rows} + + Yui4Rails::Widgets::Chart.new(chart_type, chart_id, data, options).render end def yui_datatable(statistics, div_id, options = {}) lib/yui4rails/helpers_extension.rb @@ -1,6 +1,6 @@ require 'yui4rails/widgets/datatable' -require 'yui4rails/widgets/charts' +require 'yui4rails/widgets/chart' require 'yui4rails/widgets/carousel' require 'yui4rails/widgets/tooltip' -ActionView::Base.send(:include, Yui4Rails::Widgets) \ No newline at end of file +ActionView::Base.send(:include, Yui4Rails::Widgets) lib/yui4rails/widgets.rb @@ -15,9 +15,9 @@ module Yui4Rails end end - def self.extract_keys(data_rows) - keys = [] - return keys if data_rows.empty? + def self.extract_keys(data_rows) + keys = [] + return keys if data_rows.nil? || data_rows.empty? data_rows.first.each do |k, v| keys << { :key => k.to_s } lib/yui4rails/widgets/datatable.rb @@ -149,21 +149,9 @@ describe Yui4Rails::AssetManager do @manager.send(:process_components) end - it "should use add_container_includes for :datatable" do + it "should use add_component for :datatable" do @manager.instance_variable_set(:@components, [:datatable]) - @manager.should_receive(:add_datatable_includes) - @manager.send(:process_components) - end - - it "should use add_container_includes for :charts" do - @manager.instance_variable_set(:@components, [:charts]) - @manager.should_receive(:add_charts_includes) - @manager.send(:process_components) - end - - it "should use add_container_includes for :carousel" do - @manager.instance_variable_set(:@components, [:carousel]) - @manager.should_receive(:add_carousel_includes) + @manager.should_receive(:add_component).once.with(:datatable) @manager.send(:process_components) end end spec/models/asset_manager_spec.rb @@ -1,9 +1,10 @@ $:.unshift(File.dirname(__FILE__) + '/../lib') require 'spec' +require 'active_support' require 'yui4rails/helpers_extension' require 'yui4rails/include_extension' require 'yui4rails/widgets/datatable' -require 'yui4rails/widgets/charts' +require 'yui4rails/widgets/chart' require 'yui4rails/widgets/carousel' require 'yui4rails/widgets/tooltip' require 'yui4rails/asset_manager' spec/spec_helper.rb lib/yui4rails/widgets/charts.rb 927a5ec7f2ce36a5238e252c4d6c5bcd12efd190 Marty Haught mghaught@gmail.com http://github.com/mghaught/yui4rails/commit/274306eb2d77fc761730e418a9443440bfd5d7af 274306eb2d77fc761730e418a9443440bfd5d7af 2008-11-24T09:46:41-08:00 2008-11-24T09:46:41-08:00 Merged chart changes into smc application 2bc39998491d219e599bd6e524677682b7e4bb72 Marty Haught mghaught@gmail.com