gruff 0.7.0 → 0.8.0

data/lib/gruff/pie.rb

@@ -50,10 +50,10 @@ class Gruff::Pie < Gruff::Base
 
   def options
     {
-      :zero_degree            => zero_degree,
-      :hide_labels_less_than  => hide_labels_less_than,
-      :text_offset_percentage => text_offset_percentage,
-      :show_values_as_labels  => show_values_as_labels
+      zero_degree: zero_degree,
+      hide_labels_less_than: hide_labels_less_than,
+      text_offset_percentage: text_offset_percentage,
+      show_values_as_labels: show_values_as_labels
     }
   end
 
@@ -78,7 +78,7 @@ class Gruff::Pie < Gruff::Base
     trigger_final_draw
   end
 
-  private
+private
 
   def slices
     @slices ||= begin
@@ -163,7 +163,7 @@ class Gruff::Pie < Gruff::Base
 
   def process_label_for(slice)
     if slice.percentage >= hide_labels_less_than
-      x, y  = label_coordinates_for slice
+      x, y = label_coordinates_for slice
 
       @d = draw_label(x, y, slice.label)
     end

data/lib/gruff/scatter.rb

@@ -6,30 +6,30 @@ require File.dirname(__FILE__) + '/base'
 # g.data(:apples, [1,2,3,4], [4,3,2,1])
 # g.data('oranges', [5,7,8], [4,1,7])
 # g.write('test/output/scatter.png')
-# 
+#
 #
 class Gruff::Scatter < Gruff::Base
 
   # Maximum X Value. The value will get overwritten by the max in the
-  # datasets.  
+  # datasets.
   attr_accessor :maximum_x_value
-  
-  # Minimum X Value. The value will get overwritten by the min in the 
-  # datasets.  
+
+  # Minimum X Value. The value will get overwritten by the min in the
+  # datasets.
   attr_accessor :minimum_x_value
-  
+
   # The number of vertical lines shown for reference
   attr_accessor :marker_x_count
-  
+
   #~ # Draw a dashed horizontal line at the given y value
   #~ attr_accessor :baseline_y_value
-	
+
   #~ # Color of the horizontal baseline
   #~ attr_accessor :baseline_y_color
-  
+
   #~ # Draw a dashed horizontal line at the given y value
   #~ attr_accessor :baseline_x_value
-	
+
   #~ # Color of the horizontal baseline
   #~ attr_accessor :baseline_x_color
 
@@ -51,8 +51,7 @@ class Gruff::Scatter < Gruff::Base
   # Allow passing lambdas to format labels
   attr_accessor :y_axis_label_format
   attr_accessor :x_axis_label_format
-  
-  
+
   # Gruff::Scatter takes the same parameters as the Gruff::Line graph
   #
   # ==== Example
@@ -91,7 +90,7 @@ class Gruff::Scatter < Gruff::Base
     super
     return unless @has_data
 
-    # Check to see if more than one datapoint was given. NaN can result otherwise.  
+    # Check to see if more than one datapoint was given. NaN can result otherwise.
     @x_increment = (@column_count > 1) ? (@graph_width / (@column_count - 1).to_f) : @graph_width
 
     #~ if (defined?(@norm_y_baseline)) then
@@ -106,13 +105,13 @@ class Gruff::Scatter < Gruff::Base
     #~ end
 
     #~ if (defined?(@norm_x_baseline)) then
-      
+
     #~ end
 
-    @norm_data.each do |data_row|      
+    @norm_data.each do |data_row|
       data_row[DATA_VALUES_INDEX].each_with_index do |data_point, index|
         x_value = data_row[DATA_VALUES_X_INDEX][index]
-        next if data_point.nil? || x_value.nil? 
+        next if data_point.nil? || x_value.nil?
 
         new_x = get_x_coord(x_value, @graph_width, @graph_left)
         new_y = @graph_top + (@graph_height - data_point * @graph_height)
@@ -130,7 +129,7 @@ class Gruff::Scatter < Gruff::Base
 
     @d.draw(@base_image)
   end
