gruff 0.7.0-java → 0.8.0-java

data/lib/gruff.rb

@@ -2,7 +2,7 @@ require 'gruff/version'
 
 # Extra full path added to fix loading errors on some installations.
 
-%w(
+%w[
   themes
   base
   area
@@ -27,6 +27,6 @@ require 'gruff/version'
   mini/bar
   mini/pie
   mini/side_bar
-).each do |filename|
+].each do |filename|
   require "gruff/#{filename}"
 end

data/lib/gruff/accumulator_bar.rb

@@ -2,14 +2,14 @@ require File.dirname(__FILE__) + '/base'
 
 ##
 # A special bar graph that shows a single dataset as a set of
-# stacked bars. The bottom bar shows the running total and 
+# stacked bars. The bottom bar shows the running total and
 # the top bar shows the new value being added to the array.
 
 class Gruff::AccumulatorBar < Gruff::StackedBar
   def draw
     raise(Gruff::IncorrectNumberOfDatasetsException) unless @data.length == 1
 
-    accum_array = @data.first[DATA_VALUES_INDEX][0..-2].inject([0]) { |a, v| a << a.last + v}
+    accum_array = @data.first[DATA_VALUES_INDEX][0..-2].inject([0]) { |a, v| a << a.last + v }
     data 'Accumulator', accum_array
     set_colors
     @data.reverse!

data/lib/gruff/area.rb

@@ -1,4 +1,3 @@
-
 require File.dirname(__FILE__) + '/base'
 
 class Gruff::Area < Gruff::Base
@@ -41,11 +40,9 @@ class Gruff::Area < Gruff::Base
       poly_points << @graph_bottom - 1
 
       @d = @d.polyline(*poly_points)
-
     end
 
     @d.draw(@base_image)
   end
-   
- 
+
 end

data/lib/gruff/bar.rb

@@ -13,10 +13,10 @@ class Gruff::Bar < Gruff::Base
 
   def draw
     # Labels will be centered over the left of the bar if
-    # there are more labels than columns. This is basically the same 
+    # there are more labels than columns. This is basically the same
     # as where it would be for a line graph.
-    @center_labels_over_point = (@labels.keys.length > @column_count ? true : false)
-    
+    @center_labels_over_point = (@labels.keys.length > @column_count)
+
     super
     return unless @has_data
 
@@ -30,7 +30,8 @@ class Gruff::Bar < Gruff::Base
   #
   # Default value is 0.9.
   def spacing_factor=(space_percent)
-    raise ArgumentError, 'spacing_factor must be between 0.00 and 1.00' unless (space_percent >= 0 and space_percent <= 1)
+    raise ArgumentError, 'spacing_factor must be between 0.00 and 1.00' unless space_percent >= 0 and space_percent <= 1
+
     @spacing_factor = (1 - space_percent)
   end
 
@@ -52,25 +53,24 @@ protected
     conversion.graph_top = @graph_top
 
     # Set up the right mode [1,2,3] see BarConversion for further explanation
-    if @minimum_value >= 0 then
+    if @minimum_value >= 0
       # all bars go from zero to positiv
       conversion.mode = 1
     else
       # all bars go from 0 to negativ
-      if @maximum_value <= 0 then
+      if @maximum_value <= 0
         conversion.mode = 2
       else
         # bars either go from zero to negativ or to positiv
         conversion.mode = 3
         conversion.spread = @spread
         conversion.minimum_value = @minimum_value
-        conversion.zero = -@minimum_value/@spread
+        conversion.zero = -@minimum_value / @spread
       end
     end
 
     # iterate over all normalised data
     @norm_data.each_with_index do |data_row, row_index|
-
       data_row[DATA_VALUES_INDEX].each_with_index do |data_point, point_index|
         # Use incremented x and scaled y
         # x
@@ -78,25 +78,24 @@ protected
         right_x = left_x + @bar_width * @bar_spacing
         # y
         conv = []
-        conversion.get_left_y_right_y_scaled( data_point, conv )
+        conversion.get_left_y_right_y_scaled(data_point, conv)
 
         # create new bar
         @d = @d.fill data_row[DATA_COLOR_INDEX]
         @d = @d.rectangle(left_x, conv[0], right_x, conv[1])
 
         # Calculate center based on bar_width and current row
-        label_center = @graph_left + 
-                      (@data.length * @bar_width * point_index) + 
+        label_center = @graph_left +
+                      (@data.length * @bar_width * point_index) +
                       (@data.length * @bar_width / 2.0)
 
         # Subtract half a bar width to center left if requested
         draw_label(label_center - (@center_labels_over_point ? @bar_width / 2.0 : 0.0), point_index)
         if @show_labels_for_bar_values
           val = (@label_formatting || '%.2f') % @norm_data[row_index][3][point_index]
