scruffy 0.0.12 → 0.1.0

data/CHANGES

@@ -1,6 +1,13 @@
 = Scruffy Changelog
 
-Version 0.1.0 will be the first release for general use.
+== Version 0.1.0
+(August 11th, 2006)
+
+* First public release!
+* Legend rendering
+* Rasterizing graph to multiple image types (graph.render :as => 'PNG')
+
+
 
 == Version 0.0.12
 (August 10th, 2006)

data/Rakefile

@@ -42,7 +42,7 @@ Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_files.include('README', 'CHANGES')
   rdoc.rdoc_files.include('lib/scruffy.rb')
   rdoc.rdoc_files.include('lib/scruffy/*.rb')
-  rdoc.rdoc_files.include('lib/scruffy/graph_layers/*.rb')
+  rdoc.rdoc_files.include('lib/scruffy/layers/*.rb')
   rdoc.rdoc_files.include('lib/scruffy/renderers/*.rb')
 }
 

data/lib/scruffy.rb

@@ -9,6 +9,7 @@ require 'scruffy/graph'
 require 'scruffy/themes'
 require 'scruffy/version'
 require 'scruffy/transformer'
+require 'scruffy/rasterizers'
 require 'scruffy/resolver'
 require 'scruffy/layers'
 

data/lib/scruffy/graph.rb

@@ -123,14 +123,20 @@ module Scruffy
     # min_value:: Overrides the calculated minimum value used for the graph.
     # max_value:: Overrides the calculated maximum value used for the graph.
     #
+    # For other image formats:
+    # as:: File format to render to ('PNG', 'JPG', etc)
+    # to:: Name of file to save graph to, if desired.  If not provided, image is returned as blob.
     def render(options = {})
       size  = options.delete(:size) || (options[:width] ? [options[:width], (options.delete(:width) * 0.6).to_i] : [600, 400])
       options[:theme] ||= @theme
       options[:marker_transformer] ||= @marker_transformer
       options[:point_markers] ||= @point_markers
       
-      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) } ) )
+      svg = 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) } ) )
+
+      options[:as] ? Scruffy::Rasterizers::RMagickRasterizer.new.rasterize(svg, options) : svg
     end
     
     # Adds a Layer to the Graph.  Accepts either a list of arguments used to build a new layer, or

data/lib/scruffy/layers/base.rb

@@ -1,6 +1,13 @@
 module Scruffy
+  # ==Scruffy::Layers
+  #
+  # Author:: Brasten Sager
+  # Date:: August 10th, 2006
+  #
+  # See documentation in Scruffy::Layers::Base
+  #
   module Layers
-    # ==Base
+    # ==Scruffy::Layers::Base
     #
     # Author:: Brasten Sager
     # Date:: August 5th, 2006

data/lib/scruffy/rasterizers.rb

@@ -0,0 +1 @@
+require 'scruffy/rasterizers/rmagick_rasterizer.rb'

data/lib/scruffy/rasterizers/rmagick_rasterizer.rb

@@ -0,0 +1,26 @@
+module Scruffy
+  # ===Scruffy Rasterizers
+  #
+  # Author:: Brasten Sager
+  # Date:: August 10th, 2006
+  #
+  # These handle the job of rasterizing SVG images to other image formats.
+  # At the moment, only RMagickRasterizer exists, but others may soon follow.
+  #
+  # I'm somewhat interesting in finding a way to integrate Apache Batik, as it's
+  # SVG rendering seems to be superior to ImageMagick's.
+  module Rasterizers
+    class RMagickRasterizer
+      def rasterize(svg, options={})
+        require 'RMagick'
+        
+        image = Magick::Image::from_blob(svg)[0]
+        if options[:to]
+          image.write(options[:to]) { self.format = options[:as] }
+        end
+
+        image.to_blob { self.format = options[:as] }
+      end
+    end
+  end
+end

data/lib/scruffy/renderers/standard.rb

@@ -24,6 +24,7 @@ module Scruffy
           render_markers(svg, options)
           render_title(svg, options)
           render_layers(svg, options)
+          render_legend(svg, options)
           
         }
       }
@@ -55,6 +56,8 @@ module Scruffy
       
       def render_layers(svg, options)
         svg.g(:id => 'graphs', :transform => "translate(#{GRAPH_VIEWPORT[:x] * options[:size][0]},#{GRAPH_VIEWPORT[:y] * options[:size][1]})") {
+          options[:legend_information] = {}          
+
           options[:layers].each_with_index do |layer, idx|
 
             layer_options = {}
@@ -74,6 +77,7 @@ module Scruffy
 
             svg.g {
               layer.render(svg, layer_options)
+              (options[:legend_information][layer.title] = layer.color) unless layer.title.nil?
             }
           end
         }
@@ -111,6 +115,28 @@ module Scruffy
           }
         end
       end
+
+      def render_legend(svg, options)
+        scaled = options[:resolver]
+
+        active_width = scaled.to_point(100) * options[:legend_information].size
+        
+        svg.g(:transform => "translate(#{(options[:size][0] * 0.5) - (active_width * 0.5) + scaled.to_point(50)}, #{options[:size][1] * 0.12})") {
+          point_distance = scaled.to_point(100)
+          points = (0...options[:legend_information].size).map { |idx| idx * point_distance }
+          
+          
+          points.each_with_index do |point, idx|
+            svg.rect(:x => point, :y => scaled.to_point(18), 
+                     :width => scaled.to_point(13), :height => scaled.to_point(13), 
+                     :fill => options[:legend_information].values[idx])
+           svg.text( options[:legend_information].keys[idx], :x => point + scaled.to_point(25), 
+                      :y => scaled.to_point(30), 'font-size' => scaled.to_point(15), 
+                     :fill => (options[:theme][:marker] || 'white'))
+
+          end
+        }
+      end
       
       def render_title(svg, options)
         svg.g(:transform => "translate(0, #{options[:size][1] * 0.09})") {

data/lib/scruffy/version.rb

@@ -1,3 +1,3 @@
 module Scruffy
-  VERSION = '0.0.12'
+  VERSION = '0.1.0'
 end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: scruffy
 version: !ruby/object:Gem::Version 
-  version: 0.0.12
+  version: 0.1.0
 date: 2006-08-10 00:00:00 -07:00
 summary: A powerful, clean graphing library for Ruby.
 require_paths: 
@@ -36,6 +36,7 @@ files:
 - lib/scruffy.rb
 - lib/scruffy/graph.rb
 - lib/scruffy/layers.rb
+- lib/scruffy/rasterizers.rb
 - lib/scruffy/resolver.rb
 - lib/scruffy/themes.rb
 - lib/scruffy/transformer.rb
@@ -46,6 +47,7 @@ files:
 - lib/scruffy/layers/bar.rb
 - lib/scruffy/layers/base.rb
 - lib/scruffy/layers/line.rb
+- lib/scruffy/rasterizers/rmagick_rasterizer.rb
 - lib/scruffy/renderers/standard.rb
 - spec/graph_spec.rb
 test_files: []