prawn-graph 0.9.10 → 1.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb2a51bcf0e59ebb68b1d71b874dc8342343810e
-  data.tar.gz: 051ab456f7af3318a2c8a9d4a1e9b6a05669bbcf
+  metadata.gz: 84da9cfac88ce76e053409afd8ea057d8fb165b6
+  data.tar.gz: 0dc84a38ede9e63fae98301613f57c89c9d4970b
 SHA512:
-  metadata.gz: 0c31371f3411e0d707e1a1145718190268cb04516395bf490eb54172f6824bf510b681d370ebfa3bcedaf11394c5aee7f38b4230ff234059b5e8606190c924ef
-  data.tar.gz: 7fc938b7daffc5f4379207fc06893ea62120f962d6e90a7a2876d48af0dff72ca3c06f904ce8d6576ca119a37cf477f54cebfce88531cb12e75610cc7acb23bb
+  metadata.gz: 2d7a8b4568f6cd91c062d2811cca83d077b086ea76d71e38ac0c5f2cb660636fd1043f2f3c68b3fb1bedd204629fb746a368daa3074afee9088b1c964d361a1c
+  data.tar.gz: 98609b55fe0f6cca079bf8b3421ee6fbd9315f1737c2278c0ec4c6e099ecdae658a9f8c37b8e9411c3198830695311eea9b682fca7bd6c44fcb17742549f6b8e

data/.travis.yml

@@ -1,17 +1,7 @@
 language: ruby
 rvm:
   - 2.0.0
-  - 2.1.0-p0
   - 2.1.8
-  - 2.2.0-p0
   - 2.2.4
   - 2.3.0
-  - jruby-9.0.5.0
-  - rbx-3.19
-matrix:
-  allow_failures:
-    - rvm: rbx-3.19
 before_install: gem install bundler -v 1.11.2
-addons:
-    code_climate:
-        repo_token: 9646aae52d1d1670d545c46bd94f5d86b92d516c5e3cb9890fcef62acc3a34b6

data/README.md