-          draw_value_label(left_x + (right_x - left_x)/2, conv[0]-30, val.commify, true)
+          draw_value_label(left_x + (right_x - left_x) / 2, conv[0] - 30, val.commify, true)
         end
       end
-
     end
 
     # Draw the last label if requested

data/lib/gruff/bar_conversion.rb

@@ -1,13 +1,13 @@
 ##
 # Original Author: David Stokar
 #
-#	This class perfoms the y coordinats conversion for the bar class.
+#   This class perfoms the y coordinats conversion for the bar class.
 #
-#	There are three cases: 
+#   There are three cases:
 #
 #   1. Bars all go from zero in positive direction
-#		2. Bars all go from zero to negative direction	
-#		3. Bars either go from zero to positive or from zero to negative
+#   2. Bars all go from zero to negative direction
+#   3. Bars either go from zero to positive or from zero to negative
 #
 class Gruff::BarConversion
   attr_writer :mode
@@ -21,21 +21,21 @@ class Gruff::BarConversion
     case @mode
     when 1 then # Case one
                 # minimum value >= 0 ( only positiv values )
-      result[0] = @graph_top + @graph_height*(1 - data_point) + 1
+      result[0] = @graph_top + @graph_height * (1 - data_point) + 1
       result[1] = @graph_top + @graph_height - 1
     when 2 then # Case two
                 # only negativ values
       result[0] = @graph_top + 1
-      result[1] = @graph_top + @graph_height*(1 - data_point) - 1
+      result[1] = @graph_top + @graph_height * (1 - data_point) - 1
     when 3 then # Case three
                 # positiv and negativ values
-      val = data_point-@minimum_value/@spread
+      val = data_point - @minimum_value / @spread
       if data_point >= @zero
-        result[0] = @graph_top + @graph_height*(1 - (val-@zero)) + 1
-        result[1] = @graph_top + @graph_height*(1 - @zero) - 1
+        result[0] = @graph_top + @graph_height * (1 - (val - @zero)) + 1
+        result[1] = @graph_top + @graph_height * (1 - @zero) - 1
       else
-        result[0] = @graph_top + @graph_height*(1 - (val-@zero)) + 1
-        result[1] = @graph_top + @graph_height*(1 - @zero) - 1
+        result[0] = @graph_top + @graph_height * (1 - (val - @zero)) + 1
+        result[1] = @graph_top + @graph_height * (1 - @zero) - 1
       end
     else
       result[0] = 0.0

data/lib/gruff/base.rb

@@ -120,7 +120,7 @@ module Gruff
 
     # Same as font but for the title.
     attr_accessor :title_font
-    
+
     # Specifies whether to draw the title bolded or not.
     attr_accessor :bold_title
 
@@ -216,7 +216,7 @@ module Gruff
     #
     # Looks for Bitstream Vera as the default font. Expects an environment var
     # of MAGICK_FONT_PATH to be set. (Uses RMagick's default font otherwise.)
-    def initialize(target_width=DEFAULT_TARGET_WIDTH)
+    def initialize(target_width = DEFAULT_TARGET_WIDTH)
       if Numeric === target_width
         @columns = target_width.to_f
         @rows = target_width.to_f * 0.75
@@ -241,7 +241,7 @@ module Gruff
     def initialize_ivars
       # Internal for calculations
       @raw_columns = 800.0
-      @raw_rows = 800.0 * (@rows/@columns)
+      @raw_rows = 800.0 * (@rows / @columns)
       @column_count = 0
       @data = Array.new
       @marker_count = nil
@@ -326,7 +326,7 @@ module Gruff
     #
     # Example:
     #  replace_colors ['#cc99cc', '#d9e043', '#34d8a2']
-    def replace_colors(color_list=[])
+    def replace_colors(color_list = [])
       @colors = color_list
       @color_index = 0
     end
@@ -348,13 +348,13 @@ module Gruff
       reset_themes
 
       defaults = {
-          :colors => %w(black white),
-          :additional_line_colors => [],
-          :marker_color => 'white',
-          :marker_shadow_color => nil,
-          :font_color => 'black',
-          :background_colors => nil,
-          :background_image => nil
+        colors: %w[black white],
+        additional_line_colors: [],
+        marker_color: 'white',
+        marker_shadow_color: nil,
+        font_color: 'black',
+        background_colors: nil,
+        background_image: nil
       }
       @theme_options = defaults.merge options
 
@@ -405,7 +405,7 @@ module Gruff
     #
     # Example:
     #   data("Bart S.", [95, 45, 78, 89, 88, 76], '#ffcc00')
-    def data(name, data_points=[], color=nil)
+    def data(name, data_points = [], color = nil)
       data_points = Array(data_points) # make sure it's an array
       @data << [name, data_points, color]
                                        # Set column count if this is larger than previous counts
