prawn-graph 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d0a4c3175c0641db328c6713e13f86db27d04a2
-  data.tar.gz: 0604788d0fdfcba265040cc8f82cc2061fc3e86b
+  metadata.gz: bab79a3dc4ba1072ba72479b83ac9de8a1d38922
+  data.tar.gz: 6c23d7a89268e42bfff25b1da58bcb49adc7e3bc
 SHA512:
-  metadata.gz: 0b22c30fc8ec27404d3cf5482ac90e8b23204929eadf7982014be9993ad0197cb77c04808ef99dd47a55bcfb2cc7ab9bed314343d7c8022cebbb6b8d011b3bd0
-  data.tar.gz: f4b3bae5bdc387dc4ce5e93871b924313a1f16c1ed630e42a2d1d0c489a2037b0f07ef8f3cbead3def6de31e9336dc5a288cb12f8e311a9f1eb7718f1ceff0b1
+  metadata.gz: b6b4482768b7d5470a3a3913698cd8669a391d8947a576c540d45938a76c62b644705f7572fd7474e21a218b2aab72d1a3a7c342d1dcacdbcfddbbcf79050898
+  data.tar.gz: d4666cd5006ccaef777fe90c882b36da57a170903dd1017588b037ddd9d5070b81533c86db743ce4fb2acab5083926a72888e0a1e07a3f20e5a617699611a4c9

data/README.md

@@ -104,10 +104,10 @@ Option      | Data type | Description
   require 'prawn-graph'
 
   series = []
-  series << Prawn::Graph::Series.new([5,4,3,2,1,1,2,8,7,5,4,9,2], title: "A label for a series", type: :bar)
-  series << Prawn::Graph::Series.new([5,4,3,2,1,1,2,8,7,5,4,9,2].reverse, title: "Another label", type: :bar)
-  series << Prawn::Graph::Series.new([1,2,3,4,5,9,6,4,5,6,3,2,9], title: "Yet another label", type: :bar)
-  series << Prawn::Graph::Series.new([1,2,3,4,5,9,6,4,5,6,3,2,9].shuffle, title: "One final label", type: :line)
+  series << Prawn::Graph::Series.new([4,9,3,2,1,6,2,8,2,3,4,9,2], title: "A label for a series", type: :bar, mark_average: true)
+  series << Prawn::Graph::Series.new([5,4,3,2,7,9,2,8,7,5,4,9,2].reverse, title: "Another label", type: :line, mark_average: true)
+  series << Prawn::Graph::Series.new([1,2,3,4,5,9,6,4,5,6,3,2,11], title: "Yet another label", type: :bar)
+  series << Prawn::Graph::Series.new([1,2,3,4,5,12,6,4,5,6,3,2,9].shuffle, title: "One final label", type: :line, mark_average: true)
 
   Prawn::Document.generate('test.pdf') do
     graph series, width: 500, height: 200, title: "A Title for the chart", at: [10,700]

data/lib/prawn/graph/calculations/layout_calculator.rb

@@ -53,6 +53,7 @@ module Prawn
           @canvas_height = BigDecimal(attributes[:height], 10) rescue 0
           @num_series = attributes[:series_count] || 1
           @title = attributes[:title]
+          @show_series_key = !attributes[:show_series_key].nil? ? attributes[:show_series_key]  : true
         end
 
         def calculate_width_and_height_of_canvas
@@ -80,7 +81,7 @@ module Prawn
         end
 
         def calculate_key_area
-          if @num_series > 1
+          if @num_series > 1 && @show_series_key
             @series_key_area[:width] = ( (canvas_width / 100) * 25 ).round
             @series_key_area[:x] = (canvas_width - @series_key_area[:width] - hpadding)
             @series_key_area[:y] = canvas_height + vpadding

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

@@ -91,6 +91,7 @@ module Prawn
                   prawn.line_width = 0.5
                   prawn.fill_color = theme.series[i]
 
+                  
                   series_offset = series_offset * theme.font_sizes.series_key
 
                   title = series.title || "Series #{series_offset}"

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

@@ -62,6 +62,14 @@ module Prawn
                   j += 1
                 end
                 
+                if @series.mark_average?
+                  average_y_coordinate = (point_height_percentage(@series.avg) * @plot_area_height) - 5
+                  prawn.line_width = 1
+                  prawn.stroke_color = @color
+                  prawn.dash(2)
+                  prawn.stroke_line([0, average_y_coordinate], [ @plot_area_width, average_y_coordinate ])
+                  prawn.undash
+                end
               end
               render_axes
             end
@@ -79,7 +87,7 @@ module Prawn
           # the series.
           #
           def point_height_percentage(value)
-            ((BigDecimal(value, 10)/BigDecimal(@series.max, 10)) * BigDecimal(1)).round(2)
+            ((BigDecimal(value, 10)/BigDecimal(@canvas.series.collect(&:max).max, 10)) * BigDecimal(1)).round(2)
           end
 
           def prawn
@@ -138,6 +146,15 @@ module Prawn
                     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])
+
+                    if @series[series_index].mark_average?
+                      average_y_coordinate = (point_height_percentage(@series[series_index].avg) * @plot_area_height) - 5
+                      prawn.line_width = 1
+                      prawn.stroke_color = @colors[series_index]
+                      prawn.dash(2)
+                      prawn.stroke_line([0, average_y_coordinate], [ @plot_area_width, average_y_coordinate ])
+                      prawn.undash
+                    end
                   end
 
                 end

data/lib/prawn/graph/extension.rb

@@ -34,7 +34,12 @@ module Prawn
       # rendered graph
       #
       # @param series [Array] of Prawn::Graph::Series objects
-      # @param options [Hash] of options, which can be: `:width`, `:height` , `:at` , or `:title`
+      # @param options [Hash] of options, which can be:
+      #    `:width`       - The overall width of the graph to be drawn. `<Integer>`
+      #    `:height`      - The overall height of the graph to be drawn. `<Integer>`
+      #    `:at`          - The point from where the graph will be drawn. `[<Integer>x, <Integer>y]`
+      #    `:title`       - The title for this chart. Must be a string. `<String>`
+      #    `:series_key`  - Should we render the key to series in this chart? `<Boolean>`
       #
       def graph(series, options = {}, &block)
         canvas = Prawn::Graph::ChartComponents::Canvas.new(series, self, options, &block)

data/lib/prawn/graph/series.rb

@@ -67,6 +67,10 @@ module Prawn
         @values.size
       end
 
+      def mark_average?
+        options.mark_average == true
+      end
+
       # @deprecated Provided to allow for tempory backwards compatibilty with legacy graph drawing. Do not use.
       # @return [Array] Series represented as an array in the format [ title, val1, val2... ]
       #

data/lib/prawn/graph/version.rb

@@ -1,5 +1,5 @@
 module Prawn
   module Graph
-    VERSION = "0.9.1"
+    VERSION = "0.9.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prawn-graph
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Ryan Stenhouse
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler