samhendley-scruffy 0.2.8 → 0.2.9

data/lib/scruffy/components/data_markers.rb

@@ -8,7 +8,7 @@ module Scruffy
       attr_accessor :markers
       
       def draw(svg, bounds, options={})
-        if (options[:point_markers].nil? || options[:point_markers].empty?) && options[:calculate_markers]
+        if options[:calculate_markers] && (options[:point_markers].nil? || options[:point_markers].empty?)
           markers = (options[:markers] || self.markers) || 5
           options[:point_markers] = []
           each_marker(markers, options[:min_key], options[:max_key], bounds[:width], options, :key_formatter) do |label, x|

data/lib/scruffy/formatters.rb

@@ -209,5 +209,22 @@ module Scruffy::Formatters
       end
     end
   end
+  
+ 
+  class Date < Base
+
+    def initialize(format_string, options = {})
+      @format_string = format_string
+    end
+    
+    # Formats percentages.
+    def format(target, idx, options)
+      begin
+        target.strftime(@format_string)
+      rescue
+        target
+      end
+    end
+  end
 
 end

data/lib/scruffy/graph.rb

@@ -116,7 +116,7 @@ module Scruffy
       self.value_formatter = Scruffy::Formatters::Number.new
       self.key_formatter = Scruffy::Formatters::Number.new
 
-      %w(title theme layers default_type value_formatter point_markers rasterizer).each do |arg|
+      %w(title theme layers default_type value_formatter point_markers rasterizer key_formatter).each do |arg|
         self.send("#{arg}=".to_sym, options.delete(arg.to_sym)) unless options[arg.to_sym].nil?
       end
       

data/lib/scruffy/helpers/marker_helper.rb

@@ -7,7 +7,7 @@ module Scruffy::Helpers
 
       (0...markers).each do |idx|
         percent = idx.to_f / (markers-1)
-        all_values << (max - min) * percent + min
+        all_values << min + (max - min) * percent
       end
 
       all_values.size.times do |idx|

data/lib/scruffy/layers/base.rb

@@ -162,8 +162,8 @@ module Scruffy::Layers
         ret = []
         points.each_point do |x, y|
           if y
-            x_coord = dx * (x.to_f - options[:min_key])
-            y_coord = dy * (y.to_f - options[:min_value])
+            x_coord = dx * (x - options[:min_key])
+            y_coord = dy * (y - options[:min_value])
 
             ret << [x_coord, height - y_coord]
           end

data/lib/scruffy/version.rb

@@ -2,7 +2,7 @@ module Scruffy
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 8
+    TINY  = 9
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/graph_creation_test.rb

@@ -117,4 +117,18 @@ class GraphCreationTest < Test::Unit::TestCase
     graph.render :to => "#{WEBSITE_DIR}/scatter_test.svg"
     graph.render  :width => 500, :to => "#{WEBSITE_DIR}/scatter_test.png", :as => 'png' if $make_png
   end
+  
+  def test_scatter_by_date
+    graph = Scruffy::Graph.new
+    graph.title = "Some Kind of Information"
+    graph.renderer = Scruffy::Renderers::Standard.new
+    graph.key_formatter = Scruffy::Formatters::Date.new("%H:%M")
+    h = {}
+    start = Time.local(2009, 1, 20, 12, 0, 0)
+    30.times{|i| h[start + 60*i] = i*i}
+    
+    graph.add :scatter, 'DNI', h
+    graph.render :to => "#{WEBSITE_DIR}/scatter_date_test.svg", :calculate_markers => true
+    graph.render  :width => 500, :to => "#{WEBSITE_DIR}/scatter_date_test.png", :as => 'png' if $make_png
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: samhendley-scruffy
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors: 
 - Brasten Sager
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-28 21:00:00 -08:00
+date: 2009-01-22 21:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency