svg-graph 1.0.0 → 1.0.1

data/History.txt

@@ -1,6 +1,7 @@
-=== 1.0.0 / 2009-08-01
+=== 1.0.1 / 2009-09-26
 
-* 1 major enhancement
+* Work for Ruby version 1.8.6, 1.8.7 and 1.9
 
-  * Birthday!
+=== 1.0.0 / 2009-08-01
 
+* First version

data/README.txt

@@ -1,6 +1,6 @@
 = SVG::Graph
 
-Gem version of SVG::Graph, available on http://www.germane-software.com/software/SVG/SVG::Graph/
+http://www.germane-software.com/software/SVG/SVG::Graph/
 
 == Author
 
@@ -11,8 +11,14 @@ This software is available under the Ruby license[LICENSE.txt]
 
 == DESCRIPTION:
 
+Gem version of SVG:::Graph.
+
 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.1
+
 == LICENSE:
 
 (The Ruby Licence)

data/Rakefile

@@ -4,12 +4,12 @@ require 'rubygems'
 require 'hoe'
 $:.unshift("./lib")
 require 'svggraph'
-Hoe.spec 'svg-graph' do |p|
-	p.version=SVG::Graph::VERSION
-	p.developer('Sean Russell', 'ser_AT_germane-software.com')
-	p.developer('Claudio Bustos', 'clbustos_AT_gmail.com')
-	p.rubyforge_name = 'ruby-statsample' # if different than 'svg_graph'
-        p.remote_rdoc_dir = 'svg-graph'
+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.rubyforge_name = 'ruby-statsample' # if different than 'svg_graph'
+        self.remote_rdoc_dir = 'svg-graph'
 end
 
 # vim: syntax=ruby

data/lib/SVG/Graph/BarBase.rb

@@ -17,34 +17,32 @@ module SVG
     #
     class BarBase < SVG::Graph::Graph
 			# Ensures that :fields are provided in the configuration.
-      def initialize config
-        raise "fields was not supplied or is empty" unless config[:fields] &&
-        config[:fields].kind_of?(Array) &&
-        config[:fields].length > 0
-				super
-			end
-
-			# In addition to the defaults set in Graph::initialize, sets
-			# [bar_gap] true
-			# [stack] :overlap
-			def set_defaults
-        init_with( :bar_gap => true, :stack => :overlap )
-      end
-
-      #   Whether to have a gap between the bars or not, default
-      #   is true, set to false if you don't want gaps.
-      attr_accessor :bar_gap
-      #   How to stack data sets.  :overlap overlaps bars with
-      #   transparent colors, :top stacks bars on top of one another,
-      #   :side stacks the bars side-by-side. Defaults to :overlap.
-      attr_accessor :stack
-
+        def initialize config
+            raise "fields was not supplied or is empty" unless config[:fields] &&
+            config[:fields].kind_of?(Array) &&
+            config[:fields].length > 0
+            super
+        end
 
-			protected
+        # In addition to the defaults set in Graph::initialize, sets
+        # [bar_gap] true
+        # [stack] :overlap
+        def set_defaults
+            init_with( :bar_gap => true, :stack => :overlap )
+        end
 
-      def max_value
+        #   Whether to have a gap between the bars or not, default
+        #   is true, set to false if you don't want gaps.
+        attr_accessor :bar_gap
+        #   How to stack data sets.  :overlap overlaps bars with
+        #   transparent colors, :top stacks bars on top of one another,
+        #   :side stacks the bars side-by-side. Defaults to :overlap.
+        attr_accessor :stack
+        protected
+        
+        def max_value
         @data.collect{|x| x[:data].max}.max
-      end
+        end
 
       def min_value
         min = 0

data/lib/SVG/Graph/Graph.rb

@@ -99,7 +99,7 @@ module SVG
       # [add_popups] false
       def initialize( config )
         @config = config
-
+        @data = nil
         self.top_align = self.top_font = self.right_align = self.right_font = 0
 
         init_with({
@@ -148,9 +148,7 @@ module SVG
           :no_css               =>false,
           :add_popups           =>false,
         })
-
-				set_defaults if methods.include? "set_defaults"
-
+        set_defaults if self.respond_to? :set_defaults
         init_with config
       end
 
@@ -165,7 +163,7 @@ module SVG
       #     :title => 'Sales 2002'
       #   })
       def add_data conf
-        @data = [] unless defined? @data
+          @data = [] unless (defined? @data and !@data.nil?) 
 
         if conf[:data] and conf[:data].kind_of? Array
           @data << conf
