charts 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4da2755eb0417c5b0c4745ba3c48731b7885b976
-  data.tar.gz: aa2f198109cf7b2778a0e96a373d26f28747c613
+  metadata.gz: 517daea21634f29dd222d42af3d3aa64a64c6b98
+  data.tar.gz: ffa37ef3e28ae074513ba0f0537536ac451ad27d
 SHA512:
-  metadata.gz: aeb9f5516f4c5f4636158833639d369a1ab67c9b2b1a7a5beda73d13512a6fb78c981372c608ac13abf11171c51f22b0892a3caf6db58bece66418bce3111ae8
-  data.tar.gz: c7500f8d6819e229ef05890ace09bc27b66d597afd71bae33bd83adab7ff4b2a692e54dda9fdf18850ca4bbd5b9fa9b6f4a10117308d2c5e9c2c301962ee61db
+  metadata.gz: d5ddd1b7c0c6dd1eb54995f6d0a044ac7e5ea3c482af110b18daa3584ac922631d59d9114fe52d89f9a3980853aadd139a0169687ea85f65992235d4bd8fe7b6
+  data.tar.gz: c5b1ff625d1ae535f63d71c67df43c69da01b939a9c518fb9e84492e0d5a3005a56861ba2eb376a43bb645f216f957516a314cbd1fdf7a7df8403d616189e4aa

data/lib/charts/bar_chart/bar/bar.rb

@@ -1,15 +1,15 @@
 class Charts::BarChart::Bar
-  attr_reader :graph, :data_value, :set_nr, :bar_nr_in_set
+  attr_reader :chart, :data_value, :set_nr, :bar_nr_in_set
 
-  def initialize(graph, data_value, set_nr, bar_nr_in_set)
-    @graph = graph
+  def initialize(chart, data_value, set_nr, bar_nr_in_set)
+    @chart = chart
     @data_value = data_value
     @set_nr = set_nr
     @bar_nr_in_set = bar_nr_in_set
   end
 
   def draw
-    graph.renderer.rect x, y, width, height, fill: graph.colors[set_nr], class: 'bar'
+    chart.renderer.rect x, y, width, height, fill: chart.colors[set_nr], class: 'bar'
   end
 
   def x
@@ -28,7 +28,7 @@ class Charts::BarChart::Bar
     raise NotImplementedError
   end
 
-  def bar_number_in_graph
-    set_nr + bar_nr_in_set * graph.set_count
+  def bar_number_in_chart
+    set_nr + bar_nr_in_set * chart.set_count
   end
 end

data/lib/charts/bar_chart/bar/horizontal_bar.rb

@@ -4,11 +4,11 @@ class Charts::BarChart::HorizontalBar < Charts::BarChart::Bar
   end
 
   def x_margin
-    graph.outer_margin
+    chart.outer_margin
   end
 
   def x_offset
-    graph.inner_width * [data_value, graph.base_line].min
+    chart.inner_width * [data_value, chart.base_line].min
   end
 
   def y
@@ -16,18 +16,18 @@ class Charts::BarChart::HorizontalBar < Charts::BarChart::Bar
   end
 
   def y_margin
-    graph.outer_margin + graph.bar_margin + graph.group_margin * bar_nr_in_set
+    chart.outer_margin + chart.bar_margin + chart.group_margin * bar_nr_in_set
   end
 
   def y_offset
-    graph.bar_outer_width * bar_number_in_graph
+    chart.bar_outer_width * bar_number_in_chart
   end
 
   def width
-    graph.inner_width * (data_value - graph.base_line).abs
+    chart.inner_width * (data_value - chart.base_line).abs
   end
 
   def height
-    graph.bar_inner_width.floor.to_i
+    chart.bar_inner_width.floor.to_i
   end
 end

data/lib/charts/bar_chart/bar/vertical_bar.rb

@@ -4,11 +4,11 @@ class Charts::BarChart::VerticalBar < Charts::BarChart::Bar
   end
 
   def x_margin
-    graph.outer_margin + graph.bar_margin + graph.group_margin * bar_nr_in_set
+    chart.outer_margin + chart.bar_margin + chart.group_margin * bar_nr_in_set
   end
 
   def x_offset
-    graph.bar_outer_width * bar_number_in_graph
+    chart.bar_outer_width * bar_number_in_chart
   end
 
   def y
@@ -16,18 +16,18 @@ class Charts::BarChart::VerticalBar < Charts::BarChart::Bar
   end
 
   def y_margin
-    graph.outer_margin
+    chart.outer_margin
   end
 
   def y_offset
-    graph.inner_height * [(1 - data_value), (1 - graph.base_line)].min
+    chart.inner_height * [(1 - data_value), (1 - chart.base_line)].min
   end
 
   def width
