scruffy 0.2.6 → 0.3.0.beta1

data/lib/scruffy/layers/multi_bar.rb

@@ -0,0 +1,51 @@
+module Scruffy::Layers
+  # ==Scruffy::Layers::MultiBar
+  #
+  # Author:: Jeremy Green
+  # Date:: July 29th, 2009
+  #
+  # Based on:: Scruffy::Layers::Bar by
+  # Author:: Brasten Sager
+  # Date:: August 6th, 2006
+  #
+  # Standard multi_bar graph.  
+  class MultiBar < Bar
+  
+    
+
+    protected
+    
+      # Due to the size of the bar graph, X-axis coords must 
+      # be squeezed so that the bars do not hang off the ends
+      # of the graph.
+      #
+      # Unfortunately this just mean that bar-graphs and most other graphs
+      # end up on different points.  Maybe adding a padding to the coordinates
+      # should be a graph-wide thing?
+      #
+      # Update : x-axis coords for lines and area charts should now line
+      # up with the center of bar charts.
+      
+      def generate_coordinates(options = {})
+        @point_width = (width / points.size)
+        @point_space = @point_width * 0.1
+        @point_width = @point_width - @point_space
+        @bar_width = @point_width/options[:num_bars]
+        @bar_space = @bar_width * 0.1
+        @bar_width = @bar_width * 0.9
+        
+        #options[:point_distance] = (width - (width / points.size)) / (points.size - 1).to_f
+          
+        #TODO more array work with index, try to rework to be accepting of hashes
+        coords = (0...points.size).map do |idx| 
+          
+          x_coord = (@point_width * idx) + @point_space/2 + @point_space*idx + @bar_width * options[:position] +   @bar_space*(options[:position].to_f - 0.5)
+
+          relative_percent = ((points[idx] == min_value) ? 0 : ((points[idx] - min_value) / (max_value - min_value).to_f))
+          y_coord = (height - (height * relative_percent))
+          [x_coord, y_coord]
+        end
+        coords
+      end
+  end
+end

data/lib/scruffy/layers/scatter.rb

@@ -7,15 +7,23 @@ module Scruffy::Layers
   # Simple scatter graph
   class Scatter < Base
     
+    include Scruffy::Helpers::Marker
+    
     # Renders scatter graph.
     def draw(svg, coords, options={})
-      svg.g(:class => 'shadow', :transform => "translate(#{relative(0.5)}, #{relative(0.5)})") {
-        coords.each { |coord| svg.circle( :cx => coord.first, :cy => coord.last + relative(0.9), :r => relative(2), 
-                                          :style => "stroke-width: #{relative(2)}; stroke: black; opacity: 0.35;" ) }
-      }
+      
+      options.merge!(@options)
+      
+      if options[:shadow]
+        svg.g(:class => 'shadow', :transform => "translate(#{relative(0.5)}, #{relative(0.5)})") {
+          coords.each { |coord| svg.circle( :cx => coord.first, :cy => coord.last + relative(0.9), :r => relative(2), 
+                                            :style => "stroke-width: #{relative(2)}; stroke: black; opacity: 0.35;" ) }
+        }
+      end
 
       coords.each { |coord| svg.circle( :cx => coord.first, :cy => coord.last, :r => relative(2), 
                                         :style => "stroke-width: #{relative(2)}; stroke: #{color.to_s}; fill: #{color.to_s}" ) }
     end
   end
-end
+end
+

data/lib/scruffy/layers/stacked.rb

@@ -31,7 +31,7 @@ module Scruffy::Layers
     # Overrides Base#render to fiddle with layers' points to achieve a stacked effect.
     def render(svg, options = {})
       #TODO ensure this works with new points
-      current_points = points.dup
+      current_points = points
       
       layers.each do |layer|
         real_points = layer.points
@@ -63,6 +63,7 @@ module Scruffy::Layers
     def points
       longest_arr = layers.inject(nil) do |longest, layer|
         longest = layer.points if (longest.nil? || longest.size < layer.points.size)
+        longest
       end
       
       summed_points = (0...longest_arr.size).map do |idx|

data/lib/scruffy/rasterizers.rb

@@ -11,4 +11,5 @@
 module Scruffy::Rasterizers; end
 
 require 'scruffy/rasterizers/rmagick_rasterizer.rb'
+require 'scruffy/rasterizers/mini_magick_rasterizer.rb'
 require 'scruffy/rasterizers/batik_rasterizer.rb'

data/lib/scruffy/rasterizers/mini_magick_rasterizer.rb

@@ -0,0 +1,24 @@
+module Scruffy::Rasterizers
+
+  # == MiniMagickRasterizer
+  #
+  # Author:: Tim Connor
+  # Date:: Feb 9th, 2010
+  #
+  # The MiniMagickRasterizer converts SVG graphs to images using MiniMagick.
+  class MiniMagickRasterizer
+    def rasterize(svg, options={})
+      require 'mini_magick'
+
+      image = MiniMagick::Image::from_blob(svg)
+
+      image.format(options[:as]) do |cmd|
+        cmd.background "#0000" # Transparent background
+      end if options[:as]
+      
+      image.write(options[:to]) if options[:to]
+      image.to_blob
+
+    end
+  end
+end

data/lib/scruffy/rasterizers/rmagick_rasterizer.rb

@@ -10,7 +10,13 @@ module Scruffy::Rasterizers
     def rasterize(svg, options={})
       # I know this seems weird, I'm open to suggestions.
       # I didn't want RMagick required unless absolutely necessary.
-      require 'RMagick'
+      unless defined? Magick
+        begin
+          require 'rmagick'
+        rescue LoadError
+          require 'RMagick'
+        end
+      end
 
       image = Magick::Image::from_blob(svg)[0]
 
@@ -24,4 +30,4 @@ module Scruffy::Rasterizers
       image.to_blob { self.format = options[:as] }
     end
   end
-end
+end

data/lib/scruffy/renderers.rb

@@ -13,8 +13,10 @@
 module Scruffy::Renderers; end
 
 require 'scruffy/renderers/base'
+require 'scruffy/renderers/basic'
 require 'scruffy/renderers/empty'
 require 'scruffy/renderers/standard'
+require 'scruffy/renderers/axis_legend'
 require 'scruffy/renderers/reversed'
 require 'scruffy/renderers/cubed'
 require 'scruffy/renderers/split'

data/lib/scruffy/renderers/axis_legend.rb

@@ -0,0 +1,41 @@
+module Scruffy::Renderers
+  class AxisLegend < Empty
+    
+    def define_layout
+      super do |components|
+        components << Scruffy::Components::Title.new(:title, :position => [5, 2], :size => [90, 7])
+        
+        
+        components << Scruffy::Components::Viewport.new(:view, :position => [6, 22], :size => [90, 66]) do |graph|
+          graph << Scruffy::Components::ValueMarkers.new(:values, :position => [0, 2], :size => [8, 89])
+          graph << Scruffy::Components::Grid.new(:grid, :position => [10, 0], :size => [90, 89], :stroke_width => 1)
+          graph << Scruffy::Components::VGrid.new(:vgrid, :position => [10, 0], :size => [90, 89], :stroke_width => 1)
+          graph << Scruffy::Components::DataMarkers.new(:labels, :position => [10, 92], :size => [90, 8])
+          graph << Scruffy::Components::Graphs.new(:graphs, :position => [10, 0], :size => [90, 89])
+        end
+        components << Scruffy::Components::YLegend.new(:y_legend, :position => [1, 26], :size => [5, 66])
+        components << Scruffy::Components::XLegend.new(:x_legend, :position => [5, 92], :size => [90, 6])
+        components << Scruffy::Components::Legend.new(:legend, :position => [5, 13], :size => [90, 6])
+      end
+    end
+    
+    protected
+      def hide_values
+        super
+        component(:view).position[0] = -10
+        component(:view).size[0] = 100
+      end
+    
+      def labels
+        [component(:view).component(:labels)]
+      end
+    
+      def values
+        [component(:view).component(:values)]
+      end
+      
+      def grids
+        [component(:view).component(:grid),component(:view).component(:vgrid)]
+      end
+  end
+end

