simple_charts 0.0.6 → 0.0.7

data/lib/simple_charts.rb

@@ -3,14 +3,13 @@ require 'simple_charts/version'
 module SimpleCharts
   class Chart
 
-    def create_pie_paths(data, opts)
-
+    def create_doughnut_paths(data, opts)
       total = data.inject(:+)
       segments = data.map{ |val| 360 * val / total }
       centroid = opts[:width] / 2
-      centroid_padding = 5
-      radius = centroid - centroid_padding
-
+      svg_padding = 5
+      centroid_padding = opts[:centroid_padding] || 0
+      radius = centroid - svg_padding
       end_angle = 0
       paths = []
 
@@ -18,12 +17,28 @@ module SimpleCharts
         start_angle = end_angle
         end_angle = start_angle + segment
 
-        x1 = (centroid + radius * Math.cos(Math::PI * start_angle / 180)).round.to_s
-        y1 = (centroid + radius * Math.sin(Math::PI * start_angle / 180)).round.to_s
-        x2 = (centroid + radius * Math.cos(Math::PI * end_angle / 180)).round.to_s
-        y2 = (centroid + radius * Math.sin(Math::PI * end_angle / 180)).round.to_s
+        outer_edge_start_x = (centroid + radius * Math.cos(Math::PI * start_angle / 180)).round.to_s
+        outer_edge_start_y = (centroid + radius * Math.sin(Math::PI * start_angle / 180)).round.to_s
+        outer_edge_end_x = (centroid + radius * Math.cos(Math::PI * end_angle / 180)).round.to_s
+        outer_edge_end_y = (centroid + radius * Math.sin(Math::PI * end_angle / 180)).round.to_s
+        inner_edge_end_x = (centroid + centroid_padding * Math.cos(Math::PI * end_angle / 180)).round.to_s
+        inner_edge_end_y = (centroid + centroid_padding * Math.sin(Math::PI * end_angle / 180)).round.to_s
+        inner_edge_start_x = (centroid + centroid_padding * Math.cos(Math::PI * start_angle / 180)).round.to_s
+        inner_edge_start_y = (centroid + centroid_padding * Math.sin(Math::PI * start_angle / 180)).round.to_s
+
+        # move to start of outer arc
+        path = 'M' + outer_edge_start_x + ',' + outer_edge_start_y
+
+        # arc to outer edge of segment
+        path += ' A ' + radius.to_s + ',' + radius.to_s + ' 0 ' + ((end_angle - start_angle > 180) ? '1' : '0') + ' 1 ' + outer_edge_end_x + ',' + outer_edge_end_y
+
+        # line to inner edge of segment
+        path += ' L ' + inner_edge_end_x + ',' + inner_edge_end_y
+
+        # arc to inner other edge of segment
+        path += ' A ' + centroid_padding.to_s + ',' + centroid_padding.to_s + ' 0 ' + ((end_angle - start_angle > 180) ? '1' : '0') + ' 0 ' + inner_edge_start_x + ',' + inner_edge_start_y + ' z'
 
-        paths << 'M' + centroid.to_s + ',' + centroid.to_s + ' L' + x1 + ',' + y1 + ' A' + radius.to_s + ',' + radius.to_s + ' 0 ' + ((end_angle - start_angle > 180) ? '1' : '0') + ',1 ' + x2 + ',' + y2 + ' z'
+        paths << path
       end
 
       paths
@@ -32,13 +47,10 @@ module SimpleCharts
     def render(type, data, opts)
       svg = "<svg width='#{opts[:width]}' height='#{opts[:height]}' id='#{opts[:id]}' xmlns='http://www.w3.org/2000/svg'>"
 
-      case type
-        when 'pie'
-          create_pie_paths(data, opts).each_with_index do |path, index|
-            svg += "<path d='#{path}' id='#{opts[:id]}-path-#{index}'></path>"
-          end
-        else
-          # error
+      if type == 'pie' || type == 'doughnut'
+        create_doughnut_paths(data, opts).each_with_index do |path, index|
+          svg += "<path d='#{path}' id='#{opts[:id]}-path-#{index}'></path>"
+        end
       end
 
       svg + '</svg>'

data/lib/simple_charts/version.rb

@@ -1,3 +1,3 @@
 module SimpleCharts
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_charts
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -69,7 +69,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3323566945862839880
+      hash: -649686454733890820
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3323566945862839880
+      hash: -649686454733890820
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24