Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'master' of https://github.com/topfunky/gruff into bar_u…

…pdates
  • Loading branch information...
commit d94d323e11e80e0f9465c6d500f8c4f3bc064d52 2 parents 71d799e + 6e1a2b0
Brian Miller authored
34  gruff.gemspec
... ...
@@ -1,34 +0,0 @@
1  
-Gem::Specification.new do |s|
2  
-  s.name = %q{gruff}
3  
-  s.version = "0.3.5"
4  
-
5  
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
6  
-  s.authors = ["Geoffrey Grosenbach"]
7  
-  s.date = %q{2009-01-14}
8  
-  s.description = %q{Beautiful graphs for one or multiple datasets. Can be used on websites or in documents.}
9  
-  s.email = %q{boss@topfunky.com}
10  
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
11  
-  s.files = ["History.txt", "MIT-LICENSE", "Manifest.txt", "README.txt", "Rakefile", "assets/bubble.png", "assets/city_scene/background/0000.png", "assets/city_scene/background/0600.png", "assets/city_scene/background/2000.png", "assets/city_scene/clouds/cloudy.png", "assets/city_scene/clouds/partly_cloudy.png", "assets/city_scene/clouds/stormy.png", "assets/city_scene/grass/default.png", "assets/city_scene/haze/true.png", "assets/city_scene/number_sample/1.png", "assets/city_scene/number_sample/2.png", "assets/city_scene/number_sample/default.png", "assets/city_scene/sky/0000.png", "assets/city_scene/sky/0200.png", "assets/city_scene/sky/0400.png", "assets/city_scene/sky/0600.png", "assets/city_scene/sky/0800.png", "assets/city_scene/sky/1000.png", "assets/city_scene/sky/1200.png", "assets/city_scene/sky/1400.png", "assets/city_scene/sky/1500.png", "assets/city_scene/sky/1700.png", "assets/city_scene/sky/2000.png", "assets/pc306715.jpg", "assets/plastik/blue.png", "assets/plastik/green.png", "assets/plastik/red.png", "init.rb", "lib/gruff.rb", "lib/gruff/accumulator_bar.rb", "lib/gruff/area.rb", "lib/gruff/bar.rb", "lib/gruff/bar_conversion.rb", "lib/gruff/base.rb", "lib/gruff/bullet.rb", "lib/gruff/deprecated.rb", "lib/gruff/dot.rb", "lib/gruff/line.rb", "lib/gruff/mini/bar.rb", "lib/gruff/mini/legend.rb", "lib/gruff/mini/pie.rb", "lib/gruff/mini/side_bar.rb", "lib/gruff/net.rb", "lib/gruff/photo_bar.rb", "lib/gruff/pie.rb", "lib/gruff/scene.rb", "lib/gruff/side_bar.rb", "lib/gruff/side_stacked_bar.rb", "lib/gruff/spider.rb", "lib/gruff/stacked_area.rb", "lib/gruff/stacked_bar.rb", "lib/gruff/stacked_mixin.rb", "rails_generators/gruff/gruff_generator.rb", "rails_generators/gruff/templates/controller.rb", "rails_generators/gruff/templates/functional_test.rb", "test/gruff_test_case.rb", "test/test_accumulator_bar.rb", "test/test_area.rb", "test/test_bar.rb", "test/test_base.rb", "test/test_bullet.rb", "test/test_dot.rb", "test/test_legend.rb", "test/test_line.rb", "test/test_mini_bar.rb", "test/test_mini_pie.rb", "test/test_mini_side_bar.rb", "test/test_net.rb", "test/test_photo.rb", "test/test_pie.rb", "test/test_scene.rb", "test/test_side_bar.rb", "test/test_sidestacked_bar.rb", "test/test_spider.rb", "test/test_stacked_area.rb", "test/test_stacked_bar.rb"]
12  
-  s.has_rdoc = true
13  
-  s.homepage = %q{http://nubyonrails.com/pages/gruff}
14  
-  s.rdoc_options = ["--main", "README.txt"]
15  
-  s.require_paths = ["lib"]
16  
-  s.rubyforge_project = %q{gruff}
17  
-  s.rubygems_version = %q{1.3.1}
18  
-  s.summary = %q{Beautiful graphs for one or multiple datasets.}
19  
-  s.test_files = ["test/test_accumulator_bar.rb", "test/test_area.rb", "test/test_bar.rb", "test/test_base.rb", "test/test_bullet.rb", "test/test_dot.rb", "test/test_legend.rb", "test/test_line.rb", "test/test_mini_bar.rb", "test/test_mini_pie.rb", "test/test_mini_side_bar.rb", "test/test_net.rb", "test/test_photo.rb", "test/test_pie.rb", "test/test_scene.rb", "test/test_side_bar.rb", "test/test_sidestacked_bar.rb", "test/test_spider.rb", "test/test_stacked_area.rb", "test/test_stacked_bar.rb"]
20  
-  s.add_dependency(%q<rmagick>, [">= 2.12.2"])
21  
-
22  
-  if s.respond_to? :specification_version then
23  
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
24  
-    s.specification_version = 2
25  
-
26  
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
27  
-      s.add_development_dependency(%q<hoe>, [">= 1.8.2"])
28  
-    else
29  
-      s.add_dependency(%q<hoe>, [">= 1.8.2"])
30  
-    end
31  
-  else
32  
-    s.add_dependency(%q<hoe>, [">= 1.8.2"])
33  
-  end
34  
-end
2  lib/gruff/scene.rb
@@ -133,7 +133,7 @@ class Gruff::Layer
133 133
   def initialize(base_dir, folder_name)
134 134
     @base_dir = base_dir.to_s
135 135
     @name = folder_name.to_s
136  
-    @filenames = Dir.open(File.join(base_dir, folder_name)).entries.select { |file| file =~ /^[^.]+\.png$/ }
  136
+    @filenames = Dir.open(File.join(base_dir, folder_name)).entries.select { |file| file =~ /^[^.]+\.png$/ }.sort
137 137
     @selected_filename = select_default
138 138
   end
139 139
   
1  test/test_line.rb
@@ -462,6 +462,7 @@ def test_jruby_error
462 462
     g.legend_font_size = 12
463 463
     g.marker_font_size = 16
464 464
     g.hide_dots = false
  465
+    g.label_max_decimals = 1
465 466
 
466 467
     g.write('test/output/line_jruby_error.png')
467 468
   end
2  test/test_scene.rb
@@ -51,7 +51,7 @@ def test_stormy_day
51 51
 
52 52
   def test_layer
53 53
     l = LayerStub.new(File.expand_path("../assets/city_scene", File.dirname(__FILE__)), "clouds")
54  
-    assert_equal %w(cloudy.png partly_cloudy.png stormy.png), l.filenames
  54
+    assert_equal %w(cloudy.png partly_cloudy.png stormy.png), l.filenames.sort
55 55
     
56 56
     l = LayerStub.new(File.expand_path("../assets/city_scene", File.dirname(__FILE__)), "grass")
57 57
     assert_equal 'default.png', l.selected_filename

0 notes on commit d94d323

Please sign in to comment.
Something went wrong with that request. Please try again.