svg-graph 1.0.5 → 2.0.1

data/lib/SVG/Graph/Plot.rb

@@ -1,5 +1,5 @@
-require 'SVG/Graph/Graph'
-require 'SVG/Graph/DataPoint'
+require_relative 'Graph'
+require_relative 'DataPoint'
 
 module SVG
   module Graph

data/lib/SVG/Graph/Schedule.rb

@@ -1,8 +1,5 @@
-require 'SVG/Graph/Plot'
-TIME_PARSE_AVAIL = (RUBY_VERSION =~ /1\.9\./) ? true : false
-if not TIME_PARSE_AVAIL then
-  require 'parsedate'
-end
+require 'date'
+require_relative 'Plot'
 
 module SVG
   module Graph
@@ -132,14 +129,23 @@ module SVG
       #   graph.add_data( 
       #     :data => d1,
       #     :title => 'Meetings'
+      #     :template => '%H:%M'
       #   )
       #   graph.add_data(
       #     :data => d2,
       #     :title => 'Plays'
+      #     :template => '%d/%m/%y'
       #   )
       #
       # Note that the data must be in time,value pairs, and that the date format
-      # may be any date that is parseable by ParseDate.
+      # may be any date that is parseable by DateTime#parse, DateTime#strptime.
+      # The :template argument is optional. By default DateTime#parse will be used.
+      # Checkout the ruby doc for valit template notation:
+      # http://ruby-doc.org/stdlib-2.3.1/libdoc/date/rdoc/Date.html#method-i-strftime
+      # http://ruby-doc.org/stdlib-2.3.1/libdoc/date/rdoc/DateTime.html#method-c-parse
+      # http://ruby-doc.org/stdlib-2.3.1/libdoc/date/rdoc/DateTime.html#method-c-strptime.
+      # 
+      # 
       # Also note that, in this example, we're mixing scales; the data from d1
       # will probably not be discernable if both data sets are plotted on the same
       # graph, since d1 is too granular.
@@ -153,7 +159,6 @@ module SVG
           "data points" unless data[:data].length % 3 == 0
         return if data[:data].length == 0
 
-
         y = []
         x_start = []
         x_end = []
@@ -162,13 +167,12 @@ module SVG
           if im3 == 0
             y << data[:data][i]
           else
-            if TIME_PARSE_AVAIL then
-              arr = DateTime.parse(data[:data][i])
-              t = arr.to_time
+            if data.has_key?(:template) && data[:template].kind_of?(String)
+              arr = DateTime.strptime(data[:data][i], data[:template])
             else
-              arr = ParseDate.parsedate( data[:data][i] )
-              t = Time.local( *arr[0,6].compact )
+              arr = DateTime.parse(data[:data][i])
             end
+            t = arr.to_time
             (im3 == 1 ? x_start : x_end) << t.to_i
           end
         }
@@ -180,13 +184,8 @@ module SVG
       protected
 
       def min_x_value=(value)
-        if TIME_PARSE_AVAIL then
-          arr = Time.parse(value)
-          t = arr.to_time
-        else
-          arr = ParseDate.parsedate( value )
-          t = Time.local( *arr[0,6].compact )
-        end
+        arr = Time.parse(value)
+        t = arr.to_time
         @min_x_value = t.to_i
       end
 

data/lib/SVG/Graph/TimeSeries.rb

@@ -1,8 +1,5 @@
-require 'SVG/Graph/Plot'
-TIME_PARSE_AVAIL = (RUBY_VERSION =~ /1\.9\./) ? true : false
-if not TIME_PARSE_AVAIL then
-  require 'parsedate'
-end
+require 'date'
+require_relative 'Plot'
 
 module SVG
   module Graph
@@ -13,7 +10,7 @@ module SVG
     #   require 'SVG/Graph/TimeSeries'
     #   
     #   # Data sets are x,y pairs