data/lib/scruffy/renderers/base.rb

@@ -30,9 +30,11 @@ module Scruffy::Renderers
       rendertime_renderer.instance_eval { before_render if respond_to?(:before_render) }
 
       svg = Builder::XmlMarkup.new(:indent => 2)
-      svg.instruct!
-      svg.declare!(:DOCTYPE, :svg, :PUBLIC, "-//W3C//DTD SVG 1.1//EN", "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd")
-      svg.svg(:xmlns => "http://www.w3.org/2000/svg", 'xmlns:xlink' => "http://www.w3.org/1999/xlink", :viewBox => "#{options[:size].first} 100 #{options[:size].last} 200") {
+      unless options[:no_doctype_header]
+        svg.instruct!
+        svg.declare! :DOCTYPE, :svg, :PUBLIC, "-//W3C//DTD SVG 1.0//EN", "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"
+      end
+      svg.svg(:xmlns => "http://www.w3.org/2000/svg", 'xmlns:xlink' => "http://www.w3.org/1999/xlink", :width => options[:size].first, :height => options[:size].last) {
         svg.g(:id => options[:graph_id]) {
           rendertime_renderer.components.each do |component|
             component.render(svg, 
@@ -90,4 +92,4 @@ module Scruffy::Renderers
         end
       end
   end   # base
-end
+end

data/lib/scruffy/renderers/basic.rb

@@ -0,0 +1,20 @@
+module Scruffy::Renderers
+  # ===Scruffy::Renderers::Basic
+  #
+  # Author:: Martyn Taylor
+  # Date:: July 30th 2010
+  #
+  # The Basic Renderer Creates a Blank Graph with everything ready for adding components
+  class Basic < Base
+
+    def define_layout
+      components << Scruffy::Components::Background.new(:background, :position => [0,0], :size =>[100, 100])
+      components << Scruffy::Components::Viewport.new(:view, :position => [2, 26], :size => [89, 66]) do |graph|
+          graph << Scruffy::Components::Graphs.new(:graphs, :position => [3, 0], :size => [80, 89])
+          graph << Scruffy::Components::ValueMarkers.new(:values, :position => [0, 0], :size => [1, 89])
+          graph << Scruffy::Components::Axis.new(:values, :position => [3, 0], :size => [80, 89])
+      end
+      yield(self.components) if block_given?
+    end
+  end
+end

data/lib/scruffy/renderers/standard.rb

@@ -4,11 +4,12 @@ module Scruffy::Renderers
     def define_layout
       super do |components|
         components << Scruffy::Components::Title.new(:title, :position => [5, 2], :size => [90, 7])
-        components << Scruffy::Components::Viewport.new(:view, :position => [2, 26], :size => [89, 66]) do |graph|
-          graph << Scruffy::Components::ValueMarkers.new(:values, :position => [0, 2], :size => [18, 89])
-          graph << Scruffy::Components::Grid.new(:grid, :position => [20, 0], :size => [80, 89])
-          graph << Scruffy::Components::DataMarkers.new(:labels, :position => [20, 92], :size => [80, 8])
-          graph << Scruffy::Components::Graphs.new(:graphs, :position => [20, 0], :size => [80, 89])
+        components << Scruffy::Components::Viewport.new(:view, :position => [2, 26], :size => [90, 66]) do |graph|
+          graph << Scruffy::Components::ValueMarkers.new(:values, :position => [0, 2], :size => [8, 89])
+          graph << Scruffy::Components::Grid.new(:grid, :position => [10, 0], :size => [90, 89], :stroke_width => 1)
+          graph << Scruffy::Components::VGrid.new(:vgrid, :position => [10, 0], :size => [90, 89], :stroke_width => 1)
+          graph << Scruffy::Components::DataMarkers.new(:labels, :position => [10, 92], :size => [90, 8])
+          graph << Scruffy::Components::Graphs.new(:graphs, :position => [10, 0], :size => [90, 89])
         end
         components << Scruffy::Components::Legend.new(:legend, :position => [5, 13], :size => [90, 6])
       end
@@ -30,7 +31,7 @@ module Scruffy::Renderers
       end
       
       def grids
-        [component(:view).component(:grid)]
+        [component(:view).component(:grid),component(:view).component(:vgrid)]
       end
   end
 end

data/lib/scruffy/themes.rb

@@ -19,8 +19,13 @@ module Scruffy::Themes
   class Base
     attr_accessor :background     # Background color or array of two colors
     attr_accessor :colors         # Array of colors for data graphs
+    attr_accessor :outlines       # Array of colors for outlines of elements for data graphs
+    attr_accessor :grid           # Marker color for grid lines, etc.
     attr_accessor :marker         # Marker color for grid lines, values, etc.
     attr_accessor :font_family    # Font family: Not really supported.  Maybe in the future.
+    attr_accessor :marker_font_size    # Marker Font Size:
+    attr_accessor :title_font_size    # Title Font Size:
+    attr_accessor :legend_font_size    # Legend Font Size:
 
     # Returns a new Scruffy::Themes::Base object.
     #
@@ -34,17 +39,33 @@ module Scruffy::Themes
     def initialize(descriptor)
       self.background = descriptor[:background]
       self.colors     = descriptor[:colors]
+      self.outlines     = descriptor[:outlines]
+      self.grid     = descriptor[:grid]
       self.marker     = descriptor[:marker]
       self.font_family = descriptor[:font_family]
+      self.marker_font_size = descriptor[:marker_font_size]
+      self.title_font_size = descriptor[:title_font_size]
+      self.legend_font_size = descriptor[:legend_font_size]
     end
     
     # Returns the next available color in the color array.
     def next_color
-      @previous_color ||= 0
+      @previous_color = 0 if @previous_color.nil?
       @previous_color += 1
               
       self.colors[(@previous_color-1) % self.colors.size]
     end
+    
+    
+    # Returns the next available outline in the outline array.
+    def next_outline
+      @previous_outline = 0 if @previous_outline.nil?
+      @previous_outline += 1
+      if self.outlines.nil?
+        return "#000000"
+      end
+      self.outlines[(@previous_outline-1) % self.outlines.size]
+    end
 
     # todo: Implement darken function.
     def darken(color, shift=20); end
@@ -54,6 +75,21 @@ module Scruffy::Themes
     
   end
   
+
+  
+  # A basic default theme
+  # Based on http://www.wellstyled.com/tools/colorscheme2/index-en.html?tetrad;50;0;255;1;-1;1;-0.6;0.1;1;0.6;1;1;-1;1;-0.6;0.1;1;0.6;1;1;-1;1;-0.6;0.1;1;0.6;1;1;-1;1;-0.6;0.1;1;0.6;1;0
+  class Standard < Base
+    def initialize
+      super({
+              :background => ['#FFFFFF', '#FFFFFF'],
+              :marker => '#999999',
+              :colors => %w(#1919B3 #FFB200 #FFFF00 #660099 #E9E9FF #FFF7E6 #FFFFE6 #F7E6FF #0F0F6B #996B00 #999900 #3D005C)
+            })
+    
+    end
+  end
+  
   # Keynote theme, based on Apple's Keynote presentation software.
   #
   # Color values used from Gruff's default theme.

data/lib/scruffy/version.rb

@@ -1,9 +1,3 @@
 module Scruffy
-  module VERSION #:nodoc:
-    MAJOR = 0
-    MINOR = 2
-    TINY  = 6
-
-    STRING = [MAJOR, MINOR, TINY].join('.')
-  end
+  VERSION = '0.3.0.beta1'
 end

data/spec/output/array.svg

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" type>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="360">
+  <g id="scruffy_graph">
+    <g id="background" transform="translate(0.0, 0.0)">
+      <defs>
+        <linearGradient id="BackgroundGradient" x1="0%" y1="0%" x2="0%" y2="100%">
+          <stop offset="5%" stop-color="#FFFFFF"/>
+          <stop offset="95%" stop-color="#FFFFFF"/>
+        </linearGradient>
+      </defs>
+      <rect width="600.0" height="360.0" x="0" y="0" fill="url(#BackgroundGradient) #FFFFFF"/>
+    </g>
+    <g id="title" transform="translate(30.0, 7.2)">
+      <text class="title" x="270.0" y="25.200000000000003" font-size="25.200000000000003" font-family="" fill="#999999" stroke="none" stroke-width="0" text-anchor="middle">Graph</text>
+    </g>
+    <g id="view" transform="translate(12.0, 93.60000000000001)">
+      <g>
+        <g id="values" transform="translate(0.0, 4.752000000000001)">
+          <text x="43.2" y="211.46400000000003" font-size="16.917120000000004" font-family="" fill="#999999" text-anchor="end">0</text>
+          <text x="43.2" y="158.598" font-size="16.917120000000004" font-family="" fill="#999999" text-anchor="end">1</text>
+          <text x="43.2" y="105.73200000000001" font-size="16.917120000000004" font-family="" fill="#999999" text-anchor="end">2</text>
+          <text x="43.2" y="52.866000000000014" font-size="16.917120000000004" font-family="" fill="#999999" text-anchor="end">3</text>
+          <text x="43.2" y="0.0" font-size="16.917120000000004" font-family="" fill="#999999" text-anchor="end">4</text>
+        </g>
+        <g id="grid" transform="translate(54.0, 0.0)">
+          <line x1="0" y1="0.0" x2="486.0" y2="0.0" style="stroke: #999999; stroke-width: 1;"/>
+          <line x1="0" y1="52.86600000000001" x2="486.0" y2="52.86600000000001" style="stroke: #999999; stroke-width: 1;"/>
+          <line x1="0" y1="105.73200000000001" x2="486.0" y2="105.73200000000001" style="stroke: #999999; stroke-width: 1;"/>
+          <line x1="0" y1="158.598" x2="486.0" y2="158.598" style="stroke: #999999; stroke-width: 1;"/>
+          <line x1="0" y1="211.46400000000003" x2="486.0" y2="211.46400000000003" style="stroke: #999999; stroke-width: 1;"/>
+          <line x1="0" y1="211.46400000000003" x2="486.0" y2="211.46400000000003" style="stroke: #999999; stroke-width: 1;"/>
+        </g>
+        <g id="vgrid" transform="translate(54.0, 0.0)">
+          <line x1="0.0" y1="0" x2="0.0" y2="211.46400000000003" style="stroke: #999999; stroke-width: 1;"/>
+          <line x1="121.5" y1="0" x2="121.5" y2="211.46400000000003" style="stroke: #999999; stroke-width: 1;"/>
+          <line x1="243.0" y1="0" x2="243.0" y2="211.46400000000003" style="stroke: #999999; stroke-width: 1;"/>
+          <line x1="364.5" y1="0" x2="364.5" y2="211.46400000000003" style="stroke: #999999; stroke-width: 1;"/>
+          <line x1="486.0" y1="0" x2="486.0" y2="211.46400000000003" style="stroke: #999999; stroke-width: 1;"/>
+        </g>
+        <g id="labels" transform="translate(54.0, 218.59200000000004)">
+        </g>
+        <g id="graphs" transform="translate(54.0, 0.0)">
+          <g id="component_graphs_graph_0" class="graph_layer">
+            <polyline points="60.75,158.598 182.25,105.73200000000001 425.25,0.0" fill="none" stroke="#1919B3" stroke-width="1" style=""/>
+          </g>
+        </g>
+      </g>
+    </g>
+    <g id="legend" transform="translate(30.0, 46.800000000000004)">
+      <rect x="243.0" y="0" width="10.799999999999999" height="10.799999999999999" fill="#1919B3"/>
+      <text x="262.44" y="11.663999999999998" font-size="15.551999999999998" font-family="" style="color: #999999" fill="#999999">Data</text>
+    </g>
+  </g>
+</svg>

data/spec/output/hash.svg

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" type>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="360">
+  <g id="scruffy_graph">
+    <g id="background" transform="translate(0.0, 0.0)">
+      <defs>
+        <linearGradient id="BackgroundGradient" x1="0%" y1="0%" x2="0%" y2="100%">
+          <stop offset="5%" stop-color="#FFFFFF"/>
+          <stop offset="95%" stop-color="#FFFFFF"/>
+        </linearGradient>
+      </defs>
+      <rect width="600.0" height="360.0" x="0" y="0" fill="url(#BackgroundGradient) #FFFFFF"/>
+    </g>
+    <g id="title" transform="translate(30.0, 7.2)">
+      <text class="title" x="270.0" y="25.200000000000003" font-size="25.200000000000003" font-family="" fill="#999999" stroke="none" stroke-width="0" text-anchor="middle">Graph</text>
+    </g>
+    <g id="view" transform="translate(12.0, 93.60000000000001)">
+      <g>
+        <g id="values" transform="translate(0.0, 4.752000000000001)">
+          <text x="43.2" y="211.46400000000003" font-size="16.917120000000004" font-family="" fill="#999999" text-anchor="end">0</text>
+          <text x="43.2" y="158.598" font-size="16.917120000000004" font-family="" fill="#999999" text-anchor="end">1</text>
+          <text x="43.2" y="105.73200000000001" font-size="16.917120000000004" font-family="" fill="#999999" text-anchor="end">2</text>
+          <text x="43.2" y="52.866000000000014" font-size="16.917120000000004" font-family="" fill="#999999" text-anchor="end">3</text>
+          <text x="43.2" y="0.0" font-size="16.917120000000004" font-family="" fill="#999999" text-anchor="end">4</text>
+        </g>
+        <g id="grid" transform="translate(54.0, 0.0)">
+          <line x1="0" y1="0.0" x2="486.0" y2="0.0" style="stroke: #999999; stroke-width: 1;"/>
+          <line x1="0" y1="52.86600000000001" x2="486.0" y2="52.86600000000001" style="stroke: #999999; stroke-width: 1;"/>
+          <line x1="0" y1="105.73200000000001" x2="486.0" y2="105.73200000000001" style="stroke: #999999; stroke-width: 1;"/>
+          <line x1="0" y1="158.598" x2="486.0" y2="158.598" style="stroke: #999999; stroke-width: 1;"/>
+          <line x1="0" y1="211.46400000000003" x2="486.0" y2="211.46400000000003" style="stroke: #999999; stroke-width: 1;"/>
+          <line x1="0" y1="211.46400000000003" x2="486.0" y2="211.46400000000003" style="stroke: #999999; stroke-width: 1;"/>
+        </g>
+        <g id="vgrid" transform="translate(54.0, 0.0)">
+          <line x1="0.0" y1="0" x2="0.0" y2="211.46400000000003" style="stroke: #999999; stroke-width: 1;"/>
+          <line x1="121.5" y1="0" x2="121.5" y2="211.46400000000003" style="stroke: #999999; stroke-width: 1;"/>
+          <line x1="243.0" y1="0" x2="243.0" y2="211.46400000000003" style="stroke: #999999; stroke-width: 1;"/>
+          <line x1="364.5" y1="0" x2="364.5" y2="211.46400000000003" style="stroke: #999999; stroke-width: 1;"/>
+          <line x1="486.0" y1="0" x2="486.0" y2="211.46400000000003" style="stroke: #999999; stroke-width: 1;"/>
+        </g>
+        <g id="labels" transform="translate(54.0, 218.59200000000004)">
+        </g>
+        <g id="graphs" transform="translate(54.0, 0.0)">
+          <g id="component_graphs_graph_0" class="graph_layer">
+            <polyline points="60.75,158.598 182.25,105.73200000000001 425.25,0.0" fill="none" stroke="#1919B3" stroke-width="1" style=""/>
+          </g>
+        </g>
+      </g>
+    </g>
+    <g id="legend" transform="translate(30.0, 46.800000000000004)">
+      <rect x="243.0" y="0" width="10.799999999999999" height="10.799999999999999" fill="#1919B3"/>
+      <text x="262.44" y="11.663999999999998" font-size="15.551999999999998" font-family="" style="color: #999999" fill="#999999">Data</text>
+    </g>
+  </g>
+</svg>