gruff 0.7.0 → 0.8.0

data/lib/gruff/side_stacked_bar.rb

@@ -3,24 +3,24 @@ require File.dirname(__FILE__) + '/side_bar'
 require File.dirname(__FILE__) + '/stacked_mixin'
 
 ##
-# New gruff graph type added to enable sideways stacking bar charts 
+# New gruff graph type added to enable sideways stacking bar charts
 # (basically looks like a x/y flip of a standard stacking bar chart)
 #
-# alun.eyre@googlemail.com 
+# alun.eyre@googlemail.com
 
 class Gruff::SideStackedBar < Gruff::SideBar
   include StackedMixin
 
   # Spacing factor applied between bars
   attr_accessor :bar_spacing
-  
+
   def draw
     @has_left_labels = true
     get_maximum_by_stack
     super
   end
 
-  protected
+protected
 
   def draw_bars
     # Setup spacing.
@@ -35,33 +35,32 @@ class Gruff::SideStackedBar < Gruff::SideBar
     padding = (@bar_width * (1 - @bar_spacing)) / 2
     if @show_labels_for_bar_values
       label_values = Array.new
-      0.upto(@column_count-1) {|i| label_values[i] = {:value => 0, :right_x => 0}}
+      0.upto(@column_count - 1) { |i| label_values[i] = { value: 0, right_x: 0 } }
     end
     @norm_data.each_with_index do |data_row, row_index|
       data_row[DATA_VALUES_INDEX].each_with_index do |data_point, point_index|
+        ## using the original calcs from the stacked bar chart to get the difference between
+        ## part of the bart chart we wish to stack.
+        temp1 = @graph_left + (@graph_width -
+                                  data_point * @graph_width -
+                                  height[point_index]) + 1
+        temp2 = @graph_left + @graph_width - height[point_index] - 1
+        difference = temp2 - temp1
 
-    	  ## using the original calcs from the stacked bar chart to get the difference between
-    	  ## part of the bart chart we wish to stack.
-    	  temp1 = @graph_left + (@graph_width -
-                                    data_point * @graph_width - 
-                                    height[point_index]) + 1
-    	  temp2 = @graph_left + @graph_width - height[point_index] - 1
-    	  difference = temp2 - temp1
-
-    	  @d = @d.fill data_row[DATA_COLOR_INDEX]
+        @d = @d.fill data_row[DATA_COLOR_INDEX]
 
         left_x = length[point_index] #+ 1
-              left_y = @graph_top + (@bar_width * point_index) + padding
-    	  right_x = left_x + difference
-              right_y = left_y + @bar_width * @bar_spacing
-    	  length[point_index] += difference
+        left_y = @graph_top + (@bar_width * point_index) + padding
+        right_x = left_x + difference
+        right_y = left_y + @bar_width * @bar_spacing
+        length[point_index] += difference
         height[point_index] += (data_point * @graph_width - 2)
-        
+
         if @show_labels_for_bar_values
           label_values[point_index][:value] += @norm_data[row_index][3][point_index]
           label_values[point_index][:right_x] = right_x
         end
-                
+
         # if a data point is 0 it can result in weird really thing lines
         # that shouldn't even be there being drawn on top of the existing
         # bar - this is bad
@@ -74,24 +73,23 @@ class Gruff::SideStackedBar < Gruff::SideBar
         label_center = @graph_top + (@bar_width * point_index) + (@bar_width * @bar_spacing / 2.0)
         draw_label(label_center, point_index)
       end
-
     end
     if @show_labels_for_bar_values
       label_values.each_with_index do |data, i|
         val = (@label_formatting || "%.2f") % data[:value]
-        draw_value_label(data[:right_x]+40, (@graph_top + (((i+1) * @bar_width) - (@bar_width / 2)))-12, val.commify, true)
+        draw_value_label(data[:right_x] + 40, (@graph_top + (((i + 1) * @bar_width) - (@bar_width / 2))) - 12, val.commify, true)
       end
     end
-    
-    @d.draw(@base_image)    
+
+    @d.draw(@base_image)
   end
 
-  def larger_than_max?(data_point, index=0)
+  def larger_than_max?(data_point, index = 0)
     max(data_point, index) > @maximum_value
   end
 
   def max(data_point, index)
-    @data.inject(0) {|sum, item| sum + item[DATA_VALUES_INDEX][index]}
+    @data.inject(0) { |sum, item| sum + item[DATA_VALUES_INDEX][index] }
   end
 
 end

