gruff 0.3.7 → 0.4.0

data/lib/gruff/themes.rb

@@ -0,0 +1,102 @@
+module Gruff
+  module Themes
+    
+    # A color scheme similar to the popular presentation software.
+    KEYNOTE = {
+      :colors => [
+        '#FDD84E',  # yellow
+        '#6886B4',  # blue
+        '#72AE6E',  # green
+        '#D1695E',  # red
+        '#8A6EAF',  # purple
+        '#EFAA43',  # orange
+        'white'
+      ],
+      :marker_color => 'white',
+      :font_color => 'white',
+      :background_colors => %w(black #4a465a)
+    }
+
+    # A color scheme plucked from the colors on the popular usability blog.
+    THIRTYSEVEN_SIGNALS = {
+      :colors => [
+        '#FFF804',  # yellow
+        '#336699',  # blue
+        '#339933',  # green
+        '#ff0000',  # red
+        '#cc99cc',  # purple
+        '#cf5910',  # orange
+        'black'
+      ],
+      :marker_color => 'black',
+      :font_color => 'black',
+      :background_colors => %w(#d1edf5 white)
+    }
+
+    # A color scheme from the colors used on the 2005 Rails keynote
+    # presentation at RubyConf.
+    RAILS_KEYNOTE = {
+      :colors => [
+        '#00ff00',  # green
+        '#333333',  # grey
+        '#ff5d00',  # orange
+        '#f61100',  # red
+        'white',
+        '#999999',  # light grey
+        'black'
+      ],
+      :marker_color => 'white',
+      :font_color => 'white',
+      :background_colors => %w(#0083a3 #0083a3)
+    }
+
+    # A color scheme similar to that used on the popular podcast site.
+    ODEO = {
+      :colors => [
+        '#202020',  # grey
+        'white',
+        '#3a5b87',  # dark blue
+        '#a21764',  # dark pink
+        '#8ab438',  # green
+        '#999999',  # light grey
+        'black'
+      ],
+      :marker_color => 'white',
+      :font_color => 'white',
+      :background_colors => %w(#ff47a4 #ff1f81)
+    }
+
+    # A pastel theme
+    PASTEL = {
+      :colors => [
+        '#a9dada', # blue
+        '#aedaa9', # green
+        '#daaea9', # peach
+        '#dadaa9', # yellow
+        '#a9a9da', # dk purple
+        '#daaeda', # purple
+        '#dadada' # grey
+      ],
+      :marker_color => '#aea9a9', # Grey
+      :font_color => 'black',
+      :background_colors => 'white'
+    }
+
+    # A greyscale theme
+    GREYSCALE = {
+      :colors => [
+        '#282828', #
+        '#383838', #
+        '#686868', #
+        '#989898', #
+        '#c8c8c8', #
+        '#e8e8e8', #
+      ],
+      :marker_color => '#aea9a9', # Grey
+      :font_color => 'black',
+      :background_colors => 'white'
+    }
+    
+  end
+end
+

data/lib/gruff/version.rb

@@ -1,3 +1,3 @@
 module Gruff
-  VERSION = '0.3.7'
+  VERSION = '0.4.0'
 end

data/test/gruff_test_case.rb

@@ -1,67 +1,88 @@
-$:.unshift(File.dirname(__FILE__) + "/../lib/")
-# require 'rubygems'
+$:.unshift(File.dirname(__FILE__) + '/../lib/')
 
 RMAGICK_BYPASS_VERSION_TEST = true
 
 require 'test/unit'
 require 'gruff'
 require 'fileutils'
-# require 'test_timer'
 
-TEST_OUTPUT_DIR = File.dirname(__FILE__) + "/output"
+TEST_OUTPUT_DIR = File.dirname(__FILE__) + "/output#{'_java' if RUBY_PLATFORM == 'java'}"
 FileUtils.mkdir_p(TEST_OUTPUT_DIR)
+FileUtils.rm_f Dir[TEST_OUTPUT_DIR + '/*']
+
+if ENV['RM_INFO'] && RUBY_VERSION =~ /^(1\.9|2\.0)\./
+  require 'minitest/reporters'
+  MiniTest::Reporters.use!
+end
+
+class Gruff::Base
+  alias :write_org :write
+
+  def write(filename='graph.png')
+    basefilename = File.basename(filename).split('.')[0..-2].join('.')
+    extension = filename.slice(/\.[^\.]*$/)
+    testfilename = File.join(TEST_OUTPUT_DIR, basefilename) + extension
+    counter = 0
+    while File.exists?(testfilename)
+      counter += 1
+      testfilename = File.join(TEST_OUTPUT_DIR, basefilename) + "-#{counter}#{extension}"
+    end
+    write_org(testfilename)
+  end
+end
 
 class GruffTestCase < Test::Unit::TestCase
 
   def setup
+    srand 42
     @datasets = [
-      [:Jimmy, [25, 36, 86, 39, 25, 31, 79, 88]],
-      [:Charles, [80, 54, 67, 54, 68, 70, 90, 95]],
-      [:Julie, [22, 29, 35, 38, 36, 40, 46, 57]],
-      [:Jane, [95, 95, 95, 90, 85, 80, 88, 100]],
-      [:Philip, [90, 34, 23, 12, 78, 89, 98, 88]],
-      ["Arthur", [5, 10, 13, 11, 6, 16, 22, 32]],
-      ]
+        [:Jimmy, [25, 36, 86, 39, 25, 31, 79, 88]],
+        [:Charles, [80, 54, 67, 54, 68, 70, 90, 95]],
+        [:Julie, [22, 29, 35, 38, 36, 40, 46, 57]],
+        [:Jane, [95, 95, 95, 90, 85, 80, 88, 100]],
+        [:Philip, [90, 34, 23, 12, 78, 89, 98, 88]],
+        [:Arthur, [5, 10, 13, 11, 6, 16, 22, 32]],
+    ]
 
     @labels = {
-        0 => '5/6', 
-        1 => '5/15', 
-        2 => '5/24', 
-        3 => '5/30', 
-        4 => '6/4', 
-        5 => '6/12', 
-        6 => '6/21', 
-        7 => '6/28', 
-      }      
+        0 => '5/6',
+        1 => '5/15',
+        2 => '5/24',
+        3 => '5/30',
+        4 => '6/4',
+        5 => '6/12',
+        6 => '6/21',
+        7 => '6/28',
+    }
   end
 
   def setup_single_dataset
     @datasets = [
-      [:Jimmy, [25, 36, 86]]
-      ]
+        [:Jimmy, [25, 36, 86]]
+    ]
 
     @labels = {
-        0 => 'You', 
-        1 => 'Average', 
-        2 => 'Lifetime' 
-      }      
+        0 => 'You',
+        1 => 'Average',
+        2 => 'Lifetime'
+    }
   end
 
   def setup_wide_dataset
     @datasets = [
-      ["Auto", 25],
-      ["Food", 5],
-      ["Entertainment", 15]
-      ]
+        ['Auto', 25],
+        ['Food', 5],
+        ['Entertainment', 15]
+    ]
 
