prawn-graph 1.0.0.pre1 → 1.0.1

data/lib/prawn/graph/theme.rb

@@ -1,5 +1,3 @@
-require 'ostruct'
-
 module Prawn
   module Graph
     module Theme
@@ -10,14 +8,33 @@ module Prawn
                                 '85929E',
                                 '34495E',
                                 '1B2631',
+                                'EBEDEF',
+                                'D6DBDF',
+                                '85929E',
+                                '34495E',
+                                '1B2631',
+                                'EBEDEF',
+                                'D6DBDF',
+                                '85929E',
+                                '34495E',
+                                '1B2631',
                               ],
-        title:                '000000',
+        title:                '17202A',
         background:           'FFFFFF',
         grid:                 'F2F4F4',
         axes:                 '17202A',
-        markers:              '17202A',
-        stroke_grid_markers:  true,
-        default:              '000000',
+        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,
+        }),
       })
     end
   end

data/lib/prawn/graph/version.rb

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

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      = "https://ryanstenhouse.jp"
+  spec.homepage      = "http://prawn-graph.ryanstenhouse.jp"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -28,10 +28,16 @@ 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 "simplecov"
-
+  spec.add_development_dependency "yard"
 
   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: 1.0.0.pre1
+  version: 1.0.1
 platform: ruby
 authors:
 - Ryan Stenhouse
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,6 +53,20 @@ 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: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +81,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  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: prawn
   requirement: !ruby/object:Gem::Requirement
@@ -111,24 +139,24 @@ files:
 - bin/console
 - bin/setup
 - lib/prawn-graph.rb
-- lib/prawn/graph/charts.rb
-- lib/prawn/graph/charts/bar.rb
-- lib/prawn/graph/charts/base.rb
-- lib/prawn/graph/charts/legacy.rb
-- lib/prawn/graph/charts/legacy/bar.rb
-- lib/prawn/graph/charts/legacy/base.rb
-- lib/prawn/graph/charts/legacy/grid.rb
-- lib/prawn/graph/charts/legacy/line.rb
-- lib/prawn/graph/charts/line.rb
+- lib/prawn/graph/calculations.rb
+- lib/prawn/graph/calculations/layout_calculator.rb
+- lib/prawn/graph/chart_components.rb
+- lib/prawn/graph/chart_components/bar_chart_renderer.rb
+- lib/prawn/graph/chart_components/canvas.rb
+- lib/prawn/graph/chart_components/line_chart_renderer.rb
+- lib/prawn/graph/chart_components/series_renderer.rb
 - lib/prawn/graph/extension.rb
 - lib/prawn/graph/series.rb
 - lib/prawn/graph/theme.rb
 - lib/prawn/graph/version.rb
 - prawn-graph.gemspec
-homepage: https://ryanstenhouse.jp
+homepage: http://prawn-graph.ryanstenhouse.jp
 licenses:
 - MIT
-metadata: {}
+metadata:
+  issue_tracker: https://github.com/HHRy/prawn-graph/issues
+  source_code: https://github.com/HHRy/prawn-graph
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -140,9 +168,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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -150,3 +178,4 @@ signing_key:
 specification_version: 4
 summary: Easily add graphs to Prawn PDF documents
 test_files: []
+has_rdoc: 

data/lib/prawn/graph/charts.rb

@@ -1,4 +0,0 @@
-require_relative "charts/base"
-require_relative "charts/bar"
-require_relative "charts/line"
-require_relative "charts/legacy"

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

@@ -1,18 +0,0 @@
-module Prawn
-  module Graph
-    module Charts
-      class Bar < Base
-
-        private
-
-        def chart_object
-          Prawn::Graph::Charts::Legacy::Bar.new(@series.collect(&:to_a), @prawn, @options)
-        end
-
-        def series_type
-          :bar
-        end
-      end
-    end
-  end
-end

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

