gchartrb 0.3.0 → 0.4.0

data/CREDITS

@@ -1 +1,2 @@
-Will Fitzgerald - http://www.entish.org/willwhim
+Will Fitzgerald - http://www.entish.org/willwhim
+Bryan Donovan

data/History.txt

@@ -1,3 +1,12 @@
+== 0.4
+
+* Fixed issue when all data points are 0 in Line XY Chart (Thanks Cedric)
+* Proper calculation of max values for Line XY chart (Thanks Bryan Donovan)
+
+== 0.3 / 2007-12-11
+
+* Google changed Pie chart implementation to disable legends. Fixed in API.
+
 == 0.2 / 2007-12-11
 
 * Removed hoe dependency 

data/Rakefile

@@ -8,7 +8,7 @@ class Hoe
   def extra_deps; @extra_deps.reject { |x| Array(x).first == "hoe" } end
 end # copied from the Rakefile of the sup project
 
-Hoe.new('gchartrb', "0.3.0") do |p|
+Hoe.new('gchartrb', "0.4.0") do |p|
   p.rubyforge_name  = 'gchartrb'
   p.author          = 'Deepak Jois'
   p.email           = 'deepak.jois@gmail.com'

data/TODO

@@ -1,13 +1,13 @@
 TODO List (Features)
 ====================
-* Axis labels
-* Grid lines
 * Markers
 * Line Styles
 * Fill Area
 * Handle Missing Values (?)
 * Other charts (Scatter)
 * Download image
+* Friendly color values
+* Helper methods for standard chart types like Sparklines etc.
 
 TODO List (Other)
 =================
@@ -15,9 +15,10 @@ TODO List (Other)
 
 Code Level Improvements
 =======================
+* Automate upload to google code
 * Write tests that render different kinds of graphs
-* Remove the need for core_ext.rb file (stupid idea I was trying out earlier)
 * Use splats instead of attribute accessors to provide a neater API (?)
+* Clean up encoding, especially the handling of 'missing' values
 * Improved error handling and reporting for things
-  * Number of labels and number of postions in axis must be the same
+  * Number of labels and number of postions in axis must be the same (?)
   * Axis styles need to be specified in a certain way

data/lib/google_chart/base.rb

@@ -276,11 +276,11 @@ module GoogleChart
         def encode_data(values, max_value=nil)
             case data_encoding
                 when :simple
-                    simple_encode(values)
+                    simple_encode(values, max_value)
                 when :text
-                    text_encode(values)
+                    text_encode(values, max_value)
                 when :extended
-                    extended_encode(values)
+                    extended_encode(values, max_value)
                 else
                     raise "Illegal Encoding Specified"
             end
@@ -291,8 +291,13 @@ module GoogleChart
             max_value = values.max unless max_value
 
             chart_data = values.collect do |val|              
-                    if val.to_i >=0  
+                    if val.to_i >=0
+                      puts max_value
+                      if max_value == 0  
+                        SIMPLE_ENCODING[0]
+                      else
                         SIMPLE_ENCODING[(alphabet_length * val / max_value).to_i]
+                      end
                     else
                         "_"
                     end
@@ -304,13 +309,23 @@ module GoogleChart
         def text_encode(values, max_value=nil)
              max_value = values.max unless max_value
              values.inject("") { |sum, v|
-               sum += ( "%.1f" % (v*100/max_value) ) + ","
+               if max_value == 0
+                 sum += "0,"
+               else
+                 sum += ( "%.1f" % (v*100/max_value) ) + ","
+               end
              }.chomp(",")
         end
         
         def extended_encode(values, max_value)
             max_value = values.max unless max_value
-            values.collect { |v| @@complex_encoding[(v * 4095/max_value).to_i]}.join('')
+            values.collect { |v| 
+              if max_value == 0
+                @@complex_encoding[0]
+              else
+                @@complex_encoding[(v * 4095/max_value).to_i]
+              end
+            }.join('')
         end
         
         def join_encoded_data(encoded_data)

data/lib/google_chart/line_chart.rb

@@ -1,73 +1,62 @@
 require File.dirname(__FILE__) + '/base'
 module GoogleChart
-    # Generates a Line Chart. You can specify whether it is a standard line chart or an XY Line chart
-    # 
-    # ==== Examples
-    #
-    #      # Line Chart
-    #      lc = GoogleChart::LineChart.new('320x200', "Line Chart", false)
-    #      lc.data "Trend 1", [5,4,3,1,3,5,6], '0000ff'
-    #      lc.data "Trend 2", [1,2,3,4,5,6], '00ff00'
-    #      lc.data "Trend 3", [6,5,4,3,2,1], 'ff0000'
-    #      puts lc.to_url
-    #
-    #      # Line XY Chart
-    #      lcxy =  GoogleChart::LineChart.new('320x200', "Line XY Chart", true)
-    #      lcxy.data "Trend 1", [[1,1], [2,2], [3,3], [4,4]], '0000ff'
-    #      lcxy.data "Trend 2", [[4,5], [2,2], [1,1], [3,4]], '00ff00'
-    #      puts lcxy.to_url    
-    class LineChart < Base
-        attr_accessor :is_xy
-        
-        # Initializes a Line Chart object with a +chart_size+ and +chart_title+. Specify +is_xy+ as +true+ to generate a Line XY chart
-        def initialize(chart_size='300x200', chart_title=nil, is_xy=false)
-            super(chart_size, chart_title)
-            self.is_xy = is_xy
-        end
-        
-        # If you want the Line Chart to be an XY chart, set the value to <tt>true</tt>, otherwise <tt>false</tt>.
-        #
-        # ==== Examples
-        # A line chart takes data in the following format (both X and Y coordinates need to be specified)
-        #     lcxy =  GoogleChart::LineChart.new('320x200', "Line XY Chart", true)
-        #     lcxy.data "Trend 1", [[1,1], [2,2], [3,3], [4,4]], '0000ff'
-        #     puts lcxy.to_url         
-        def is_xy=(value)
-            @is_xy = value
-            if value
-                self.chart_type = :lxy
-            else
-                self.chart_type = :lc
-            end
-        end
-                
-        def process_data
-            if self.is_xy or @data.size > 1
-                if self.is_xy # XY Line graph data series
-                  max_value = @data.flatten.max
-                 x_data = @data.collect do |series|
-                     series.collect { |val| val.first }
-                 end
-                 
-                 y_data = @data.collect do |series|
-                      series.collect { |val| val.last }
-                 end
-                  
-                  encoded_data = []
-                  @data.size.times { |i|
-                      # Interleave X and Y co-ordinate data
-                      encoded_data << join_encoded_data([encode_data(x_data[i],max_value), encode_data(y_data[i],max_value)])
-                  }
-                  join_encoded_data(encoded_data)
-                else # Line graph multiple data series
-                  max_value = @data.flatten.max
-                  join_encoded_data(@data.collect { |series|
-                    encode_data(series, max_value)
-                  })
-                end
-            else
-                encode_data(@data.flatten)
-            end
+  class LineChart < Base
+    attr_accessor :is_xy
+
+    def initialize(chart_size='300x200', chart_title=nil, is_xy=false)
+      super(chart_size, chart_title)
+      self.is_xy = is_xy
+    end
+
+    def is_xy=(value)
+      @is_xy = value
+      if value
+        self.chart_type = :lxy
+      else
+        self.chart_type = :lc
+      end
+    end
+
+    def max_x_value
+      puts "Max x value is #{x_data.flatten.max}"
+      x_data.flatten.max
+    end
+
+    def max_y_value
+      puts "Max y value is #{y_data.flatten.max}"
+      y_data.flatten.max
+    end
+
+    def x_data
+      @data.collect do |series|
+        series.collect { |val| val.first }
+      end
+    end
+
+    def y_data
+      @data.collect do |series|
+        series.collect { |val| val.last }
+      end
+    end
+
+    def process_data
+      if self.is_xy or @data.size > 1
+        if self.is_xy # XY Line graph data series
+          encoded_data = []
+          @data.size.times { |i|
+            # Interleave X and Y co-ordinate data
+            encoded_data << join_encoded_data([encode_data(x_data[i],max_x_value), encode_data(y_data[i],max_y_value)])
+          }
+          join_encoded_data(encoded_data)
+        else # Line graph multiple data series
+          max_value = @data.flatten.max
+          join_encoded_data(@data.collect { |series|
+            encode_data(series, max_value)
+          })
         end
+      else
+        encode_data(@data.flatten)
+      end
     end
-end
+  end
+end

data/lib/test.rb

@@ -70,3 +70,11 @@ lc.data "Trend 2", [1,2,3,4,5,6], '00ff00'
 lc.data "Trend 3", [6,5,4,3,2,1], 'ff0000'
 puts lc.to_url({:chm => "r,000000,0,0.1,0.5"}) # Single black line as a horizontal marker
 
+# Bryan Error condition
+lcxy =  GoogleChart::LineChart.new('320x200', "Line XY Chart", true)
+lcxy.data 'A', [[0, 32], [1, 15], [2, 23], [3, 18], [4, 41],  [5, 53]],'0000ff'
+lcxy.data 'B', [[0, 73], [1, 0],  [2, 28], [3, 0],  [4, 333], [5, 0]], '00ff00'
+lcxy.data 'C', [[0, 22], [1, 26], [2, 14], [3, 33], [4, 17],  [5, 7]], 'ff0000'
+lcxy.data 'D', [[0, 4],  [1, 39], [2, 0],  [3, 5],  [4, 11],  [5, 14]], 'cc00ff'
+puts lcxy.to_url
+

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: gchartrb
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
-date: 2007-12-11 00:00:00 +08:00
+  version: 0.4.0
+date: 2007-12-12 00:00:00 +08:00
 summary: Ruby Wrapper for the Google Chart API
 require_paths: 
 - lib