squid 1.0.0.beta2 → 1.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 802e428b541dc6eaba5d9274733688abd8c47666
-  data.tar.gz: cf142a3795699066ebde7c1ba686749a1785184f
+  metadata.gz: a30136182bd1690282984a45aa989c76048d2323
+  data.tar.gz: 4fbcc2b4a29298c6f6c5548d96e07dc211913334
 SHA512:
-  metadata.gz: c64d9edd048a94b238f389d408e6df4b1906531214aae2e4d162323cf5e66213d9eab0c25db673eafba0e0e2703dff7917106cef87089c5f8ab5fab115139a5d
-  data.tar.gz: b3db0636c20220d14f8ca97f4200f3d97f31b78a5c1ff3d76ec752ab1c643971d2fe6059b14e42806de108d0b1828c9bb5986008ccee48fa41f96af30f77f44d
+  metadata.gz: 8cd3102e934345601ef5177af3a7a85cb395a4fc262ab45cc025cb4a7011364d9157aa65ce094ff37fc4c01866824410393d559fcf09a14312ee8e01030ef741
+  data.tar.gz: 9470e71ffb9c6197b210b4f6f050630c3c1c330450bc011164fb878a605e674f8928cbbada38e590bc5a8da3dbaed378e9369816fc284b34ca70fdebc35cbc22

data/README.md

