sparklines 0.4.5 → 0.4.6

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.4.6
+
+* Added :underneath_color option to smooth sparkline. [Cory Forsyth]
+
 == 0.4.5
 
 * Several fixes by Rob Biedenharn

data/lib/sparklines.rb

@@ -74,7 +74,7 @@ Licensed under the MIT license.
 =end
 class Sparklines
 
-  VERSION = '0.4.5'
+  VERSION = '0.4.6'
 
   @@label_margin = 5.0
   @@pointsize = 10.0
@@ -102,12 +102,12 @@ class Sparklines
         :max_color => 'green',	
         :last_color => 'red',                
         :std_dev_color => '#efefef',
-
+        
         :has_min => false,
         :has_max => false,
         :has_last => false,
         :has_std_dev => false,
-
+        
         :label => nil
       }
 
@@ -284,7 +284,7 @@ class Sparklines
 
     width = @norm_data.size * step - 1
         
-    create_canvas(width, height, background_color)
+    create_canvas(@norm_data.size * step - 1, height, background_color)
     
     below_color = @options[:below_color]
     above_color = @options[:above_color]
@@ -373,7 +373,6 @@ class Sparklines
     @canvas.to_blob
   end
 
-
   ##
   # Creates a smooth sparkline.
   #
@@ -396,15 +395,15 @@ class Sparklines
   #   :last_color - A string or color code representing the color that the dot drawn at the last value will be displayed as.  Defaults to red.
   #
   #   :std_dev_color - A string or color code representing the color that the standard deviation bar behind the smooth graph will be displayed as. Defaults to #efefef
-
+  #
+  #   :underneath_color - A string or color code representing the color that will be used to fill in the area underneath the line. Optional.
   def smooth
 
     step = @options[:step].to_f
     height = @options[:height].to_f
+    width = ((@norm_data.size - 1) * step).to_f
+    
     background_color = @options[:background_color]
-
-    width = (@norm_data.size - 1) * step + 4
-
     create_canvas(width, height, background_color)
     
     min_color = @options[:min_color]
@@ -423,23 +422,24 @@ class Sparklines
     coords = []
     i=0
     @norm_data.each do |r|
-      coords.push [ 2 + i, (height - 3 - r/(101.0/(height-4))) ]
+      coords.push [ i, (height - 3 - r/(101.0/(height-4))) ]
       i += step
     end
     
-    open_ended_polyline(coords)
+    if @options[:underneath_color]
+      closed_polygon(height, width, coords)
+    else
+      open_ended_polyline(coords)
+    end
 
     drawbox(coords[@norm_data.index(@norm_data.min)], 2, min_color) if has_min == true
-
     drawbox(coords[@norm_data.index(@norm_data.max)], 2, max_color) if has_max == true
-
     drawbox(coords[-1], 2, last_color) if has_last == true
 
     @draw.draw(@canvas)
     @canvas.to_blob
   end
-
-
+  
   ##
   # Creates a whisker sparkline to track on/off type data. There are five states: 
   # on, off, no value, exceptional on, exceptional off. On values create an up 
@@ -533,7 +533,18 @@ private
       @draw.line(arr[i][0], arr[i][1], arr[i+1][0], arr[i+1][1])
     }
   end
-
+  
+  # Fills in the area under the line (used for a smooth graph)
+  def closed_polygon(height, width, coords)
+    return if @options[:underneath_color].nil?
+    list = []
+    list << [0, height]
+    list << coords
+    list << [width, height]
+    @draw.fill( @options[:underneath_color] )
+    @draw.polygon( *list.flatten )
+  end
+  
   ##
   # Create an image to draw on and a drawable to do the drawing with.
   #
@@ -646,4 +657,3 @@ private
 
 
 end
-

data/test/test_all.rb

@@ -9,32 +9,32 @@ class SparklinesTest < Test::Unit::TestCase
   def setup
     @output_dir = "test/output"
     FileUtils.mkdir_p(@output_dir)
