gruff 0.3.1 → 0.3.3

data/lib/gruff/bullet.rb

@@ -0,0 +1,109 @@
+require File.dirname(__FILE__) + '/base'
+
+class Gruff::Bullet < Gruff::Base
+
+  def initialize(target_width="400x40")
+    if not Numeric === target_width
+      geometric_width, geometric_height = target_width.split('x')
+      @columns = geometric_width.to_f
+      @rows = geometric_height.to_f
+    else
+      @columns = target_width.to_f
+      @rows = target_width.to_f / 5.0
+    end
+
+    initialize_ivars
+
+    reset_themes
+    theme_greyscale
+    @title_font_size = 20
+  end
+
+  def data(value, maximum_value, options={})
+    @value = value.to_f
+    @maximum_value = maximum_value.to_f
+    @options = options
+    @options.map { |k, v| @options[k] = v.to_f if v === Numeric }
+  end
+
+  # def setup_drawing
+  #   # Maybe should be done in one of the following functions for more granularity.
+  #   unless @has_data
+  #     draw_no_data()
+  #     return
+  #   end
+  #
+  #   normalize()
+  #   setup_graph_measurements()
+  #   sort_norm_data() if @sort # Sort norm_data with avg largest values set first (for display)
+  #
+  #   draw_legend()
+  #   draw_line_markers()
+  #   draw_axis_labels()
+  #   draw_title
+  # end
+
+  def draw
+    # TODO Left label
+    # TODO Bottom labels and markers
+    # @graph_bottom
+    # Calculations are off 800x???
+
+    @colors.reverse!
+
+    draw_title
+
+    @margin       = 30.0
+    @thickness    = @raw_rows / 6.0
+    @right_margin = @margin
+    @graph_left   = @title_width * 1.3 rescue @margin # HACK Need to calculate real width
+    @graph_width  = @raw_columns - @graph_left - @right_margin
+    @graph_height = @thickness * 3.0
+
+    # Background
+    @d = @d.fill @colors[0]
+    @d = @d.rectangle(@graph_left, 0, @graph_left + @graph_width, @graph_height)
+
+    [: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)
+      @d = @d.rectangle(@graph_left, 0, indicator_width_x, @graph_height)
+    end
+
+    if @options.has_key?(:target)
+      @d = @d.fill @font_color
+      target_x = @graph_left + @graph_width * (@options[:target] / @maximum_value)
+      half_thickness = @thickness / 2.0
+      @d = @d.rectangle(target_x, half_thickness, target_x + half_thickness, @thickness * 2 + half_thickness)
+    end
+
+    # Value
+    @d = @d.fill @font_color
+    @d = @d.rectangle(@graph_left, @thickness, @graph_left + @graph_width * (@value / @maximum_value), @thickness * 2)
+
+    @d.draw(@base_image)
+  end
+
+  def draw_title
+    return unless @title
+
+    @font_height = calculate_caps_height(scale_fontsize(@title_font_size))
+    @title_width = calculate_width(@title_font_size, @title)
+
+    @d.fill        = @font_color
+    @d.font        = @font if @font
+    @d.stroke('transparent')
+    @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
+    ])
+  end
+
+end

data/lib/gruff/line.rb

@@ -67,7 +67,7 @@ class Gruff::Line < Gruff::Base
     @norm_data.each do |data_row|      
       prev_x = prev_y = nil
 
-      data_row[1].each_with_index do |data_point, index|
+      data_row[DATA_VALUES_INDEX].each_with_index do |data_point, index|
         new_x = @graph_left + (@x_increment * index)
         next if data_point.nil?
 
@@ -79,12 +79,12 @@ class Gruff::Line < Gruff::Base
         @d = @d.stroke data_row[DATA_COLOR_INDEX]
         @d = @d.fill data_row[DATA_COLOR_INDEX]
         @d = @d.stroke_opacity 1.0
-        @d = @d.stroke_width clip_value_if_greater_than(@columns / (@norm_data.first[1].size * 4), 5.0)
+        @d = @d.stroke_width clip_value_if_greater_than(@columns / (@norm_data.first[DATA_VALUES_INDEX].size * 4), 5.0)
 
         if !@hide_lines and !prev_x.nil? and !prev_y.nil? then          
           @d = @d.line(prev_x, prev_y, new_x, new_y)
         end
-        circle_radius = clip_value_if_greater_than(@columns / (@norm_data.first[1].size * 2.5), 5.0)
+        circle_radius = clip_value_if_greater_than(@columns / (@norm_data.first[DATA_VALUES_INDEX].size * 2.5), 5.0)
         @d = @d.circle(new_x, new_y, new_x - circle_radius, new_y) unless @hide_dots
 
         prev_x = new_x

data/lib/gruff/net.rb

@@ -24,10 +24,10 @@ class Gruff::Net < Gruff::Base
     @center_y = @graph_top + (@graph_height / 2.0) - 10 # Move graph up a bit
 
     @x_increment = @graph_width / (@column_count - 1).to_f
-    circle_radius = clip_value_if_greater_than(@columns / (@norm_data.first[1].size * 2.5), 5.0)
+    circle_radius = clip_value_if_greater_than(@columns / (@norm_data.first[DATA_VALUES_INDEX].size * 2.5), 5.0)
 
     @d = @d.stroke_opacity 1.0
-    @d = @d.stroke_width clip_value_if_greater_than(@columns / (@norm_data.first[1].size * 4), 5.0)
+    @d = @d.stroke_width clip_value_if_greater_than(@columns / (@norm_data.first[DATA_VALUES_INDEX].size * 4), 5.0)
 
     if (defined?(@norm_baseline)) then
       level = @graph_top + (@graph_height - @norm_baseline * @graph_height)
@@ -45,7 +45,7 @@ class Gruff::Net < Gruff::Base
       @d = @d.stroke data_row[DATA_COLOR_INDEX]
       @d = @d.fill data_row[DATA_COLOR_INDEX]
 
-      data_row[1].each_with_index do |data_point, index|
+      data_row[DATA_VALUES_INDEX].each_with_index do |data_point, index|
         next if data_point.nil?
 
         rad_pos = index * Math::PI * 2 / @column_count
@@ -53,10 +53,10 @@ class Gruff::Net < Gruff::Base
         start_x = @center_x + Math::sin(rad_pos) * point_distance
         start_y = @center_y - Math::cos(rad_pos) * point_distance
 
-        next_index = index + 1 < data_row[1].length ? index + 1 : 0
+        next_index = index + 1 < data_row[DATA_VALUES_INDEX].length ? index + 1 : 0
 
         next_rad_pos = next_index * Math::PI * 2 / @column_count
-        next_point_distance = data_row[1][next_index] * @radius
+        next_point_distance = data_row[DATA_VALUES_INDEX][next_index] * @radius
         end_x = @center_x + Math::sin(next_rad_pos) * next_point_distance
         end_y = @center_y - Math::cos(next_rad_pos) * next_point_distance
 

data/lib/gruff/photo_bar.rb

@@ -48,7 +48,7 @@ class Gruff::PhotoBar < Gruff::Base
 
     @norm_data.each_with_index do |data_row, row_index|
   
-      data_row[1].each_with_index do |data_point, point_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
         left_x = @graph_left + (@bar_width * (row_index + point_index + ((@data.length - 1) * point_index)))

data/lib/gruff/pie.rb

@@ -40,14 +40,14 @@ class Gruff::Pie < Gruff::Base
     prev_degrees = @zero_degree
 
     # Use full data since we can easily calculate percentages
-    data = (@sort ? @data.sort{ |a, b| a[DATA_VALUES_INDEX][0] <=> b[DATA_VALUES_INDEX][0] } : @data)
+    data = (@sort ? @data.sort{ |a, b| a[DATA_VALUES_INDEX].first <=> b[DATA_VALUES_INDEX].first } : @data)
     data.each do |data_row|
-      if data_row[DATA_VALUES_INDEX][0] > 0
+      if data_row[DATA_VALUES_INDEX].first > 0
         @d = @d.stroke data_row[DATA_COLOR_INDEX]
         @d = @d.fill 'transparent'
         @d.stroke_width(radius) # stroke width should be equal to radius. we'll draw centered on (radius / 2)
 
-        current_degrees = (data_row[DATA_VALUES_INDEX][0] / total_sum) * 360.0 
+        current_degrees = (data_row[DATA_VALUES_INDEX].first / total_sum) * 360.0 
 
         # ellipse will draw the the stroke centered on the first two parameters offset by the second two.
         # therefore, in order to draw a circle of the proper diameter we must center the stroke at
@@ -63,7 +63,7 @@ class Gruff::Pie < Gruff::Base
         # unless @hide_line_markers then
           # End the string with %% to escape the single %.
           # RMagick must use sprintf with the string and % has special significance.