@@ -434,21 +434,20 @@ module Gruff
     #
     # Example:
     #   write('graphs/my_pretty_graph.png')
-    def write(filename='graph.png')
+    def write(filename = 'graph.png')
       draw
       @base_image.write(filename)
     end
 
     # Return the graph as a rendered binary blob.
-    def to_blob(fileformat='PNG')
+    def to_blob(fileformat = 'PNG')
       draw
       @base_image.to_blob do
         self.format = fileformat
       end
     end
 
-
-    protected
+  protected
 
     # Overridden by subclasses to do the actual plotting of the graph.
     #
@@ -501,7 +500,7 @@ module Gruff
     end
 
     # Make copy of data with values scaled between 0-100
-    def normalize(force=false)
+    def normalize(force = false)
       if @norm_data.nil? || force
         @norm_data = []
         return unless @has_data
@@ -541,9 +540,9 @@ module Gruff
           calculate_caps_height(@legend_font_size)
 
       if @hide_line_markers
-        (@graph_left,
-            @graph_right_margin,
-            @graph_bottom_margin) = [@left_margin, @right_margin, @bottom_margin]
+        @graph_left = @left_margin
+        @graph_right_margin = @right_margin
+        @graph_bottom_margin = @bottom_margin
       else
         if @has_left_labels
           longest_left_label_width = calculate_width(@marker_font_size,
@@ -565,7 +564,7 @@ module Gruff
         # Make space for half the width of the rightmost column label.
         # Might be greater than the number of columns if between-style bar markers are used.
         last_label = @labels.keys.sort.last.to_i
-        extra_room_for_long_label = (last_label >= (@column_count-1) && @center_labels_over_point) ?
+        extra_room_for_long_label = (last_label >= (@column_count - 1) && @center_labels_over_point) ?
             calculate_width(@marker_font_size, @labels[last_label]) / 2.0 :
             0
         @graph_right_margin = @right_margin + extra_room_for_long_label
@@ -762,7 +761,6 @@ module Gruff
           @top_margin + title_margin + @title_caps_height)
 
       @legend_labels.each_with_index do |legend_label, index|
-
         # Draw label
         @d.fill = @font_color
         @d.font = @font if @font
@@ -810,13 +808,13 @@ module Gruff
 
     # Draws a title on the graph.
     def draw_title
-      return if (@hide_title || @title.nil?)
+      return if @hide_title || @title.nil?
 
       @d.fill = @font_color
       @d.font = @title_font || @font if @title_font || @font
       @d.stroke('transparent')
       @d.pointsize = scale_fontsize(@title_font_size)