-    #   projection = ["6/17/72", 11,    "1/11/72", 7,    "4/13/04 17:31", 11,
+    #   projection = ["6/17/72", 11,    "1/11/72", 7,    "4/13/04", 11,
     #                "9/11/01", 9,    "9/1/85", 2,    "9/1/88", 1,    "1/15/95", 13]
     #   actual = ["8/1/73", 18,    "3/1/77", 15,    "10/1/98", 4,
     #             "5/1/02", 14,    "3/1/95", 6,    "8/1/91", 12,    "12/1/87", 6,
@@ -30,8 +27,8 @@ module SVG
     #     :key => true,
     #     :scale_x_integers => true,
     #     :scale_y_integers => true,
-    #     :min_x_value => 0,
-    #     :min_y_value => 0,
+    #     :min_x_value => 0,  # Integer, Time, or parseable by DateTime#parse
+    #     :min_y_value => 0,  # Integer, Time, or parseable by DateTime#parse
     #     :show_data_values => true,
     #     :show_x_guidelines => true,
     #     :show_x_title => true,
@@ -44,13 +41,15 @@ module SVG
     #   })
     #   
     #   graph.add_data({
-    #           :data => projection,
+    #     :data => projection,
     #     :title => 'Projected',
+    #     :template => '%d/%m/%y'
     #   })
     #   
     #   graph.add_data({
-    #           :data => actual,
+    #     :data => actual,
     #     :title => 'Actual',
+    #     :template => '%d/%m/%y'
     #   })
     #   
     #   print graph.burn()
@@ -81,7 +80,7 @@ module SVG
     # and that the data in the datasets needn't be in order; they will be ordered
     # by the plot along the X-axis.
     # 
-    # The dates must be parseable by ParseDate, but otherwise can be
+    # The dates must be parseable by DateTime#parse or DateTime#strptime, but otherwise can be
     # any order of magnitude (seconds within the hour, or years)
     # 
     # = See also
@@ -138,31 +137,37 @@ module SVG
       #                                #                           ("14:20",6)  
       #   graph.add_data( 
       #     :data => d1,
-      #     :title => 'One'
+      #     :title => 'One',
+      #     :template => '%H:%M'
       #   )
       #   graph.add_data(
       #     :data => d2,
-      #     :title => 'Two'
+      #     :title => 'Two',
+      #     :template => '%H:%M'
       #   )
       #
       # Note that the data must be in time,value pairs. The time may be any date in
       # a format that is parseable by ParseDate, a Time object, or a number of seconds
       # after the unix epoch.
       def add_data data
+        @time_template = data[:template]
         data[:data].each_index do |i|
           data[:data][i] = parse_time(data[:data][i]).to_i if i % 2 == 0
         end
+        @time_template = nil # reset for the next data series
         super(data)
       end
 
 
       protected
 
+      
       def min_x_value=(value)
         t = parse_time(value)
         @min_x_value = t.to_i
       end
 
+      # value should be 
       def max_x_value=(value)
         t = parse_time(value)
         @max_x_value = t.to_i
@@ -190,12 +195,10 @@ module SVG
         when Time
           return time
         when String
-          if TIME_PARSE_AVAIL then
-            arr = DateTime.parse(time)
-            return arr.to_time
+          if @time_template.kind_of? String
+            return DateTime.strptime(time, @time_template).to_time
           else
-            arr = ParseDate.parsedate(time)
-            return Time.local( *arr[0,6].compact )
+            return DateTime.parse(time).to_time
           end
         when Integer
           return Time.at(time)
@@ -252,7 +255,8 @@ module SVG
         end
         min.step( max, scale_division ) {|v| rv << v}
         return rv
-      end
-    end
-  end
-end
+      end # get_x_values
+      
+    end # class TimeSeries
+  end # module Graph
+end # module SVG

data/lib/svggraph.rb

@@ -1,14 +1,16 @@
 module SVG
   module Graph
-    VERSION = '1.0.5'
-    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')
+    VERSION = '2.0.1'
   end
 end
