gruff 0.7.0 → 0.8.0

data/lib/gruff/deprecated.rb

@@ -1,39 +1,38 @@
-
 ##
 # A mixin for methods that need to be deleted or have been
 # replaced by cleaner code.
 
 module Gruff
   module Deprecated
-  
+
     def scale_measurements
       setup_graph_measurements
     end
-    
+
     def total_height
       @rows + 10
     end
-    
+
     def graph_top
       @graph_top * @scale
     end
-    
+
     def graph_height
       @graph_height * @scale
     end
-    
-    def graph_left 
-      @graph_left * @scale 
+
+    def graph_left
+      @graph_left * @scale
     end
-    
+
     def graph_width
       @graph_width * @scale
     end
-    
+
     # TODO Should be calculate_graph_height
     # def setup_graph_height
     #   @graph_height = @graph_bottom - @graph_top
     # end
-  
+
   end
 end

data/lib/gruff/dot.rb

@@ -24,7 +24,7 @@ class Gruff::Dot < Gruff::Base
     @norm_data.each_with_index do |data_row, row_index|
       data_row[DATA_VALUES_INDEX].each_with_index do |data_point, point_index|
         x_pos = @graph_left + (data_point * @graph_width)
-        y_pos = @graph_top + (@items_width * point_index) + padding + (@items_width.to_f/2.0).round
+        y_pos = @graph_top + (@items_width * point_index) + padding + (@items_width.to_f / 2.0).round
 
         if row_index == 0
           @d = @d.stroke(@marker_color)
@@ -38,17 +38,16 @@ class Gruff::Dot < Gruff::Base
 
         @d = @d.fill data_row[DATA_COLOR_INDEX]
         @d = @d.stroke('transparent')
-        @d = @d.circle(x_pos, y_pos, x_pos + (@item_width.to_f/3.0).round, y_pos)
+        @d = @d.circle(x_pos, y_pos, x_pos + (@item_width.to_f / 3.0).round, y_pos)
 
         draw_label(y_pos, point_index)
       end
-
     end
 
     @d.draw(@base_image)
   end
 
-  protected
+protected
 
   # Instead of base class version, draws vertical background lines and label
   def draw_line_markers

data/lib/gruff/line.rb

@@ -37,7 +37,7 @@ class Gruff::Line < Gruff::Base
 
   # Get the value if somebody has defined it.
   def baseline_value
-    if (@reference_lines.key?(:baseline))
+    if @reference_lines.key?(:baseline)
       @reference_lines[:baseline][:value]
     else
       nil
@@ -51,7 +51,7 @@ class Gruff::Line < Gruff::Base
   end
 
   def baseline_color
-    if (@reference_lines.key?(:baseline))
+    if @reference_lines.key?(:baseline)
       @reference_lines[:baseline][:color]
     else
       nil
@@ -74,6 +74,7 @@ class Gruff::Line < Gruff::Base
   # The preferred way is to call hide_dots or hide_lines instead.
   def initialize(*args)
     raise ArgumentError, 'Wrong number of arguments' if args.length > 2
+
     if args.empty? || ((not Numeric === args.first) && (not String === args.first))
       super()
     else
@@ -127,11 +128,12 @@ class Gruff::Line < Gruff::Base
   #   In this example the lables are drawn at x positions 2, 4, and 6:
   #   g.labels = {0 => '2003', 2 => '2004', 4 => '2005', 6 => '2006'}
   #   The 0 => '2003' label will be ignored since it is outside the chart range.
-  def dataxy(name, x_data_points=[], y_data_points=[], color=nil)
+  def dataxy(name, x_data_points = [], y_data_points = [], color = nil)
     raise ArgumentError, 'x_data_points is nil!' if x_data_points.length == 0
 
     if x_data_points.all? { |p| p.is_a?(Array) && p.size == 2 }
-      x_data_points, y_data_points = x_data_points.map { |p| p[0] }, x_data_points.map { |p| p[1] }
+      y_data_points = x_data_points.map { |p| p[1] }
+      x_data_points = x_data_points.map { |p| p[0] }
     end
 
     raise ArgumentError, 'x_data_points.length != y_data_points.length!' if x_data_points.length != y_data_points.length
@@ -157,7 +159,6 @@ class Gruff::Line < Gruff::Base
       @minimum_x_value = (x_data_point < @minimum_x_value) ?
           x_data_point : @minimum_x_value
     end
-
   end
 
   def draw_reference_line(reference_line, left, right, top, bottom)
@@ -193,7 +194,7 @@ class Gruff::Line < Gruff::Base
       draw_vertical_reference_line(curr_reference_line) if curr_reference_line.key?(:index)
     end
 
-    if (@show_vertical_markers)
+    if @show_vertical_markers
       (0..@column_count).each do |column|
         x = @graph_left + @graph_width - column.to_f * @x_increment
 
@@ -260,7 +261,8 @@ class Gruff::Line < Gruff::Base
           @d = DotRenderers.renderer(@dot_style).render(@d, new_x, new_y, circle_radius)
         end
 