-          label_string = ((data_row[DATA_VALUES_INDEX][0] / total_sum) *
+          label_string = ((data_row[DATA_VALUES_INDEX].first / total_sum) *
                           100.0).round.to_s + '%%'
           @d = draw_label(center_x,center_y, half_angle,
                           radius + (radius * TEXT_OFFSET_PERCENTAGE),
@@ -109,7 +109,7 @@ private
 
   def sums_for_pie
     total_sum = 0.0
-    @data.collect {|data_row| total_sum += data_row[DATA_VALUES_INDEX][0] }
+    @data.collect {|data_row| total_sum += data_row[DATA_VALUES_INDEX].first }
     total_sum
   end
 

data/lib/gruff/side_bar.rb

@@ -24,7 +24,7 @@ class Gruff::SideBar < Gruff::Base
     @norm_data.each_with_index do |data_row, row_index|
       @d = @d.fill data_row[DATA_COLOR_INDEX]
 
-      data_row[1].each_with_index do |data_point, point_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

data/lib/gruff/side_stacked_bar.rb

@@ -31,7 +31,7 @@ class Gruff::SideStackedBar < Gruff::SideBar
     @norm_data.each_with_index do |data_row, row_index|
       @d = @d.fill data_row[DATA_COLOR_INDEX]
 
-      data_row[1].each_with_index do |data_point, point_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.
@@ -67,7 +67,7 @@ class Gruff::SideStackedBar < Gruff::SideBar
   end
 
   def max(data_point, index)
-    @data.inject(0) {|sum, item| sum + item[1][index]}
+    @data.inject(0) {|sum, item| sum + item[DATA_VALUES_INDEX][index]}
   end
 
 end

data/lib/gruff/spider.rb

@@ -101,7 +101,7 @@ private
               center_x + x_offset,
               center_y + y_offset)
             
-      draw_label(center_x, center_y, current_angle, radius, data_row[0].to_s) unless hide_text
+      draw_label(center_x, center_y, current_angle, radius, data_row[DATA_LABEL_INDEX].to_s) unless hide_text
             
       current_angle += additive_angle
     end
@@ -111,8 +111,8 @@ private
     points = []
     current_angle = 0.0
     @data.each do |data_row|
-      points << center_x + normalize_points(data_row[1][0]) * Math.cos(current_angle)
-      points << center_y + normalize_points(data_row[1][0]) * Math.sin(current_angle)
+      points << center_x + normalize_points(data_row[DATA_VALUES_INDEX].first) * Math.cos(current_angle)
+      points << center_y + normalize_points(data_row[DATA_VALUES_INDEX].first) * Math.sin(current_angle)
       current_angle += additive_angle
     end
     
@@ -124,7 +124,7 @@ private
   end
   
   def sums_for_spider
-    @data.inject(0.0) {|sum, data_row| sum += data_row[1][0]}
+    @data.inject(0.0) {|sum, data_row| sum += data_row[DATA_VALUES_INDEX].first}
   end
 
 end

data/lib/gruff/stacked_area.rb

@@ -7,6 +7,7 @@ class Gruff::StackedArea < Gruff::Base
   attr_accessor :last_series_goes_on_bottom
   
   def draw
+    get_maximum_by_stack
     super
 
     return unless @has_data
@@ -24,7 +25,7 @@ class Gruff::StackedArea < Gruff::Base
         
       @d = @d.fill data_row[DATA_COLOR_INDEX]
 
-      data_row[1].each_with_index do |data_point, index|
+      data_row[DATA_VALUES_INDEX].each_with_index do |data_point, index|
         # Use incremented x and scaled y
         new_x = @graph_left + (@x_increment * index)
         new_y = @graph_top + (@graph_height - data_point * @graph_height - height[index])

data/lib/gruff/stacked_bar.rb

@@ -21,10 +21,10 @@ class Gruff::StackedBar < Gruff::Base
       
       height = Array.new(@column_count, 0)
     
-      @norm_data.each_with_index do |data_row, row_index|
-        @d = @d.fill data_row[DATA_COLOR_INDEX]
-      
-        data_row[1].each_with_index do |data_point, point_index|
+      @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 * spacing_factor / 2.0)
           draw_label(label_center, point_index)

data/rails_generators/gruff/gruff_generator.rb

