svg-graph 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b402bac1f075fc4fc1a67ffcdc113f39594c80a
-  data.tar.gz: c1eceab98a933da3ff83e28dca1d7dfa68327600
+  metadata.gz: e90898ce4dcd05963231c3079d62310773f6d5fd
+  data.tar.gz: 8a3008024055118d688581ff05b09e572d78e35b
 SHA512:
-  metadata.gz: ed49ba27640773bad9f5c1f2853c134e882e3ebb373df57a32f9fcf63532ad01aa7f4255e4b9bedb2ad0dde4e08393d77359185bcaed8f961d2b4d594ed6f93f
-  data.tar.gz: a5c059786637278c40f686a14661e5a94ebcebbd7d0ebe969d9d5e383aa6bdcb9da47ac96573e3f4f525e8b52510a1056a169c75b66d4d2439c8a9b664b545d9
+  metadata.gz: c8b0aa6aafcbf93f64b3410d28d9a8f22b38ecaac4953cdb0d0e577d090f3f6a5772f7340cec6a3e259f43b4318e4ce35cc4bed35f5ca9776501b95a1efe7a5b
+  data.tar.gz: 1f556e4a745c961400275e1cb5dbafaa5ac22ef9a23caed138bc12c338c473897c46bb9e2af20396928196b63a87d061d7f953ccff161b8f50725d37340bf6e8

data/History.txt

@@ -1,6 +1,13 @@
 TODO / Backlog
 * add unit tests for all types of graphs
 * refactor various hardcoded constant pixel offsets in Graph class to use named constants or variables