-        prev_x, prev_y = new_x, new_y
+        prev_x = new_x
+        prev_y = new_y
       end
     end
 
@@ -268,13 +270,12 @@ class Gruff::Line < Gruff::Base
   end
 
   def setup_data
-
     # Deal with horizontal reference line values that exceed the existing minimum & maximum values.
     possible_maximums = [@maximum_value.to_f]
     possible_minimums = [@minimum_value.to_f]
 
     @reference_lines.each_value do |curr_reference_line|
-      if (curr_reference_line.key?(:value))
+      if curr_reference_line.key?(:value)
         possible_maximums << curr_reference_line[:value].to_f
         possible_minimums << curr_reference_line[:value].to_f
       end
@@ -286,16 +287,14 @@ class Gruff::Line < Gruff::Base
     super
   end
 
-  def normalize(force=false)
+  def normalize(force = false)
     super(force)
 
     @reference_lines.each_value do |curr_reference_line|
-
       # We only care about horizontal markers ... for normalization.
       # Vertical markers won't have a :value, they will have an :index
 
-      curr_reference_line[:norm_value] = ((curr_reference_line[:value].to_f - @minimum_value) / @spread.to_f) if (curr_reference_line.key?(:value))
-
+      curr_reference_line[:norm_value] = ((curr_reference_line[:value].to_f - @minimum_value) / @spread.to_f) if curr_reference_line.key?(:value)
     end
 
     #normalize the x data if it is specified
@@ -309,7 +308,6 @@ class Gruff::Line < Gruff::Base
         @norm_data[index] << norm_x_data_points
       end
     end
-
   end
 
   def sort_norm_data
@@ -329,6 +327,7 @@ class Gruff::Line < Gruff::Base
           # more than one point, bail
           return false
         end
+
         # there is at least one data point
         one_point = true
       end

data/lib/gruff/mini/bar.rb

@@ -8,10 +8,10 @@ module Gruff
     class Bar < Gruff::Bar
 
       include Gruff::Mini::Legend
-      
+
       def initialize_ivars
         super
-        
+
         @hide_legend = true
         @hide_title = true
         @hide_line_numbers = true
@@ -32,6 +32,6 @@ module Gruff
       end
 
     end
-  
+
   end
 end

data/lib/gruff/mini/legend.rb

@@ -16,7 +16,7 @@ module Gruff
       def expand_canvas_for_vertical_legend
         return if @hide_mini_legend
 