@@ -2,11 +2,6 @@
 
 [![Gem Version](https://badge.fury.io/rb/prawn-graph.svg)](https://badge.fury.io/rb/prawn-graph)
 [![License](http://img.shields.io/:license-mit-blue.svg)](http://sujrd.mit-license.org)
-[![Code Climate](https://codeclimate.com/github/HHRy/prawn-graph/badges/gpa.svg)](https://codeclimate.com/github/HHRy/prawn-graph)
-[![Test Coverage](https://codeclimate.com/github/HHRy/prawn-graph/badges/coverage.svg)](https://codeclimate.com/github/HHRy/prawn-graph/coverage)
-[![Build Status](https://travis-ci.org/HHRy/prawn-graph.svg?branch=master)](https://travis-ci.org/HHRy/prawn-graph)
-[![security](https://hakiri.io/github/HHRy/prawn-graph/master.svg)](https://hakiri.io/github/HHRy/prawn-graph/master)
-![Maintained: yes](https://img.shields.io/badge/maintained-yes-brightgreen.png)
 
 An extension for the [prawn pdf library][5] which adds the ability to draw graphs (or charts if
 you perfer) in PDF documents.
@@ -18,52 +13,42 @@ are dramatic.
 
 By default, graphs are drawn in monochrome, as that's likely how they will be printed. 
 
-This is free and open source software released under ther terms of the [MIT Licence](http://opensource.org/licenses/MIT).
-
-Its copyright is held by Ryan Stenhouse and the [other contributors][8] and it was first released in 
-2010.
-
 ## Compatibility
 
-This gem is built assuming a Ruby version of 2.0 or higher. Older Ruby versions may work but are not 
+The gem is  only tested against Ruby version 2.0 and greater. Older Ruby versions may work but are not 
 officially supported. We aim for compatibilty with 1.x and 2.x series of prawn. Any incomaptibilities
-with prawn versions should be treated as bugs and added to the [issue tracker][2]. 
-
-We build automatically using Travis CI. Our [.travis.yml][9] file targets the same Ruby versions as
-[prawn itself][5] does.
+should be treated as bugs and added to the [issue tracker][2]. 
 
+Unlike previous version of prawn-graph, this version does not at this time include a theme api or the 
+ability to change the colors used to render the graph. 
 
-### Legacy support and deprecation notices.
 
-To provide backwards-compatibility (of sorts), `prawn-graph` provides `bar_graph` (aliased as `bar_chart`)
-and `line_graph` (aliased as `line_chart`) methods as part of its interface which function the same as their
-equivalents in version `0.0.4`. These methods are, however, deprecated and **will** be removed when version
-`1.0.0` is released. Using these methods will result in a `warn` level message from Ruby.
+## IMPORTANT - READ THIS BEFORE USING
 
-These legacy methods will still be buggy as they are using the same rendering methods as before. Where possible
-you should use the new `graph` (aliased as `chart`) interface. Unless serious problems are uncovered, bugs
-reported with legacy rendering **will not be considered**.
+prawn-graph is currently being rewritten to have its internal components replaced with new, properly
+test-driven bits of code to draw the various cool graphs and charts that people would like to use in
+their PDFs.
 
-Unlike previous versions of `prawn-graph`, this version does not at this time include a theme api or the 
-ability to change the colors used to render the graph. 
+Right now, the "legacy" drawing code is what is ultimately being used to render any graphs being 
+generated. The newness instead is that project is compatible with all modern versions of prawn and
+therefore are useful again.
 
-## Installation
+This means that for now any existing rendering bugs still remain. If you find any, please be
+[a good citizen][2] and [report them][2].
 
-To use prawn-graph, you can add the following to your `Gemfile`:
+To use prawn-graph with these caveats, you can add the following to your `Gemfile`:
 
 ```Gemfile
- gem 'prawn-graph', ' ~> 0.9'
+ gem 'prawn-graph', '1.0.0.pre1'
 ```
 
-Alternatively, you can use Rubygems directly: `gem install prawn-graph`.
+Alternatively, you can use Rubygems directly: `gem install prawn-graph --pre`.
  
 ## Acknowledgements
 
 With thanks to [株式会社アルム][3] ([Allm Inc][4]) for allowing Ryan Stenhouse the time to rebuild this version of
 prawn-graph. This updated version of prawn-graph was inspired and guided by [prawn-svg][1] by [Roger Nesbitt][6]. 
-
-Prawn Graph was originally sponsored by and built for use at [Purchasing Card Consultancy Ltd][7] while
-Ryan Stenhouse was employed there.
+It also uses some of [prawn-svg][1]'s document size calculation code.
 
 ## Supported graph / chart types
 
@@ -77,64 +62,39 @@ adventurous - please add it!
 
 ## Using prawn-graph
 
-Graphs can be created by calling the `graph` or its alias, `chart` method with an array of
-`Prawn::Graph::Series` objects representing the data you would like to plot and how it should
-be displayed. It will also take a hash of options, and block which will have the graph yeilded
-to it.
-
 ```ruby
-  graph data, options = {}, &block.
+  require 'prawn-graph'
+
+  data = [ ['A', 10], ['B', 11], ['C', 12] ]
+
+  Prawn::Document.generate('test.pdf') do
+    text 'Graph Example'
+    bar_graph data
+  end
 ```
 
 When called with just a set of data, prawn-graph will do its best to make the graph fit in the 
 available space. For a little more control over how the graphs are rendered in the document
-you can pass the following options to `graph` or `chart`:
+you can pass the following options:
 
 Option      | Data type | Description
 ----------- | --------- | -----------
 :at         | [integer, integer] | Specify the location on the page you want the graph to appear.
 :width      | integer   | Desired width of the graph.  Defaults to horizontal space available.
 :height     | integer   | Desired height of the graph.  Defaults to vertical space available.
-:title      | string    | The overall title for your chart
-:series_key | boolean   | Should we render the series key for multi series graphs? Defaults to true.
 
-The `data` passed to `graph` or `chart` should be an `Array` of `Prawn::Graph::Series` objects, which
-themselves are made up of an array of data points to plot, and a series of options.
-
-```ruby
-  Prawn::Graph::Series.new [1,2,3,4], options = {}
-```
-
-Valid `options` are:
-
-Option        | Data type | Description
-------------- | --------- | -----------
-:mark_average | boolean   | Should we mark a line showing the average value of the series? Defaults to false.
-:mark_minimum | boolean   | Should we mark the minimum value of the series? Defaults to false.
-:mark_maximum | boolean   | Should we mark the maximum value of the series? Defaults to false.
-:title        | string    | The title of this series, which will be shown in the series key.
-:type         | symbol    | How this series should be rendered. Defaults to `:bar`, valid options are `:bar`, `:line`.
-
-### Show me some code!
+### Example
 
 ```ruby
   require 'prawn-graph'
 
-  series = []
-  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)
-  series << Prawn::Graph::Series.new([5,4,3,2,7,9,2,8,7,5,4,9,2],  title: "Another label", type: :line, mark_average: true, mark_minimum: 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, mark_maximum: true)
-
-  xaxis_labels = ['0900', '1000', '1100', '1200', '1300', '1400', '1500', '1600', '1700', '1800', '1900', '2000', '2100']
+  data = [ ['A', 10], ['B', 11], ['C', 12] ]
 
   Prawn::Document.generate('test.pdf') do
-    graph series, width: 500, height: 200, title: "A Title for the chart", at: [10,700], xaxis_labels: xaxis_labels
+    text 'Graph Example'
+    bar_graph data, at: [10,20], width: 200
   end
-``` 
-
-### Output
-<img src="http://prawn-graph.ryanstenhouse.jp/img/prawn-graph-output.png" alt="Prawn Graph Example Output" width="933" height="420">
+```
 
 ## Development
 
@@ -151,6 +111,9 @@ Bug reports and pull requests are welcome [on GitHub][2]. This project is intend
 safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) 
 code of conduct.
 
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
 
 
 [1]: https://github.com/mogest/prawn-svg/
@@ -158,7 +121,4 @@ code of conduct.
 [3]: http://www.allm.net/
 [4]: http://www.allm.net/en/
 [5]: http://github.com/prawnpdf/prawn/
-[6]: https://github.com/mogest/
-[7]: http://www.pccl.co.uk/
-[8]: https://github.com/HHRy/prawn-graph/blob/master/CONTRIBUTORS.md
-[9]: https://github.com/HHRy/prawn-graph/blob/master/.travis.yml
+[6]: https://github.com/mogest/

data/Rakefile

@@ -1,11 +1,5 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require 'yard'
-
-
-YARD::Rake::YardocTask.new do |t|
-  t.files   = ['lib/**/*.rb', '-', '*.md']
-end
 
 RSpec::Core::RakeTask.new(:spec)
 

data/lib/prawn/graph/charts/base.rb

@@ -21,7 +21,7 @@ module Prawn
               @series << s
             else
               title = s.shift
-              @series << Prawn::Graph::Series.new(s, title: title, type: series_type)
+              @series << Prawn::Graph::Series.new(s, title, series_type)
             end
           end
           

data/lib/prawn/graph/charts/legacy/base.rb

@@ -16,6 +16,7 @@ module Prawn
             @colour = false
             @document = document
             @theme = Prawn::Graph::Theme::Default
+            off = 20
             @grid = Prawn::Graph::Charts::Legacy::Grid.new(grid_x_start, grid_y_start, grid_width, grid_height, opts[:spacing], document, Prawn::Graph::Theme::Default)
           end
 
@@ -95,7 +96,8 @@ module Prawn
           # method, which does the actual real heavy lifting of drawing the graph.
           #
           def plot_values
-            raise RuntimeError.new('subclasses of Prawn::Chart::Base must implement their own plot_values method')
+            raise Prawn::Errors::NoPlotValuesMethod, 'subclasses of Prawn::Chart::Base must implement '
+                                                  +  'their own plot_values method.'
           end
 
           def reset

data/lib/prawn/graph/charts/legacy/grid.rb

@@ -23,7 +23,7 @@ module Prawn
           #
           def draw
             @document.stroke_color @theme.markers
-            if @theme.stroke_grid_lines
+            if @theme.stroke_grid_markers
               (@height / @spacing).times do |x|
                 offset = @spacing * (x + 1)
                 @document.move_to [@point.first, (@point.last + offset)]

data/lib/prawn/graph/extension.rb

@@ -2,63 +2,32 @@ module Prawn
   module Graph
     module Extension
 
-      # @deprecated bar_graph and bar_chart are deprecated and will be removed in a future version. Use the new graph / chart methods instead.
-      # Draws a bar graph into the PDF using the legacy graph stuff. Please avoid.
+      # Draws a bar graph into the PDF
       #
       # Example:
       #
       #  bar_graph [ ["A", 1], ["B", 2], ["C", 3] ], at: [10,10]
       #
       def bar_graph(data, options = {}, &block)
-        deprecate :bar_graph
-        draw_graph(Prawn::Graph::Charts::Bar, data, options, &block)
+        graph = Prawn::Graph::Charts::Bar.new(data, self, options, &block)
+        graph.draw
+        {warnings: [], width: graph.prawn.bounds.width, height: graph.prawn.bounds.height}
       end
       alias bar_chart bar_graph
 
-      # @deprecated line_graph and line_chart are deprecated and will be removed in a future version. Use the new graph / chart methods instead.
-      # Draws a line graph into the PDF using the legacy graph stuff. Please avoid.
+      # Draws a line graph into the PDF
       #
       # Example:
       #
       #  line_graph [ ["A", 1], ["B", 2], ["C", 3] ], at: [10,10]
       #
       def line_graph(data, options = {}, &block)
-        deprecate :line_graph
-        draw_graph(Prawn::Graph::Charts::Line, data, options, &block)
+        graph = Prawn::Graph::Charts::Line.new(data, self, options, &block)
+        graph.draw
+        {warnings: [], width: graph.prawn.bounds.width, height: graph.prawn.bounds.height}
       end
       alias line_chart line_graph
 
-      
-      # Plots one or more Prawn::Graph::Series on a chart. Expects an array-like object of
-      # Prawn::Graph::Series objects and some options for positioning the sizing the
-      # rendered graph
-      #
-      # @param series [Array] of Prawn::Graph::Series objects
-      # @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)
-        canvas.draw
-        {warnings: [], width: self.bounds.width, height: self.bounds.height}
-      end
-      alias chart graph
-
-      private
-
-      def draw_graph(klass, data, options, &block)
-        graph = klass.new(data, self, options, &block)
-        graph.draw
-        {warnings: [], width: self.bounds.width, height: self.bounds.height}
-      end
-      
-      def deprecate(method)
-        warn "[DEPRECATION] #{method} is deprecated and will be removed in future versions of prawn-graph. Use chart or graph instead."
-      end
     end
   end
 end

data/lib/prawn/graph/series.rb

@@ -5,90 +5,33 @@ module Prawn
     # on a chart.
     #
     class Series
-      attr_accessor :values, :options
+      attr_accessor :values, :title, :type
+      VALID_TYPES = [ :bar, :line ]
 
-      DEFAULT_OPTIONS = {
-        title:            nil,
-        type:             :bar,
-        mark_average:     false,
-        mark_minimum:     false,
-        mark_maximum:     false,
-      }
-
-      def initialize(values = [], options = {})
+      def initialize(values = [], title = nil, type = :bar)
         @values   = values
-        @options  = OpenStruct.new(DEFAULT_OPTIONS.merge(options))
-      end
-
-      # @return [String] The value of +options.title+.
-      #
-      def title
-        options.title
+        @title    = title
+        @type     = type
       end
 
-      # @return [Symbol] The value of +options.type+.
-      #
-      def type
-        options.type
-      end
-
-      # @param value [Object] a value to be added to the series. Must be of the same kind as other +values+.
-      # @return [Array] The modified +values+ object.
-      #
       def <<(value)
         @values << value
       end
 
-      # @return [Numeric] The smallest value stored in the +values+ of this Series.
-      #
       def min
-        if values.empty?
-          0
-        else
-          values.sort.collect{ |x| x unless x.zero? }.compact.first
-        end
+        @values.min || 0
       end
 
-      # @return [Numeric] The largest value stored in the +values+ of this Series.
-      #
       def max
         @values.max || 0
       end
 
-      # @return [Numeric] The average value stored in the +values+ of this Series.
-      #
-      def avg
-        if size > 0
-          @values.inject(:+) / size
-        else
-          0
-        end
-      end
-
-      # @return [Numeric] The size of the +values+ stored in this Series.
-      #
       def size
         @values.size
       end
 
-      def mark_average?
-        options.mark_average == true
-      end
-
-      def mark_minimum?
-        options.mark_minimum == true
-      end
-
-      def mark_maximum?
-        options.mark_maximum == 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... ]
-      #
       def to_a
-        warn "[DEPRECATION] Series#to_a is deprecated and will be removed in a future version of prawn-graph."
-        [options.title, @values].compact.flatten
+        [title, @values].compact.flatten
       end
     end
   end

data/lib/prawn/graph/theme.rb

@@ -1,3 +1,5 @@
+require 'ostruct'
+
 module Prawn
   module Graph
     module Theme
@@ -8,33 +10,14 @@ module Prawn
                                 '85929E',
                                 '34495E',
                                 '1B2631',
-                                'EBEDEF',
-                                'D6DBDF',
-                                '85929E',
-                                '34495E',
-                                '1B2631',
-                                'EBEDEF',
-                                'D6DBDF',
-                                '85929E',
-                                '34495E',
-                                '1B2631',
                               ],
-        title:                '17202A',
+        title:                '000000',
         background:           'FFFFFF',
         grid:                 'F2F4F4',
         axes:                 '17202A',
-        markers:              '34495E',
-        stroke_grid_lines:    true,
-        default:              '333333',
-        average:              '34495E',
-        max:                  '17202A',
-        min:                  '17202A',
-        font_sizes:           OpenStruct.new({
-          default:      8,
-          main_title:   10,
-          axis_labels:  5,
-          series_key:   8,
-        }),
+        markers:              '17202A',
+        stroke_grid_markers:  true,
+        default:              '000000',
       })
     end
   end

data/lib/prawn/graph/version.rb

@@ -1,5 +1,5 @@
 module Prawn
   module Graph
-    VERSION = "0.9.10"
+    VERSION = "1.0.0.pre1"
   end
 end

data/lib/prawn-graph.rb

@@ -1,11 +1,5 @@
-require "ostruct"
-require "bigdecimal"
 require "prawn"
 require "prawn/graph/version"
-require "prawn/graph/calculations"
-
-require "prawn/graph/chart_components"
-
 require "prawn/graph/theme"
 require "prawn/graph/series"
 require "prawn/graph/charts"

data/prawn-graph.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Easily add graphs to Prawn PDF documents}
   spec.description   = %q{Prawn::Graph adds straightforward native graph drawing to Prawn without the need to depend on anything else. All generated graphs are pure PDF Vector Images. It results in smaller document sizes and less complication.}
-  spec.homepage      = "http://prawn-graph.ryanstenhouse.jp"
+  spec.homepage      = "https://ryanstenhouse.jp"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -28,15 +28,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "codeclimate-test-reporter"
-  spec.add_development_dependency "yard"
+  spec.add_development_dependency "simplecov"
+
 
   spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_runtime_dependency "prawn", ">= 0.11.1", "< 3"
-
-  spec.metadata = { 
-    "issue_tracker" => "https://github.com/HHRy/prawn-graph/issues",
-    "source_code" => "https://github.com/HHRy/prawn-graph"
-  }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prawn-graph
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 1.0.0.pre1
 platform: ruby
 authors:
 - Ryan Stenhouse
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,21 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -125,11 +111,6 @@ files:
 - bin/console
 - bin/setup
 - lib/prawn-graph.rb
-- lib/prawn/graph/calculations.rb
-- lib/prawn/graph/calculations/layout_calculator.rb
-- lib/prawn/graph/chart_components.rb
-- lib/prawn/graph/chart_components/canvas.rb
-- lib/prawn/graph/chart_components/series_renderer.rb
 - lib/prawn/graph/charts.rb
 - lib/prawn/graph/charts/bar.rb
 - lib/prawn/graph/charts/base.rb
@@ -144,13 +125,10 @@ files:
 - lib/prawn/graph/theme.rb
 - lib/prawn/graph/version.rb
 - prawn-graph.gemspec
-- test.pdf
-homepage: http://prawn-graph.ryanstenhouse.jp
+homepage: https://ryanstenhouse.jp
 licenses:
 - MIT
-metadata:
-  issue_tracker: https://github.com/HHRy/prawn-graph/issues
-  source_code: https://github.com/HHRy/prawn-graph
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -162,9 +140,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -172,4 +150,3 @@ signing_key:
 specification_version: 4
 summary: Easily add graphs to Prawn PDF documents
 test_files: []
-has_rdoc: 

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

@@ -1,109 +0,0 @@
-module Prawn
-  module Graph
-    module Calculations
-
-      class LayoutCalculator
-        attr_reader :bounds
-        attr_reader :series_key_area, :title_area, :graph_area, :canvas_width, :canvas_height
-
-        class Dimensions < OpenStruct
-          def renderable?
-            width > 0 && height > 0
-          end
-
-          def point
-            [x, y]
-          end
-        end
-
-        def initialize(bounds, attributes = nil, theme = Prawn::Graph::Theme::Default)
-          @bounds = bounds
-          @graph_area       = Dimensions.new({ width: 0, height: 0, x: 0, y: 0 })
-          @title_area       = Dimensions.new({ width: 0, height: 0, x: 0, y: 0 })
-          @series_key_area  = Dimensions.new({ width: 0, height: 0, x: 0, y: 0 })
-          @theme            = theme
-          set_from_attributes(attributes) if attributes
-        end
-
-        def calculate
-          calculate_width_and_height_of_canvas
-          calculate_key_area
-          calculate_title_area
-          calculate_graph_area
-          
-          self
-        end
-
-        def hpadding
-          ((BigDecimal(canvas_width) / 100) * 2).round
-        end
-
-        def vpadding
-          ((BigDecimal(canvas_height) / 100) * 2).round
-        end
-
-        def invalid?
-          canvas_width > bounds[0] || canvas_height > bounds[1]
-        end
-
-        private
-
-        def set_from_attributes(attributes)
-          @canvas_width = BigDecimal(attributes[:width], 10) rescue 0
-          @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
-          if @canvas_width.zero? && @canvas_height.zero?
-            @canvas_width   = BigDecimal(bounds[0], 10) 
-            @canvas_height  = BigDecimal(bounds[1], 10) 
-          elsif !@canvas_width.zero? && @canvas_height.zero?
-            @canvas_height  = (@canvas_width / bounds_aspect_ratio).round
-          elsif !@canvas_height.zero? && @canvas_width.zero?
-            @canvas_width  = (@canvas_height * bounds_aspect_ratio).round
-          end
-        end
-
-        def bounds_aspect_ratio
-          BigDecimal(bounds[0], 10) / BigDecimal(bounds[1], 10)
-        end
-
-        def calculate_title_area
-          unless @title.nil?
-            @title_area[:width] = (canvas_width - @series_key_area[:width] - (2*hpadding))
-            @title_area[:x] = hpadding
-            @title_area[:height] = @theme.font_sizes.main_title + vpadding
-            @title_area[:y] = canvas_height + vpadding 
-          end
-        end
-
-        def calculate_key_area
-          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
-            @series_key_area[:height] = (canvas_height - vpadding)
-          end 
-        end
-
-        def calculate_graph_area
-          @graph_area[:width] = (canvas_width - @series_key_area[:width] - (2*hpadding))
-          @graph_area[:x] = hpadding
-
-          if !@title_area.renderable?
-            @graph_area[:y] = canvas_height + vpadding
-            @graph_area[:height] = (canvas_height - vpadding)
-          else
-            @graph_area[:y] =  (@title_area[:y] - @title_area[:height])
-            @graph_area[:height] = (canvas_height - vpadding - @title_area[:height])
-          end
-        end
-
-      end
-
-    end
-  end
-end

data/lib/prawn/graph/calculations.rb

@@ -1 +0,0 @@
-require_relative "calculations/layout_calculator"

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

@@ -1,139 +0,0 @@
-module Prawn
-  module Graph
-    module ChartComponents
-      # A Prawn::Graph::Canvas represents the area on which a graph will be drawn. Think of it
-      # as the container in which your chart / graph will be sized to fit within. 
-      #
-      class Canvas
-        attr_reader :layout, :series, :prawn, :theme, :options
-
-        # @param series [Array[Prawn::Graph::Series]]
-        # @param prawn [Prawn::Document]
-        # @param options [Hash]
-        # @return [Prawn::Graph::Canvas] a canvas ready to be drawn on the provided +prawn+ document.
-        #
-        def initialize(series, prawn, options = {}, &block)
-          @series   = series
-          verify_series_are_ok!
-          @options  =  {xaxis_labels: []}.merge(options.merge({ series_count: series.size }))
-          @prawn    = prawn
-          @theme    = Prawn::Graph::Theme::Default
-          @layout   = Prawn::Graph::Calculations::LayoutCalculator.new([prawn.bounds.width, prawn.bounds.height], @options, @theme).calculate
-
-          yield self if block_given?
-        end
-
-        # Fires off the actual drawing of the chart on the provided canvas.
-        # @return [nil]
-        #
-        def draw
-          prawn.bounding_box(position, :width => layout.canvas_width, :height => layout.canvas_height, padding: 0) do
-            prawn.save_graphics_state do         
-              apply_theme! 
-              render_title_area!
-              render_series_keys!
-              render_graph_area!
-            end
-          end
-        end
-
-        # The coordinates which the canvas will be drawn at
-        # @return [Array] [X-Coord, Y-Coord]
-        #
-        def position
-          @options[:at] || [0,0]
-        end
-
-        private
-
-        def apply_theme!
-          prawn.fill_color    @theme.default
-          prawn.stroke_color  @theme.default
-          prawn.font_size     @theme.font_sizes.default
-        end
-
-        def plot_series!
-          bar_charts    = series.collect{ |s| s if s.type == :bar }.compact
-          others        = series - bar_charts
-
-          BarChartRenderer.render(bar_charts, self, theme.series[0..(bar_charts.size - 1)]) unless bar_charts.empty?
-
-          i = bar_charts.size
-          others.each do |series|
-            SeriesRenderer.render(series, self, theme.series[i])
-            i+=1
-          end
-        end
-
-        def render_graph_area!
-          if layout.graph_area.renderable?
-            prawn.bounding_box layout.graph_area.point, width: layout.graph_area.width, height: layout.graph_area.height do
-              plot_series!
-            end
-          end
-        end
-
-        def render_title_area!
-          if layout.title_area.renderable?
-            prawn.text_box "<color rgb=\"#{@theme.title}\">#{@options[:title]}</color>", at: layout.title_area.point, inline_format: true, 
-            valign: :center, align: :center, size: @theme.font_sizes.main_title, width: layout.title_area.width, height: layout.title_area.height
-          end
-        end
-
-        def render_series_keys!
-          if layout.series_key_area.renderable?
-            prawn.bounding_box layout.series_key_area.point, width: layout.series_key_area.width, height: layout.series_key_area.height do
-              series.each_with_index do |series, i|
-                series_offset = i + 1
-
-                prawn.save_graphics_state do
-                  prawn.stroke_color = theme.axes
-                  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}"
-                  top_position = (prawn.bounds.top - (series_offset * 3))
-
-
-                  prawn.fill_and_stroke_rectangle([ theme.font_sizes.series_key, top_position ], theme.font_sizes.series_key, theme.font_sizes.series_key)
-                  
-                  prawn.fill_color = theme.axes
-                  prawn.text_box title, at: [ (theme.font_sizes.series_key * 3), top_position ], size: theme.font_sizes.series_key, height: (series_offset * 2)
-                end
-              end
-            end
-          end
-        end
-
-        # Verifies that we provide an array-like object of Prawn::Graph::Series instances to
-        # the Canvas, for later rendering.
-        #
-        def verify_series_are_ok!
-          if @series.respond_to?(:each) && @series.respond_to?(:collect)
-            classes = @series.collect{ |c| c.is_a?(Prawn::Graph::Series) }.uniq
-            if classes.size > 1 || classes[0] != true
-              raise RuntimeError.new("All of the items provided must be instances of Prawn::Graph::Series")
-            end
-          else
-            raise RuntimeError.new("Series provided must be an Array (or Array-like) object.")
-          end
-        end
-        
-        # From prawn-svg - creates a cipped retangle, which we will then use to draw the graphs
-        # upon.
-        #
-        def clip_graph_to_bounds(x, y, width, height)
-          prawn.move_to x, y
-          prawn.line_to x + width, y
-          prawn.line_to x + width, y + height
-          prawn.line_to x, y + height
-          prawn.close_path
-          prawn.add_content "W n"
-        end
-      end
-    end
-  end
-end

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

@@ -1,339 +0,0 @@
-module Prawn
-  module Graph
-    module ChartComponents
-
-      # The Prawn::Graph::ChartComponents::SeriesRenderer is used to plot indivdual Prawn::Graph::Series on
-      # a Prawn::Graph::ChartComponents::Canvas and its associated Prawn::Document.
-      #
-      module SeriesRenderer
-        class << self 
-          # @param series [Prawn::Graph::Series]
-          # @param canvas [Prawn::Graph::ChartComponents::Canvas]
-          #
-          def render(series, canvas, color = '000000')
-            raise ArgumentError.new("series must be a Prawn::Graph::Series") unless series.is_a?(Prawn::Graph::Series)
-            raise ArgumentError.new("canvas must be a Prawn::Graph::ChartComponents::Canvas") unless canvas.is_a?(Prawn::Graph::ChartComponents::Canvas)
-
-            @series = series
-            @canvas = canvas
-            @prawn = canvas.prawn
-            @color = color
-
-            @graph_area = @canvas.layout.graph_area
-
-            @plot_area_width  = @graph_area.width - 25
-            @plot_area_height = @graph_area.height - 20
-
-            render_line_chart
-          end
-
-          private
-
-          def render_line_chart
-            prawn.bounding_box [@graph_area.point[0] + 5, @graph_area.point[1] - 20], width: @plot_area_width, height: @plot_area_height do
-              j = 2
-              prawn.save_graphics_state do  
-                max_marked = false
-                min_marked = false
-
-                @series.values.each_with_index do |v, i|
-                  next if i == 0
-
-                  width_per_point = (@plot_area_width / @series.size).round(2).to_f
-                  spacing = width_per_point
-
-                  prawn.line_width = 2
-                  prawn.fill_color    = @color
-                  prawn.stroke_color  = @color
-
-
-                  previous_value = @series.values[i - 1]
-                  this_value = v
-
-                  previous_y  = (point_height_percentage(previous_value) * @plot_area_height) - 5
-                  this_y      = (point_height_percentage(this_value) * @plot_area_height) - 5
-
-                  previous_x_offset = ((spacing * (j - 1)) - spacing) + (spacing / 2.0)
-                  this_x_offset    = ((spacing * j) - spacing) + (spacing / 2.0)
-
-
-                  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)  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
-                      prawn.fill_color = @canvas.theme.min
-                      prawn.stroke_color = @canvas.theme.min
-                      prawn.line_width = 1
-
-                      prawn.dash(2)
-                      prawn.stroke_line([previous_x_offset, 0], [previous_x_offset, previous_y])
-                      prawn.undash
-
-                      prawn.fill_ellipse([ ( previous_x_offset), previous_y ], 2)
-                      min_marked = true
-                    end
-                  end
-
-                  if @series.mark_maximum? && max_marked == false && previous_value != 0 && previous_value == @series.max
-                    prawn.save_graphics_state do
-                      prawn.fill_color = @canvas.theme.max
-                      prawn.stroke_color = @canvas.theme.max
-                      prawn.line_width = 1
-
-                      prawn.dash(2)
-                      prawn.stroke_line([previous_x_offset, 0], [previous_x_offset, previous_y])
-                      prawn.undash
-
-                      prawn.fill_ellipse([ ( previous_x_offset), previous_y ], 2)
-                      max_marked = true
-                    end
-                  end
-             
-
-                if @series.mark_minimum? && min_marked == false && this_value != 0 && this_value == @series.min 
-                    prawn.save_graphics_state do
-                      prawn.fill_color = @canvas.theme.min
-                      prawn.stroke_color = @canvas.theme.min
-                      prawn.line_width = 1
-
-                      prawn.dash(2)
-                      prawn.stroke_line([this_x_offset, 0], [this_x_offset, this_y])
-                      prawn.undash
-
-                      prawn.fill_ellipse([ ( this_x_offset), this_y ], 2)
-                      min_marked = true
-                    end
-                  end
-
-                  if @series.mark_maximum? && max_marked == false && this_value != 0 && this_value == @series.max
-                    prawn.save_graphics_state do
-                      prawn.fill_color = @canvas.theme.max
-                      prawn.stroke_color = @canvas.theme.max
-                      prawn.line_width = 1
-
-                      prawn.dash(2)
-                      prawn.stroke_line([this_x_offset, 0], [this_x_offset, this_y])
-                      prawn.undash
-
-                      prawn.fill_ellipse([ ( this_x_offset), this_y ], 2)
-                      max_marked = true
-                    end
-                  end
-                  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
-          end
-
-          def render_axes
-            prawn.stroke_color  = @canvas.theme.axes
-            prawn.fill_color  = @canvas.theme.axes
-            prawn.stroke_horizontal_line(0, @plot_area_width, at: 0) 
-            prawn.stroke_vertical_line(0, @plot_area_height, at: 0) 
-            prawn.fill_and_stroke_ellipse [ 0,0], 1
-
-            max = @series.max || 0
-            min = @series.min || 0
-            avg = @series.avg || 0
-            mid = (min + max) / 2 rescue 0
-
-            max_y = (point_height_percentage(max) * @plot_area_height)
-            min_y = (point_height_percentage(min) * @plot_area_height)
-            mid_y = (point_height_percentage(mid) * @plot_area_height)
-            avg_y = (point_height_percentage(avg) * @plot_area_height)
-
-            prawn.text_box "#{max}", at: [-14, max_y], height: 5, overflow: :shrink_to_fit, width: 12, valign: :bottom, align: :right unless max.zero?
-            prawn.text_box "#{mid}", at: [-14, mid_y], height: 5, overflow: :shrink_to_fit, width: 12, valign: :bottom, align: :right unless mid.zero?
-            prawn.text_box "#{avg}", at: [-14, avg_y], height: 5, overflow: :shrink_to_fit, width: 12, valign: :bottom, align: :right unless avg.zero?
-            prawn.text_box "#{min}", at: [-14, min_y], height: 5, overflow: :shrink_to_fit, width: 12, valign: :bottom, align: :right unless min.zero?
-
-            return if @canvas.options[:xaxis_labels].size.zero?
-
-            width_of_each_label = (@plot_area_width / @canvas.options[:xaxis_labels].size) - 1
-            @canvas.options[:xaxis_labels].each_with_index do |label, i|
-              offset    = i + 1
-              position  = ((offset * width_of_each_label) - width_of_each_label) + 1
-              
-              prawn.text_box  label, at: [ position, -2 ], width: width_of_each_label, height: 6, valign: :center, align: :right,
-                              overflow: :shrink_to_fit
-            end
-          end
-
-          # Calculates the relative height of a given point based on the maximum value present in
-          # the series.
-          #
-          def point_height_percentage(value)
-            ((BigDecimal(value, 10)/BigDecimal(@canvas.series.collect(&:max).max, 10)) * BigDecimal(1)).round(2) rescue 0
-          end
-
-          def prawn
-            @prawn
-          end
-        end
-      end
-
-
-
-      # The Prawn::Graph::ChartComponents::BarChartRenderer is used to plot one or more bar charts 
-      # in a sensible way on a a Prawn::Graph::ChartComponents::Canvas and its associated 
-      # Prawn::Document.
-      #
-      module BarChartRenderer
-        class << self 
-          # @param series [Prawn::Graph::Series]
-          # @param canvas [Prawn::Graph::ChartComponents::Canvas]
-          #
-          def render(series, canvas, colors)
-            @series = series
-            @canvas = canvas
-            @prawn = canvas.prawn
-            @colors = colors
-
-
-            @graph_area = @canvas.layout.graph_area
-
-            @plot_area_width  = @graph_area.width - 25
-            @plot_area_height = @graph_area.height - 20
-
-            render_bar_charts
-          end
-
-          private
-
-          def render_bar_charts
-            prawn.bounding_box [@graph_area.point[0] + 5, @graph_area.point[1] - 20], width: @plot_area_width, height: @plot_area_height do
-           
-              prawn.save_graphics_state do  
-                num_points        = @series[0].size
-                width_per_point   = (@plot_area_width / num_points)
-                width             = (((width_per_point * 0.9) / @series.size).round(2)).to_f
-                min_marked        = false
-                max_marked        = false
-
-                num_points.times do |point|
-
-                  @series.size.times do |series_index|
-                    series_offset = series_index + 1
-                    prawn.fill_color    = @colors[series_index]
-                    prawn.stroke_color  = @colors[series_index]
-                    prawn.line_width  = width
-
-                    starting = (prawn.bounds.left + (point * width_per_point))
-
-                    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]) 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
-                      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
-
-                    if @series[series_index].mark_minimum? && min_marked == false && !@series[series_index].values[point].zero? && @series[series_index].values[point] == @series[series_index].min
-                      prawn.save_graphics_state do
-                        prawn.fill_color = @canvas.theme.min
-                        prawn.stroke_color = @canvas.theme.min
-                        prawn.line_width = 1
-
-                        prawn.dash(2)
-                        prawn.stroke_line([x_position, 0], [x_position, y_position])
-                        prawn.undash
-
-                        prawn.fill_ellipse([x_position, y_position ], 2)
-                        min_marked = true
-                      end
-                    end
-
-                    if @series[series_index].mark_maximum? && max_marked == false && @series[series_index].values[point] == @series[series_index].max
-                      prawn.save_graphics_state do
-                        prawn.fill_color = @canvas.theme.max
-                        prawn.stroke_color = @canvas.theme.max
-                        prawn.line_width = 1
-
-                        prawn.dash(2)
-                        prawn.stroke_line([x_position, 0], [x_position, y_position])
-                        prawn.undash
-
-                        prawn.fill_ellipse([x_position, y_position ], 2)
-                        max_marked = true
-                      end
-                    end
-                  end
-
-                end
-
-              end
-              render_axes
-            end
-          end
-
-          def render_axes
-            prawn.stroke_color  = @canvas.theme.axes
-            prawn.fill_color  = @canvas.theme.axes
-            prawn.stroke_horizontal_line(0, @plot_area_width, at: 0) 
-            prawn.stroke_vertical_line(0, @plot_area_height, at: 0) 
-            prawn.fill_and_stroke_ellipse [ 0,0], 1
-
-            max = @series.collect(&:max).max || 0
-            min = @series.collect(&:min).min  || 0
-            avg = ((BigDecimal(@series.collect(&:avg).inject(:+), 10) / @series.collect(&:avg).size).round(2)).to_f || 0
-            mid = (min + max) / 2 || 0
-
-            max_y = (point_height_percentage(max) * @plot_area_height)
-            min_y = (point_height_percentage(min) * @plot_area_height)
-            mid_y = (point_height_percentage(mid) * @plot_area_height)
-            avg_y = (point_height_percentage(avg) * @plot_area_height)
-
-            prawn.text_box "#{max}", at: [-14, max_y], height: 5, overflow: :shrink_to_fit, width: 12, valign: :bottom, align: :right unless max.zero?
-            prawn.text_box "#{mid}", at: [-14, mid_y], height: 5, overflow: :shrink_to_fit, width: 12, valign: :bottom, align: :right unless mid.zero?
-            prawn.text_box "#{avg}", at: [-14, avg_y], height: 5, overflow: :shrink_to_fit, width: 12, valign: :bottom, align: :right unless avg.zero?
-            prawn.text_box "#{min}", at: [-14, min_y], height: 5, overflow: :shrink_to_fit, width: 12, valign: :bottom, align: :right unless min.zero?
-
-            return if @canvas.options[:xaxis_labels].size.zero?
-
-            width_of_each_label = (@plot_area_width / @canvas.options[:xaxis_labels].size) - 1
-            @canvas.options[:xaxis_labels].each_with_index do |label, i|
-              offset    = i + 1
-              position  = ((offset * width_of_each_label) - width_of_each_label) + 1
-              
-              prawn.text_box  label, at: [ position, -2 ], width: width_of_each_label, height: 6, valign: :center, align: :right,
-                              overflow: :shrink_to_fit
-            end
-          end
-
-          # Calculates the relative height of a given point based on the maximum value present in
-          # the series.
-          #
-          def point_height_percentage(value)
-            pc = ((BigDecimal(value, 10)/BigDecimal(@series.collect(&:max).max, 10)) * BigDecimal(1)).round(2)
-            pc = 0 if pc.nan?
-            pc
-          end
-
-          def prawn
-            @prawn
-          end
-        end
-      end
-    end
-  end
-end

data/lib/prawn/graph/chart_components.rb

@@ -1,2 +0,0 @@
-require_relative "chart_components/series_renderer"
-require_relative "chart_components/canvas"