prawn-graph 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28701ddd8575d49883e813d18fbf43297ed88cb9
-  data.tar.gz: 01ace96eb5fca82f47f1095d59f0a8b4dd4b4c4c
+  metadata.gz: 804e9234484be154069bb231f7fa2e888e6e8c8a
+  data.tar.gz: 548f36e31f80f7ec89d9d9753b084c206b6670d7
 SHA512:
-  metadata.gz: c809b60ff93e6fb1729e48c9d982dcdc8dc959125ad790a5d70fb12164063be420c686ca79192567324ad71283e5de68bb40cfa002d0574959b22550e35481d7
-  data.tar.gz: 562932100c59e894f7cc16882203609bde13f8eec75920139e2babed166305f4e4a7340fbb8183a0686d3b78d526ab3a4348fabd023bf0a2ce9c503453d82d65
+  metadata.gz: 3874e72db6f60168ac807977c982971cfb2285f3e7d8753bbf224537d35bd5419fcf2995c6654bef430a4cd38f1055b8c6f9a6511dd1c86c1827ae4b90a17c4d
+  data.tar.gz: 6a9b880eb51c053419ce53fc40d8aab4372c4263186536d46609c774e45b04c672c91fd228527855dc99e8bd4373d494831cb5d736b684386f8840d605bd54b5

data/lib/prawn/graph/chart_components/series_renderer.rb

@@ -57,11 +57,11 @@ module Prawn
                   this_x_offset    = ((spacing * j) - spacing) + (spacing / 2.0)
 
 
-                  prawn.stroke_line([previous_x_offset, previous_y], [ this_x_offset, this_y ])
+                  prawn.stroke_line([previous_x_offset, previous_y], [ this_x_offset, this_y ]) unless previous_value.zero? || this_value.zero?
                   
                   prawn.fill_color = @canvas.theme.markers
-                  prawn.fill_ellipse([ ( previous_x_offset), previous_y ], 1)
-                  prawn.fill_ellipse([ ( this_x_offset), this_y ], 1)
+                  prawn.fill_ellipse([ ( previous_x_offset), previous_y ], 1)  unless previous_value.zero? || this_value.zero?
+                  prawn.fill_ellipse([ ( this_x_offset), this_y ], 1)  unless previous_value.zero? || this_value.zero?
 
                   if @series.mark_minimum? && min_marked == false && previous_value != 0 && previous_value == @series.min 
                     prawn.save_graphics_state do
@@ -146,6 +146,21 @@ module Prawn
             prawn.stroke_vertical_line(0, @plot_area_height, at: 0) 
             prawn.fill_and_stroke_ellipse [ 0,0], 1
 
+            max = @series.max
+            min = @series.min
+            avg = @series.avg
+            mid = (min + max) / 2
+
+            max_y = (point_height_percentage(max) * @plot_area_height).to_f
+            min_y = (point_height_percentage(min) * @plot_area_height).to_f
+            mid_y = (point_height_percentage(mid) * @plot_area_height).to_f
+            avg_y = (point_height_percentage(avg) * @plot_area_height).to_f
+
+            prawn.text_box "#{max}", at: [-14, max_y], height: 5, overflow: :shrink_to_fit, width: 12, valign: :bottom, align: :right
+            prawn.text_box "#{mid}", at: [-14, mid_y], height: 5, overflow: :shrink_to_fit, width: 12, valign: :bottom, align: :right
+            prawn.text_box "#{avg}", at: [-14, avg_y], height: 5, overflow: :shrink_to_fit, width: 12, valign: :bottom, align: :right
+            prawn.text_box "#{min}", at: [-14, min_y], height: 5, overflow: :shrink_to_fit, width: 12, valign: :bottom, align: :right
+
             return if @canvas.options[:xaxis_labels].size.zero?
 
             width_of_each_label = (@plot_area_width / @canvas.options[:xaxis_labels].size) - 1
@@ -222,7 +237,7 @@ module Prawn
                     x_position = ( (starting + (series_offset * width) ).to_f - (width / 2.0))
                     y_position = ((point_height_percentage(@series[series_index].values[point]) * @plot_area_height) - 5).to_f
 
-                    prawn.fill_and_stroke_line([ x_position ,0], [x_position ,y_position])
+                    prawn.fill_and_stroke_line([ x_position ,0], [x_position ,y_position]) unless @series[series_index].values[point].zero?
 
                     if @series[series_index].mark_average?
                       average_y_coordinate = (point_height_percentage(@series[series_index].avg) * @plot_area_height) - 5
@@ -278,6 +293,21 @@ module Prawn
             prawn.stroke_vertical_line(0, @plot_area_height, at: 0) 
             prawn.fill_and_stroke_ellipse [ 0,0], 1
 
+            max = @series.collect(&:max).max
+            min = @series.collect(&:min).min
+            avg = ((BigDecimal(@series.collect(&:avg).inject(:+), 10) / @series.collect(&:avg).size).round(2)).to_f
+            mid = (min + max) / 2
+
+            max_y = (point_height_percentage(max) * @plot_area_height).to_f
+            min_y = (point_height_percentage(min) * @plot_area_height).to_f
+            mid_y = (point_height_percentage(mid) * @plot_area_height).to_f
+            avg_y = (point_height_percentage(avg) * @plot_area_height).to_f
+
+            prawn.text_box "#{max}", at: [-14, max_y], height: 5, overflow: :shrink_to_fit, width: 12, valign: :bottom, align: :right
+            prawn.text_box "#{mid}", at: [-14, mid_y], height: 5, overflow: :shrink_to_fit, width: 12, valign: :bottom, align: :right
+            prawn.text_box "#{avg}", at: [-14, avg_y], height: 5, overflow: :shrink_to_fit, width: 12, valign: :bottom, align: :right
+            prawn.text_box "#{min}", at: [-14, min_y], height: 5, overflow: :shrink_to_fit, width: 12, valign: :bottom, align: :right
+
             return if @canvas.options[:xaxis_labels].size.zero?
 
             width_of_each_label = (@plot_area_width / @canvas.options[:xaxis_labels].size) - 1

data/lib/prawn/graph/version.rb

@@ -1,5 +1,5 @@
 module Prawn
   module Graph
-    VERSION = "0.9.6"
+    VERSION = "0.9.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prawn-graph
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Ryan Stenhouse
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-16 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -144,6 +144,7 @@ files:
 - lib/prawn/graph/theme.rb
 - lib/prawn/graph/version.rb
 - prawn-graph.gemspec
+- test.pdf
 homepage: http://prawn-graph.ryanstenhouse.jp
 licenses:
 - MIT