svg-graph 1.0.3 → 1.0.4

data/History.txt

@@ -1,9 +1,16 @@
-=== 1.0.3 / 2011-08-04
-* Removed unused variables which raises warnings on ruby head
-* Bug fix: Test raises error on different order of xml attribute
-* Merge pull request #2 from liehann/master
-* Max values and improved Time data handling.
-* Merge pull request #1 from thinkingbox/master
-* Adding scattered plot support with :show_lines =>false Rounding values to integers in popups can be disabled with :round_popups => false Optional description gets shown in popup
-
-
+=== 1.0.4 / 2011-09-03
+* Data point shape is configurable based on rule matches on description. It defaults to usual circle with radius 2.5. [pgbossi]
+* New shapes can be specified through lambdas that accept parameters x,y (coordinates) and the dataset number.[pgbossi]
+* Max x and y values & allow Time objects in TimeSeries data. [pgbossi]
+* Popup hovering area is now customizable (it defaults to radius=10). [pgbossi]
+* Some DataPoint shapes can be marked as overlays. [pgbossi]
+
+=== 1.0.3 / 2011-08-04
+* Removed unused variables which raises warnings on ruby head
+* Bug fix: Test raises error on different order of xml attribute
+* Merge pull request #2 from liehann/master
+* Max values and improved Time data handling.
+* Merge pull request #1 from thinkingbox/master
+* Adding scattered plot support with :show_lines =>false Rounding values to integers in popups can be disabled with :round_popups => false Optional description gets shown in popup
+
+

data/Manifest.txt

@@ -32,6 +32,7 @@ install.rb
 lib/SVG/Graph/Bar.rb
 lib/SVG/Graph/BarBase.rb
 lib/SVG/Graph/BarHorizontal.rb
+lib/SVG/Graph/DataPoint.rb
 lib/SVG/Graph/Graph.rb
 lib/SVG/Graph/Line.rb
 lib/SVG/Graph/Pie.rb
@@ -49,5 +50,7 @@ test/plot.rb
 test/schedule.rb
 test/single.rb
 test/test.rb
+test/test_data_point.rb
+test/test_plot.rb
 test/test_svg_graph.rb
 test/timeseries.rb

data/README.txt