-    graph.bar_inner_width.floor.to_i
+    chart.bar_inner_width.floor.to_i
   end
 
   def height
-    graph.inner_height * (data_value - graph.base_line).abs
+    chart.inner_height * (data_value - chart.base_line).abs
   end
 end

data/lib/charts/bar_chart/grid/grid_line.rb

@@ -1,14 +1,14 @@
 class Charts::Grid::GridLine
-  attr_accessor :graph, :value
+  attr_accessor :chart, :value
 
-  def initialize(graph, value)
-    @graph = graph
+  def initialize(chart, value)
+    @chart = chart
     @value = value
   end
 
   def draw
-    graph.renderer.line x1, y1, x2, y2, graph.renderer.grid_line_style
-    graph.renderer.text label_text, label_x, label_y, label_style
+    chart.renderer.line x1, y1, x2, y2, chart.renderer.grid_line_style
+    chart.renderer.text label_text, label_x, label_y, label_style
   end
 
   def x1
@@ -36,7 +36,7 @@ class Charts::Grid::GridLine
   end
 
   def label_text
-    if graph.spread_order_of_magnitude <= 0
+    if chart.spread_order_of_magnitude <= 0
       value.to_f
     else
       value

data/lib/charts/bar_chart/grid/horizontal_grid_line.rb

@@ -1,14 +1,14 @@
 class Charts::Grid::HorizontalGridLine < Charts::Grid::GridLine
   def x1
-    graph.outer_margin
+    chart.outer_margin
   end
 
   def x2
-    graph.width - graph.outer_margin
+    chart.width - chart.outer_margin
   end
 
   def y1
-    graph.outer_margin + graph.inner_height * (1 - graph.normalize(value))
+    chart.outer_margin + chart.inner_height * (1 - chart.normalize(value))
   end
 
   def y2
@@ -20,7 +20,7 @@ class Charts::Grid::HorizontalGridLine < Charts::Grid::GridLine
   end
 
   def label_y
-    y1 + graph.renderer.font_size / 3
+    y1 + chart.renderer.font_size / 3
   end
 
   def label_style

data/lib/charts/bar_chart/grid/vertical_grid_line.rb

@@ -1,14 +1,14 @@
 class Charts::Grid::VerticalGridLine < Charts::Grid::GridLine
   def y1
-    graph.outer_margin
+    chart.outer_margin
   end
 
   def y2
-    graph.outer_margin + graph.inner_height
+    chart.outer_margin + chart.inner_height
   end
 
   def x1
-    graph.outer_margin + graph.inner_width * graph.normalize(value)
+    chart.outer_margin + chart.inner_width * chart.normalize(value)
   end
 
   def x2
@@ -16,7 +16,7 @@ class Charts::Grid::VerticalGridLine < Charts::Grid::GridLine
   end
 
   def label_y
-    y2 + graph.renderer.font_size + 5
+    y2 + chart.renderer.font_size + 5
   end
 
   def label_x

data/lib/charts/bin/dispatcher.rb

@@ -1,33 +1,34 @@
 module Charts
   class Dispatcher
-    attr_reader :options
+    attr_reader :options, :chart
 
     def initialize(options)
       @options = options
+      @chart = dispatch
     end
 
     def render
       if options[:filename]
-        graph.render
+        chart.render
       else
-        puts graph.render
+        puts chart.render
       end
     end
 
-    def graph
+    def dispatch
       if type == :txt
-        SymbolCountChart.new(data, graph_options)
+        SymbolCountChart.new(data, chart_options)
       elsif [:svg, :png, :jpg, :gif].include? type
         if style == :circle
-          CircleCountChart.new(data, graph_options)
+          CircleCountChart.new(data, chart_options)
         elsif style == :cross
-          CrossCountChart.new(data, graph_options)
+          CrossCountChart.new(data, chart_options)
         elsif style == :manikin
-          ManikinCountChart.new(data, graph_options)
+          ManikinCountChart.new(data, chart_options)
         elsif style == :bar
-          BarChart.new(data, graph_options)
+          BarChart.new(data, chart_options)
         elsif style == :pie
-          PieChart.new(data, graph_options)
+          PieChart.new(data, chart_options)
         end
       end
     end
@@ -36,7 +37,7 @@ module Charts
       options[:data]
     end
 