-        @legend_labels = @data.collect {|item| item[Gruff::Base::DATA_LABEL_INDEX] }
+        @legend_labels = @data.collect { |item| item[Gruff::Base::DATA_LABEL_INDEX] }
 
         legend_height = scale_fontsize(
                                        @data.length * calculate_line_height +
@@ -41,7 +41,7 @@ module Gruff
 
       def calculate_legend_width
         width = @legend_labels.map { |label| calculate_width(@legend_font_size, label) }.max
-        scale_fontsize(width + 40*1.7)
+        scale_fontsize(width + 40 * 1.7)
       end
 
       ##
@@ -70,7 +70,6 @@ module Gruff
         debug { @d.line 0.0, current_y_offset, @raw_columns, current_y_offset }
 
         @legend_labels.each_with_index do |legend_label, index|
-
           # Draw label
           @d.fill = @font_color
           @d.font = @font if @font
@@ -78,10 +77,10 @@ module Gruff
           @d.stroke = 'transparent'
           @d.font_weight = Magick::NormalWeight
           @d.gravity = Magick::WestGravity
-          @d = @d.annotate_scaled( @base_image,
-                                   @raw_columns, 1.0,
-                                   current_x_offset + (legend_square_width * 1.7), current_y_offset,
-                                   truncate_legend_label(legend_label), @scale)
+          @d = @d.annotate_scaled(@base_image,
+                                  @raw_columns, 1.0,
+                                  current_x_offset + (legend_square_width * 1.7), current_y_offset,
+                                  truncate_legend_label(legend_label), @scale)
 
           # Now draw box with color of this dataset
           @d = @d.stroke 'transparent'
@@ -104,7 +103,7 @@ module Gruff
       def truncate_legend_label(label)
         truncated_label = label.to_s
         while calculate_width(scale_fontsize(@legend_font_size), truncated_label) > (@columns - @legend_left_margin - @right_margin) && (truncated_label.length > 1)
-          truncated_label = truncated_label[0..truncated_label.length-2]
+          truncated_label = truncated_label[0..truncated_label.length - 2]
         end
         truncated_label + (truncated_label.length < label.to_s.length ? "..." : '')
       end

data/lib/gruff/mini/pie.rb

@@ -11,26 +11,26 @@ module Gruff
 
       def initialize_ivars
         super
-        
+
         @hide_legend = true
         @hide_title = true
         @hide_line_numbers = true
-  
+
         @marker_font_size = 60.0
         @legend_font_size = 60.0
       end
 
       def draw
         expand_canvas_for_vertical_legend
-        
+
         super
-        
+
         draw_vertical_legend
-        
+
         @d.draw(@base_image)
       end # def draw
 
     end # class Pie
-  
+
   end
 end

data/lib/gruff/mini/side_bar.rb

@@ -8,7 +8,7 @@ module Gruff
     class SideBar < Gruff::SideBar
 
       include Gruff::Mini::Legend
-      
+
       def initialize_ivars
         super
         @hide_legend = true
@@ -18,18 +18,18 @@ module Gruff
         @marker_font_size = 50.0
         @legend_font_size = 50.0
       end
-      
+
       def draw
         expand_canvas_for_vertical_legend
-        
+
         super
-        
+
         draw_vertical_legend
-        
+
         @d.draw(@base_image)
       end
-      
+
     end
-  
+
   end
 end

data/lib/gruff/net.rb

@@ -69,43 +69,37 @@ class Gruff::Net < Gruff::Base
 
         @d = @d.circle(start_x, start_y, start_x - circle_radius, start_y) unless @hide_dots
       end
-
     end
 
     @d.draw(@base_image)
   end
 
-
   # the lines connecting in the center, with the first line vertical
   def draw_line_markers
     return if @hide_line_markers
 
-
     # have to do this here (AGAIN)... see draw() in this class
     # because this funtion is called before the @radius, @center_x and @center_y are set
     @radius = @graph_height / 2.0
     @center_x = @graph_left + (@graph_width / 2.0)
     @center_y = @graph_top + (@graph_height / 2.0) - 10 # Move graph up a bit
 
-
     # Draw horizontal line markers and annotate with numbers
     @d = @d.stroke(@marker_color)
     @d = @d.stroke_width 1
 
-
-    (0..@column_count-1).each do |index|
+    (0..@column_count - 1).each do |index|
       rad_pos = index * Math::PI * 2 / @column_count
 
       @d = @d.line(@center_x, @center_y, @center_x + Math::sin(rad_pos) * @radius, @center_y - Math::cos(rad_pos) * @radius)
 
-
       marker_label = labels[index] ? labels[index].to_s : '000'
 
       draw_label(@center_x, @center_y, rad_pos * 360 / (2 * Math::PI), @radius, marker_label)
     end
   end
 
-  private
+private
 
   def draw_label(center_x, center_y, angle, radius, amount)
     r_offset = 1.1

data/lib/gruff/photo_bar.rb

@@ -30,7 +30,7 @@ class Gruff::PhotoBar < Gruff::Base
     return # TODO Remove for further development
 
     init_photo_bar_graphics()
-    
+
     #Draw#define_clip_path()
     #Draw#clip_path(pathname)
     #Draw#composite....with bar graph image OverCompositeOp
@@ -38,7 +38,7 @@ class Gruff::PhotoBar < Gruff::Base
     # See also
     #
     # Draw.pattern # define an image to tile as the filling of a draw object
-    # 
+    #
 
     # Setup spacing.
     #
@@ -47,7 +47,6 @@ class Gruff::PhotoBar < Gruff::Base
     @bar_width = @norm_data[0][DATA_COLOR_INDEX].columns
 
     @norm_data.each_with_index do |data_row, row_index|
-  
       data_row[DATA_VALUES_INDEX].each_with_index do |data_point, point_index|
         data_point = 0 if data_point.nil?
         # Use incremented x and scaled y
@@ -55,27 +54,25 @@ class Gruff::PhotoBar < Gruff::Base
         left_y = @graph_top + (@graph_height - data_point * @graph_height) + 1
         right_x = left_x + @bar_width * spacing_factor
         right_y = @graph_top + @graph_height - 1
-      
+
         bar_image_width = data_row[DATA_COLOR_INDEX].columns
         bar_image_height = right_y.to_f - left_y.to_f
-      
+
         # Crop to scale for data
         bar_image = data_row[DATA_COLOR_INDEX].crop(0, 0, bar_image_width, bar_image_height)
-        
+
         @d.gravity = NorthWestGravity
         @d = @d.composite(left_x, left_y, bar_image_width, bar_image_height, bar_image)
-      
+
         # Calculate center based on bar_width and current row
         label_center = @graph_left + (@data.length * @bar_width * point_index) + (@data.length * @bar_width / 2.0)
         draw_label(label_center, point_index)
       end
-
     end
 
-    @d.draw(@base_image)    
+    @d.draw(@base_image)
   end
 
-
   # Return the chosen theme or the default
   def theme
     @theme || 'plastik'
@@ -85,16 +82,16 @@ protected
 
   # Sets up colors with a list of images that will be used.
   # Images should be 340px tall
-  def init_photo_bar_graphics    
+  def init_photo_bar_graphics
     color_list = Array.new
     theme_dir = File.dirname(__FILE__) + '/../../assets/' + theme
 
     Dir.open(theme_dir).each do |file|
       next unless /\.png$/.match(file)
+
       color_list << Image.read("#{theme_dir}/#{file}").first
     end
     @colors = color_list
   end
 
 end
-