@@ -1,89 +1,89 @@
-= SVG::Graph
-
-http://www.germane-software.com/software/SVG/SVG::Graph/
-
-== AUTHOR
-
-Sean E. Russell <serATgermaneHYPHENsoftwareDOTcom>
-Copyright 2004 Sean E. Russell
-This software is available under the Ruby license[LICENSE.txt]
-
-== DEVELOPERS
-
-* Claudio Bustos <clbustos_AT_gmail_DOT_com
-* Liehann Loots <liehhanl_AT_gmail_DOT_com
-* Piergiuliano Bossi <pgbossi_AT_gmail_DOT_com
-
-== DESCRIPTION:
-
-This is a minor revision of the [SVG::Graph library](http://www.germane-software.com/software/SVG/SVG::Graph/) by Sean Russell with few minor touch-ups to make it run on Ruby 1.9.x and to have it gem-installable
-
-SVG:::Graph is a pure Ruby library for generating charts, which are a type of graph where the values of one axis are not scalar. SVG::Graph has a verry similar API to the Perl library SVG::TT::Graph, and the resulting charts also look the same. This isn't surprising, because SVG::Graph started as a loose port of SVG::TT::Graph, although the internal code no longer resembles the Perl original at all.
-
-== FEATURES
-
-* Tested for Ruby versions 1.8.6, 1.8.7 and 1.9.*
-
-We are not sure that all the parts of the original SVG library work as expected under 1.9.x too. Please notify via github messages or on the Issues section if you find any bug.
-
-== LICENSE:
-
-(The Ruby Licence)
-
-SVG::Graph is copyrighted free software by Sean Russell <ser@germane-software.com>.
-You can redistribute it and/or modify it under either the terms of the GPL
-(see GPL.txt file), or the conditions below:
-
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-	  modifications to Usenet or an equivalent medium, or by allowing
-	  the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) rename any non-standard executables so the names do not conflict
-	  with standard executables, which must also be provided.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may distribute the software in object code or executable
-     form, provided that you do at least ONE of the following:
-
-       a) distribute the executables and library files of the software,
-	  together with instructions (in the manual page or equivalent)
-	  on where to get the original distribution.
-
-       b) accompany the distribution with the machine-readable source of
-	  the software.
-
-       c) give non-standard executables non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial).  But some files in the distribution
-     are not written by the author, so that they are not under this terms.
-
-     They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
-     files under the ./missing directory.  See each file for the copying
-     condition.
-
-  5. The scripts and library files supplied as input to or produced as 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.
+= SVG::Graph
+
+http://www.germane-software.com/software/SVG/SVG::Graph/
+
+== AUTHOR
+
+Sean E. Russell <serATgermaneHYPHENsoftwareDOTcom>
+Copyright 2004 Sean E. Russell
+This software is available under the Ruby license[LICENSE.txt]
+
+== DEVELOPERS
+
+* Claudio Bustos <clbustos_AT_gmail_DOT_com
+* Liehann Loots <liehhanl_AT_gmail_DOT_com
+* Piergiuliano Bossi <pgbossi_AT_gmail_DOT_com
+
+== DESCRIPTION:
+
+This is a  revision of the [SVG::Graph library](http://www.germane-software.com/software/SVG/SVG::Graph/) by Sean Russell with touch-ups to make it run on Ruby 1.9.x and be gem-installable. See History.txt for other changes
+
+SVG:::Graph is a pure Ruby library for generating charts, which are a type of graph where the values of one axis are not scalar. SVG::Graph has a verry similar API to the Perl library SVG::TT::Graph, and the resulting charts also look the same. This isn't surprising, because SVG::Graph started as a loose port of SVG::TT::Graph, although the internal code no longer resembles the Perl original at all.
+
+== FEATURES
+
+* Tested for Ruby versions 1.8.6, 1.8.7 and 1.9.*
+
+We are not sure that all the parts of the original SVG library work as expected under 1.9.x too. Please notify via github messages or on the Issues section if you find any bug.
+
+== LICENSE:
+
+(The Ruby Licence)
+
+SVG::Graph is copyrighted free software by Sean Russell <ser@germane-software.com>.
+You can redistribute it and/or modify it under either the terms of the GPL
+(see GPL.txt file), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) rename any non-standard executables so the names do not conflict
+	  with standard executables, which must also be provided.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or executable
+     form, provided that you do at least ONE of the following:
+
+       a) distribute the executables and library files of the software,
+	  together with instructions (in the manual page or equivalent)
+	  on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+
+       c) give non-standard executables non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under this terms.
+
+     They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
+     files under the ./missing directory.  See each file for the copying
+     condition.
+
+  5. The scripts and library files supplied as input to or produced as 
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them, 
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.

data/Rakefile

@@ -1,21 +1,21 @@
-# -*- ruby -*-
-# -*- coding: utf-8 -*-
-$:.unshift(File.dirname(__FILE__)+"/lib/")
-
-require 'rubygems'
-require 'hoe'
-
-Hoe.plugin :git
-$:.unshift("./lib")
-require 'svggraph'
-Hoe.spec 'svg-graph' do
-	self.version=SVG::Graph::VERSION
-	self.developer('Sean Russell', 'ser_AT_germane-software.com')
-	self.developer('Claudio Bustos', 'clbustos_AT_gmail.com')
-  self.developer("Liehann Loots","liehhanl_AT_gmail.com")
-  self.developer("Piergiuliano Bossi","pgbossi_AT_gmail.com")
-	self.rubyforge_name = 'ruby-statsample' # if different than 'svg_graph'
-        self.remote_rdoc_dir = 'svg-graph'
-end
-
-# vim: syntax=ruby
+# -*- ruby -*-
+# -*- coding: utf-8 -*-
+$:.unshift(File.dirname(__FILE__)+"/lib/")
+
+require 'rubygems'
+require 'hoe'
+
+Hoe.plugin :git
+$:.unshift("./lib")
+require 'svggraph'
+Hoe.spec 'svg-graph' do
+    self.version=SVG::Graph::VERSION
+    self.developer('Sean Russell', 'ser_AT_germane-software.com')
+    self.developer('Claudio Bustos', 'clbustos_AT_gmail.com')
+    self.developer("Liehann Loots","liehhanl_AT_gmail.com")
+    self.developer("Piergiuliano Bossi","pgbossi_AT_gmail.com")
+    self.rubyforge_name = 'ruby-statsample' # if different than 'svg_graph'
+    self.remote_rdoc_dir = 'svg-graph'
+end
+
+# vim: syntax=ruby