data/lib/gruff/spider.rb

@@ -1,17 +1,16 @@
-
 require File.dirname(__FILE__) + '/base'
 
 # Experimental!!! See also the Net graph.
 #
 # Submitted by Kevin Clark http://glu.ttono.us/
 class Gruff::Spider < Gruff::Base
-  
+
   # Hide all text
   attr_reader :hide_text
   attr_accessor :hide_axes
   attr_reader :transparent_background
   attr_accessor :rotation
-  
+
   def transparent_background=(value)
     @transparent_background = value
     @base_image = render_transparent_background if value
@@ -27,10 +26,10 @@ class Gruff::Spider < Gruff::Base
     @hide_legend = true
     @rotation = 0
   end
-  
+
   def draw
     @hide_line_markers = true
-    
+
     super
 
     return unless @has_data
@@ -41,11 +40,11 @@ class Gruff::Spider < Gruff::Base
     center_y = @graph_top + (@graph_height / 2.0) - 25 # Move graph up a bit
 
     @unit_length = radius / @max_value
-        
-    additive_angle = (2 * Math::PI)/ @data.size
-    
+
+    additive_angle = (2 * Math::PI) / @data.size
+
     # Draw axes
-    draw_axes(center_x, center_y, radius, additive_angle) unless hide_axes    
+    draw_axes(center_x, center_y, radius, additive_angle) unless hide_axes
 
     # Draw polygon
     draw_polygon(center_x, center_y, additive_angle)
@@ -60,7 +59,7 @@ private
   end
 
   def draw_label(center_x, center_y, angle, radius, amount)
-    r_offset = 50      # The distance out from the center of the pie to get point
+    r_offset = 50            # The distance out from the center of the pie to get point
     x_offset = center_x      # The label points need to be tweaked slightly
     y_offset = center_y + 0  # This one doesn't though
     x = x_offset + ((radius + r_offset) * Math.cos(angle))
@@ -73,10 +72,10 @@ private
     @d.stroke = 'transparent'
     @d.font_weight = BoldWeight
     @d.gravity = CenterGravity
-    @d.annotate_scaled( @base_image, 
-                      0, 0,
-                      x, y, 
-                      amount, @scale)
+    @d.annotate_scaled(@base_image,
+                       0, 0,
+                       x, y,
+                       amount, @scale)
   end
 
   def draw_axes(center_x, center_y, radius, additive_angle, line_color = nil)
@@ -119,7 +118,7 @@ private
   end
 
   def sums_for_spider
-    @data.inject(0.0) {|sum, data_row| sum + data_row[DATA_VALUES_INDEX].first}
+    @data.inject(0.0) { |sum, data_row| sum + data_row[DATA_VALUES_INDEX].first }
   end
 
 end

data/lib/gruff/stacked_area.rb

@@ -1,11 +1,10 @@
-
 require File.dirname(__FILE__) + '/base'
 require File.dirname(__FILE__) + '/stacked_mixin'
 
 class Gruff::StackedArea < Gruff::Base
   include StackedMixin
   attr_accessor :last_series_goes_on_bottom
-  
+
   def draw
     get_maximum_by_stack
     super
@@ -22,7 +21,7 @@ class Gruff::StackedArea < Gruff::Base
     @norm_data.send(iterator) do |data_row|
       prev_data_points = data_points
       data_points = Array.new
-        
+
       @d = @d.fill data_row[DATA_COLOR_INDEX]
 
       data_row[DATA_VALUES_INDEX].each_with_index do |data_point, index|
@@ -31,37 +30,34 @@ class Gruff::StackedArea < Gruff::Base
         new_y = @graph_top + (@graph_height - data_point * @graph_height - height[index])
 
         height[index] += (data_point * @graph_height)
-        
+
         data_points << new_x
         data_points << new_y
-          
-        draw_label(new_x, index)
 
+        draw_label(new_x, index)
       end
 
       if prev_data_points
         poly_points = data_points.dup
-        (prev_data_points.length/2 - 1).downto(0) do |i|
-          poly_points << prev_data_points[2*i] 
-          poly_points << prev_data_points[2*i+1]
+        (prev_data_points.length / 2 - 1).downto(0) do |i|
+          poly_points << prev_data_points[2 * i]
+          poly_points << prev_data_points[2 * i + 1]
         end