-    def graph_options
+    def chart_options
       options.select do |key, _value|
         [
           :background_color,

data/lib/charts/bin/opt_parser.rb

@@ -31,7 +31,7 @@ class Charts::OptParser
   end
 
   def post_process_options
-    # force 2-dimensional array for bar graph if only one data set is provided
+    # force 2-dimensional array for bar chart if only one data set is provided
     if options[:style] == :bar and !options[:data].first.is_a? Array
       options[:data] = [options[:data]]
     end
@@ -88,7 +88,7 @@ class Charts::OptParser
         '-s STYLE',
         '--style STYLE',
         STYLES,
-        "Choose the graph style: #{STYLES.join(', ')} (circle, cross and manikin are count graphs)"
+        "Choose the chart style: #{STYLES.join(', ')} (circle, cross and manikin are count charts)"
       ) do |style|
         options[:style] = style
       end
@@ -129,7 +129,7 @@ class Charts::OptParser
       end
       opts.on(
         '-w WIDTH',
-        '--width WIDTH (not for count graphs)',
+        '--width WIDTH (not for count charts)',
         Integer,
         'Sets the image width'
       ) do |width|
@@ -137,7 +137,7 @@ class Charts::OptParser
       end
       opts.on(
         '-h HEIGHT',
-        '--height HEIGHT (not for count graphs)',
+        '--height HEIGHT (not for count charts)',
         Integer,
         'Sets the image height'
       ) do |height|
@@ -146,14 +146,14 @@ class Charts::OptParser
       opts.on(
         '--item-width WIDTH',
         Integer,
-        'Sets the width of the individual item (count graphs only)'
+        'Sets the width of the individual item (count charts only)'
       ) do |item_width|
         options[:item_width] = item_width
       end
       opts.on(
         '--item-height HEIGHT',
         Integer,
-        'Sets the height of the individual item (count graphs only)'
+        'Sets the height of the individual item (count charts only)'
       ) do |item_height|
         options[:item_height] = item_height
       end

data/lib/charts/chart.rb

@@ -20,20 +20,17 @@ class Charts::Chart
     if options[:outer_margin] and !options[:outer_margin].is_a?(Numeric)
       raise ArgumentError.new('outer_margin not a number')
     end
-    if options[:colors]
-      unless options[:colors].is_a? Array
-        raise ArgumentError.new('colors not an array')
-      end
-      if options[:colors].any? and data.count > options[:colors].count
-        raise ArgumentError.new('not enough colors')
-      end
-    end
-    if options[:labels]
-      unless options[:labels].is_a? Array
-        raise ArgumentError.new('labels not an array')
+    validate_array_and_count(data, options, :colors)
+    validate_array_and_count(data, options, :labels)
+  end
+
+  def validate_array_and_count(data, options, key)
+    if options[key]
+      unless options[key].is_a? Array
+        raise ArgumentError.new("#{ key } not an array")
       end
-      if options[:labels].any? and data.count > options[:labels].count
-        raise ArgumentError.new('not enough labels')
+      if options[key].any? and data.count > options[key].count
+        raise ArgumentError.new("not enough #{ key }")
       end
     end
   end

data/lib/charts/renderer/renderer.rb

@@ -1,9 +1,9 @@
 class Charts::Renderer
-  attr_reader :graph
+  attr_reader :chart
 
-  def initialize(graph)
-    @graph = graph
-    if graph.type == :svg
+  def initialize(chart)
+    @chart = chart
+    if chart.type == :svg
       extend Charts::Renderer::SvgRenderer
     else
       extend Charts::Renderer::RvgRenderer
@@ -12,7 +12,7 @@ class Charts::Renderer
   end
 
   def post_draw
-    filename = graph.options[:filename]
+    filename = chart.options[:filename]
     if filename
       save filename
     else

data/lib/charts/renderer/rvg_renderer.rb

@@ -4,7 +4,7 @@ module Charts::Renderer::RvgRenderer
   attr_reader :rvg
 
   def pre_draw
-    @rvg = Magick::RVG.new(graph.width, graph.height) do |canvas|
+    @rvg = Magick::RVG.new(chart.width, chart.height) do |canvas|
       canvas.background_fill = 'white'
     end
   end
@@ -39,7 +39,7 @@ module Charts::Renderer::RvgRenderer
 
   def canvas(style)
     style.delete(:class)
-    rvg.rvg(graph.width, graph.height) do |canvas|
+    rvg.rvg(chart.width, chart.height) do |canvas|
       yield(canvas).styles(style)
     end
   end

data/lib/charts/renderer/svg_renderer.rb

@@ -4,7 +4,7 @@ module Charts::Renderer::SvgRenderer
   attr_reader :svg
 
   def pre_draw
-    @svg = SVG.new width: graph.width, height: graph.height
+    @svg = SVG.new width: chart.width, height: chart.height
   end
 
   def print

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: charts
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Eike Send
@@ -39,7 +39,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: Create charts, graphs and info graphics with ruby as SVG, JPG or PNG
+description: Create charts, graphs and info chartics with ruby as SVG, JPG or PNG
   images
 email: charts@eike.se
 executables: []