@@ -40,11 +40,11 @@ Multiple options can be combined. Here is a comprehensive list.
 
 ![02-type-point](https://raw.githubusercontent.com/fullscreen/squid/master/examples/screenshots/readme_02.png "chart(data, type: :point)")
 
-##### `:line_widths` changes the line width (default: `[3]`, only applies to line graphs).
+##### `:line_width` changes the line width (default: `3`, only applies to line graphs).
 
-![03-type-line](https://raw.githubusercontent.com/fullscreen/squid/master/examples/screenshots/readme_03.png "chart(data, type: :line, line_widths: [10])")
+![03-type-line](https://raw.githubusercontent.com/fullscreen/squid/master/examples/screenshots/readme_03.png "chart(data, type: :line, line_width: 10)")
 
-##### `:colors` changes the colors of the chart (default: `%w(2e578c 5d9648 e7a13d bc2d30 6f3d79 7d807f)`).
+##### `:color` changes the color of the chart (default: `'2e578c'`).
 
 ![04-colors](https://raw.githubusercontent.com/fullscreen/squid/master/examples/screenshots/readme_04.png "chart(data, colors: ['5d9648'])")
 
@@ -68,17 +68,17 @@ Multiple options can be combined. Here is a comprehensive list.
 
 ![09-legend](https://raw.githubusercontent.com/fullscreen/squid/master/examples/screenshots/readme_09.png "chart(data, legend: false)")
 
-##### `:legend` can also set the distance of the legend from the right margin (default: `{offset: 0}`).
+##### `:legend` can also set the right and bottom margins of the legend (default: `{right: 0, bottom: 15}`).
 
-![10-legend-offset](https://raw.githubusercontent.com/fullscreen/squid/master/examples/screenshots/readme_10.png "chart(data, legend: {offset: 50})")
+![10-legend-offset](https://raw.githubusercontent.com/fullscreen/squid/master/examples/screenshots/readme_10.png "chart(data, legend: {right: 50})")
 
-##### `:format` changes the format of the label values. Can be `:integer` (default), `:float`, `:percentage`, `:currency`, or `:seconds`.
+##### `:format` changes the format of the axis labels. Can be `:integer` (default), `:float`, `:percentage`, `:currency`, or `:seconds`.
 
 ![11-format](https://raw.githubusercontent.com/fullscreen/squid/master/examples/screenshots/readme_11.png "chart(data, format: :percentage)")
 
-##### `:labels` shows/hides the value for each point in the graph (default: `false`).
+##### `:label` shows/hides the value for each point in the graph (default: `false`).
 
-![12-labels](https://raw.githubusercontent.com/fullscreen/squid/master/examples/screenshots/readme_12.png "chart(data, labels: true)")
+![12-label](https://raw.githubusercontent.com/fullscreen/squid/master/examples/screenshots/readme_12.png "chart(data, label: true)")
 
 ##### `:border` shows/hides a border around the graph (default: `false`).
 
@@ -101,12 +101,21 @@ data = {safari:  {2013 => 43.2, 2014 => 46.1, 2015 => 50.7},
 chart data, labels: true, format: :percentage
 ```
 
-![15-multiple-columns](https://raw.githubusercontent.com/fullscreen/squid/master/examples/screenshots/readme_15.png "chart(data, labels: true, format: :percentage)")
+![15-multiple-columns](https://raw.githubusercontent.com/fullscreen/squid/master/examples/screenshots/readme_15.png "chart(data, label: true, format: :percentage)")
 
 When plotting multiple series, the option `type: :stack` can be set to display stacked columns:
 
 ![16-multiple-stacks](https://raw.githubusercontent.com/fullscreen/squid/master/examples/screenshots/readme_16.png "chart(data, type: :stack, format: :percentage)")
 
+Any value set for the `:color`, `:format`, `:line_width` and `:label` options will be applied to the first series only:
+
+![17-singular-options](https://raw.githubusercontent.com/fullscreen/squid/master/examples/screenshots/readme_17.png "chart data, type: :line, color: '6f3d79', format: :percentage, line_width: 0.5, label: true")
+
+To customize each series, use the _plural_ options `:colors`, `:formats`, `:line_widths` and `:labels` instead:
+
+![18-plural-options](https://raw.githubusercontent.com/fullscreen/squid/master/examples/screenshots/readme_18.png "chart data, type: :line, colors: ['6f3d79', '7d807f'], formats: [:percentage, :percentage], line_widths: [0.5, 6], labels: [true, true]")
+
+
 Finally, the option `type: :two_axis` can be set to display two separate axes in your series belong to two different domains.
 
 For instance, the following code generates the graph below:
@@ -117,7 +126,7 @@ data = {views: {2013 => 182, 2014 => 46, 2015 => 88},
 chart data, type: :two_axis
 ```
 
-![17-two-axis](https://raw.githubusercontent.com/fullscreen/squid/master/examples/screenshots/readme_17.png "chart(data, type: :two_axis)")
+![19-two-axis](https://raw.githubusercontent.com/fullscreen/squid/master/examples/screenshots/readme_19.png "chart(data, type: :two_axis)")
 
 How to install
 ==============

data/Rakefile

@@ -12,6 +12,7 @@ task :readme do
   print 'Building readme... '
   require_relative 'examples/readme'
   print 'Extracting screenshots...'
+  # Note: images 17, 18 and 19 need to be cropped at 309 (not 280) because they have more code
   `convert -density 175 -colorspace sRGB readme.pdf -resize 50% -quality 100 -crop 744x320+0+280 examples/screenshots/readme_%02d.png`
   puts 'DONE!'
 end

data/examples/readme/03-type-line.rb

@@ -1,5 +1,5 @@
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
   data = {views: {2013 => 182, 2014 => 46, 2015 => 134}}
-  chart data, type: :line, line_widths: [10]
+  chart data, type: :line, line_width: 10
 end

data/examples/readme/10-legend-offset.rb

@@ -1,5 +1,5 @@
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
   data = {views: {2013 => 182, 2014 => 46, 2015 => 134}}
-  chart data, legend: {offset: 50}
+  chart data, legend: {right: 50, bottom: 50}
 end

data/examples/readme/12-labels.rb

@@ -1,5 +1,5 @@
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
   data = {views: {2013 => 182, 2014 => 46, 2015 => 134}}
-  chart data, labels: true
+  chart data, label: true
 end

data/examples/readme/15-multiple-columns.rb

@@ -1,5 +1,5 @@
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
   data = {safari:  {2013 => 43.2, 2014 => 46.1, 2015 => 50.7}, firefox:  {2013 => 56.8, 2014 => 53.9, 2015 => 49.3}}
-  chart data, labels: true, format: :percentage
+  chart data, label: true, format: :percentage
 end

data/examples/readme/17-singular-options.rb

@@ -0,0 +1,5 @@
+filename = File.basename(__FILE__).gsub('.rb', '.pdf')
+Prawn::ManualBuilder::Example.generate(filename) do
+  data = {safari:  {2013 => 53.2, 2014 => 56.1, 2015 => 60.7}, firefox:  {2013 => 46.8, 2014 => 43.9, 2015 => 39.3}}
+  chart data, type: :line, color: '6f3d79', format: :percentage, line_width: 0.5, label: true
+end

data/examples/readme/18-plural-options.rb

@@ -0,0 +1,5 @@
+filename = File.basename(__FILE__).gsub('.rb', '.pdf')
+Prawn::ManualBuilder::Example.generate(filename) do
+  data = {safari:  {2013 => 53.2, 2014 => 56.1, 2015 => 60.7}, firefox:  {2013 => 46.8, 2014 => 43.9, 2015 => 39.3}}
+  chart data, type: :line, colors: ['6f3d79', '7d807f'], formats: [:percentage, :percentage], line_widths: [0.5, 6], labels: [true, true]
+end

data/examples/readme/19-two-axis.rb

@@ -0,0 +1,5 @@
+filename = File.basename(__FILE__).gsub('.rb', '.pdf')
+Prawn::ManualBuilder::Example.generate(filename) do
+  data = {earnings: {2013 => 104_323, 2014 => 27_234, 2015 => 74_123}, views: {2013 => 182, 2014 => 46, 2015 => 88}, uniques: {2013 => 153, 2014 => 36, 2015 => 78} }
+  chart data, type: :two_axis
+end

data/examples/readme/readme.rb

@@ -22,7 +22,9 @@ Prawn::ManualBuilder::Example.generate 'readme.pdf' do
       s.example '14-height'
       s.example '15-multiple-columns'
       s.example '16-multiple-stacks'
-      s.example '17-two-axis'
+      s.example '17-singular-options'
+      s.example '18-plural-options'
+      s.example '19-two-axis'
     end
   end
 end

data/examples/squid/baseline.rb

@@ -4,6 +4,6 @@
 #
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
-  data = {views: {2013 => 182, 2014 => 46, 2015 => 802000000000000000}}
-  chart data, baseline: false, format: :float
+  data = {earnings: {2013 => 182, 2014 => 46, 2015 => 8020}}
+  chart data, baseline: false, formats: [:currency]
 end

data/examples/squid/color.rb

@@ -0,0 +1,9 @@
+# By default, <code>chart</code> generates charts with default colors.
+#
+# You can use the <code>:color</code> option to manually set the color.
+#
+filename = File.basename(__FILE__).gsub('.rb', '.pdf')
+Prawn::ManualBuilder::Example.generate(filename) do
+  data = {views: {2013 => 18.2, 2014 => 4.6, 2015 => 10.2}}
+  chart data, color: '6f3d79'
+end

data/examples/squid/columns.rb

@@ -5,5 +5,5 @@ filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
   data = {views: {2013 => 182, 2014 => 46, 2015 => 88},
         uniques: {2013 => 104, 2014 => -27, 2015 => 14}}
-  chart data, labels: true
+  chart data, label: true, format: :percentage
 end

data/examples/squid/labels.rb

@@ -1,9 +1,9 @@
 # By default, <code>chart</code> does not write value labels on the chart.
 #
-# You can use the <code>:labels</code> option to enable this behavior.
+# You can use the <code>:label</code> option to enable this behavior.
 #
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
   data = {a_very_long_label_to_test_padding_with_labels: {2013 => 182000, 2014 => -182000, 2015 => 182000}}
-  chart data, labels: true
+  chart data, label: true
 end

data/examples/squid/legend_offset.rb

@@ -5,5 +5,5 @@
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
   data = {views: {2013 => 182, 2014 => 46}, uniques: {2013 => 94, 2014 => 27}}
-  chart data, legend: {offset: 50}
+  chart data, legend: {right: 50, bottom: 20}
 end

data/examples/squid/line.rb

@@ -5,5 +5,5 @@
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
   data = {views: {Safari: 45.20001, Firefox: 63.3999, Chrome: 21.4}}
-  chart data, type: :line
+  chart data, type: :line, line_width: 0.25
 end

data/examples/squid/lines.rb

@@ -5,7 +5,7 @@ filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
   data = {views: {2013 => 182, 2014 => -46, 2015 => 88},
         uniques: {2013 => 104, 2014 => 27, 2015 => 14}}
-  chart data, type: :line, labels: true
+  chart data, type: :line, labels: [false, true], formats: %i(percentage percentage), line_widths: [0.5]
 end
 
 

data/examples/squid/points.rb

@@ -5,5 +5,5 @@ filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
   data = {views: {2013 => 182, 2014 => 46, 2015 => 88},
         uniques: {2013 => -104, 2014 => 27, 2015 => 14}}
-  chart data, type: :point, labels: true
+  chart data, type: :point, labels: [false, true], formats: []
 end

data/examples/squid/squid.rb

@@ -18,14 +18,15 @@ Prawn::ManualBuilder::Example.generate 'squid.pdf' do
       s.example 'basic'
       s.example 'legend'
     end
-    
+
     p.section 'Chart types' do |s|
       s.example 'point'
       s.example 'line'
     end
-    
+
     p.section 'Styling' do |s|
       s.example 'height'
+      s.example 'color'
       s.example 'baseline'
       s.example 'ticks'
       s.example 'every'
@@ -36,7 +37,7 @@ Prawn::ManualBuilder::Example.generate 'squid.pdf' do
       s.example 'line_width'
       s.example 'legend_offset'
     end
-    
+
     p.section 'Multiple series' do |s|
       s.example 'columns'
       s.example 'lines'

data/examples/squid/stacks.rb

@@ -6,5 +6,5 @@ Prawn::ManualBuilder::Example.generate(filename) do
   data = {views: {2013 => 196, 2014 => 66, 2015 => -282},
            hits: {2013 => 100, 2014 => -12, 2015 => 82},
         uniques: {2013 => -114, 2014 => 47, 2015 => -14}}
-  chart data, type: :stack, labels: true
+  chart data, type: :stack, labels: [true, false, true], formats: [:currency, :float, :percentage]
 end

data/examples/squid/two_axis.rb

@@ -3,8 +3,8 @@
 # You can use ..
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
-
-  data = {views: {2013 => 182, 2014 => 46, 2015 => 88},
-       earnings: {2013 => 104_323, 2014 => 27_234, 2015 => 14_123}}
-  chart data, type: :two_axis, border: true
+  data = {earnings: {2013 => 104_323, 2014 => 27_234, 2015 => 34_123},
+             views: {2013 => 182, 2014 => 46, 2015 => 88},
+           uniques: {2013 => 104, 2014 => 27, 2015 => 14}}
+  chart data, type: :two_axis, height: 150, labels: [true, false, false], formats: [:currency], line_width: 0.5, colors: ['6f3d79', '7d807f']
 end

data/lib/squid/configuration.rb

@@ -28,12 +28,10 @@ module Squid
   #   ENV['SQUID_GRIDLINES'] =  '4'
   #
   class Configuration < OpenStruct
-    COLORS = '2e578c 5d9648 e7a13d bc2d30 6f3d79 7d807f'
-
     def self.boolean
       -> (value) { %w(1 t T true TRUE).include? value }
     end
-    
+
     def self.integer
       -> (value) { value.to_i }
     end
@@ -45,25 +43,25 @@ module Squid
     def self.float
       -> (value) { value.to_f }
     end
-    
-    def self.array
-      -> (value) { value.split }
+
+    def self.array(proc = nil)
+      -> (values) { values.split.map{|value| proc ? proc.call(value) : value} }
     end
 
     ATTRIBUTES = {
-      baseline:     {default: 'true',      as: boolean},
-      border:       {default: 'false',     as: boolean},
-      chart:        {default: 'true',      as: boolean},
-      colors:       {default: COLORS,      as: array},
-      every:        {default: '1',         as: integer},
-      format:       {default: 'integer',   as: symbol},
-      height:       {default: '250',       as: float},
-      labels:       {default: 'false',     as: boolean},
-      legend:       {default: 'true',      as: boolean},
-      line_widths:  {default: '3',         as: integer},
-      steps:        {default: '4',         as: integer},
-      ticks:        {default: 'true',      as: boolean},
-      type:         {default: 'column',    as: symbol},
+      baseline:     {as: boolean,        default: 'true'},
+      border:       {as: boolean,        default: 'false'},
+      chart:        {as: boolean,        default: 'true'},
+      colors:       {as: array},
+      every:        {as: integer,        default: '1'},
+      formats:      {as: array(symbol)},
+      height:       {as: float,          default: '250'},
+      labels:       {as: array(boolean)},
+      legend:       {as: boolean,        default: 'true'},
+      line_widths:  {as: array(float)},
+      steps:        {as: integer,        default: '4'},
+      ticks:        {as: boolean,        default: 'true'},
+      type:         {as: symbol,         default: 'column'},
     }
 
     attr_accessor *ATTRIBUTES.keys
@@ -72,7 +70,7 @@ module Squid
     def initialize
       ATTRIBUTES.each do |key, options|
         var = "squid_#{key}".upcase
-        value = ENV.fetch var, options[:default]
+        value = ENV.fetch var, options.fetch(:default, '')
         public_send "#{key}=", options[:as].call(value)
       end
     end

data/lib/squid/format.rb

@@ -10,13 +10,19 @@ module Squid
         when :percentage then number_to_percentage value, precision: 1
         when :currency then number_to_currency value
         when :seconds then number_to_minutes_and_seconds value
-        when :float then number_to_delimited value
+        when :float then number_to_float value
         else number_to_delimited value.to_i
       end.to_s
     end
 
     def number_to_minutes_and_seconds(value)
-      "#{value.round / 60}:#{(value.round % 60).to_s.rjust 2, '0'}"
+      signum = '-' if value < 0
+      "#{signum}#{value.abs.round/60}:#{(value.abs.round%60).to_s.rjust 2, '0'}"
+    end
+
+    def number_to_float(value)
+      float = number_to_rounded value, significant: true, precision: 2
+      number_to_delimited float
     end
   end
 end

data/lib/squid/graph.rb

@@ -12,7 +12,7 @@ module Squid
   # @private
   class Graph
     extend Settings
-    has_settings :baseline, :border, :chart, :colors, :every, :format, :height
+    has_settings :baseline, :border, :chart, :colors, :every, :formats, :height
     has_settings :legend, :line_widths, :steps, :ticks, :type, :labels
 
     def initialize(document, data = {}, settings = {})
@@ -37,8 +37,8 @@ module Squid
 
     def draw_legend
       labels = @data.keys.reverse.map{|key| key.to_s.titleize}
-      offset = legend.is_a?(Hash) ? legend.fetch(:offset, 0) : 0
-      @plot.legend labels, offset: offset, colors: colors, height: legend_height
+      right = legend.is_a?(Hash) ? legend.fetch(:right, 0) : 0
+      @plot.legend labels, right: right, colors: colors, height: legend_height
     end
 
     def draw_gridlines
@@ -60,14 +60,17 @@ module Squid
     end
 
     def draw_charts
-      draw_chart right, type: :column, colors: colors[1..-1]
-      draw_chart left, colors: colors
+      draw_chart right, second_axis: true
+      draw_chart left
     end
 
-    def draw_chart(axis, options = {})
-      args = {minmax: axis.minmax, height: grid_height, stack: stack?, labels: labels, format: format}
+    def draw_chart(axis, second_axis: false)
+      args = {minmax: axis.minmax, height: grid_height, stack: stack?}
+      args[:labels] = items_of labels, skip_first_if: second_axis
+      args[:formats] = items_of formats, skip_first_if: second_axis
       points = Point.for axis.data, args
-      case options.delete(:type) {type}
+      options = {colors: colors, starting_at: (second_axis ? 1: 0)}
+      case (second_axis ? :column : type)
         when :point then @plot.points points, options
         when :line, :two_axis then @plot.lines points, options.merge(line_widths: line_widths)
         when :column then @plot.columns points, options
@@ -75,19 +78,26 @@ module Squid
       end
     end
 
+    def items_of(array, skip_first_if:)
+      if skip_first_if
+        array.empty? ? [] : array[1..-1]
+      else
+        array
+      end
+    end
+
     def left
       @left ||= axis first: 0, last: (two_axis? ? 1 : @data.size)
     end
 
     def right
-      @right ||= axis first: 1, last: (two_axis? ? 1 : 0)
+      @right ||= axis first: 1, last: (two_axis? ? @data.size : 0)
     end
 
     def axis(first:, last:)
       series = @data.values[first, last].map(&:values)
-      Axis.new series, steps: steps, stack: stack?, format: format do |label|
-        @plot.width_of label
-      end
+      options = {steps: steps, stack: stack?, format: formats[first]}
+      Axis.new(series, options) {|label| @plot.width_of label}
     end
 
     def bottom
@@ -95,11 +105,15 @@ module Squid
     end
 
     def legend_height
-      15
+      legend ? 15 : 0
+    end
+
+    def legend_bottom
+      legend.is_a?(Hash) ? legend.fetch(:bottom, 15) : 15
     end
 
     def grid_height
-      height - bottom - legend_height * (legend ? 2 : 1)
+      height - bottom - legend_height - legend_bottom
     end
 
     def stack?

data/lib/squid/plotter.rb

@@ -22,18 +22,25 @@ module Squid
 
     # Draws the graph legend with the given labels.
     # @param [Array<LegendItem>] The labels to write as part of the legend.
-    def legend(labels, height:, offset: 0, colors: [])
+    def legend(labels, height:, right: 0, colors: [])
       left = @pdf.bounds.width/2
       box(x: left, y: @pdf.bounds.top, w: left, h: height) do
-        x = @pdf.bounds.right - offset
+        x = @pdf.bounds.right - right
         options = {size: 7, height: @pdf.bounds.height, valign: :center}
         labels.each.with_index do |label, i|
-          color = Array.wrap(colors[labels.size - 1 - i]).first
+          index = labels.size - 1 - i
+          series_color = colors.fetch index, series_colors(index)
+          color = Array.wrap(series_color).first
           x = legend_item label, x, color, options
         end
       end
     end
 
+    def series_colors(index)
+      default_colors = %w(2e578c 5d9648 e7a13d bc2d30 6f3d79 7d807f)
+      default_colors.fetch(index % default_colors.size)
+    end
+
     # Draws a horizontal line.
     def horizontal_line(y, options = {})
       with options do
@@ -66,34 +73,35 @@ module Squid
       end
     end
 
-    def points(series, colors: [])
-      items(series, colors: colors) do |point, w, i, padding|
+    def points(series, options = {})
+      items(series, options) do |point, w, i, padding|
         x, y = (point.index + 0.5)*w + left, point.y + @bottom
         @pdf.fill_circle [x, y], 5
       end
     end
 
-    def lines(series, colors: [], line_widths: [])
+    def lines(series, options = {})
       x, y = nil, nil
-      items(series, colors: colors) do |point, w, i, padding|
+      line_widths = options.delete(:line_widths) { [] }
+      items(series, options) do |point, w, i, padding|
         prev_x, prev_y = x, y
         x, y = (point.index + 0.5)*w + left, point.y + @bottom
-        line_width = Array.wrap(line_widths).fetch(i, 1)
+        line_width = line_widths.fetch i, 3
         with line_width: line_width, cap_style: :round do
           @pdf.line [prev_x, prev_y], [x,y] unless point.index.zero? || prev_y.nil? || prev_x > x
         end
       end
     end
 
-    def stacks(series, colors: [])
-      items(series, colors: colors, fill: true) do |point, w, i, padding|
+    def stacks(series, options = {})
+      items(series, options.merge(fill: true)) do |point, w, i, padding|
         x, y = point.index*w + padding + left, point.y + @bottom
         @pdf.fill_rectangle [x, y], w - 2*padding, point.height
       end
     end
 
-    def columns(series, colors: [])
-      items(series, colors: colors, fill: true, count: series.size) do |point, w, i, padding|
+    def columns(series, options = {})
+      items(series, options.merge(fill: true, count: series.size)) do |point, w, i, padding|
         item_w = (w - 2 * padding)/ series.size
         x, y = point.index*w + padding + left + i*item_w, point.y + @bottom
         @pdf.fill_rectangle [x, y], item_w, point.height
@@ -127,13 +135,15 @@ module Squid
       options
     end
 
-    def items(series, colors: [], fill: false, count: 1, &block)
+    def items(series, colors: [], fill: false, count: 1, starting_at: 0, &block)
       series.reverse_each.with_index do |points, reverse_index|
         index = series.size - reverse_index - 1
+        color_index = index + starting_at
         w = width / points.size.to_f
-        series_colors = Array.wrap(colors[index]).cycle
+        series_color = colors.fetch color_index, series_colors(color_index)
+        item_color = Array.wrap(series_color).cycle
         points.select(&:y).each do |point|
-          item point, series_colors.next, w, fill, index, count, &block
+          item point, item_color.next, w, fill, index, count, &block
         end
       end
     end

data/lib/squid/point.rb

@@ -4,17 +4,17 @@ module Squid
   class Point
     extend Format
 
-    def self.for(series, minmax:, height:, labels:, stack:, format:)
+    def self.for(series, minmax:, height:, labels:, stack:, formats:)
       @min = Hash.new 0
       @max = Hash.new 0
       min, max = minmax
       offset = -> (value) { value * height.to_f / (max-min) }
-      series.map do |values|
+      series.map.with_index do |values, series_i|
         values.map.with_index do |value, i|
           h = y_for value, index: i, stack: false, &offset if value
           y = y_for value, index: i, stack: stack, &offset if value
           y = y - offset.call([min, 0].min) if value
-          label = format_for(value, format) if labels
+          label = format_for value, formats[series_i] if labels[series_i]
           new y: y, height: h, index: i, label: label, negative: value.to_f < 0
         end
       end

data/lib/squid/settings.rb

@@ -3,12 +3,25 @@ require 'squid/config'
 module Squid
   # @private
   module Settings
+    # For each key, create an attribute reader with a settings value.
+    # First, check if an option with the key exists.
+    # For example: {formats: [:currency]} ->> [:currency]
+    # Then, check is an option with the singular version of the key exists.
+    # For example: {format: :currency} ->> [:currency]
+    # Finally, check whether the key has a value in Squid configuration.
+    # For example: config.formats = [:currency] ->> [:currency]
     def has_settings(*keys)
       keys.each do |key|
-        define_method key do
-          @settings.fetch key, Squid.configuration.public_send(key)
+        define_method(key) do
+          singular_key = key.to_s.singularize.to_sym
+          if @settings.key? key
+            @settings[key]
+          elsif @settings.key? singular_key
+            [@settings[singular_key]]
+          else
+            Squid.configuration.public_send key
+          end
         end
-        private key
       end
     end
   end

data/lib/squid/version.rb

@@ -1,3 +1,3 @@
 module Squid
-  VERSION = '1.0.0.beta2'
+  VERSION = '1.0.0.beta3'
 end

data/lib/squid.rb

@@ -7,7 +7,7 @@ module Squid
   module Interface
     # Plots a graph the current document.
     #
-    # @param [Hash<#to_s, [Hash<#to_s, Numeric>]>] data the series to plot in 
+    # @param [Hash<#to_s, [Hash<#to_s, Numeric>]>] data the series to plot in
     #   the graph. Each key is the name of the series, and each value contains
     #   the values for the series. Values are also a hash, where each key is
     #   a category, and each value the numerical value for that category.
@@ -21,8 +21,8 @@ module Squid
     # @option settings [Numeric] :height (250) the full height of the graph.
     # @option settings [Boolean] :labels (false) whether to plot value labels.
     # @option settings [<Boolean, Hash>] :legend (true) whether to plot the
-    #   legend. If a Hash is provided, the `:offset` option can be set to
-    #   specify the offset between the legend and the right margin.
+    #   legend. If a Hash is provided, the `:right` and `:bottom` options can be
+    #   set to specify the right and bottom margin of the legend.
     # @option settings [Numeric] :line_width (3) the line width for line graphs.
     # @option settings [Numeric] :steps (4) the number of gridlines.
     # @option settings [Boolean] :ticks (true) whether to plot the ticks.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squid
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0.beta3
 platform: ruby
 authors:
 - claudiob
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -157,7 +157,9 @@ files:
 - examples/readme/14-height.rb
 - examples/readme/15-multiple-columns.rb
 - examples/readme/16-multiple-stacks.rb
-- examples/readme/17-two-axis.rb
+- examples/readme/17-singular-options.rb
+- examples/readme/18-plural-options.rb
+- examples/readme/19-two-axis.rb
 - examples/readme/readme.rb
 - examples/screenshots/readme_00.png
 - examples/screenshots/readme_01.png
@@ -177,9 +179,12 @@ files:
 - examples/screenshots/readme_15.png
 - examples/screenshots/readme_16.png
 - examples/screenshots/readme_17.png
+- examples/screenshots/readme_18.png
+- examples/screenshots/readme_19.png
 - examples/squid/baseline.rb
 - examples/squid/basic.rb
 - examples/squid/border.rb
+- examples/squid/color.rb
 - examples/squid/columns.rb
 - examples/squid/every.rb
 - examples/squid/format.rb

data/examples/readme/17-two-axis.rb

@@ -1,7 +0,0 @@
-filename = File.basename(__FILE__).gsub('.rb', '.pdf')
-Prawn::ManualBuilder::Example.generate(filename) do
-  data = {views: {2013 => 182, 2014 => 46, 2015 => 88}, earnings: {2013 => 104_323, 2014 => 27_234, 2015 => 14_123}}
-  chart data, type: :two_axis
-end
-
-