-      @d.font_weight = if @bold_title then BoldWeight else NormalWeight end
+      @d.font_weight = @bold_title ? BoldWeight : NormalWeight
       @d.gravity = NorthGravity
       @d = @d.annotate_scaled(@base_image,
                               @raw_columns, 1.0,
@@ -846,10 +844,10 @@ module Gruff
           if @label_truncation_style == :trailing_dots
             if @label_max_size > 3
               # 4 because '...' takes up 3 chars
-              label_text = "#{label_text[0 .. (@label_max_size - 4)]}..."
+              label_text = "#{label_text[0..(@label_max_size - 4)]}..."
             end
           else # @label_truncation_style is :absolute (default)
-            label_text = label_text[0 .. (@label_max_size - 1)]
+            label_text = label_text[0..(@label_max_size - 1)]
           end
 
         end
@@ -872,7 +870,7 @@ module Gruff
     end
 
     # Draws the data value over the data point in bar graphs
-    def draw_value_label(x_offset, y_offset, data_point, bar_value=false)
+    def draw_value_label(x_offset, y_offset, data_point, bar_value = false)
       return if @hide_line_markers && !bar_value
 
       #y_offset = @graph_bottom + LABEL_MARGIN
@@ -900,7 +898,7 @@ module Gruff
       @d.pointsize = scale_fontsize(80)
       @d.gravity = CenterGravity
       @d = @d.annotate_scaled(@base_image,
-                              @raw_columns, @raw_rows/2.0,
+                              @raw_columns, @raw_rows / 2.0,
                               0, 10,
                               @no_data_message, @scale)
     end
@@ -996,6 +994,7 @@ module Gruff
 
     def significant(i) # :nodoc:
       return 1.0 if i == 0 # Keep from going into infinite loop
+
       inc = BigDecimal(i.to_s)
       factor = BigDecimal('1.0')
       while inc < 10
@@ -1030,7 +1029,7 @@ module Gruff
     # correctly in the drawn graph.
     def sort_norm_data
       @norm_data =
-          @norm_data.sort_by { |a| -a[DATA_VALUES_INDEX].inject(0) { |sum, num| sum + num.to_f } }
+        @norm_data.sort_by { |a| -a[DATA_VALUES_INDEX].inject(0) { |sum, num| sum + num.to_f } }
     end
 
     # Used by StackedBar and child classes.
@@ -1047,7 +1046,7 @@ module Gruff
       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
@@ -1063,7 +1062,7 @@ module Gruff
       end
     end
 
-    private
+  private
 
     # Takes a block and draws it if DEBUG is true.
     #
@@ -1100,7 +1099,7 @@ module Gruff
                 else
                   value.to_s
                 end
-              elsif (@spread.to_f % (@marker_count.to_f==0 ? 1 : @marker_count.to_f) == 0) || !@y_axis_increment.nil?
+              elsif (@spread.to_f % (@marker_count.to_f == 0 ? 1 : @marker_count.to_f) == 0) || !@y_axis_increment.nil?
                 value.to_i.to_s
               elsif @spread > 10.0
                 sprintf('%0i', value)
@@ -1132,6 +1131,7 @@ module Gruff
     # scaling will handle.
     def calculate_width(font_size, text)
       return 0 if text.nil?
+
       @d.pointsize = font_size
       @d.font = @font if @font
       @d.get_type_metrics(@base_image, text.to_s).width
@@ -1139,12 +1139,12 @@ module Gruff
 
     # Used for degree => radian conversions
     def deg2rad(angle)
-      angle * (Math::PI/180.0)
+      angle * (Math::PI / 180.0)
     end
 
   end # Gruff::Base
 
-  class IncorrectNumberOfDatasetsException < StandardError;
+  class IncorrectNumberOfDatasetsException < StandardError
   end
 
 end # Gruff
@@ -1169,7 +1169,7 @@ module Magick
       #              Remove this method as soon as RMagick4J Issue #16 is fixed.
       #              https://github.com/Serabe/RMagick4J/issues/16
       def fill=(fill)
-        fill = {:white => '#FFFFFF'}[fill.to_sym] || fill
+        fill = { white: '#FFFFFF' }[fill.to_sym] || fill
         @draw.fill = Magick4J.ColorDatabase.query_default(fill)
         self
       end
@@ -1182,7 +1182,7 @@ end # Magick
 
 class String
   #Taken from http://codesnippets.joyent.com/posts/show/330
-  def commify(delimiter=',')
+  def commify(delimiter = ',')
     self.gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{delimiter}")
   end
 end

data/lib/gruff/bezier.rb

@@ -27,7 +27,7 @@ class Gruff::Bezier < Gruff::Base
 
         draw_label(new_x, index)
       end
-   
+
       @d = @d.fill_opacity 0.0
       @d = @d.stroke data_row[DATA_COLOR_INDEX]
       @d = @d.stroke_width clip_value_if_greater_than(@columns / (@norm_data.first[1].size * 4), 5.0)
@@ -41,6 +41,5 @@ class Gruff::Bezier < Gruff::Base
 
     @d.draw(@base_image)
   end
-   
 
 end

data/lib/gruff/bullet.rb

@@ -4,7 +4,7 @@ require 'gruff/themes'
 # http://en.wikipedia.org/wiki/Bullet_graph
 class Gruff::Bullet < Gruff::Base
 
-  def initialize(target_width="400x40")
+  def initialize(target_width = "400x40")
     if not Numeric === target_width
       geometric_width, geometric_height = target_width.split('x')
       @columns = geometric_width.to_f
@@ -21,7 +21,7 @@ class Gruff::Bullet < Gruff::Base
     @title_font_size = 20
   end
 
-  def data(value, maximum_value, options={})
+  def data(value, maximum_value, options = {})
     @value = value.to_f
     @maximum_value = maximum_value.to_f
     @options = options
@@ -68,8 +68,9 @@ class Gruff::Bullet < Gruff::Base
 
     [:high, :low].each_with_index do |indicator, index|
       next unless @options.has_key?(indicator)
+
       @d = @d.fill @colors[index + 1]
-      indicator_width_x  = @graph_left + @graph_width * (@options[indicator] / @maximum_value)
+      indicator_width_x = @graph_left + @graph_width * (@options[indicator] / @maximum_value)
       @d = @d.rectangle(@graph_left, 0, indicator_width_x, @graph_height)
     end
 
@@ -99,13 +100,9 @@ class Gruff::Bullet < Gruff::Base
     @d.font_weight = NormalWeight
     @d.pointsize   = scale_fontsize(@title_font_size)
     @d.gravity     = NorthWestGravity
-    @d             = @d.annotate_scaled(*[
-      @base_image,
-      1.0, 1.0,
-      @font_height/2, @font_height/2,
-      @title,
-      @scale
-    ])
+    @d             = @d.annotate_scaled(
+      @base_image, 1.0, 1.0, @font_height / 2, @font_height / 2, @title, @scale
+    )
   end
 
 end