data/lib/SVG/Graph/DataPoint.rb

@@ -0,0 +1,39 @@
+class DataPoint
+  OVERLAY = "OVERLAY" unless defined?(OVERLAY)
+  DEFAULT_SHAPE = lambda{|x,y,line| ["circle", {
+          "cx" => x,
+          "cy" => y,
+          "r" => "2.5",
+          "class" => "dataPoint#{line}"
+        }]
+      } unless defined? DEFAULT_SHAPE
+  CRITERIA = [] unless defined? CRITERIA
+  def DataPoint.configure_shape_criteria(*matchers)
+    CRITERIA.push(*matchers)
+  end
+  def DataPoint.reset_shape_criteria
+    CRITERIA.clear
+  end
+
+  def initialize(x, y, line)
+    @x = x
+    @y = y
+    @line = line
+  end
+  def shape(description=nil)
+    shapes = CRITERIA.select {|criteria|
+      criteria.size == 2
+    }.collect {|regexp, proc|
+      proc.call(@x, @y, @line) if description =~ regexp
+    }.compact
+    shapes = [DEFAULT_SHAPE.call(@x, @y, @line)] if shapes.empty?
+
+    overlays = CRITERIA.select { |criteria|
+      criteria.last == OVERLAY
+    }.collect { |regexp, proc|
+      proc.call(@x, @y, @line) if description =~ regexp
+    }.compact
+
+    return shapes + overlays
+  end
+end

data/lib/SVG/Graph/Graph.rb

@@ -341,6 +341,8 @@ module SVG
       attr_accessor :no_css
       # Add popups for the data points on some graphs
       attr_accessor :add_popups
+      # Customize popup radius
+      attr_accessor :popup_radius
 
 
       protected
@@ -355,6 +357,7 @@ module SVG
         config.each { |key, value|
             self.send( key.to_s+"=", value ) if self.respond_to?  key
         }
+        @popup_radius ||= 10
       end
 
       attr_accessor :top_align, :top_font, :right_align, :right_font