-        poly_points << data_points[0] 
-        poly_points << data_points[1] 
+        poly_points << data_points[0]
+        poly_points << data_points[1]
       else
         poly_points = data_points.dup
         poly_points << @graph_right
         poly_points << @graph_bottom - 1
         poly_points << @graph_left
         poly_points << @graph_bottom - 1
-        poly_points << data_points[0] 
-        poly_points << data_points[1] 
+        poly_points << data_points[0]
+        poly_points << data_points[1]
       end
       @d = @d.polyline(*poly_points)
-
     end
 
     @d.draw(@base_image)
   end
-   
- 
+
 end

data/lib/gruff/stacked_bar.rb

@@ -1,61 +1,59 @@
-
 require File.dirname(__FILE__) + '/base'
 require File.dirname(__FILE__) + '/stacked_mixin'
 
 class Gruff::StackedBar < Gruff::Base
-    include StackedMixin
-
-    # Spacing factor applied between bars
-    attr_accessor :bar_spacing
-
-    # Number of pixels between bar segments
-    attr_accessor :segment_spacing
-    
-    # Draws a bar graph, but multiple sets are stacked on top of each other.
-    def draw
-      get_maximum_by_stack
-      super
-      return unless @has_data
-
-      # Setup spacing.
-      #
-      # Columns sit stacked.
-      @bar_spacing ||= 0.9
-      @segment_spacing ||= 1
-      @bar_width = @graph_width / @column_count.to_f
-      padding = (@bar_width * (1 - @bar_spacing)) / 2
-    
-      @d = @d.stroke_opacity 0.0
-      
-      height = Array.new(@column_count, 0)
-    
-      @norm_data.each_with_index do |data_row, row_index|      
-        data_row[DATA_VALUES_INDEX].each_with_index do |data_point, point_index|
-          @d = @d.fill data_row[DATA_COLOR_INDEX]
-          
-          # Calculate center based on bar_width and current row
-          label_center = @graph_left + (@bar_width * point_index) + (@bar_width * @bar_spacing / 2.0)
-          draw_label(label_center, point_index)
-
-          next if (data_point == 0)
-          # Use incremented x and scaled y
-          left_x = @graph_left + (@bar_width * point_index) + padding
-          left_y = @graph_top + (@graph_height -
-                                 data_point * @graph_height - 
-                                 height[point_index]) + @segment_spacing
-          right_x = left_x + @bar_width * @bar_spacing
-          right_y = @graph_top + @graph_height - height[point_index] - @segment_spacing
-          
-          # update the total height of the current stacked bar
-          height[point_index] += (data_point * @graph_height ) 
-          
-          @d = @d.rectangle(left_x, left_y, right_x, right_y)
-          
-        end
+  include StackedMixin
+
+  # Spacing factor applied between bars
+  attr_accessor :bar_spacing
+
+  # Number of pixels between bar segments
+  attr_accessor :segment_spacing
+
+  # Draws a bar graph, but multiple sets are stacked on top of each other.
+  def draw
+    get_maximum_by_stack
+    super
+    return unless @has_data
+
+    # Setup spacing.
+    #
+    # Columns sit stacked.
+    @bar_spacing ||= 0.9
+    @segment_spacing ||= 1
+    @bar_width = @graph_width / @column_count.to_f
+    padding = (@bar_width * (1 - @bar_spacing)) / 2
+
+    @d = @d.stroke_opacity 0.0
+
+    height = Array.new(@column_count, 0)
 
+    @norm_data.each_with_index do |data_row, row_index|
+      data_row[DATA_VALUES_INDEX].each_with_index do |data_point, point_index|
+        @d = @d.fill data_row[DATA_COLOR_INDEX]
+
+        # Calculate center based on bar_width and current row
+        label_center = @graph_left + (@bar_width * point_index) + (@bar_width * @bar_spacing / 2.0)
+        draw_label(label_center, point_index)
+
+        next if data_point == 0
+
+        # Use incremented x and scaled y
+        left_x = @graph_left + (@bar_width * point_index) + padding
+        left_y = @graph_top + (@graph_height -
+                               data_point * @graph_height -
+                               height[point_index]) + @segment_spacing
+        right_x = left_x + @bar_width * @bar_spacing
+        right_y = @graph_top + @graph_height - height[point_index] - @segment_spacing
+
+        # update the total height of the current stacked bar
+        height[point_index] += (data_point * @graph_height)
+
+        @d = @d.rectangle(left_x, left_y, right_x, right_y)
       end