@@ -354,7 +352,7 @@ module SVG
       # by subclasses.
       def init_with config
         config.each { |key, value|
-          self.send( key.to_s+"=", value ) if methods.include? key.to_s
+            self.send( key.to_s+"=", value ) if self.respond_to?  key
         }
       end
 

data/lib/SVG/Graph/Line.rb

@@ -78,55 +78,55 @@ module SVG
       # Fill in the area under the plot if true
       attr_accessor :area_fill
 
-      # The constructor takes a hash reference, fields (the names for each
-      # field on the X axis) MUST be set, all other values are defaulted to 
-      # those shown above - with the exception of style_sheet which defaults
-      # to using the internal style sheet.
-      def initialize config
-        raise "fields was not supplied or is empty" unless config[:fields] &&
-        config[:fields].kind_of?(Array) &&
-        config[:fields].length > 0
-				super
-			end
+        # The constructor takes a hash reference, fields (the names for each
+        # field on the X axis) MUST be set, all other values are defaulted to 
+        # those shown above - with the exception of style_sheet which defaults
+        # to using the internal style sheet.
+        def initialize config
+            raise "fields was not supplied or is empty" unless config[:fields] &&
+            config[:fields].kind_of?(Array) &&
+            config[:fields].length > 0
+            super
+        end
 
       # In addition to the defaults set in Graph::initialize, sets
       # [show_data_points] true
       # [show_data_values] true
       # [stacked] false
       # [area_fill] false
-			def set_defaults
+        def set_defaults
         init_with(
-          :show_data_points   => true,
-          :show_data_values   => true,
-          :stacked            => false,
-          :area_fill          => false
+        :show_data_points   => true,
+        :show_data_values   => true,
+        :stacked            => false,
+        :area_fill          => false
         )
-
+        
         self.top_align = self.top_font = self.right_align = self.right_font = 1
-      end
+        end
 
       protected
 
-      def max_value
-        max = 0
-        
-        if (stacked == true) then
-          sums = Array.new(@config[:fields].length).fill(0)
-
-          @data.each do |data|
-            sums.each_index do |i|
-              sums[i] += data[:data][i].to_f
+        def max_value
+            max = 0
+            
+            if (stacked == true) then
+              sums = Array.new(@config[:fields].length).fill(0)
+            
+              @data.each do |data|
+                sums.each_index do |i|
+                  sums[i] += data[:data][i].to_f
+                end
+              end
+              
+              max = sums.max
+            else
+              max = @data.collect{|x| x[:data].max}.max
             end
-          end
-          
-          max = sums.max
-        else
-          max = @data.collect{|x| x[:data].max}.max
+            
+            return max
         end
 
-        return max
-      end
-
       def min_value
         min = 0
         

data/lib/svggraph.rb

@@ -1,6 +1,6 @@
 module SVG
 module Graph
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
   ORIGINAL_VERSION='0.6.1'
 	autoload(:Bar, 'SVG/Graph/Bar')
 	autoload(:BarBase, 'SVG/Graph/BarBase')

data/test/test_svg_graph.rb

@@ -2,54 +2,54 @@ require "test/unit"
 require "svggraph"
 
 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_plot
-	  
-	  projection = [
+    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_plot
+        
+        projection = [
          6, 11,    0, 5,   18, 7,   1, 11,   13, 9,   1, 2,   19, 0,   3, 13,
          7, 9 
-       ]
-       actual = [
+        ]
+        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,
+        ]
+        
+        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
+        })
+        
+        graph.add_data({
+        :data => projection, 
+          :title => 'Projected',
+        })
+        
+        graph.add_data({
+        :data => actual,
+          :title => 'Actual',
+        })
+        
+        out=graph.burn()
+        assert(out=~/Created with SVG::Graph/)
+    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: svg-graph
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Sean Russell
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-01 00:00:00 -04:00
+date: 2009-09-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,9 +21,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
+        version: 2.3.3
     version: 
-description: 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.
+description: |-
+  Gem version of SVG:::Graph.
+  
+  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
 - clbustos_AT_gmail.com
@@ -56,7 +59,9 @@ files:
 - lib/SVG/Graph/TimeSeries.rb
 - test/test_svg_graph.rb
 has_rdoc: true
-homepage: Gem version of SVG::Graph, available on http://www.germane-software.com/software/SVG/SVG::Graph/
+homepage: http://www.germane-software.com/software/SVG/SVG::Graph/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -78,9 +83,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ruby-statsample
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
-summary: 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
+specification_version: 3
+summary: Gem version of SVG:::Graph
 test_files: 
 - test/test_svg_graph.rb