scruffy 0.0.10 → 0.0.11

data/CHANGES

@@ -1,10 +1,18 @@
 = Scruffy Changelog
 
+Version 0.1.0 will be the first release for general use.
+
+== Version 0.0.11
+(August 10th, 2006)
+This is not a public release.
+
+* Fixed gem issue.
+
 == Version 0.0.10
 (August 10th, 2006)
 
 This is not a public release.
-Version 0.1.0 will be the first release for general use.
+
 
 * Removed bogus changelog.
 
@@ -12,6 +20,8 @@ Version 0.1.0 will be the first release for general use.
 == Version 0.0.9
 (August 10th, 2006)
 
+This is not a public release.
+
 * Initial release.
 * Standard renderer.
 * Marker transformers: currency, percentages.

data/Rakefile

@@ -60,13 +60,7 @@ spec = Gem::Specification.new do |s|
   EOF
 
   s.files = PKG_FILES.to_a
-  s.require_path = 'lib'
-
   s.has_rdoc = true
-
-  #s.test_files = Dir.glob('test/*_test.rb')
-  s.require_path = 'lib'
-  s.autorequire = 'scruffy'
   s.rubyforge_project = "scruffy"
 end
 

data/lib/scruffy/graph.rb

@@ -78,9 +78,10 @@ module Scruffy
     attr_accessor :layers
     attr_accessor :default_type
     attr_accessor :point_markers
-    attr_accessor :renderer
     attr_accessor :marker_transformer
     
+    attr_reader :renderer     # Writer defined below
+    
     # Returns a new Graph.  You can optionally pass in a default graph type and an options hash.
     #
     #   Graph.new           # New graph
@@ -90,21 +91,27 @@ module Scruffy
     # Options:
     #
     # title::  Graph's title
-    # theme::  Theme to use when rendering graph
+    # theme::  A theme hash to use when rendering graph
+    # layers::  An array of GraphLayers for this graph to use
+    # default_type::  A symbol indicating the default type of GraphLayer for this graph
     # renderer::   Sets the renderer to use when rendering graph
     # marker_transformer::   Sets a transformer used to modify marker values prior to rendering
     # point_markers::  Sets the x-axis marker values
     def initialize(*args)
-      @default_type   = args.shift if args.first.is_a?(Symbol)
-      options         = args.shift if args.first.is_a?(Hash)
+      self.default_type   = args.shift if args.first.is_a?(Symbol)
+      options             = args.shift.dup if args.first.is_a?(Hash)
+      raise ArgumentError, "The arguments provided are not supported." if args.size > 0
+
       options ||= {}
+      self.theme = Scruffy::Theme::KEYNOTE
+      self.layers = []
+      self.renderer = Scruffy::StandardRenderer.new
+
+      %w(title theme layers default_type renderer marker_transformer point_markers).each do |arg|
+        self.send("#{arg}=".to_sym, options.delete(arg.to_sym)) unless options[arg.to_sym].nil?
+      end
       
-      @title = options[:title]
-      @theme = options[:theme] || Scruffy::Theme::KEYNOTE
-      @layers = []
-      @renderer = options[:renderer] || Scruffy::StandardRenderer.new
-      @marker_transformer = options[:marker_transformer]
-      @point_markers = options[:point_markers]
+      raise ArgumentError, "Some options provided are not supported: #{options.keys.join(' ')}." if options.size > 0
     end
     
     # Renders the graph in it's current state to an SVG object.
@@ -122,7 +129,7 @@ module Scruffy
       options[:marker_transformer] ||= @marker_transformer
       options[:point_markers] ||= @point_markers
       