-  
+
   # The first parameter is the name of the dataset.  The next two are the
   # x and y axis data points contain in their own array in that respective
   # order.  The final parameter is the color.
@@ -146,8 +145,8 @@ class Gruff::Scatter < Gruff::Base
   #
   # ==== Parameters
   # name:: String or Symbol containing the name of the dataset.
-  # x_data_points:: An Array of of x-axis data points. 
-  # y_data_points:: An Array of of y-axis data points. 
+  # x_data_points:: An Array of of x-axis data points.
+  # y_data_points:: An Array of of y-axis data points.
   # color:: The hex string for the color of the dataset.  Defaults to nil.
   #
   # ==== Exceptions
@@ -168,64 +167,63 @@ class Gruff::Scatter < Gruff::Base
   # g.data('oranges', [1,1,1], [2,3,4])
   # g.data('bitter_melon', [3,5,6], [6,7,8], '#000000')
   #
-  def data(name, x_data_points=[], y_data_points=[], color=nil)
-    
+  def data(name, x_data_points = [], y_data_points = [], color = nil)
     raise ArgumentError, 'Data Points contain nil Value!' if x_data_points.include?(nil) || y_data_points.include?(nil)
     raise ArgumentError, 'x_data_points is empty!' if x_data_points.empty?
     raise ArgumentError, 'y_data_points is empty!' if y_data_points.empty?
     raise ArgumentError, 'x_data_points.length != y_data_points.length!' if x_data_points.length != y_data_points.length
-    
+
     # Call the existing data routine for the y axis data
     super(name, y_data_points, color)
-    
+
     #append the x data to the last entry that was just added in the @data member
-    last_elem = @data.length()-1
+    last_elem = @data.length() - 1
     @data[last_elem] << x_data_points
-    
+
     if @maximum_x_value.nil? && @minimum_x_value.nil?
       @maximum_x_value = @minimum_x_value = x_data_points.first
     end
-    
+
     @maximum_x_value = x_data_points.max > @maximum_x_value ?
                         x_data_points.max : @maximum_x_value
     @minimum_x_value = x_data_points.min < @minimum_x_value ?
                         x_data_points.min : @minimum_x_value
   end
-  
+
 protected
-  
+
   def calculate_spread #:nodoc:
     super
     @x_spread = @maximum_x_value.to_f - @minimum_x_value.to_f
     @x_spread = @x_spread > 0 ? @x_spread : 1
   end
-  
-  def normalize(force=nil)
-    if @norm_data.nil? || force 
+
+  def normalize(force = nil)
+    if @norm_data.nil? || force
       @norm_data = []
       return unless @has_data
-      
+
       @data.each do |data_row|
         norm_data_points = [data_row[DATA_LABEL_INDEX]]
-        norm_data_points << data_row[DATA_VALUES_INDEX].map do |r|  
-                                (r.to_f - @minimum_value.to_f) / @spread
-                            end
+        norm_data_points << data_row[DATA_VALUES_INDEX].map do |r|
+          (r.to_f - @minimum_value.to_f) / @spread
+        end
         norm_data_points << data_row[DATA_COLOR_INDEX]
-        norm_data_points << data_row[DATA_VALUES_X_INDEX].map do |r|  
-                                (r.to_f - @minimum_x_value.to_f) / @x_spread 
-                            end
+        norm_data_points << data_row[DATA_VALUES_X_INDEX].map do |r|
+          (r.to_f - @minimum_x_value.to_f) / @x_spread
+        end
         @norm_data << norm_data_points
       end
     end
     #~ @norm_y_baseline = (@baseline_y_value.to_f / @maximum_value.to_f) if @baseline_y_value
     #~ @norm_x_baseline = (@baseline_x_value.to_f / @maximum_x_value.to_f) if @baseline_x_value
   end
-  
+
   def draw_line_markers
     # do all of the stuff for the horizontal lines on the y-axis
     super
     return if @hide_line_markers
-    
+
     @d = @d.stroke_antialias false
 
     if @x_axis_increment.nil?
@@ -249,7 +247,7 @@ protected
       @minimum_x_value = @minimum_x_value.floor
       calculate_spread
       normalize(true)