-    
-      @d.draw(@base_image)    
     end
 
+    @d.draw(@base_image)
+  end
+
 end

data/lib/gruff/stacked_mixin.rb

@@ -1,4 +1,3 @@
-
 module Gruff::Base::StackedMixin
   # Used by StackedBar and child classes.
   #
@@ -13,9 +12,9 @@ module Gruff::Base::StackedMixin
         max_hash[i] += data_point.to_f
       end
     end
-  
+
     # @maximum_value = 0
-    max_hash.keys.each do |key|
+    max_hash.each_key do |key|
       @maximum_value = max_hash[key] if max_hash[key] > @maximum_value
     end
     @minimum_value = 0

data/lib/gruff/themes.rb

@@ -1,9 +1,9 @@
 module Gruff
   module Themes
-    
+
     # A color scheme similar to the popular presentation software.
     KEYNOTE = {
-      :colors => [
+      colors: [
         '#FDD84E',  # yellow
         '#6886B4',  # blue
         '#72AE6E',  # green
@@ -12,14 +12,14 @@ module Gruff
         '#EFAA43',  # orange
         'white'
       ],
-      :marker_color => 'white',
-      :font_color => 'white',
-      :background_colors => %w(black #4a465a)
+      marker_color: 'white',
+      font_color: 'white',
+      background_colors: %w[black #4a465a]
     }
 
     # A color scheme plucked from the colors on the popular usability blog.
     THIRTYSEVEN_SIGNALS = {
-      :colors => [
+      colors: [
         '#FFF804',  # yellow
         '#336699',  # blue
         '#339933',  # green
@@ -28,15 +28,15 @@ module Gruff
         '#cf5910',  # orange
         'black'
       ],
-      :marker_color => 'black',
-      :font_color => 'black',
-      :background_colors => %w(#d1edf5 white)
+      marker_color: 'black',
+      font_color: 'black',
+      background_colors: %w[#d1edf5 white]
     }
 
     # A color scheme from the colors used on the 2005 Rails keynote
     # presentation at RubyConf.
     RAILS_KEYNOTE = {
-      :colors => [
+      colors: [
         '#00ff00',  # green
         '#333333',  # grey
         '#ff5d00',  # orange
@@ -45,14 +45,14 @@ module Gruff
         '#999999',  # light grey
         'black'
       ],
-      :marker_color => 'white',
-      :font_color => 'white',
-      :background_colors => %w(#0083a3 #0083a3)
+      marker_color: 'white',
+      font_color: 'white',
+      background_colors: %w[#0083a3 #0083a3]
     }
 
     # A color scheme similar to that used on the popular podcast site.
     ODEO = {
-      :colors => [
+      colors: [
         '#202020',  # grey
         'white',
         '#3a5b87',  # dark blue
@@ -61,14 +61,14 @@ module Gruff
         '#999999',  # light grey
         'black'
       ],
-      :marker_color => 'white',
-      :font_color => 'white',
-      :background_colors => %w(#ff47a4 #ff1f81)
+      marker_color: 'white',
+      font_color: 'white',
+      background_colors: %w[#ff47a4 #ff1f81]
     }
 
     # A pastel theme
     PASTEL = {
-      :colors => [
+      colors: [
         '#a9dada', # blue
         '#aedaa9', # green
         '#daaea9', # peach
@@ -77,26 +77,25 @@ module Gruff
         '#daaeda', # purple
         '#dadada' # grey
       ],
-      :marker_color => '#aea9a9', # Grey
-      :font_color => 'black',
-      :background_colors => 'white'
+      marker_color: '#aea9a9', # Grey
+      font_color: 'black',
+      background_colors: 'white'
     }
 
     # A greyscale theme
     GREYSCALE = {
-      :colors => [
-        '#282828', #
-        '#383838', #
-        '#686868', #
-        '#989898', #
-        '#c8c8c8', #
-        '#e8e8e8', #
+      colors: [
+        '#282828',
+        '#383838',
+        '#686868',
+        '#989898',
+        '#c8c8c8',
+        '#e8e8e8',
       ],
-      :marker_color => '#aea9a9', # Grey
-      :font_color => 'black',
-      :background_colors => 'white'
+      marker_color: '#aea9a9', # Grey
+      font_color: 'black',
+      background_colors: 'white'
     }
-    
+
   end
 end
-