+require_relative 'SVG/Graph/DataPoint'
+require_relative 'SVG/Graph/BarBase'
+require_relative 'SVG/Graph/Graph'
+require_relative 'SVG/Graph/Bar'
+require_relative 'SVG/Graph/BarHorizontal'
+require_relative 'SVG/Graph/ErrBar'
+require_relative 'SVG/Graph/Line'
+require_relative 'SVG/Graph/Pie'
+require_relative 'SVG/Graph/Plot'
+require_relative 'SVG/Graph/Schedule'
+require_relative 'SVG/Graph/TimeSeries'

data/test/test_svg_graph.rb

@@ -1,9 +1,14 @@
-$: << File.dirname(__FILE__) + '/../lib'
-require "test/unit"
-require "svggraph"
-require "SVG/Graph/DataPoint"
+require_relative '../lib/svggraph'
+require_relative '../lib/SVG/Graph/DataPoint'
+require 'minitest/autorun'
+require 'minitest/reporters'
+
+reporter_options = { :color => true }
+Minitest::Reporters.use! [Minitest::Reporters::DefaultReporter.new(reporter_options)]
+
+
+class TestSvgGraph < Minitest::Test
 
-class TestSvgGraph < Test::Unit::TestCase
   def test_bar_line_and_pie
     fields = %w(Jan Feb Mar);
     data_sales_02 = [12, 45, 21]
@@ -21,6 +26,43 @@ class TestSvgGraph < Test::Unit::TestCase
       out=graph.burn
       assert(out=~/Created with SVG::Graph/)
     end
-  end
+  end # test_bar_line_and_pie
+  
+  def test_pie_100_percent
+    fields = %w(Internet TV Newspaper Magazine Radio)
+    #data1 = [2, 3, 1, 3, 1]
+    #data2 = [0, 2, 1, 5, 4]
+    data1 = [0, 3, 0, 0, 0]
+    data2 = [0, 6, 0, 0, 0]
+    
+    graph = SVG::Graph::Pie.new(
+        :height => 500,
+        :width => 300,
+        :fields => fields,
+        :graph_title => "100% pie",
+        :show_graph_title => true,
+        :show_data_labels => true,
+        :show_x_guidelines => true,
+        :show_x_title => true,
+        :x_title => "Time"
+      )
+    graph.add_data(
+        :data => data1,
+        :title => 'data1'
+      )
+    
+    graph.add_data(
+        :data => data2,
+        :title => 'data2'
+      )
+    out = graph.burn
+    File.open("pie_100.svg", "w") {|fout| 
+      fout.print( out )
+    }
+    assert_match(/TV 100%/, out, "100% text not found in graph") 
+    assert_match(/circle/, out, "no circle was found in graph")
+
+  end # test_pie_100_percent
+  
 end
 

metadata

@@ -1,118 +1,49 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: svg-graph
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 5
-  version: 1.0.5
+version: !ruby/object:Gem::Version
+  version: 2.0.1
 platform: ruby
-authors: 
+authors:
 - Sean Russell
 - Claudio Bustos
 - Liehann Loots
 - Piergiuliano Bossi