-      
+
       @marker_count = (@x_spread / @x_axis_increment).to_i
       @x_increment = @x_axis_increment
     end
@@ -257,7 +255,6 @@ protected
 
     # Draw vertical line markers and annotate with numbers
     (0..@marker_x_count).each do |index|
-
       # TODO Fix the vertical lines, and enable them by default. Not pretty when they don't match up with top y-axis line
       if @enable_vertical_line_markers
         x = @graph_left + @graph_width - index.to_f * @increment_x_scaled
@@ -277,18 +274,17 @@ protected
         @d.pointsize = scale_fontsize(@marker_font_size)
         @d.gravity = NorthGravity
         @d.rotation = -90.0 if @use_vertical_x_labels
-        @d = @d.annotate_scaled(@base_image, 
-                          1.0, 1.0, 
-                          x_offset, y_offset, 
-                          vertical_label(marker_label, @x_increment), @scale)
+        @d = @d.annotate_scaled(@base_image,
+                                1.0, 1.0,
+                                x_offset, y_offset,
+                                vertical_label(marker_label, @x_increment), @scale)
         @d.rotation = 90.0 if @use_vertical_x_labels
       end
     end
-    
+
     @d = @d.stroke_antialias true
   end
 
-
   def label(value, increment)
     if @y_axis_label_format
       @y_axis_label_format.call(value)
@@ -304,11 +300,11 @@ protected
       label(value, increment)
     end
   end
-  
+
 private
-  
+
   def get_x_coord(x_data_point, width, offset) #:nodoc:
     x_data_point * width + offset
   end
-  
+
 end # end Gruff::Scatter

data/lib/gruff/scene.rb

@@ -1,10 +1,9 @@
-
 require "observer"
 require File.dirname(__FILE__) + '/base'
 
 ##
 # A scene is a non-linear graph that assembles layers together to tell a story.
-# Layers are folders with appropriately named files (see below). You can group 
+# Layers are folders with appropriately named files (see below). You can group
 # layers and control them together or just set their values individually.
 #
 # Examples:
@@ -13,7 +12,7 @@ require File.dirname(__FILE__) + '/base'
 # * A traffic map that shows red lines on streets that are crowded and green on free-flowing ones.
 #
 # Usage:
-# 
+#
 #  g = Gruff::Scene.new("500x100", "path/to/city_scene_directory")
 #
 #  # Define order of layers, back to front
@@ -40,7 +39,7 @@ require File.dirname(__FILE__) + '/base'
 # * If there is a file named 'default.png', it will be used unless other input values are set for the corresponding layer.
 
 class Gruff::Scene < Gruff::Base
-    
+
   # An array listing the foldernames that will be rendered, from back to front.
   #
   #  g.layers = %w(sky clouds buildings street people)
@@ -50,13 +49,13 @@ class Gruff::Scene < Gruff::Base
   def initialize(target_width, base_dir)
     @base_dir = base_dir
     @groups = {}
-    @layers = []    
+    @layers = []
     super target_width
   end
 
   def draw
     # Join all the custom paths and filter out the empty ones
-    image_paths = @layers.map { |layer| layer.path }.select { |path| !path.empty? }
+    image_paths = @layers.map { |layer| layer.path }.reject { |path| path.empty? }
     images = Magick::ImageList.new(*image_paths)
     @base_image = images.flatten_images
   end
@@ -102,9 +101,8 @@ private
       end
     end
   end
-  
-end
 
+end
 
 class Gruff::Group
 
@@ -117,31 +115,30 @@ class Gruff::Group
       layer.observe self
     end
   end
-  
+
   def send_updates(value)
     changed
     notify_observers value
   end
-  
-end
 
+end
 
 class Gruff::Layer
-  
+
   attr_reader :name
-  
+
   def initialize(base_dir, folder_name)
     @base_dir = base_dir.to_s
     @name = folder_name.to_s
     @filenames = Dir.open(File.join(base_dir, folder_name)).entries.select { |file| file =~ /^[^.]+\.png$/ }.sort
     @selected_filename = select_default
   end