-    @labels = { 0 => 'This Month' }
+    @labels = {0 => 'This Month'}
   end
 
   def test_dummy
     assert true
   end
 
-protected
+  protected
 
   # Generate graphs at several sizes.
   #
@@ -76,13 +97,21 @@ protected
     Array(sizes).each do |size|
       g = instance_eval("Gruff::#{class_name}.new #{size}")
       g.title = "#{class_name} Graph"
-      yield g      
+      yield g
       write_test_file g, "#{filename}_#{size}.png"
     end
   end
 
   def write_test_file(graph, filename)
-    graph.write([TEST_OUTPUT_DIR, filename].join("/"))
+    testfilename = [TEST_OUTPUT_DIR, filename].join('/')
+    basefilename = filename.split('.')[0..-2].join('.')
+    extension = filename.slice(/\..*$/)
+    counter = 0
+    while File.exists? testfilename
+      counter += 1
+      testfilename = [TEST_OUTPUT_DIR, basefilename].join('/') + "-#{counter}#{extension}"
+    end
+    graph.write(testfilename)
   end
 
   ##
@@ -100,20 +129,21 @@ protected
       case args[0]
       when Fixnum
         size = args[0]
-        klass = eval("Gruff::#{self.class.name.gsub(/^TestGruff/, '')}") 
+        klass = eval("Gruff::#{self.class.name.gsub(/^TestGruff/, '')}")
       when String
         size = args[0]
-        klass = eval("Gruff::#{self.class.name.gsub(/^TestGruff/, '')}") 
+        klass = eval("Gruff::#{self.class.name.gsub(/^TestGruff/, '')}")
       else
         klass = args[0]
       end
     when 2
       klass, size = args[0], args[1]
     end
-    
+
     g = klass.new(size)
-    g.title = "My Bar Graph"
+    g.title = 'My Bar Graph'
     g.labels = @labels
+    g.font = '/Library/Fonts/Verdana.ttf'
 
 
     @datasets.each do |data|

data/test/image_compare.rb

@@ -0,0 +1,58 @@
+#!ruby
+
+require 'chunky_png'
+
+class ImageCompare
+  include ChunkyPNG::Color
+
+  def self.compare(file_name, old_file_name)
+    name = file_name.chomp('.png')
+    org_file_name = "#{name}_0.png~"
+    new_file_name = "#{name}_1.png~"
+
+    return nil unless File.exists? old_file_name
+    images = [
+        ChunkyPNG::Image.from_file(old_file_name),
+        ChunkyPNG::Image.from_file(file_name),
+    ]
+
+    sizes = images.map(&:width).uniq + images.map(&:height).uniq
+    if sizes.size != 2
+      logger.warn "Image size has changed for #{name}: #{sizes}"
+      return nil
+    end
+
+    diff = []
+    images.first.height.times do |y|
+      images.first.row(y).each_with_index do |pixel, x|
+        unless pixel == images.last[x, y]
+          diff << [x, y]
+        end
+      end
+    end
+
+    if diff.empty?
+      File.delete(org_file_name) if File.exists? org_file_name
+      File.delete(new_file_name) if File.exists? new_file_name
+      return false
+    end
+
+    x, y = diff.map { |xy| xy[0] }, diff.map { |xy| xy[1] }
+    (1..2).each do |i|
+      images.each do |image|
+        image.rect(x.min - i, y.min - i, x.max + i, y.max + i, ChunkyPNG::Color.rgb(255, 0, 0))
+      end
+    end
+    images.first.save(org_file_name)
+    images.last.save(new_file_name)
+    true
+  end
+end
+
+if $0 == __FILE__
+  unless ARGV.size == 2
+    puts "Usage:  #$0 <image1> <image2>"
+    exit 1
+  end
+  ImageCompare.compare(ARGV[0], ARGV[1])
+end