+- Manuel Widmer
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDMjCCAhqgAwIBAgIBADANBgkqhkiG9w0BAQUFADA/MREwDwYDVQQDDAhjbGJ1
-  c3RvczEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
-  MB4XDTEwMDMyOTIxMzg1NVoXDTExMDMyOTIxMzg1NVowPzERMA8GA1UEAwwIY2xi
-  dXN0b3MxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
-  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf8JVMGqE7m5kYb+PNN
-  neZv2pcXV5fQCi6xkyG8bi2/SIFy/LyxuvLzEeOxBeaz1Be93bayIUquOIqw3dyw
-  /KXWa31FxuNuvAm6CN8fyeRYX/ou4cw3OIUUnIvB7RMNIu4wbgeM6htV/QEsNLrv
-  at1/mh9JpqawPrcjIOVMj4BIp67vmzJCaUf+S/H2uYtSO09F+YQE3tv85TPeRmqU
-  yjyXyTc/oJiw1cXskUL8UtMWZmrwNLHXuZWWIMzkjiz3UNdhJr/t5ROk8S2WPznl
-  0bMy/PMIlAbqWolRn1zl2VFJ3TaXScbqImY8Wf4g62b/1ZSUlGrtnLNsCYXrWiso
-  UPUCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFGu9
-  rrJ1H64qRmNNu3Jj/Qjvh0u5MA0GCSqGSIb3DQEBBQUAA4IBAQCV0Unka5isrhZk
-  GjqSDqY/6hF+G2pbFcbWUpjmC8NWtAxeC+7NGV3ljd0e1SLfoyBj4gnFtFmY8qX4
-  K02tgSZM0eDV8TpgFpWXzK6LzHvoanuahHLZEtk/+Z885lFene+nHadkem1n9iAB
-  cs96JO9/JfFyuXM27wFAwmfHCmJfPF09R4VvGHRAvb8MGzSVgk2i06OJTqkBTwvv
-  JHJdoyw3+8bw9RJ+jLaNoQ+xu+1pQdS2bb3m7xjZpufml/m8zFCtjYM/7qgkKR8z
-  /ZZt8lCiKfFArppRrZayE2FVsps4X6WwBdrKTMZ0CKSXTRctbEj1BAZ67eoTvBBt
-  rpP0jjs0
-  -----END CERTIFICATE-----
-
-date: 2011-10-03 00:00:00 -03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 8
-        - 0
-        version: 2.8.0
-  type: :development
-  version_requirements: *id001
-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.
-email: 
+cert_chain: []
+date: 2016-08-08 00:00:00.000000000 Z
+dependencies: []
+description: "Gem version of SVG:::Graph. SVG:::Graph is a pure Ruby library for generating
+  charts, \nwhich are a type of graph where the values of one axis are not scalar.
+  SVG::Graph has a verry similar API to \nthe Perl library SVG::TT::Graph, and the
+  resulting charts also look the same. This isn't surprising, \nbecause SVG::Graph
+  started as a loose port of SVG::TT::Graph, although the internal code no longer
+  resembles \nthe Perl original at all.\n  "
+email:
 - ser_AT_germane-software.com
 - clbustos_AT_gmail.com
-- liehhanl_AT_gmail.com
-- pgbossi_AT_gmail.com
+- liehannl_AT_gmail_DOT_com
+- pgbossi_AT_gmail_DOT_com
+- m-widmer_AT_gmx_DOT_ch
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- GPL.txt
-- History.txt
+extra_rdoc_files:
 - LICENSE.txt
-- Manifest.txt
+- README.markdown
 - README.txt
-files: 
+files:
 - GPL.txt
 - History.txt
 - LICENSE.txt
-- Manifest.txt
 - README.markdown
 - README.txt
 - Rakefile
-- build.xml
-- dist.xml.in
-- images/bar.png
-- images/bar.svg
-- images/bar.svgz
-- images/barhorizontal.png
-- images/barhorizontal.svg
-- images/barhorizontal.svgz
-- images/line.png
-- images/line.svg
-- images/line.svgz
-- images/pie.png
-- images/pie.svg
-- images/pie.svgz
-- images/plot.png
-- images/plot.svg
-- images/plot.svgz
-- images/schedule.png
-- images/schedule.svg
-- images/timeseries.png
-- images/timeseries.svg
-- images/timeseries.svgz
-- index.xml
-- 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/ErrBar.rb
 - lib/SVG/Graph/Graph.rb
 - lib/SVG/Graph/Line.rb
 - lib/SVG/Graph/Pie.rb
@@ -120,56 +51,30 @@ files:
 - lib/SVG/Graph/Schedule.rb
 - lib/SVG/Graph/TimeSeries.rb
 - lib/svggraph.rb
-- screenshots.xml
-- style/common.xsl
-- style/release_html.xsl
-- style/release_txt.xsl
-- svg-graph.gemspec
-- test/data.txt
-- 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
-has_rdoc: true
 homepage: http://www.germane-software.com/software/SVG/SVG::Graph/
-licenses: []
-
+licenses:
+- GPL
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --main
-- README.txt
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+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
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: ruby-statsample
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
-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
+specification_version: 4
+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.
+test_files: []