@@ -424,7 +427,7 @@ module SVG
         @foreground.add_element( "circle", {
           "cx" => x.to_s,
           "cy" => y.to_s,
-          "r" => "10",
+          "r" => "#{@popup_radius}",
           "style" => "opacity: 0",
           "onmouseover" => 
             "document.getElementById(#{t.object_id}).setAttribute('visibility', 'visible' )",

data/lib/SVG/Graph/Plot.rb

@@ -1,4 +1,5 @@
 require 'SVG/Graph/Graph'
+require 'SVG/Graph/DataPoint'
 
 module SVG
   module Graph
@@ -334,12 +335,9 @@ module SVG
               x = (x_points[idx] -  x_min) * x_step
               y = @graph_height - (y_points[idx] -  y_min) * y_step
               if show_data_points
-                @graph.add_element( "circle", {
-                  "cx" => x.to_s,
-                  "cy" => y.to_s,
-                  "r" => "2.5",
-                  "class" => "dataPoint#{line}"
-                })
+                DataPoint.new(x, y, line).shape(data[:description][idx]).each{|s|
+                  @graph.add_element( *s )
+                }
                 add_popup(x, y, format( x_points[idx], y_points[idx], data[:description][idx])) if add_popups
               end
               make_datapoint_text( x, y-6, y_points[idx] ) if show_data_values

data/lib/svggraph.rb

@@ -1,13 +1,14 @@
-module SVG
-module Graph
-  VERSION = '1.0.3'
-	autoload(:Bar, 'SVG/Graph/Bar')
-	autoload(:BarBase, 'SVG/Graph/BarBase')
-	autoload(:BarHorizontal, 'SVG/Graph/BarHorizontal')
-	autoload(:Line, 'SVG/Graph/Line')
-	autoload(:Pie, 'SVG/Graph/Pie')
-	autoload(:Plot, 'SVG/Graph/Plot')
-	autoload(:Schedule, 'SVG/Graph/Schedule')
-	autoload(:TimeSeries, 'SVG/Graph/TimeSeries')
-end
-end
+module SVG
+  module Graph
+    VERSION = '1.0.4'
+    autoload(:Bar, 'SVG/Graph/Bar')
+    autoload(:BarBase, 'SVG/Graph/BarBase')
+    autoload(:BarHorizontal, 'SVG/Graph/BarHorizontal')
+    autoload(:Line, 'SVG/Graph/Line')
+    autoload(:Pie, 'SVG/Graph/Pie')
+    autoload(:Plot, 'SVG/Graph/Plot')
+    autoload(:Schedule, 'SVG/Graph/Schedule')
+    autoload(:TimeSeries, 'SVG/Graph/TimeSeries')
+    autoload(:DataPoint, 'SVG/Graph/DataPoint')
+  end
+end

data/test/test_data_point.rb

@@ -0,0 +1,67 @@
+$: << File.dirname(__FILE__) + '/../lib'
+require "test/unit"
+require "SVG/Graph/DataPoint"
+
+class TestDataPoint < Test::Unit::TestCase
+  def setup
+    DataPoint.reset_shape_criteria
+  end
+  def teardown
+    DataPoint.reset_shape_criteria
+  end
+  def test_default_shape_is_circle_with_2_point_5_radius
+    assert_equal([['circle', {
+        "cx" => 100.0,
+        "cy" => 100.0,
+        "r" => "2.5",
+        "class" => "dataPoint1"
+    }]], DataPoint.new(100.0, 100.0, 1).shape)
+  end
+  def test_default_shape_based_on_description_without_criteria_is_circle_with_2_point_5_radius
+    assert_equal([['circle', {
+        "cx" => 100.0,
+        "cy" => 100.0,
+        "r" => "2.5",
+        "class" => "dataPoint1"
+    }]], DataPoint.new(100.0, 100.0, 1).shape("description"))
+  end
+  def test_shape_for_matching_regular_expression_is_lambda_value
+    DataPoint.configure_shape_criteria(
+      [/angle/, lambda{|x,y,line| ['rect', {
+          "x" => x,
+          "y" => y,
+          "width" => "5",
+          "height" => "5",
+          "class" => "dataPoint#{line}"
+        }]
+      }]
+    )
+    assert_equal([['rect', {
+        "x" => 100.0,
+        "y" => 50.0,
+        "width" => "5",
+        "height" => "5",
+        "class" => "dataPoint2"
+    }]], DataPoint.new(100.0, 50.0, 2).shape("rectangle"))
+  end
+  def test_multiple_criteria_generate_shapes_in_order
+    DataPoint.configure_shape_criteria(
+      [/3/, lambda{|x,y,line| "three" }],
+      [/2/, lambda{|x,y,line| "two" }],
+      [/1/, lambda{|x,y,line| "one" }]
+    )
+    assert_equal(["three", "two", "one"], DataPoint.new(100.0, 50.0, 2).shape("1 3 2"))
+  end
+  def test_overlay_match_is_last_and_does_not_prevent_default
+    DataPoint.configure_shape_criteria(
+      [/3/, lambda{|x,y,line| "three" }, DataPoint::OVERLAY]
+    )
+    default_circle = ['circle', {
+        "cx" => 100.0,
+        "cy" => 50.0,
+        "r" => "2.5",
+        "class" => "dataPoint2"
+    }]
+    assert_equal([default_circle, "three"], DataPoint.new(100.0, 50.0, 2).shape("1 3 2"))
+  end
+end

data/test/test_plot.rb

@@ -1,40 +1,47 @@
 $: << File.dirname(__FILE__) + '/../lib'
 require "test/unit"
 require "svggraph"
+require "SVG/Graph/DataPoint"
 
 class TestSvgGraphPlot < Test::Unit::TestCase
-    def _test_plot
-        
-        projection = [
-         6, 11,    0, 5,   18, 7,   1, 11,   13, 9,   1, 2,   19, 0,   3, 13,
-         7, 9 
-        ]
-        actual = [
-         0, 18,    8, 15,    9, 4,   18, 14,   10, 2,   11, 6,  14, 12,   
-         15, 6,   4, 17,   2, 12
-        ]
-        
-        graph = SVG::Graph::Plot.new({
-        :height => 500,
-            :width => 300,
-         :key => true,
-         :scale_x_integers => true,
-         :scale_y_integerrs => true,
-        })
-        
-        graph.add_data({
-        :data => projection, 
-          :title => 'Projected',
-        })
-        
-        graph.add_data({
-        :data => actual,
-          :title => 'Actual',
-        })
-        
-        out=graph.burn()
-        assert(out=~/Created with SVG::Graph/)
-    end
+  def setup
+    DataPoint.reset_shape_criteria
+  end
+  def teardown
+    DataPoint.reset_shape_criteria
+  end
+  def test_plot
+
+      projection = [
+       6, 11,    0, 5,   18, 7,   1, 11,   13, 9,   1, 2,   19, 0,   3, 13,
+       7, 9
+      ]
+      actual = [
+       0, 18,    8, 15,    9, 4,   18, 14,   10, 2,   11, 6,  14, 12,
+       15, 6,   4, 17,   2, 12
+      ]
+
+      graph = SVG::Graph::Plot.new({
+      :height => 500,
+          :width => 300,
+       :key => true,
+       :scale_x_integers => true,
+       :scale_y_integerrs => true,
+      })
+
+      graph.add_data({
+      :data => projection,
+        :title => 'Projected',
+      })
+
+      graph.add_data({
+      :data => actual,
+        :title => 'Actual',
+      })
+
+      out=graph.burn()
+      assert(out=~/Created with SVG::Graph/)
+  end
   def test_default_plot_emits_polyline_connecting_data_points
     actual = [
      0, 18,    8, 15,    9, 4,   18, 14,   10, 2,   11, 6,  14, 12,
@@ -57,7 +64,7 @@ class TestSvgGraphPlot < Test::Unit::TestCase
     assert_match(/path.*class='line1'/, out)
   end
   
-  def _test_disabling_show_lines_does_not_emit_polyline_connecting_data_points
+  def test_disabling_show_lines_does_not_emit_polyline_connecting_data_points
     actual = [
      0, 18,    8, 15,    9, 4,   18, 14,   10, 2,   11, 6,  14, 12,
      15, 6,   4, 17,   2, 12
@@ -80,7 +87,7 @@ class TestSvgGraphPlot < Test::Unit::TestCase
     out=graph.burn()
     assert_no_match(/path class='line1' d='M.* L.*'/, out)
   end
-  def _test_popup_values_round_to_integer_by_default_in_popups
+  def test_popup_values_round_to_integer_by_default_in_popups
     actual = [
      0.1, 18,    8.55, 15.1234,    9.09876765, 4,
     ]
@@ -107,7 +114,7 @@ class TestSvgGraphPlot < Test::Unit::TestCase
     assert_no_match(/\(9.09876765, 4\)/, out)
     assert_match(/\(9, 4\)/, out)
   end
-  def _test_do_not_round_popup_values_shows_decimal_values_in_popups
+  def test_do_not_round_popup_values_shows_decimal_values_in_popups
     actual = [
      0.1, 18,    8.55, 15.1234,    9.09876765, 4,
     ]
@@ -135,7 +142,7 @@ class TestSvgGraphPlot < Test::Unit::TestCase
     assert_match(/\(9.09876765, 4\)/, out)
     assert_no_match(/\(9, 4\)/, out)
   end
-  def _test_description_is_shown_in_popups_if_provided
+  def test_description_is_shown_in_popups_if_provided
     actual = [
      8.55, 15.1234,    9.09876765, 4,     0.1, 18,
     ]
@@ -167,4 +174,106 @@ class TestSvgGraphPlot < Test::Unit::TestCase
     assert_match(/\(0.1, 18, third\)/, out)
     assert_no_match(/\(0.1, 18\)/, out)
   end
+  def test_combine_different_shapes_based_on_description
+    actual = [
+     8.55, 15.1234,         9.09876765, 4,                  2.1, 18,
+    ]
+    description = [
+     'one is a circle',     'two is a rectangle',           'three is a rectangle with strikethrough',
+    ]
+
+    DataPoint.configure_shape_criteria(
+      [/^t.*/, lambda{|x,y,line| ['polygon', {
+          "points" => "#{x-1.5},#{y+2.5} #{x+1.5},#{y+2.5} #{x+1.5},#{y-2.5} #{x-1.5},#{y-2.5}",
+          "class" => "dataPoint#{line}"
+        }]
+      }],
+      [/^three.*/, lambda{|x,y,line| ['line', {
+          "x1" => "#{x-4}",
+          "y1" => y.to_s,
+          "x2" => "#{x+4}",
+          "y2" => y.to_s,
+          "class" => "axis"
+        }]
+      }]
+    )
+    graph = SVG::Graph::Plot.new({
+      :height => 500,
+      :width => 300,
+      :key => true,
+      :scale_x_integers => true,
+      :scale_y_integers => true,
+      :add_popups => true,
+      :round_popups => false,
+    })
+
+    graph.add_data({
+      :data => actual,
+      :title => 'Actual',
+      :description => description,
+    })
+
+    out=graph.burn()
+    assert_match(/polygon.*points/, out)
+    assert_match(/line.*axis/, out)
+  end
+  def test_popup_radius_is_10_by_default
+    actual = [
+     1, 1,    5, 5,     10, 10,
+    ]
+    description = [
+     'first',    'second',          'third',
+    ]
+
+    graph = SVG::Graph::Plot.new({
+      :height => 500,
+      :width => 300,
+      :key => true,
+      :scale_x_integers => true,
+      :scale_y_integers => true,
+      :add_popups => true,
+      :round_popups => false,
+    })
+
+    graph.add_data({
+      :data => actual,
+      :title => 'Actual',
+      :description => description,
+    })
+
+    out=graph.burn()
+    assert_match(/circle .* r='10'/, out)
+    assert_match(/circle .* onmouseover=.*/, out)
+    
+  end
+  def test_popup_radius_is_overridable
+    actual = [
+     1, 1,    5, 5,     10, 10,
+    ]
+    description = [
+     'first',    'second',          'third',
+    ]
+
+    graph = SVG::Graph::Plot.new({
+      :height => 500,
+      :width => 300,
+      :key => true,
+      :scale_x_integers => true,
+      :scale_y_integers => true,
+      :add_popups => true,
+      :round_popups => false,
+      :popup_radius => 1.23
+    })
+
+    graph.add_data({
+      :data => actual,
+      :title => 'Actual',
+      :description => description,
+    })
+
+    out=graph.burn()
+    assert_match(/circle .* r='1.23'/, out)
+    assert_match(/circle .* onmouseover=.*/, out)
+    
+  end
 end

data/test/test_svg_graph.rb

@@ -1,24 +1,25 @@
 $: << File.dirname(__FILE__) + '/../lib'
 require "test/unit"
 require "svggraph"
+require "SVG/Graph/DataPoint"
 
 class TestSvgGraph < Test::Unit::TestCase
-    def test_bar_line_and_pie
-        fields = %w(Jan Feb Mar);
-        data_sales_02 = [12, 45, 21]
-        [SVG::Graph::Bar, SVG::Graph::BarHorizontal, SVG::Graph::Line, SVG::Graph::Pie].each do 
-            |klass|
-            graph = klass.new(
-            :height => 500,
-            :width => 300,
-            :fields => fields
-            )
-            graph.add_data(
-            :data => data_sales_02,
-            :title => 'Sales 2002'
-            )
-            out=graph.burn
-            assert(out=~/Created with SVG::Graph/)
-        end
-    end
+  def test_bar_line_and_pie
+      fields = %w(Jan Feb Mar);
+      data_sales_02 = [12, 45, 21]
+      [SVG::Graph::Bar, SVG::Graph::BarHorizontal, SVG::Graph::Line, SVG::Graph::Pie].each do
+          |klass|
+          graph = klass.new(
+          :height => 500,
+          :width => 300,
+          :fields => fields
+          )
+          graph.add_data(
+          :data => data_sales_02,
+          :title => 'Sales 2002'
+          )
+          out=graph.burn
+          assert(out=~/Created with SVG::Graph/)
+      end
+  end
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: svg-graph
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.0.3
+  hash: 31
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Sean Russell
@@ -34,7 +39,7 @@ cert_chain:
   rpP0jjs0
   -----END CERTIFICATE-----
 
-date: 2011-08-04 00:00:00 -04:00
+date: 2011-10-03 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,12 +50,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
         version: 2.8.0
   type: :development
   version_requirements: *id001
 description: |-
-  This is a minor revision of the [SVG::Graph library](http://www.germane-software.com/software/SVG/SVG::Graph/) by Sean Russell with few minor touch-ups to make it run on Ruby 1.9.x and to have it gem-installable
-  
+  This is a  revision of the [SVG::Graph library](http://www.germane-software.com/software/SVG/SVG::Graph/) by Sean Russell with touch-ups to make it run on Ruby 1.9.x and be gem-installable. See History.txt for other changes
+  
   SVG:::Graph is a pure Ruby library for generating charts, which are a type of graph where the values of one axis are not scalar. SVG::Graph has a verry similar API to the Perl library SVG::TT::Graph, and the resulting charts also look the same. This isn't surprising, because SVG::Graph started as a loose port of SVG::TT::Graph, although the internal code no longer resembles the Perl original at all.
 email: 
 - ser_AT_germane-software.com
@@ -102,6 +112,7 @@ files:
 - lib/SVG/Graph/Bar.rb
 - lib/SVG/Graph/BarBase.rb
 - lib/SVG/Graph/BarHorizontal.rb
+- lib/SVG/Graph/DataPoint.rb
 - lib/SVG/Graph/Graph.rb
 - lib/SVG/Graph/Line.rb
 - lib/SVG/Graph/Pie.rb
@@ -119,11 +130,12 @@ files:
 - test/schedule.rb
 - test/single.rb
 - test/test.rb
+- test/test_data_point.rb
+- test/test_plot.rb
 - test/test_svg_graph.rb
 - test/timeseries.rb
-- test/test_plot.rb
 has_rdoc: true
-homepage: http://www.germane-software.com/software/SVG/SVG::Graph/
+homepage: http://www.germane-software.com/software/SVG/SVG::Graph/
 licenses: []
 
 post_install_message: 
@@ -137,20 +149,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: ruby-statsample
-rubygems_version: 1.6.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: This is a minor revision of the [SVG::Graph library](http://www.germane-software.com/software/SVG/SVG::Graph/) by Sean Russell with few minor touch-ups to make it run on Ruby 1.9.x and to have it gem-installable
 
 SVG:::Graph is a pure Ruby library for generating charts, which are a type of graph where the values of one axis are not scalar
+summary: This is a  revision of the [SVG::Graph library](http://www.germane-software.com/software/SVG/SVG::Graph/) by Sean Russell with touch-ups to make it run on Ruby 1.9.x and be gem-installable
 test_files: 
+- test/test_data_point.rb
 - test/test_svg_graph.rb
 - test/test_plot.rb

metadata.gz.sig

@@ -1,2 +1,3 @@
-E�
�|Z�P�/Umy���r�
-�xt��b�}] ����ڸ�r�)
-�cL#�-����V�t�§D5�����ʋ�Y��9���i�����i������*��0U(�pʼ�����M��㔃��SG��Wl�.6�Z|e~sL���$5��HŜ(��<N�ܱ�����m�7�"
G��H�qǺ%}����(�+u�!�gM��h�\`5⋃
؅���b�f��q�����Z��,���{��lN�h�~/
+D����5O�,R��Xd�*p�F����҆
+�b�1��0��B
��b|�v�,V�\�gw�r�mJ�G2�B=���q��>���8�K4o�� �6mD9�� �x�`{��;�d�SP� �6
+�6��;��^��H���