@@ -1,69 +0,0 @@
-module Prawn
-  module Graph
-    module Charts
-
-      class Base
-        VALID_OPTIONS = [:at, :width, :height]
-        attr_reader :series, :prawn, :options, :lowest_value, :highest_value
-
-        def initialize(data, prawn, options = {}, &block)
-          Prawn.verify_options VALID_OPTIONS, options
-
-          if data.is_a?(Array) || (!data.is_a?(Array) && data.is_a?(Prawn::Graph::Series))
-            data = [ data ] unless data.is_a?(Array) 
-          else
-            raise ArgumentError.new("data must be a multidimensional Array, array of Prawn::Graph::Series or a single Prawn::Graph::Series")
-          end
-
-          @series = []
-          data.each do |s|
-            if s.is_a?(Prawn::Graph::Series)
-              @series << s
-            else
-              title = s.shift
-              @series << Prawn::Graph::Series.new(s, title, series_type)
-            end
-          end
-          
-          @prawn = prawn
-          @options = options
-          calculate_extreme_values!
-        end
-
-        def titles
-          @series.collect(&:title)
-        end
-
-        def position
-        end
-
-        def draw
-          chart_object.draw
-        end
-
-        private
-
-        def chart_object
-          raise RuntimeError.new("I need to be subclassed.")
-        end
-
-        def series_type
-          :bar
-        end
-
-        def calculate_extreme_values!
-          @lowest_value = @series.collect(&:min).min
-          @highest_value = @series.collect(&:max).max
-        end
-
-        def process_the(data_array)
-          col = []
-          val = []
-          data_array.each { |i| val << i[1]; col << i[0] }
-          [ col, val, val.min, val.max ]
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,4 +0,0 @@
-require_relative 'legacy/grid'
-require_relative 'legacy/base'
-require_relative 'legacy/bar'
-require_relative 'legacy/line'

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