-      @renderer.render( options.merge({:size => size, :title => title,
+      self.renderer.render( options.merge({:size => size, :title => title,
                                        :layers => layers, :min_value => (options[:min_value] || bottom_value), :max_value => (options[:max_value] || top_value) } ) )
     end
     
@@ -161,6 +168,12 @@ module Scruffy
     
     alias :add :<<
     
+    def renderer=(val)
+      raise ArgumentError, "Renderer must include a #render(options) method." unless (val.respond_to?(:render) && val.method(:render).arity.abs > 0)
+      
+      @renderer = val
+    end
+    
     protected
       def to_camelcase(type)  # :nodoc:
         type.split('_').map { |e| e.capitalize }.join('')

data/lib/scruffy/version.rb

@@ -1,3 +1,3 @@
 module Scruffy
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

data/lib/scruffy.rb

@@ -9,6 +9,7 @@ require 'scruffy/graph'
 require 'scruffy/themes'
 require 'scruffy/version'
 require 'scruffy/transformer'
+require 'scruffy/resolver'
 
 # Layer files
 require 'scruffy/graph_layers/base'

data/spec/graph_spec.rb

@@ -1,6 +1,19 @@
 require 'lib/scruffy'
 
+module CustomRenderers
+  def blank_renderer
+    object = Object.new
+    object.instance_eval { class << self;self;end }.instance_eval { define_method :render do |options|
+        puts "Rendering"
+      end
+    }
+    object
+  end
+end
+
 context "A new Scruffy::Graph" do
+  include CustomRenderers
+  
   setup do
     @graph = Scruffy::Graph.new
   end
@@ -53,4 +66,65 @@ context "A new Scruffy::Graph" do
     @graph.point_markers = markers
     @graph.point_markers.should_equal markers
   end
+  
+  specify "should accept a new renderer" do
+    renderer = blank_renderer
+    @graph.renderer = renderer
+    @graph.renderer.should_equal renderer
+  end
+  
+  specify "should not accept renderers with missing #render methods" do
+      lambda { @graph.renderer = 1 }.should_raise ArgumentError
+  end
+end
+
+context "A Scruffy::Graph's initialization block" do
+  include CustomRenderers
+  
+  specify "should accept just a default_type Symbol" do
+    lambda { Scruffy::Graph.new(:line) }.should_not_raise
+  end
+  
+  specify "should accept just an options hash" do
+    lambda { Scruffy::Graph.new({:title => "My Title"}) }.should_not_raise
+    lambda { Scruffy::Graph.new(:title => "My Title", :theme => Scruffy::Theme::KEYNOTE) }.should_not_raise
+  end
+  
+  specify "should accept both a default_type and options hash" do
+    lambda {
+      Scruffy::Graph.new(:line, {:title => "My Title"})
+      Scruffy::Graph.new(:line, :title => "My Title")
+    }.should_not_raise
+  end
+  
+  specify "should reject any invalid argument combination" do
+    lambda { Scruffy::Graph.new({:title => "My Title"}, :line) }.should_raise ArgumentError
+    lambda { Scruffy::Graph.new(:line, {:title => "My Title"}, "Any additional arguments.") }.should_raise ArgumentError
+    lambda { Scruffy::Graph.new(:line, "Any additional arguments.") }.should_raise ArgumentError    
+  end
+  
+  specify "should reject any options that are not supported" do
+    lambda { Scruffy::Graph.new(:title => "My Title", :some_key => "Some Value") }.should_raise ArgumentError
+  end
+  
+  specify "should successfully save all valid options" do
+      options = {:title => "My Title",
+                 :theme => {:background => [:black], 
+                            :colors => [:red => 'red', :yellow => 'yellow']},
+                 :layers => [ Scruffy::LineLayer.new(:points => [100, 200, 300]) ],
+                 :default_type => :average,
+                 :renderer => blank_renderer,
+                 :marker_transformer => Scruffy::Transformer::Currency.new,
+                 :point_markers => ['One Hundred', 'Two Hundred', 'Three Hundred']}
+                 
+      @graph = Scruffy::Graph.new(options)
+
+      @graph.title.should_equal options[:title]
+      @graph.theme.should_equal options[:theme]
+      @graph.layers.should_equal options[:layers]
+      @graph.default_type.should_equal options[:default_type]
+      @graph.renderer.should_equal options[:renderer]
+      @graph.marker_transformer.should_equal options[:marker_transformer]
+      @graph.point_markers.should_equal options[:point_markers]
+  end
 end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: scruffy
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.0.11
 date: 2006-08-10 00:00:00 -07:00
 summary: A powerful, clean graphing library for Ruby.
 require_paths: 
@@ -12,7 +12,7 @@ email: brasten@nagilum.com
 homepage: http://scruffy.rubyforge.org
 rubyforge_project: scruffy
 description: Scruffy is a Ruby library for generating powerful graphs.  It is based on SVG, allowing for powerful, clean code, as well as a good foundation for future features.
-autorequire: scruffy
+autorequire: 
 default_executable: 
 bindir: bin
 has_rdoc: true