sparklines 0.4.4 → 0.4.5

data/CHANGELOG

@@ -1,3 +1,11 @@
+== 0.4.5
+
+* Several fixes by Rob Biedenharn
+* lib/sparklines_helper.rb: Include example code for generating "data:" URLs (but leave it commented out due to lack of widespread testing)
+* lib/sparklines_helper.rb: allow results to be passed in the options hash (i.e., sparkline_tag(nil, :results => [ ... ], ...))
+* lib/sparklines.rb: Move calculation of whisker endpoints out of loop
+* lib/sparklines.rb: Fix fencepost bug in whisker that caused plot to be 1 pixel short
+
 == 0.4.4
 
 * Fixed stddev rounding bug [Andrew Nutter-Upham]

data/Rakefile

@@ -11,7 +11,7 @@ Hoe.new('Sparklines', Sparklines::VERSION) do |p|
   p.email = 'boss@topfunky.com'
   p.summary = "Tiny graphs."
   p.url = "http://nubyonrails.com/pages/sparklines"
-  p.clean_globs = ['test/output/*']
+  p.clean_globs = ['test/output'] # Remove this directory on "rake clean"
   p.remote_rdoc_dir = '' # Release to root
   p.changes = p.paragraphs_of('CHANGELOG', 0..1).join("\n\n")
   # * extra_deps - An array of rubygem dependencies.

data/lib/sparklines.rb

@@ -74,7 +74,7 @@ Licensed under the MIT license.
 =end
 class Sparklines
 
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 
   @@label_margin = 5.0
   @@pointsize = 10.0
@@ -463,11 +463,13 @@ class Sparklines
     height = @options[:height].to_f
     background_color = @options[:background_color]
 
-    create_canvas((@data.size - 1) * 2, height, background_color)
+    create_canvas(@data.size * 2 - 1, height, background_color)
     
     whisker_color = @options[:whisker_color] || 'black'
     exception_color = @options[:exception_color] || 'red'
 
+    on_row = (@canvas.rows/2.0 - 1).ceil
+    off_row = (@canvas.rows/2.0).floor
     i = 0
     @data.each do |r|
       color = whisker_color
@@ -476,7 +478,7 @@ class Sparklines
         color = exception_color
       end
 
-      y_mid_point = (r >= 1) ? (@canvas.rows/2.0 - 1).ceil : (@canvas.rows/2.0).floor
+      y_mid_point = (r >= 1) ? on_row : off_row
 
       y_end_point = y_mid_point
       if ( r > 0) 

data/lib/sparklines_helper.rb

@@ -1,3 +1,4 @@
+require 'base64'
 # Provides a tag for embedding sparklines graphs into your Rails app.
 #
 module SparklinesHelper
@@ -8,11 +9,20 @@ module SparklinesHelper
   #
 	# You can also pass :class => 'some_css_class' ('sparkline' by default).
 	def sparkline_tag(results=[], options={})		
-		url = { :controller => 'sparklines',
-			:results => results.join(',') }
+    url = { :controller => 'sparklines' }
+    url[:results] = results.join(',') unless results.nil?
 		options = url.merge(options)
+    attributes = %(class="#{options[:class] || 'sparkline'}" alt="Sparkline Graph" )
+    attributes << %(title="#{options[:title]}" ) if options[:title]
+
+    # prefer to use a "data" URL scheme as described in {RFC 2397}[http://www.ietf.org/rfc/rfc2397.txt]
+#     data_url = "data:image/png;base64,#{Base64.encode64(Sparklines.plot(results,options))}"
+#     tag = %(<img src="#{data_url}" #{attributes}/>)
+
+#     # respect some limits noted in RFC 2397 since the data: url is supposed to be 'short'
+#     data_url.length <= 1024 && tag.length <= 2100 ? tag :
+      %(<img src="#{ url_for options }" #{attributes}/>)
 		
-		%(<img src="#{ url_for options }" class="#{options[:class] || 'sparkline'}" alt="Sparkline Graph" />)
 	end
 
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: sparklines
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
-date: 2007-06-15 00:00:00 -07:00
+  version: 0.4.5
+date: 2007-06-18 00:00:00 -07:00
 summary: Tiny graphs.
 require_paths: 
 - lib