+* add support for c3js / d3js based graphs, see http://c3js.org/
+
+=== 2.2.0 / todo
+
+
+=== 2.1.3 / 2017-12-27
+* fixes float comparison and color for pie chart [thanks tiwi, pull request #7]
 
 === 2.1.2 / 2017-02-26
 * show_key_actual_values in pie chart lets user chose to show values in key [thanks olegsfinest, pull request #5]

data/lib/SVG/Graph/Pie.rb

@@ -3,30 +3,30 @@ require_relative 'Graph'
 module SVG
   module Graph
     # === Create presentation quality SVG pie graphs easily
-    # 
+    #
     # == Synopsis
-    # 
+    #
     #   require 'SVG/Graph/Pie'
-    # 
+    #
     #   fields = %w(Jan Feb Mar)
     #   data_sales_02 = [12, 45, 21]
-    #   
+    #
     #   graph = SVG::Graph::Pie.new({
     #   	:height => 500,
     # 	  :width  => 300,
     # 	  :fields => fields,
     #   })
-    #   
+    #
     #   graph.add_data({
     #   	:data => data_sales_02,
     # 	  :title => 'Sales 2002',
     #   })
-    #   
+    #
     #   print "Content-type: image/svg+xml\r\n\r\n"
     #   print graph.burn();
-    # 
+    #
     # == Description
-    # 
+    #
     # This object aims to allow you to easily create high quality
     # SVG pie graphs. You can either use the default style sheet
     # or supply your own. Either way there are many options which can
@@ -35,9 +35,9 @@ module SVG
     # title, subtitle etc.
     #
     # = Examples
-    # 
+    #
     # http://www.germane-software/repositories/public/SVG/test/single.rb
-    # 
+    #
     # == See also
     #
     # * SVG::Graph::Graph
@@ -73,8 +73,8 @@ module SVG
       def set_defaults
         init_with(
           :show_shadow		        => true,
-          :shadow_offset	        => 10, 
-          
+          :shadow_offset	        => 10,
+
           :show_data_labels	      => false,
           :show_actual_values     => false,
           :show_percent		        => true,
@@ -82,11 +82,11 @@ module SVG
           :show_key_data_labels	  => true,
           :show_key_actual_values => true,
           :show_key_percent		    => false,
-          
+
           :expanded				        => false,
           :expand_greatest		    => false,
           :expand_gap             => 10,
-          
+
           :show_x_labels          => false,
           :show_y_labels          => false,
           :datapoint_font_size    => 12
@@ -110,7 +110,7 @@ module SVG
       #   graph.add_data( { :data => [3,5,8,13] } )
       #
       # nil values in the array will be replaced by 0
-      #   
+      #
       #   graph.add_data( { :data => [3,nil,nil,2] } ) is equivalent to graph.add_data( { :data => [3,0,0,2] } )
       #
       def add_data arg
@@ -123,28 +123,28 @@ module SVG
       end
 
       # If true, displays a drop shadow for the chart
-      attr_accessor :show_shadow 
+      attr_accessor :show_shadow
       # Sets the offset of the shadow from the pie chart
       attr_accessor :shadow_offset
       # If true, display the data labels on the chart
-      attr_accessor :show_data_labels 
+      attr_accessor :show_data_labels
       # If true, display the actual field values in the data labels
-      attr_accessor :show_actual_values 
+      attr_accessor :show_actual_values
       # If true, display the percentage value of each pie wedge in the data
       # labels
       attr_accessor :show_percent
       # If true, display the labels in the key
-      attr_accessor :show_key_data_labels 
+      attr_accessor :show_key_data_labels
       # If true, display the actual value of the field in the key
-      attr_accessor :show_key_actual_values 
+      attr_accessor :show_key_actual_values
       # If true, display the percentage value of the wedges in the key
       attr_accessor :show_key_percent
       # If true, "explode" the pie (put space between the wedges)
-      attr_accessor :expanded 
+      attr_accessor :expanded
       # If true, expand the largest pie wedge
-      attr_accessor :expand_greatest 
+      attr_accessor :expand_greatest
       # The amount of space between expanded wedges
-      attr_accessor :expand_gap 
+      attr_accessor :expand_gap
       # The font size of the data point labels
       attr_accessor :datapoint_font_size
 
@@ -219,21 +219,20 @@ module SVG
           max_value = max_value < x ? x : max_value
           total += x
         }
-        percent_scale = 100.0 / total
 
         prev_percent = 0
         rad_mult = 3.6 * RADIANS
         @config[:fields].each_index { |count|
           value = @data[count].to_f
-          percent = percent_scale * value
+          percent = 100.0 * value / total
           radians = prev_percent * rad_mult
 
-          if percent == 100.0
+          if percent.rationalize(0.001) == 100.0
             @foreground.add_element( "circle", {
               "cx" => radius.to_s,
               "cy" => radius.to_s,
               "r" => radius.to_s,
-              "class" => "fill1"
+              "class" => "fill#{count+1}"
             })
 
             if show_shadow
@@ -357,73 +356,73 @@ module SVG
 	fill: #ff0000;
 	fill-opacity: 0.7;
 	stroke: none;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .key2,.fill2{
 	fill: #0000ff;
 	fill-opacity: 0.7;
 	stroke: none;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .key3,.fill3{
 	fill-opacity: 0.7;
 	fill: #00ff00;
 	stroke: none;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .key4,.fill4{
 	fill-opacity: 0.7;
 	fill: #ffcc00;
 	stroke: none;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .key5,.fill5{
 	fill-opacity: 0.7;
 	fill: #00ccff;
 	stroke: none;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .key6,.fill6{
 	fill-opacity: 0.7;
 	fill: #ff00ff;
 	stroke: none;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .key7,.fill7{
 	fill-opacity: 0.7;
 	fill: #00ff99;
 	stroke: none;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .key8,.fill8{
 	fill-opacity: 0.7;
 	fill: #ffff00;
 	stroke: none;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .key9,.fill9{
 	fill-opacity: 0.7;
 	fill: #cc6666;
 	stroke: none;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .key10,.fill10{
 	fill-opacity: 0.7;
 	fill: #663399;
 	stroke: none;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .key11,.fill11{
 	fill-opacity: 0.7;
 	fill: #339900;
 	stroke: none;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 .key12,.fill12{
 	fill-opacity: 0.7;
 	fill: #9966FF;
 	stroke: none;
-	stroke-width: 1px;	
+	stroke-width: 1px;
 }
 EOL
       end

data/lib/svggraph.rb

@@ -1,6 +1,6 @@
 module SVG
   module Graph
-    VERSION = '2.1.2'
+    VERSION = '2.1.3'
   end
 end
 require_relative 'SVG/Graph/DataPoint'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svg-graph
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Sean Russell
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-10 00:00:00.000000000 Z
+date: 2017-12-27 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.
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: SVG:::Graph is a pure Ruby library for generating charts, which are a type