smart_chart 0.0.9 → 0.1.0

data/README.rdoc

@@ -121,7 +121,6 @@ Data can be passed to pie charts in a similar way. For more complex graphs depic
       :thickness => 1,
       :color     => 'FF0099',
       :style     => :dotted
-      }
     }
   ]
 
@@ -133,6 +132,10 @@ Actual output is limited by Google's requirements. For example, while Google pro
 
 == To-do List
 
+* validate height and width
+  * must be integers
+  * dimensions must be >= 1px
+
 * bar graphs
   * add chbh tests
   * style and orientation tests
@@ -197,5 +200,7 @@ Actual output is limited by Google's requirements. For example, while Google pro
 Other Google Charts APIs:
 http://groups.google.com/group/google-chart-api/web/useful-links-to-api-libraries
 
+Seer:
+http://www.idolhands.com/ruby-on-rails/gems-plugins-and-engines/graphing-for-ruby-on-rails-with-seer
 
 Copyright (c) 2009 Alex Reisner. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.1.0

data/lib/smart_chart/base_chart.rb

@@ -133,7 +133,7 @@ module SmartChart
     # The number of data points represented along the x-axis.
     #
     def data_values_count
-      data_values.map{ |set| set.size }.max
+      data_values.map{ |set| set.size }.max.to_i
     end
     
     ##
@@ -155,7 +155,7 @@ module SmartChart
     # 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
+      100.0 * num / (data_values_count - 1)
     end
     
     ##
@@ -163,7 +163,7 @@ module SmartChart
     # 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
+      100.0 * (num - y_min) / (y_max - y_min).to_f
     end
     
     ##

data/lib/smart_chart/features/axes.rb

@@ -11,6 +11,21 @@ module SmartChart
         attr_accessor :labels
       end
     end
+    
+    ##
+    # Determine a nice interval between labels based on the range of
+    # axis values.
+    #
+    def self.auto_label_interval(range)
+      return nil if range == 0
+      # position of decimal point
+      exp = Math.log10(range).floor
+      # first two non-zero digits
+      digits = (range.to_s + "00").sub(/^[\.0]*/, "")[0,2].to_i
+      # the digits are in either 10..55 or 56..99
+      # divide the base in half if they're in the lower half
+      10**exp * (digits > 55 ? 1 : 0.5)
+    end
 
 
     private # ---------------------------------------------------------------
@@ -67,9 +82,13 @@ module SmartChart
       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
+        if a[:labels][:positions] == :auto
+          labels[i] = "#{i}:|" + auto_labels(a).values.join("|")
+        else
+          a[:labels].each do |pos,text|
+            labels[i] ||= "#{i}:"
+            labels[i] << "|" + text.to_s
+          end
         end
       end
       labels.join('|')
@@ -82,17 +101,79 @@ module SmartChart
       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)
+        if a[:labels][:positions] == :auto
+          l = auto_labels(a).keys
+        elsif [:left, :right].include?(axis.keys[i])
+          l = label_positions_by_values(a)
+        else
+          l = label_positions_by_data_points(a)
         end
+        labels << "#{i}," + l.join(',')
       end
       labels.join('|')
     end
     
+    ##
+    # Automatically generate numeric labels based on the given min and max.
+    #
+    def auto_labels(axis)
+      options = axis[:labels]
+      min = options[:min]
+      max = options[:max]
+      range  = max - min
+      int = options[:interval] ||
+        SmartChart::Axes.auto_label_interval(range)
+      labels = {}
+      labels[0]   = min unless options[:omit_first]
+      labels[100] = max unless options[:omit_last]
+
+      # advance cursor to first label position (min + int/2)
+      l = first_auto_label_position(min, int)
+      
+      # add labels until within int/2 of max
+      until l > (max - int / 2.0)
+        pos = 100.0 * (l - min) / range
+        labels[pos] = l
+        l += int
+      end
+      
+      # format if required
+      if options[:format]
+        labels.each{ |p,l| labels[p] = options[:format].call(l) }
+      end
+      
+      labels
+    end
+    
+    ##
+    # Find the first "round number" above the given minimum.
+    #
+    def first_auto_label_position(min, int)
+      i = int
+      i += int while i < min + int / 2.0
+      i
+    end
+    
+    ##
+    # Generate label position values, interpreting given label positions
+    # as data point indices.
+    #
+    def label_positions_by_data_points(axis)
+      axis[:labels].map do |pos,text|
+        SmartChart.decimal_string(x_axis_position(pos))
+      end
+    end
+    
+    ##
+    # Generate label position values, interpreting given label positions
+    # as data point values.
+    #
+    def label_positions_by_values(axis)
+      axis[:labels].map do |pos,text|
+        SmartChart.decimal_string(y_axis_position(pos))
+      end
+    end
+    
     ##
     # Translate an alignment name into a URL parameter value.
     #

data/smart_chart.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{smart_chart}
-  s.version = "0.0.9"
+  s.version = "0.1.0"
 
   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.date = %q{2010-04-07}
   s.description = %q{Easily create charts and graphs for the web (uses Google Charts).}
   s.email = %q{alex@alexreisner.com}
   s.extra_rdoc_files = [
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
   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.rubygems_version = %q{1.3.6}
   s.summary = %q{Easily create charts and graphs for the web (uses Google Charts).}
   s.test_files = [
     "test/smart_charts_test.rb",

data/test/smart_charts_test.rb

@@ -149,6 +149,33 @@ class SmartChartTest < Test::Unit::TestCase
     assert_equal "1,999999,12,-1,lt,888888|2,666666,,,l,", c.send(:chxs)
   end
   
+  def test_auto_label_interval
+    {
+      755   => 100,
+      23    => 5,
+      1     => 0.5,
+      0.99  => 0.1,
+      0.456 => 0.05
+    }.each do |range,int|
+      assert_equal int, SmartChart::Axes.auto_label_interval(range),
+        "Axis label interval should be #{int} when range is #{range}"
+    end
+  end
+  
+  def test_x_axis_label_position
+    c = line_graph(
+      :data => [{:values => [1,2,3,9,25,18,4,67,108,43,62]}], # data points
+      :axis => {
+        :x  => {
+          :labels => {
+            10 => "last"
+          }
+        }
+      }
+    )
+    assert_equal "0,100", c.send(:chxp)
+  end
+  
   
   # --- pie -----------------------------------------------------------------
   

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: smart_chart
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Alex Reisner
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-14 00:00:00 -05:00
+date: 2010-04-07 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -66,18 +71,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Easily create charts and graphs for the web (uses Google Charts).