-    
-    @data = %w( 1 5 15 20 30 50 57 58 55 48 
-                44 43 42 42 46 48 49 53 55 59
-                60 65 75 90 105 106 107 110 115 120
-                115 120 130 140 150 160 170 100 100 10).map {|i| i.to_f}
+
+    @data = %w( 1 5 15 20 30 50 57 58 55 48
+    44 43 42 42 46 48 49 53 55 59
+    60 65 75 90 105 106 107 110 115 120
+    115 120 130 140 150 160 170 100 100 10).map {|i| i.to_f}
   end
 
   def test_each_graph
     %w{pie area discrete smooth bar}.each do |type|
-    	quick_graph("#{type}", :type => type)
+      quick_graph("#{type}", :type => type)
     end
   end
 
   def test_each_graph_with_label
     %w{pie area discrete smooth bar}.each do |type|
-    	quick_graph("labeled_#{type}", :type => type, :label => 'Glucose')
+      quick_graph("labeled_#{type}", :type => type, :label => 'Glucose')
     end
   end
 
   def test_whisker_decimals
     @data = (1..200).map {|n| n.to_f/100 }
-    quick_graph("labeled_whisker_decimals", 
-        :height => 30, 
-        :type => 'smooth', 
-        :label => 'png'
-        )
+    quick_graph("labeled_whisker_decimals", {
+      :height => 30,
+      :type => 'smooth',
+      :label => 'png'
+    })
   end
 
   def test_whisker_random
@@ -50,7 +50,7 @@ class SparklinesTest < Test::Unit::TestCase
 
   ##
   # Send random values in the range (-9..9)
-  
+
   def test_whisker_junk
     @data = (1..40).map { |i| rand(10) * (rand(2) == 1 ? -1 : 1) }
     quick_graph("whisker_junk", :type => 'whisker')
@@ -59,85 +59,96 @@ class SparklinesTest < Test::Unit::TestCase
   def test_pie
     # Test extremes which previously did not work right
     [0, 1, 45, 95, 99, 100].each do |value|
-    	Sparklines.plot_to_file("#{@output_dir}/pie#{value}.png", 
-    	                        value, 
-    	                        :type => 'pie', 
-    	                        :diameter => 128)
+      Sparklines.plot_to_file("#{@output_dir}/pie#{value}.png",
+      value, {
+        :type => 'pie',
+        :diameter => 128
+      })
     end
-    Sparklines.plot_to_file("#{@output_dir}/pie_flat.png", 
-                            [60], 
-                            :type => 'pie')
+    Sparklines.plot_to_file("#{@output_dir}/pie_flat.png",
+    [60],
+    {
+      :type => 'pie'
+    })
   end
-  
+
   def test_special_conditions
-    tests = {	'smooth_colored' => {	
-                :type => 'smooth', 
-                :line_color => 'purple'
-                },
-    		      'pie_large'	 => {	
-    		        :type => 'pie', 
-    		        :diameter => 200 
-    		        },
-    		      'area_high'	 => {	
-    		        :type => 'area',
-    					  :upper => 80,
-                :step => 4,
-    					  :height => 20
-    					  },
-    					'discrete_wide' => { 
-    					  :type => 'discrete',
-    					  :step => 8 
-    					  },
-    					'bar_wide' => { 
-    					  :type => 'bar',
-    					  :step => 8 
-    					  },
-    					'bar_tall' => {
-      					:type => 'bar', 
-                :below_color => 'blue', 
-                :above_color => 'red',
-                :upper => 90, 
-                :height => 50,
-                :step => 8 
-    					  }
-    	}
+    tests = {	'smooth_colored' =>
+      {
+        :type => 'smooth',
+        :line_color => 'purple'
+      },
+      'pie_large'	 => {
+        :type => 'pie',
+        :diameter => 200
+      },
+      'area_high'	 => {
+        :type => 'area',
+        :upper => 80,
+        :step => 4,
+        :height => 20
+      },
+      'discrete_wide' => {
+        :type => 'discrete',
+        :step => 8
+      },
+      'bar_wide' => {
+        :type => 'bar',
+        :step => 8
+      },
+      'bar_tall' => {
+        :type => 'bar',
+        :below_color => 'blue',
+        :above_color => 'red',
+        :upper => 90,
+        :height => 50,
+        :step => 8
+      }
+    }
     tests.each do |name, options|