-  
+
   # Register this layer so it receives updates from the group
   def observe(obj)
     obj.add_observer self
   end
-  
+
   # Choose the appropriate filename for this layer, based on the input
   def update(value)
     @selected_filename =  case value.to_s
@@ -165,6 +162,7 @@ class Gruff::Layer
     unless @selected_filename.nil? || @selected_filename.empty?
       return File.join(@base_dir, @name, @selected_filename)
     end
+
     ''
   end
 
@@ -179,7 +177,7 @@ private
   def select_numeric(value)
     file_exists_or_blank value.to_s.gsub('-', '_')
   end
-  
+
   def select_time(value)
     times = @filenames.map { |filename| filename.gsub('.png', '') }
     times.each_with_index do |time, index|
@@ -189,12 +187,12 @@ private
     end
     return "#{times.last}.png"
   end
-  
+
   # Match "partly cloudy" to "partly_cloudy.png"
   def select_string(value)
     file_exists_or_blank value.to_s.gsub(' ', '_')
   end
-  
+
   def select_default
     @filenames.include?("default.png") ? "default.png" : ''
   end
@@ -205,5 +203,5 @@ private
   def file_exists_or_blank(filename)
     @filenames.include?("#{filename}.png") ? "#{filename}.png" : select_default
   end
-  
+
 end

data/lib/gruff/side_bar.rb

@@ -13,10 +13,11 @@ class Gruff::SideBar < Gruff::Base
     super
 
     return unless @has_data
+
     draw_bars
   end
 
-  protected
+protected
 
   def draw_bars
     # Setup spacing.
@@ -39,7 +40,6 @@ class Gruff::SideBar < Gruff::Base
       @d = @d.fill data_row[DATA_COLOR_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.
@@ -59,7 +59,7 @@ class Gruff::SideBar < Gruff::Base
         # Calculate center based on bar_width and current row
 
         if @use_data_label
-          label_center = @graph_top + (@bar_width * (row_index+point_index) + @bar_width / 2)
+          label_center = @graph_top + (@bar_width * (row_index + point_index) + @bar_width / 2)
           draw_label(label_center, row_index, @norm_data[row_index][DATA_LABEL_INDEX])
         else
           label_center = @graph_top + (@bars_width * point_index + @bars_width / 2)
@@ -67,10 +67,9 @@ class Gruff::SideBar < Gruff::Base
         end
         if @show_labels_for_bar_values
           val = (@label_formatting || '%.2f') % @norm_data[row_index][3][point_index]
-          draw_value_label(right_x+40, (@graph_top + (((row_index+point_index+1) * @bar_width) - (@bar_width / 2)))-12, val.commify, true)
+          draw_value_label(right_x + 40, (@graph_top + (((row_index + point_index + 1) * @bar_width) - (@bar_width / 2))) - 12, val.commify, true)
         end
       end
-
     end
 
     @d.draw(@base_image)
@@ -78,7 +77,6 @@ class Gruff::SideBar < Gruff::Base
 
   # Instead of base class version, draws vertical background lines and label
   def draw_line_markers
-
     return if @hide_line_markers
 
     @d = @d.stroke_antialias false
@@ -92,7 +90,6 @@ class Gruff::SideBar < Gruff::Base
     # TODO Round maximum marker value to a round number like 100, 0.1, 0.5, etc.
     increment = significant(@spread.to_f / number_of_lines)
     (0..number_of_lines).each do |index|
-
       line_diff = (@graph_right - @graph_left) / number_of_lines
       x = @graph_right - (line_diff * index) - 1
       @d = @d.line(x, @graph_bottom, x, @graph_top)
@@ -118,7 +115,7 @@ class Gruff::SideBar < Gruff::Base
   ##
   # Draw on the Y axis instead of the X
 
-  def draw_label(y_offset, index, label=nil)
+  def draw_label(y_offset, index, label = nil)
     if !@labels[index].nil? && @labels_seen[index].nil?
       lbl = (@use_data_label) ? label : @labels[index]
       @d.fill = @font_color