@@ -0,0 +1,63 @@
+class GruffGenerator < Rails::Generator::NamedBase
+
+  attr_reader   :controller_name,
+                :controller_class_path,
+                :controller_file_path,
+                :controller_class_nesting,
+                :controller_class_nesting_depth,
+                :controller_class_name,
+                :controller_singular_name,
+                :controller_plural_name,
+                :parent_folder_for_require
+  alias_method  :controller_file_name,  :controller_singular_name
+  alias_method  :controller_table_name, :controller_plural_name
+
+  def initialize(runtime_args, runtime_options = {})
+    super
+
+    # Take controller name from the next argument.
+    @controller_name = runtime_args.shift
+
+    base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, @controller_class_nesting_depth = extract_modules(@controller_name)
+    @controller_class_name_without_nesting, @controller_singular_name, @controller_plural_name = inflect_names(base_name)
+
+    if @controller_class_nesting.empty?
+      @controller_class_name = @controller_class_name_without_nesting
+    else
+      @controller_class_name = "#{@controller_class_nesting}::#{@controller_class_name_without_nesting}"
+    end    
+  end
+
+  def manifest
+    record do |m|
+      # Check for class naming collisions.
+      m.class_collisions controller_class_path, "#{controller_class_name}Controller",
+                                                "#{controller_class_name}ControllerTest"
+
+      # Controller, helper, views, and test directories.
+      m.directory File.join('app/controllers', controller_class_path)
+      m.directory File.join('test/functional', controller_class_path)
+
+      m.template 'controller.rb',
+                  File.join('app/controllers',
+                            controller_class_path,
+                            "#{controller_file_name}_controller.rb")
+
+      # For some reason this doesn't take effect if done in initialize()
+      @parent_folder_for_require = @controller_class_path.join('/').gsub(%r%app/controllers/?%, '')
+      @parent_folder_for_require += @parent_folder_for_require.blank? ? '' : '/'
+
+      m.template 'functional_test.rb',
+                  File.join('test/functional',
+                            controller_class_path,
+                            "#{controller_file_name}_controller_test.rb")
+
+    end
+  end
+
+  protected
+    # Override with your own usage banner.
+    def banner
+      "Usage: #{$0} gruff ControllerName"
+    end
+end

data/rails_generators/gruff/templates/controller.rb

@@ -0,0 +1,32 @@
+class <%= controller_class_name %>Controller < ApplicationController
+
+  # To make caching easier, add a line like this to config/routes.rb:
+  # map.graph "graph/:action/:id/image.png", :controller => "graph"
+  #
+  # Then reference it with the named route:
+  #   image_tag graph_url(:action => 'show', :id => 42)
+
+  def show
+    g = Gruff::Line.new
+    # Uncomment to use your own theme or font
+    # See http://colourlovers.com or http://www.firewheeldesign.com/widgets/ for color ideas
+#     g.theme = {
+#       :colors => ['#663366', '#cccc99', '#cc6633', '#cc9966', '#99cc99'],
+#       :marker_color => 'white',
+#       :background_colors => ['black', '#333333']
+#     }
+#     g.font = File.expand_path('artwork/fonts/VeraBd.ttf', RAILS_ROOT)
+
+    g.title = "Gruff-o-Rama"
+    
+    g.data("Apples", [1, 2, 3, 4, 4, 3])
+    g.data("Oranges", [4, 8, 7, 9, 8, 9])
+    g.data("Watermelon", [2, 3, 1, 5, 6, 8])
+    g.data("Peaches", [9, 9, 10, 8, 7, 9])
+
+    g.labels = {0 => '2004', 2 => '2005', 4 => '2006'}
+
+    send_data(g.to_blob, :disposition => 'inline', :type => 'image/png', :filename => "gruff.png")
+  end
+
+end

data/rails_generators/gruff/templates/functional_test.rb

@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '<%= '/..' * controller_class_name.split("::").length %>/test_helper'
+require '<%= parent_folder_for_require %><%= controller_file_name %>_controller'
+
+# Re-raise errors caught by the controller.
+class <%= controller_class_name %>Controller; def rescue_action(e) raise e end; end
+
+class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
+
+  #fixtures :data
+
+  def setup
+    @controller = <%= controller_class_name %>Controller.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  # TODO Replace this with your actual tests
+  def test_show
+    get :show
+    assert_response :success
+    assert_equal 'image/png', @response.headers['Content-Type']
+  end
+  
+end

data/test/gruff_test_case.rb

@@ -3,8 +3,12 @@ $:.unshift(File.dirname(__FILE__) + "/../lib/")
 
 require 'test/unit'
 require 'gruff'
+require 'fileutils'
 # require 'test_timer'
 
+TEST_OUTPUT_DIR = File.dirname(__FILE__) + "/output"
+FileUtils.mkdir_p(TEST_OUTPUT_DIR)
+
 class GruffTestCase < Test::Unit::TestCase
 
   def setup
@@ -76,7 +80,7 @@ protected
   end
 
   def write_test_file(graph, filename)
-    graph.write(File.dirname(__FILE__) + "/output/#{filename}")
+    graph.write([TEST_OUTPUT_DIR, filename].join("/"))
   end
 
   ##