-    	quick_graph(name, options)
+      quick_graph(name, options)
     end
   end
-  
-#   def test_smooth_graph
-#     
-#   end
-  
+
   def test_bar_extreme_values
-    Sparklines.plot_to_file("#{@output_dir}/bar_extreme_values.png", 
-                            [0,1,100,2,99,3,98,4,97,5,96,6,95,7,94,8,93,9,92,10,91], 
-                            :type => 'bar', 
-                            :below_color => 'blue', 
-                            :above_color => 'red',
-                            :upper => 90, 
-                            :step => 4 )                              
-  end
-  
+    Sparklines.plot_to_file("#{@output_dir}/bar_extreme_values.png",
+    [0,1,100,2,99,3,98,4,97,5,96,6,95,7,94,8,93,9,92,10,91], {
+      :type => 'bar',
+      :below_color => 'blue',
+      :above_color => 'red',
+      :upper => 90,
+      :step => 4
+    })
+  end
+
   def test_string_args
-    quick_graph("bar_string.png",
-                'type' => 'bar', 
-                'below_color' => 'blue', 
-                'above_color' => 'red',
-                'upper' => 50, 
-                'height' => 50,
-                'step' => 8 )
+    quick_graph("bar_string.png", {
+      'type' => 'bar',
+      'below_color' => 'blue',
+      'above_color' => 'red',
+      'upper' => 50,
+      'height' => 50,
+      'step' => 8
+    })
   end
 
   def test_area_min_max
-    quick_graph("area_min_max", 
-                :has_min => true, 
-                :has_max => true,
-                :has_first => true,
-                :has_last => true)
+    quick_graph("area_min_max", {
+      :has_min => true,
+      :has_max => true,
+      :has_first => true,
+      :has_last => true
+    })
   end
-  
+
+  def test_smooth_underneath_color
+    quick_graph("smooth_underneath_color", {
+      :type => 'smooth',
+      :line_color => "#6699cc",
+      :underneath_color => "#ebf3f6"
+    })
+  end
+
 
   def test_no_type
     Sparklines.plot_to_file("#{@output_dir}/error.png", 0, :type => 'nonexistent')
@@ -150,7 +161,7 @@ class SparklinesTest < Test::Unit::TestCase
       :line_color => '#666',
       :has_std_dev => true,
       :std_dev_color => '#cccccc'
-    })    
+    })
   end
 
   def test_standard_deviation_tall
@@ -160,7 +171,7 @@ class SparklinesTest < Test::Unit::TestCase
       :line_color => '#666',
       :has_std_dev => true,
       :std_dev_color => '#cccccc'
-    })    
+    })
   end
 
   def test_standard_deviation_short
@@ -170,10 +181,10 @@ class SparklinesTest < Test::Unit::TestCase
       :line_color => '#666',
       :has_std_dev => true,
       :std_dev_color => '#cccccc'
-    })    
+    })
   end
 
-private
+  private
 
   def quick_graph(name, options)
     Sparklines.plot_to_file("#{@output_dir}/#{name}.png", @data, options)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: sparklines
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
-date: 2007-06-18 00:00:00 -07:00
+  version: 0.4.6
+date: 2007-10-12 00:00:00 -07:00
 summary: Tiny graphs.
 require_paths: 
 - lib
@@ -71,5 +71,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.1
+        version: 1.3.0
     version: