rbgct 0.1.2 → 0.2

data/lib/rbgct/chart_factory.rb

@@ -7,6 +7,8 @@ module Rbgct
         Charts::LineChart
       when :pie_chart
         Charts::PieChart
+      when :bar_chart
+        Charts::BarChart
       else
         raise NotImplementedError, "No ChartFactory class for type #{type || 'NULL'}"
       end

data/lib/rbgct/charts/bar_chart.rb

@@ -0,0 +1,44 @@
+module Rbgct::Charts
+
+  class BarChart
+
+    include Chart
+
+    attr_accessor :name, :value, :name_label, :value_label, :is3D
+
+    def initialize(data, opts)
+      raise ArgumentError.new('name or value are not defined') unless opts[:name] && opts[:value]
+
+      @data = data
+
+      opts.each{ |method,arg| self.send("#{method}=",arg) if self.respond_to?(method)}
+
+      opts[:chart_options] ||= {}
+      opts[:chart_options].each{ |method,arg| self.send("#{method}=",arg) if self.respond_to?(method)}
+
+      set_default_values # in Chart
+      set_default_values_pie_chart
+    end
+
+    def data_columns
+      "data.addColumn('string', '#{name_label}');
+      data.addColumn('number', '#{value_label}');"
+    end
+
+    def data_rows
+      data.inject([]) do |ary, el|
+        ary << "      data.setValue(#{ary.size}, 0, '#{el.send(name)}');\n      data.setValue(#{ary.size}, 1, #{el.send(value)});"
+      end.unshift("data.addRows(#{data.size});").join("\n")
+    end
+
+    def options_for_chart
+      %(, is3D: "#{is3D}")
+    end
+
+    def set_default_values_pie_chart
+      @is3D ||= true
+    end
+
+  end
+
+end

data/lib/rbgct/charts/chart.rb

@@ -1,7 +1,7 @@
 module Rbgct::Charts
 
     module Chart
-      
+
       DEFAULT_WIDTH  = 600
       DEFAULT_HEIGHT = 400
 
@@ -13,51 +13,41 @@ module Rbgct::Charts
           return render_warning ? "<span class='rbgct-no-data'>Dataset <em>#{title}<em> contains no data.</span>" : nil
         end
         <<-EOL
-      #{jsapi}
       #{draw_visualization_start}
       #{data_columns}
       #{data_rows}
       #{draw_visualization_end}
         EOL
       end
-            
-      def jsapi
-        <<-EOL
-<script type="text/javascript" src="http://www.google.com/jsapi"></script>
-<script type="text/javascript">
-  google.load('visualization', '1', {packages: ['#{package}']});
-</script>
-        EOL
-      end
 
       def draw_visualization_start
         <<-EOL
+<div id="#{dom_id}" style="width: #{width}px; height: #{height}px;"></div>        
 <script type="text/javascript">
-  function drawVisualization() {
-    // Create and populate the data table.
-    var data = new google.visualization.DataTable();
+  rbgct.graphs['#{dom_id}'] = (function() {
+    
+    if(document.getElementById('#{dom_id}')){
+      // Create and populate the data table.
+      var data = new google.visualization.DataTable();
         EOL
       end
 
       def draw_visualization_end
         <<-EOL
 
-  // Create and draw the visualization.
-  new google.visualization.#{class_name}(document.getElementById('#{dom_id}')).
-    draw(data, {width: #{width}, height: #{height}, backgroundColor:{stroke:'#{bg_stroke_color}', strokeWidth:#{bg_stroke}, fill:'#{bg_color}'}, title: "#{title}", chartArea: {top: #{top}, left: #{left}} #{options_for_chart}});
-  }
-
-  google.setOnLoadCallback(drawVisualization);
+      // Create and draw the visualization.
+      new google.visualization.#{class_name}(document.getElementById('#{dom_id}')).
+        draw(data, {width: #{width}, height: #{height}, backgroundColor:{stroke:'#{bg_stroke_color}', strokeWidth:#{bg_stroke}, fill:'#{bg_color}'}, title: "#{title}", chartArea: {top: #{top}, left: #{left}} #{options_for_chart}});
+    }
+  })  
+  rbgct.drawGraphs();
 </script>
-<div id="#{dom_id}" style="width: #{width}px; height: #{height}px;"></div>
         EOL
       end
 
       def package
         case type
-        when :line_chart
-          'corechart'
-        when :pie_chart
+        when :line_chart, :bar_chart, :pie_chart
           'corechart'
         end
       end

data/lib/rbgct/version.rb

@@ -1,3 +1,3 @@
 module Rbgct
-  VERSION = "0.1.2"
+  VERSION = "0.2"
 end

data/lib/rbgct.rb

@@ -4,9 +4,43 @@ module Rbgct
   require 'rbgct/charts/chart'
   require 'rbgct/charts/line_chart'
   require 'rbgct/charts/pie_chart'
+  require 'rbgct/charts/bar_chart'
 
   class NotImplementedError < StandardError; end
 
+  def self.include_javascript(packages=['corechart','table'])
+  <<-EOL
+  <script type="text/javascript" src="http://www.google.com/jsapi"></script>
+  <script type="text/javascript">
+  var rbgct = {
+
+    "graphs" : {},
+
+    "loadedPackages" : [],
+
+    "packages" : ['#{packages.join("\',\'")}'],
+
+    "drawGraphs"  : (function(){
+        for(var i in rbgct.graphs){
+          rbgct.graphs[i]();
+        }
+    }),
+
+    "loadPackages" : (function(){
+      for(var i in rbgct.packages){
+        if( rbgct.loadedPackages.indexOf(rbgct.packages[i]) == -1 ){
+          google.load('visualization', '1', {packages: [rbgct.packages[i]]}); 
+          rbgct.loadedPackages.push(rbgct.packages[i]); 
+        }
+      }
+      google.setOnLoadCallback(rbgct.drawGraphs)
+    })
+  };
+  rbgct.loadPackages();
+  </script>
+  EOL
+  end
+
   def self.render(data, opts={})
     raise ArgumentError.new('Dataset must respond to :each') unless data.respond_to?(:each)
     chart = ChartFactory[opts[:type]].new(data,opts)

metadata

@@ -1,25 +1,28 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rbgct
-version: !ruby/object:Gem::Version
-  version: 0.1.2
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: "0.2"
 platform: ruby
-authors:
+authors: 
 - Emanuele Tozzato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-21 00:00:00.000000000 -07:00
-default_executable: 
+
+date: 2012-07-23 00:00:00 Z
 dependencies: []
-description: ! 'Google Chart Tools provide a perfect way to visualize data on your
-  website: now on Ruby'
-email:
+
+description: "Google Chart Tools provide a perfect way to visualize data on your website: now on Ruby"
+email: 
 - etozzato@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - LICENSE
@@ -29,34 +32,39 @@ files:
 - init.rb
 - lib/rbgct.rb
 - lib/rbgct/chart_factory.rb
+- lib/rbgct/charts/bar_chart.rb
 - lib/rbgct/charts/chart.rb
 - lib/rbgct/charts/line_chart.rb
 - lib/rbgct/charts/pie_chart.rb
 - lib/rbgct/version.rb
 - rbgct.gemspec
-has_rdoc: true
 homepage: http://www.mekdigital.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: rbgct
-rubygems_version: 1.5.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby Google Chart Tools
 test_files: []
+
+has_rdoc: