smart_chart 0.0.1 → 0.0.9

data/CHANGELOG.rdoc

@@ -0,0 +1,12 @@
+= Changelog
+
+Per-release changes to SmartChart.
+
+== 0.0.9 (2009 Dec 14)
+
+* Bar and line charts are now functional, if not complete.
+* Add basic axis style and label functionality.
+
+== 0.0.1 (2009 Oct 29)
+
+* First release (only maps and barcodes work).

data/README.rdoc

@@ -2,7 +2,7 @@
 
 SmartChart is an easy way to render charts on web pages. It uses the Google Charts engine so there are no server-side dependencies or performance issues--just install and go.
 
-<b>SmartChart is still in the early stages of development. Only maps, barcodes, and line charts (partially) are working at all. However, much of the interface is described below (plus to-do list) and if you'd like to contribute, please do.</b>
+<b>SmartChart is still in the early stages of development. Only bar charts, line graphs, maps, and barcodes are working. However, much of the interface is described below (plus to-do list) and if you'd like to contribute, please do.</b>
 
 
 == Key Benefits
@@ -29,9 +29,12 @@ SmartChart is an easy way to render charts on web pages. It uses the Google Char
       {
         :values    => [1,2,3,4],
         :label     => "Profit",
-        :thickness => 2,
+        :thickness => 2,                      # float, default is 1.5
         :color     => '550055',
-        :style     => {:solid => 3, :blank => 2}
+        :style     => {
+                        :solid => 3,
+                        :blank => 2
+                      }
       },
       {
         :values    => [2,4,6,8],
@@ -42,11 +45,20 @@ SmartChart is an easy way to render charts on web pages. It uses the Google Char
       }
     ],
     
-    # axis lines
+    # axis lines and labels
     :axis => {
-      :sides => [:left, :right, :bottom],     # empty array for none
-      :color => 'DDDDDD',
-      :style => :dashed
+      :bottom => {
+        :color      => 'DDDDDD',              # false or nil for hidden
+        :ticks      => 'DDDDDD',              # false or nil for hidden
+        :font_size  => 12,
+        :text_align => :left,
+        :labels     => {
+          1  => "Jan",
+          4  => "Apr",
+          7  => "Jul",
+          10 => "Oct"
+        }
+      }
     }
     
     # grid lines
@@ -56,14 +68,6 @@ SmartChart is an easy way to render charts on web pages. It uses the Google Char
       :style => :dashed                       # no :color or :thickness
     },
     
-    # labels
-    :x_labels => {
-      1  => "Jan",
-      4  => "Apr",
-      7  => "Jul",
-      10 => "Oct"
-    }
-    
     # options for HTML tag
     :html => {
       :id    => "stock_graph",
@@ -124,37 +128,47 @@ Data can be passed to pie charts in a similar way. For more complex graphs depic
 
 == Axis Lines
 
-Actual output is limited by Google's requirements. For example, while Google provides for a line chart with no axis lines ("sparkline"), there is no analogous bar chart type. However, SmartChart will simulate this for you by cropping the chart image using a <div> when you call the chart.to_html method.
+Actual output is limited by Google's requirements. For example, while Google provides for a line chart with no axis lines ("sparkline"), there is no analogous bar chart type. However, SmartChart will simulate this for you by cropping the chart image using a <div> when you call the +to_html+ method.
 
 
 == To-do List
 
-* query_string_params should be a class variable so feature modules can
-  auto-add their parameters
-
-* validations
-  * margins and legend dimensions are integers
-  * grid line attributes
-  
-* grids
-  * easy placement of y-gridline at zero, if exists
-  * easy placement of gridlines at label positions
-
-* axis lines
-  * specify which ones to print
-  * hide all ("sparklines")
-  * hide bar graph axes by hiding 1px from left and bottom of image when to_html is called
-  * chxr parameter?
+* bar graphs
+  * add chbh tests
+  * style and orientation tests
 
 * labels
   * on line, scatter, bar graphs
   * labels on other axes (top and right)
   * multiple rows of labels on same axis
 
+* axes
+  * hide bar graph axes by hiding 1px from left and bottom of image when to_html is called
+  * eliminate unnecessary characters from chxs parameter
+  * chxr parameter? if :auto is given for labels
+  * tests for chxl and chxp parameters
+  * make sure labels are escaped (commas, pipes, etc)
+
+* support OEmbed (oembed.com)
+* check out flotomatic (http://github.com/xdotcommer/flotomatic)
+* use :section: directive in RDoc comments
+* classes should use inheritable query_string_params (like ActiveRecord
+  validations) so features can add params
+* change arguments to to_html method so attributes are easier to pass
+
+* validations
+  * axis colors, font sizes, and alignments
+  * margins and legend dimensions are integers
+  * grid line attributes
+  
 * legend
   * size, position
   * inline legends (line up with ends of lines -- see http://code.google.com/p/graphy/wiki/UserGuide)
 
+* grids
+  * easy placement of y-gridline at zero, if exists
+  * easy placement of gridlines at label positions
+
 * general
   * support advanced background ("fill") options like gradients
 

data/VERSION

@@ -0,0 +1 @@
+0.0.9

data/examples/bar_chart_sparkline.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+#
+# Print a tiny bar chart and hide the axes using a div which is slightly
+# smaller than the chart image.
+#
+
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'smart_chart'
+
+width  = 240
+height = 20
+
+chart = SmartChart::Bar.new(
+  :width      => width,
+  :height     => height,
+  :y_min      => 0,
+  :y_max      => 100,
+  :bar_width  => 3,
+  :bar_space  => 1,
+  :data       => [38,60,68,78,52,50,19,23,33,49,38,39,12,18]
+)
+
+puts "<div style=\"width:#{width-2}px; height:#{height-1}px; overflow:hidden;\">"
+puts chart.to_html(true, true, :style => "margin:0 0 -1px -2px")
+puts "</div>"

data/examples/line_graph_pennant_race.rb

@@ -0,0 +1,128 @@
+#!/usr/bin/env ruby
+#
+# Generate a URL for a Google line graph depicting the 2008 National League
+# pennant race (games +/- .500 vs. time).
+#
+
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'smart_chart'
+
+data = [{
+  :label  => "1. Philadelphia (.568)",
+  :color  => "2f3fe0",
+  :thickness => 1,
+  :values => [
+    0, 0, 0, -1, -1, -2, -1, 0, -1, -2, -1, 0, -1, -2, -1, 0, -1, -1,
+    0, -1, 0, -1, -2, -1, 0, 1, 0, 1, 2, 3, 2, 2, 3, 2, 3, 4, 3, 4, 5, 4, 5,
+    4, 5, 4, 3, 3, 4, 3, 4, 5, 4, 3, 2, 3, 4, 5, 4, 3, 4, 5, 6, 7, 7, 8, 7,
+    8, 9, 10, 9, 10, 11, 12, 13, 13, 12, 11, 12, 13, 12, 11, 12, 11, 10, 10,
+    9, 8, 7, 7, 6, 7, 6, 5, 6, 5, 5, 6, 7, 8, 9, 8, 7, 6, 5, 6, 7, 8, 7, 8,
+    8, 9, 8, 7, 7, 8, 7, 6, 5, 6, 7, 7, 8, 9, 10, 9, 10, 11, 11, 10, 11, 10,
+    9, 10, 11, 10, 9, 8, 7, 8, 7, 8, 8, 9, 10, 9, 10, 11, 12, 13, 14, 13, 12,
+    11, 12, 13, 12, 13, 12, 12, 13, 13, 13, 14, 13, 12, 13, 13, 14, 16, 16,
+    17, 18, 19, 18, 19, 20, 21, 20, 19, 19, 20, 21, 22, 22, 22
+  ]},{
+
+  :label  => "2. New York (.549)",
+  :color  => "fae12e",
+  :thickness => 1,
+  :values => [
+    0, 0, 0, 1, 0, 1, 1, 1, 0, -1, -1, -2, -1, 0, 1, 0, -1, -1, 0, 1,
+    2, 3, 4, 3, 2, 1, 2, 1, 0, 1, 2, 2, 3, 2, 2, 3, 2, 3, 2, 1, 2, 2, 2, 2,
+    3, 2, 3, 2, 1, 1, 2, 3, 3, 1, 0, -1, -2, -1, -2, -3, -2, -1, 0, -1, 0,
+    1, 0, 1, 2, 1, 0, -1, -2, -2, -3, -2, -3, -2, -2, -2, -1, -2, -1, -1, 0,
+    -1, 0, -1, -2, -1, -1, -1, -2, -1, -2, -1, -2, -1, -2, -1, 0, 1, 2, 3, 4,
+    5, 6, 7, 8, 7, 6, 7, 7, 6, 7, 8, 9, 8, 9, 8, 9, 8, 8, 7, 6, 5, 5, 6, 5,
+    6, 7, 8, 7, 6, 7, 8, 9, 10, 11, 12, 11, 12, 13, 14, 15, 14, 13, 14, 13,
+    14, 14, 15, 14, 15, 16, 17, 18, 18, 17, 17, 17, 17, 18, 19, 19, 19, 19,
+    18, 17, 16, 17, 18, 19, 18, 17, 16, 17, 16, 17, 16, 17, 16, 16, 16
+  ]},{
+
+  :label  => "3. Florida (.522)",
+  :color  => "2dad2d",
+  :thickness => 1,
+  :values => [
+    0, 0, 0, -1, 0, -1, -1, 0, 1, 0, 1, 1, 2, 3, 4, 3, 2, 2, 3, 4, 3,
+    2, 3, 4, 5, 4, 5, 4, 5, 4, 5, 5, 4, 3, 2, 3, 2, 3, 3, 4, 5, 6, 7, 8, 9,
+    8, 7, 6, 6, 5, 6, 5, 5, 6, 7, 8, 7, 7, 9, 10, 9, 8, 8, 7, 8, 7, 6, 5, 6,
+    5, 4, 5, 6, 5, 6, 7, 6, 5, 4, 5, 6, 5, 6, 6, 5, 6, 5, 5, 4, 3, 2, 3, 2,
+    3, 4, 3, 4, 3, 2, 1, 2, 3, 2, 3, 4, 5, 6, 5, 5, 4, 5, 6, 5, 6, 5, 4, 5,
+    6, 5, 6, 5, 6, 7, 6, 7, 6, 6, 7, 6, 7, 6, 5, 6, 5, 6, 5, 4, 3, 4, 3, 3,
+    4, 3, 2, 3, 2, 3, 3, 2, 3, 2, 1, 2, 1, 2, 1, 2, 2, 3, 2, 1, 0, 1, 2, 2,
+    3, 4, 5, 5, 6, 7, 8, 9, 8, 7, 6, 5, 6, 6, 7, 6, 7, 7, 7
+  ]},{
+
+  :label  => "4. Atlanta (.444)",
+  :color  => "ff0000",
+  :thickness => 1,
+  :values => [
+    0, 0, -1, -2, -2, -1, -2, -2, -1, 0, -1, -2, -3, -3, -2, -1, -2,
+    -2, -3, -4, -3, -2, -1, 0, 1, 0, -1, 0, 1, 0, -1, -1, -2, -3, -3, -2, -1,
+    0, 0, 1, 2, 3, 2, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 3, 4, 5, 4, 5, 4, 5, 4,
+    3, 4, 3, 2, 1, 2, 3, 2, 3, 2, 1, 0, 0, -1, -2, -3, -2, -1, -2, -1, -2,
+    -1, -2, -3, -2, -1, -2, -3, -2, -2, -1, -2, -3, -3, -4, -5, -6, -5, -6,
+    -5, -6, -5, -6, -6, -7, -6, -5, -5, -4, -5, -6, -5, -6, -5, -5, -4, -5,
+    -6, -7, -8, -9, -8, -9, -10, -9, -10, -9, -10, -9, -8, -7, -8, -8, -8,
+    -10, -11, -12, -11, -12, -13, -14, -15, -16, -17, -16, -17, -17, -16,
+    -17, -16, -17, -18, -19, -20, -19, -20, -19, -18, -19, -20, -20, -19,
+    -18, -17, -17, -17, -16, -16, -17, -18, -19, -20, -19, -18, -19, -18,
+    -17, -17, -18, -17, -18, -18, -18
+  ]},{
+
+  :label  => "5. Washington (.366)",
+  :color  => "a020f0",
+  :thickness => 1,
+  :values => [
+    0, 0, 1, 2, 2, 3, 2, 1, 0, -1, -2, -2, -3, -4, -5, -6, -5, -5,
+    -6, -7, -8, -7, -8, -9, -10, -9, -10, -9, -8, -9, -8, -8, -7, -6, -5,
+    -6, -5, -4, -4, -5, -6, -5, -6, -7, -8, -7, -8, -7, -6, -7, -8, -7, -6,
+    -7, -8, -8, -7, -8, -7, -8, -9, -8, -9, -8, -9, -10, -10, -11, -11, -11,
+    -12, -13, -14, -15, -14, -15, -16, -15, -14, -13, -13, -14, -15, -16,
+    -15, -16, -17, -18, -19, -18, -18, -17, -18, -17, -18, -17, -18, -19,
+    -20, -21, -22, -22, -23, -22, -23, -22, -23, -24, -24, -25, -24, -23,
+    -23, -24, -25, -26, -27, -28, -29, -29, -30, -31, -32, -31, -30, -29,
+    -28, -29, -29, -27, -28, -29, -30, -31, -32, -33, -34, -35, -36, -37,
+    -37, -38, -39, -38, -37, -38, -39, -39, -38, -37, -36, -35, -34, -33,
+    -32, -33, -32, -33, -34, -33, -32, -32, -33, -34, -34, -35, -36, -37,
+    -36, -35, -36, -37, -38, -39, -40, -40, -39, -40, -40, -41, -42, -43,
+    -43, -43
+  ]}
+]
+
+chart = SmartChart::Line.new(
+  :width  => 600,
+  :height => 230,
+  :data   => data,
+  :y_min  => -50,
+  :y_max  => 30,
+  :grid   => {
+    :x     => {:every => 30},
+    :y     => {:every => 10},
+    :style => :dotted
+  },
+  :axis => {
+    :bottom => {
+      :labels => {
+        15  => "Apr",
+        45  => "May",
+        75  => "Jun",
+        105 => "Jul",
+        135 => "Aug",
+        165 => "Sep"
+      }
+    },
+    :left => {
+      :labels => {
+        -40 => "-40",
+        -30 => "-30",
+        -20 => "-20",
+        -10 => "-10",
+          0 => "0",
+         10 => "+10",
+         20 => "+20"
+      }
+    }
+  }
+)
+puts chart.to_url
+

data/lib/smart_chart/base_chart.rb

@@ -82,10 +82,10 @@ module SmartChart
     ##
     # Chart as an HTML tag.
     #
-    def to_html(encode = true, validation = true)
-      '<img src="%s" />' % to_url(encode, validation)
+    def to_html(encode = true, validation = true, attributes = {})
+      '<img src="%s"%s />' % [to_url(encode, validation), tag_attributes(attributes)]
     end
-    
+
     ##
     # Run validation (may raise exceptions).
     #
@@ -150,6 +150,22 @@ module SmartChart
       @y_max || data_values.flatten.compact.max
     end
     
+    ##
+    # Translate a number to a position on the x-axis (percentage). Numbers
+    # start at 0 so the maximum allowed number is sample size minus one.
+    #
+    def x_axis_position(num)
+      num.to_f * 100 / data_values_count.to_f
+    end
+    
+    ##
+    # Translate a number to a position on the y-axis (percentage). Range
+    # of the axis is y_min to y_max.
+    #
+    def y_axis_position(num)
+      100.0 * (num.to_f - y_min.to_f) / (y_max - y_min).to_f
+    end
+    
     ##
     # Array of names of required attributes.
     #
@@ -266,11 +282,22 @@ module SmartChart
       raise ColorFormatError unless (c.nil? or c.match(/^[0-9A-Fa-f]{6}$/))
     end
     
+    ##
+    # Render attributes of an HTML tag.
+    #
+    def tag_attributes(attributes)
+      attrs = []
+      attributes.each_pair do |key, value|
+        attrs << %(#{key}="#{value.to_s.gsub('"', '\"')}") unless value.nil?
+      end
+      " #{attrs.sort * ' '}" unless attrs.empty?
+    end
+    
     
     # --- URL parameter list and methods ------------------------------------
     
     ##
-    # Array of names of all possible query string parameters in the order
+    # Array of universal query string parameters in the order
     # in which they are output (for easier testing).
     #
     def query_string_params
@@ -290,16 +317,15 @@ module SmartChart
         :chxr,  # axis_range
         :chma,  # margins
         
-        :chbh,  # bar_spacing
         :chp,   # bar_chart_zero_line, pie chart rotation
 
         :chm,   # markers
 
         :chtt,  # title
         :chdl,  # legend
-        :chdlp, # legend_position
+        :chdlp  # legend_position
         
-        :chds   # data_scaling -- never used
+        #:chds   # data_scaling -- never used
       ]
     end
 
@@ -419,10 +445,5 @@ module SmartChart
     def chdlp
       nil
     end
-
-    # chds -- never used
-    def chds          
-      nil
-    end
   end
 end

data/lib/smart_chart/charts/bar.rb

@@ -1,7 +1,16 @@
 module SmartChart
   class Bar < MultipleDataSetChart
-    include GridLines
   
+    # bar width (in pixels)
+    attr_accessor :bar_width
+    
+    # space between bars (in pixels)
+    attr_accessor :bar_space
+    
+    # space between bar groups (in pixels)
+    attr_accessor :bar_group_space
+    
+    
     private # ---------------------------------------------------------------
     
     ##
@@ -13,6 +22,46 @@ module SmartChart
         (style       == :stacked    ? "s" : "g")
     end
     
+    ##
+    # Google's default bar width.
+    #
+    def default_bar_width
+      23
+    end
+    
+    ##
+    # Google's default bar width.
+    #
+    def default_bar_space
+      8
+    end
+    
+    ##
+    # Google's default bar width.
+    #
+    def default_bar_group_space
+      8
+    end
+    
+    ##
+    # Array of all possible query string parameters.
+    #
+    def query_string_params
+      super + [:chbh]
+    end
+
+    # bar width and spacing
+    def chbh
+      # use bar_space default for group default if only one data set
+      group_default = data_values.size == 1 ?
+        bar_space : default_bar_group_space
+      [
+        bar_width       || default_bar_width,
+        bar_space       || default_bar_space,
+        bar_group_space || group_default
+      ].map{ |i| i.to_s }.join(',')
+    end
+    
     # zero line
     def chp
     end

data/lib/smart_chart/charts/line.rb

@@ -1,15 +1,14 @@
 module SmartChart
   class Line < MultipleDataSetChart
-    include GridLines
-    
   
     private # ---------------------------------------------------------------
     
     ##
-    # Specify the Google Chart type.
+    # Specify the Google Chart type. Should be "lc" unless axes are
+    # explicitly hidden, then "ls".
     #
     def type
-      "lc"
+      show_axes?? "lc" : "ls"
     end
 
     ##

data/lib/smart_chart/charts/radar.rb

@@ -1,6 +1,5 @@
 module SmartChart
   class Radar < MultipleDataSetChart
-    include GridLines
   
     private # ---------------------------------------------------------------
     

data/lib/smart_chart/charts/scatter.rb

@@ -1,6 +1,5 @@
 module SmartChart
   class Scatter < MultipleDataSetChart
-    include GridLines
   
     private # ---------------------------------------------------------------
     

data/lib/smart_chart/exceptions.rb

@@ -22,6 +22,9 @@ module SmartChart
   class ValidationError < SmartChartError #:nodoc:
   end
   
+  class LineStyleNameError < ValidationError #:nodoc:
+  end
+  
   class MissingRequiredAttributeError < ValidationError #:nodoc:
     def initialize(chart, param)
       chart_type = chart.class.to_s.sub(/^SmartChart::/, "")

data/lib/smart_chart/features/axes.rb

@@ -0,0 +1,115 @@
+module SmartChart
+  module Axes
+
+    def self.included(base)
+      base.class_eval do
+      
+        # grid axis style
+        attr_accessor :axis
+        
+        # grid axis labels
+        attr_accessor :labels
+      end
+    end
+
+
+    private # ---------------------------------------------------------------
+  
+    ##
+    # Labels parameter.
+    #
+    def chdl
+      unless bare_data_set?
+        labels = data.map{ |d| d.is_a?(Hash) ? d[:label] : nil }
+        labels.compact.size > 0 ? labels.join("|") : nil
+      end
+    end
+  
+    ##
+    # Axis type parameter.
+    #
+    def chxt
+      return nil unless show_axes?
+      values = {
+        :left   => "y",
+        :right  => "r",
+        :top    => "t",
+        :bottom => "x"
+      }
+      axis.keys.map{ |i| values[i] }.join(',')
+    end
+
+    ##
+    # Axis style parameter.
+    #
+    def chxs
+      return nil unless show_axes?
+      data = []
+      axis.values.each_with_index do |side,i|
+        data << [
+          i + 1,                        # index
+          side[:color],                 # color
+          side[:font_size],             # font size
+          alignment(side[:text_align]), # alignment
+          (side[:color] ? "l" : "") +
+            (side[:ticks] ? "t" : ""),  # drawing control
+          side[:ticks]                  # tick mark color
+        ].map{ |i| i.to_s }
+      end
+      out = data.map{ |i| i.join(',') }.join("|")
+      out == "" ? nil : out
+    end
+    
+    ##
+    # Axis label text parameter.
+    #
+    def chxl
+      return nil unless show_axes?
+      labels = []
+      axis.values.each_with_index do |a,i|
+        a[:labels].each do |pos,text|
+          labels[i] ||= "#{i}:"
+          labels[i] << "|" + text
+        end
+      end
+      labels.join('|')
+    end
+    
+    ##
+    # Axis label positions parameter.
+    #
+    def chxp
+      return nil unless show_axes?
+      labels = []
+      axis.values.each_with_index do |a,i|
+        a[:labels].each do |pos,text|
+          # figure out whether are we on a vertical or horizontal axis
+          dir = [:left, :right].include?(axis.keys[i]) ? "y" : "x"
+          p = eval("#{dir}_axis_position(pos)")
+          labels[i] ||= i.to_s
+          labels[i] << "," + SmartChart.decimal_string(p)
+        end
+      end
+      labels.join('|')
+    end
+    
+    ##
+    # Translate an alignment name into a URL parameter value.
+    #
+    def alignment(name)
+      {
+        "left"   => -1,
+        "center" => 0,
+        "right"  => 1
+      }[name.to_s]
+    end
+    
+    ##
+    # Should axes be omitted?
+    #
+    def show_axes?
+      axis.is_a?(Hash) and axis.keys.size > 0 and
+        axis.values.reject{ |i| i.nil? or i == {} }.size > 0
+    end
+  end  
+end

data/lib/smart_chart/multiple_data_set_chart.rb

@@ -1,8 +1,23 @@
 module SmartChart
   class MultipleDataSetChart < BaseChart
-    include Labels
-    include AxisLines
+    include GridLines
+    include Axes
     
+    ##
+    # Hash mapping line style names to two-element arrays. This is a class
+    # method so exceptions can access it to print a list of valid style names.
+    #
+    def self.line_styles(thickness = 1)
+      {
+        :solid  => [thickness * 1, thickness * 0],
+        :dotted => [thickness * 1, thickness * 2],
+        :short  => [thickness * 2, thickness * 4],
+        :dashed => [thickness * 4, thickness * 4],
+        :long   => [thickness * 6, thickness * 4]
+      }
+    end
+    
+
     private # ---------------------------------------------------------------
     
     ##
@@ -23,6 +38,13 @@ module SmartChart
       super + [:chls]
     end
     
+    ##
+    # Default line style provided by Google if no chls parameter is given.
+    #
+    def default_line_style
+      [1.5, 1, 0]
+    end
+    
     ##
     # Line style parameter.
     #
@@ -33,50 +55,38 @@ module SmartChart
         if set.is_a?(Hash)
           line_style_to_array(set)
         else
-          [1, 1, 0]
+          default_line_style
         end
       end
       # only return non-nil if styles other than default are given
-      if lines.map{ |l| l == [1,1,0] ? nil : 1 }.compact.size > 0
+      if lines.map{ |l| l == default_line_style ? nil : 1 }.compact.size > 0
         lines.map{ |s| s.join(",") }.join("|")
       end
     end
     
     ##
-    # Translate a line style to a three-element array:
-    #
-    #   [thickness, solid, blank]
-    #
-    # Takes a hash or a symbol (shortcut for a pre-defined look).
+    # Build a three-element array describing a line style:
+    # 
+    #   [thickness, solid_segment_length, blank_segment_length]
+    # 
+    # Takes a data set hash or a symbol (shortcut for a pre-defined look).
     #
     def line_style_to_array(data)
-      return [1, 1, 0] if data.nil?
-      thickness = data[:thickness] || 1
+      return default_line_style if data.nil?
+      thickness = data[:thickness] || default_line_style.first
       style     = data[:style]
       style_arr = style.is_a?(Hash) ? [style[:solid], style[:blank]] :
-        line_style_definition(style, thickness)
+                  line_style_definition(style, thickness)
       [thickness] + style_arr
     end
     
     ##
-    # Translate a symbol into a line style: a two-element array (solid line
-    # length, blank line length). Takes a style name and line thickness.
+    # Translate a line style name (symbol) into a line style array
+    # (two integers: solid segment length, blank segment length).
+    # Takes a style name and line thickness.
     #
     def line_style_definition(symbol, thickness = 1)
-      self.class.line_styles(thickness)[symbol] || [1, 0]
-    end
-    
-    ##
-    # Get a hash of line style definitions.
-    #
-    def self.line_styles(thickness = 1)
-      {
-        :solid  => [thickness * 1, thickness * 0],
-        :dotted => [thickness * 1, thickness * 1],
-        :short  => [thickness * 2, thickness * 4],
-        :dashed => [thickness * 4, thickness * 4],
-        :long   => [thickness * 6, thickness * 4]
-      }
+      self.class.line_styles(thickness)[symbol] || default_line_style[1..2]
     end
     
     ##
@@ -107,22 +117,19 @@ module SmartChart
       end
     end
     
+    ##
+    # Make sure line style names are real.
+    #
     def validate_line_style_names
       data.each do |d|
-        if d.is_a?(Hash) and d.is_a?(Hash)
-          if (style = d[:style]).is_a?(Symbol)
-            unless self.class.line_styles.keys.include?(style)
-              raise LineStyleNameError,
-                "Line style name '#{style}' is not valid. " +
-                "Try one of: #{self.class.line_styles.keys.join(', ')}"
-            end
+        if d.is_a?(Hash) and (style = d[:style]).is_a?(Symbol)
+          unless self.class.line_styles.keys.include?(style)
+            raise LineStyleNameError,
+              "Line style name '#{style}' is not valid. " +
+              "Try one of: #{self.class.line_styles.keys.join(', ')}"
           end
         end
       end
     end
   end
-
-  
-  class LineStyleNameError < ValidationError #:nodoc:
-  end
 end

data/lib/smart_chart.rb

@@ -8,9 +8,8 @@ require 'encoder'
 require 'exceptions'
 
 # features
-require 'features/axis_lines'
+require 'features/axes'
 require 'features/grid_lines'
-require 'features/labels'
 
 # chart parents
 require 'base_chart'

data/smart_chart.gemspec

@@ -0,0 +1,73 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{smart_chart}
+  s.version = "0.0.9"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Alex Reisner"]
+  s.date = %q{2009-12-14}
+  s.description = %q{Easily create charts and graphs for the web (uses Google Charts).}
+  s.email = %q{alex@alexreisner.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "CHANGELOG.rdoc",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "examples/bar_chart_sparkline.rb",
+     "examples/line_graph_pennant_race.rb",
+     "lib/smart_chart.rb",
+     "lib/smart_chart/base_chart.rb",
+     "lib/smart_chart/charts/bar.rb",
+     "lib/smart_chart/charts/line.rb",
+     "lib/smart_chart/charts/map.rb",
+     "lib/smart_chart/charts/meter.rb",
+     "lib/smart_chart/charts/pie.rb",
+     "lib/smart_chart/charts/qr_code.rb",
+     "lib/smart_chart/charts/radar.rb",
+     "lib/smart_chart/charts/scatter.rb",
+     "lib/smart_chart/charts/venn.rb",
+     "lib/smart_chart/data_set.rb",
+     "lib/smart_chart/encoder.rb",
+     "lib/smart_chart/exceptions.rb",
+     "lib/smart_chart/features/axes.rb",
+     "lib/smart_chart/features/grid_lines.rb",
+     "lib/smart_chart/multiple_data_set_chart.rb",
+     "lib/smart_chart/single_data_set_chart.rb",
+     "smart_chart.gemspec",
+     "test/smart_charts_test.rb",
+     "test/test_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/alexreisner/smart_chart}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Easily create charts and graphs for the web (uses Google Charts).}
+  s.test_files = [
+    "test/smart_charts_test.rb",
+     "test/test_helper.rb",
+     "examples/line_graph_pennant_race.rb",
+     "examples/bar_chart_sparkline.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+

data/test/smart_charts_test.rb

@@ -72,11 +72,11 @@ class SmartChartTest < Test::Unit::TestCase
     # apply default line style automatically
     c.data[1][:thickness] = nil
     c.data[1][:style] = nil
-    assert_equal "4,3,2|1,1,0", c.send(:chls).to_s
+    assert_equal "4,3,2|1.5,1,0", c.send(:chls).to_s
     
     # apply line style by name
     c.data[0][:style] = :dotted
-    assert_equal "4,4,4|1,1,0", c.send(:chls).to_s
+    assert_equal "4,4,8|1.5,1,0", c.send(:chls).to_s
     
     # raise exception on invalid style name
     assert_raise(SmartChart::LineStyleNameError) do
@@ -102,36 +102,51 @@ class SmartChartTest < Test::Unit::TestCase
         :style => :dotted
       }
     )
-    assert_equal "25,50,1,1,12.5,25", c.send(:chg).to_s
+    assert_equal "25,50,1.5,3.0,12.5,25", c.send(:chg).to_s
     
     # test x/y-step decimal points
     c.data = [0, 2, 3, 4, 5, 6]
-    assert_equal "33.333,66.667,1,1,16.667,33.333", c.send(:chg).to_s
+    assert_equal "33.333,66.667,1.5,3.0,16.667,33.333", c.send(:chg).to_s
   end
   
   
-  # --- axis lines ----------------------------------------------------------
+  # --- axes ----------------------------------------------------------------
   
   def test_axis_lines
     c = line_graph(
       :data => [0, 2, 3, 4, 5, 6, 7, 8],
-      :axis => {
-        :color => "AABBCC",
-        :style => :dotted
-      }
+      :axis => {}
     )
-    assert_nil c.send(:chxt)
-    assert_equal "???", c.send(:chxs).to_s
-    
-    # test axis side specification
-    c.axis[:sides] = [:left, :bottom, :right]
-    assert_equal "???", c.send(:chxt).to_s
-    
-    # test no axis specification
-    c.axis[:sides] = []
     assert_equal "ls", c.send(:cht).to_s
     assert_nil c.send(:chxt)
-    assert_nil c.send(:chxs)
+    assert_equal "", c.send(:chxs).to_s
+    
+    # test with bottom axis
+    c.axis[:bottom] = {
+      :color => "aabbcc"
+    }
+    assert_equal "lc", c.send(:cht).to_s
+    assert_equal "x", c.send(:chxt).to_s
+    assert_equal "1,aabbcc,,,l,", c.send(:chxs)
+  end
+  
+  def test_complex_axis_configuration
+    c = line_graph(
+      :data => [0, 2, 3, 4, 5, 6, 7, 8],
+      :axis => {
+        :bottom => {
+          :color => "999999",
+          :ticks => "888888",
+          :font_size  => 12,
+          :text_align => :left
+        },
+        :left => {
+          :color => "666666"
+        }
+      }
+    )
+    assert_equal "x,y", c.send(:chxt).to_s
+    assert_equal "1,999999,12,-1,lt,888888|2,666666,,,l,", c.send(:chxs)
   end
   
   
@@ -274,6 +289,15 @@ class SmartChartTest < Test::Unit::TestCase
   end
   
   
+  # --- html ----------------------------------------------------------------
+  
+  def test_tag_attributes
+    c = map_chart
+    tag = c.to_html(true, true, :style => "display:none;")
+    assert tag.match(/<img.*style="display:none;".*\/>/)
+  end
+
+  
   # --- encoding ------------------------------------------------------------
   
   def test_simple_encoding

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smart_chart
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.9
 platform: ruby
 authors: 
 - Alex Reisner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 -04:00
+date: 2009-12-14 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -25,9 +25,13 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- CHANGELOG.rdoc
 - LICENSE
 - README.rdoc
 - Rakefile
+- VERSION
+- examples/bar_chart_sparkline.rb
+- examples/line_graph_pennant_race.rb
 - lib/smart_chart.rb
 - lib/smart_chart/base_chart.rb
 - lib/smart_chart/charts/bar.rb
@@ -42,11 +46,11 @@ files:
 - lib/smart_chart/data_set.rb
 - lib/smart_chart/encoder.rb
 - lib/smart_chart/exceptions.rb
-- lib/smart_chart/features/axis_lines.rb
+- lib/smart_chart/features/axes.rb
 - lib/smart_chart/features/grid_lines.rb
-- lib/smart_chart/features/labels.rb
 - lib/smart_chart/multiple_data_set_chart.rb
 - lib/smart_chart/single_data_set_chart.rb
+- smart_chart.gemspec
 - test/smart_charts_test.rb
 - test/test_helper.rb
 has_rdoc: true
@@ -80,3 +84,5 @@ summary: Easily create charts and graphs for the web (uses Google Charts).
 test_files: 
 - test/smart_charts_test.rb
 - test/test_helper.rb
+- examples/line_graph_pennant_race.rb
+- examples/bar_chart_sparkline.rb

data/lib/smart_chart/features/axis_lines.rb

@@ -1,29 +0,0 @@
-module SmartChart
-  module AxisLines
-
-    def self.included(base)
-      base.class_eval do
-        attr_accessor :axis
-      end
-    end
-
-
-    private # ---------------------------------------------------------------
-  
-    ##
-    # Axis type parameter.
-    #
-    def chxt
-      #return nil unless (axis.is_a?(Hash) and (axis[:sides].is_a?(Array))
-      "TODO"
-    end
-
-    ##
-    # Axis style parameter.
-    #
-    def chxs
-      #return nil unless (axis.is_a?(Hash) and (axis[:color] or axis[:style]))
-      "TODO"
-    end
-  end  
-end

data/lib/smart_chart/features/labels.rb

@@ -1,23 +0,0 @@
-module SmartChart
-  module Labels
-
-    def self.included(base)
-      base.class_eval do
-        attr_accessor :labels
-      end
-    end
-
-
-    private # ---------------------------------------------------------------
-  
-    ##
-    # Labels parameter.
-    #
-    def chdl
-      unless bare_data_set?
-        labels = data.map{ |d| d.is_a?(Hash) ? d[:label] : nil }
-        labels.compact.size > 0 ? labels.join("|") : nil
-      end
-    end
-  end
-end