@@ -1,28 +0,0 @@
-module Prawn
-  module Graph
-    module Charts
-      module Legacy
-        class Bar < Prawn::Graph::Charts::Legacy::Base
-
-          private
-
-          def plot_values
-            base_x = @grid.start_x + 1
-            base_y = @grid.start_y + 1
-            bar_width = calculate_bar_width
-            @document.line_width bar_width
-            last_position = base_x 
-            point_spacing = calculate_plot_spacing
-            @values.each do |value|
-              @document.move_to [base_x + last_position, base_y]
-              bar_height = calculate_point_height_from value
-              @document.stroke_color @theme.series.sample
-              @document.stroke_line_to [base_x + last_position, base_y + bar_height]
-              last_position += point_spacing
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,195 +0,0 @@
-require "bigdecimal" 
-
-module Prawn
-  module Graph
-    module Charts
-      module Legacy
-
-        class Base
-              
-          attr_accessor :grid, :headings, :values, :highest_value, :document, :colour
-          
-          def initialize(data, document, options = {})
-            opts = { :theme => Prawn::Graph::Theme::Default, :width => 500, :height => 200, :spacing => 20, :at => [0,0] }.merge(options)
-            (@headings, @values, @highest_value) = process_the data
-            (grid_x_start, grid_y_start, grid_width, grid_height) = parse_sizing_from opts 
-            @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
-
-          # Draws the graph on the document which we have a reference to.
-          #
-          def draw
-            draw_bounding_box
-            @grid.draw
-            label_axes
-            if @title
-              draw_title
-            end
-            plot_values
-            if @x_label
-              draw_x_axis_label
-            end 
-            if @y_label
-              draw_y_axis_label
-            end 
-           reset
-          end
-
-          private
-
-          def draw_bounding_box
-            @document.fill_color @theme.background
-            @document.fill_and_stroke_rectangle [(@point.first - 10), (@point.last + ( @total_height + 40 ))], @document.bounds.width, (@total_height + 40)
-            @document.fill_color '000000'
-          end   
-
-          def label_axes
-            @document.fill_color @theme.title
-            base_x = @grid.start_x + 1
-            base_y = @grid.start_y + 1
-
-            # Put the values up the Y Axis
-            #
-            @document.draw_text @highest_value, :at => [base_x - 15, base_y + @grid.height], :size => 5
-            @document.draw_text '0', :at => [base_x - 15, base_y ], :size => 5
-
-            # Put the column headings along the X Axis
-            #
-            point_spacing = calculate_plot_spacing 
-            last_position = base_x + (point_spacing / 2)
-            @headings.each do |heading|
-              @document.draw_text heading, :at => [last_position, base_y - 15 ], :size => 5
-              last_position += point_spacing
-            end
-            @document.fill_color @theme.background
-          end
-
-          def draw_title
-            @document.fill_color @theme.title
-            x_coord = calculate_x_axis_center_point(@title, 10)
-            y_coord = @grid.start_y + @grid.height + 10
-            @document.draw_text @title, :at => [x_coord, y_coord] ,:size => 10
-            @document.fill_color @theme.background
-          end
-
-          def draw_x_axis_label
-            @document.fill_color @theme.axes
-            x_coord = calculate_x_axis_center_point(@x_label, 8)
-            y_coord = @grid.start_y - 30
-            @document.draw_text @x_label, :at => [x_coord, y_coord] ,:size => 8
-            @document.fill_color @theme.background
-          end
-
-          def draw_y_axis_label
-            @document.fill_color @theme.axes
-            y_coord = calculate_y_axis_center_point(@y_label, 8)
-            x_coord = @grid.start_x - 30
-            @document.draw_text @y_label, :at => [x_coord, y_coord] ,:size => 8, :rotate => 90
-            @document.fill_color @theme.background
-          end
-          
-          # All subclasses of Prawn::Chart::Base must implement thier own plot_values
-          # method, which does the actual real heavy lifting of drawing the graph.
-          #
-          def plot_values
-            raise Prawn::Errors::NoPlotValuesMethod, 'subclasses of Prawn::Chart::Base must implement '
-                                                  +  'their own plot_values method.'
-          end
-
-          def reset
-            @document.line_width 1
-            @document.stroke_color '000000'
-            @document.fill_color '000000'
-            @document.move_to @grid.point
-          end
-
-
-          # Utility methods for dealing with working out where things should be
-          # the calculations and such done here are all very rough, but are
-          # sufficient for now to plot just what we need.
-          #
-          
-          
-          def parse_sizing_from(o)
-            x_offset = 15
-            y_offset = 0
-            move_y_up = 0
-            grid_width = o[:width]
-            grid_height = o[:height]
-          
-            @total_width = o[:width]
-            @total_height = o[:height]
-            @point = o[:at].dup 
-
-            # Make room for the title if we're choosing to Render it.
-            #
-            if o[:title]
-              @title = o[:title]
-              y_offset += 10 
-            end
-
-            # Make room for X Axis labels if we're using them.
-            #
-            if o[:label_x]
-              y_offset += 30
-              move_y_up += 30
-              @x_label = o[:label_x]
-            end
-
-            # Make room for Y Axis labels if we're using them.
-            #
-            if o[:label_y]
-              @y_label = o[:label_y]
-              x_offset += 15
-            end
-
-
-            # Return the values calculated here.
-            #
-            [ (o[:at][0] + x_offset), (o[:at][1] + move_y_up + 20), (grid_width - (x_offset - 20)), (grid_height - y_offset) ]
-          end
-
-          def process_the(data_array)
-            col = []
-            val = []
-            data_array.each { |i| val << i[1]; col << i[0] }
-            [ col, val ,val.sort.last ]
-          end
-
-          def calculate_x_axis_center_point(text, text_size, graph_start_x = @grid.start_x, graph_width = @grid.width)
-            ((graph_start_x + (graph_width / 2)) - ((text.length * text_size) / 4))
-          end
-          alias calculate_x_axis_centre_point calculate_x_axis_center_point
-
-          def calculate_y_axis_center_point(text, text_size, graph_start_y = @grid.start_y, graph_height = @grid.height)
-            ((graph_start_y + (graph_height / 2)) - ((text.length * text_size) / 4))
-          end
-          alias calculate_y_axis_centre_point calculate_y_axis_center_point
-
-          def calculate_plot_spacing
-            (@grid.width / @values.count)
-          end
-
-          def calculate_bar_width
-            calculate_plot_spacing / 2
-          end
-
-          def calculate_point_height_from(column_value)
-            cv = BigDecimal("#{column_value}")
-            hv = BigDecimal("#{@highest_value}")
-            gh = BigDecimal("#{@grid.height}")
-            percentage = (cv / (hv / 100))
-            ((gh / 100) * percentage).to_i
-          end
-
-
-        end
-
-      end
-    end
-  end
-end