scruffy 0.1.0 → 0.2.0

data/lib/scruffy/rasterizers.rb

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

data/lib/scruffy/rasterizers/batik_rasterizer.rb

@@ -0,0 +1,25 @@
+module Scruffy
+  module Rasterizers
+    class BatikRasterizer
+      def initialize(options={})
+        @command = options[:command]
+        @temp_folder = options[:temp_folder]
+      end
+      
+      def rasterize(svg, options={})
+        File.open(@temp_folder + '/temp_svg.svg', 'w') { |file|
+          file.write(svg)
+        }
+        
+        `#{@command} -d #{@temp_folder} -m image/#{options[:as].downcase} #{@temp_folder}/temp_svg.svg`
+        
+        image = ""
+        File.open(@temp_folder + '/temp_svg.' + options[:as].downcase, 'r') { |file|
+          image = file.read
+        }
+        
+        image
+      end
+    end
+  end
+end

data/lib/scruffy/rasterizers/rmagick_rasterizer.rb

@@ -12,9 +12,14 @@ module Scruffy
   module Rasterizers
     class RMagickRasterizer
       def rasterize(svg, options={})
-        require 'RMagick'
         
+        # I know this seems weird, I'm open to suggestions.
+        # I didn't want RMagick required unless absolutely necessary.
+        require 'RMagick'
+
         image = Magick::Image::from_blob(svg)[0]
+        
+        image.resize!(options[:size][0], options[:size][1], Magick::BoxFilter, 1.25) if options[:actual_size]
         if options[:to]
           image.write(options[:to]) { self.format = options[:as] }
         end

data/lib/scruffy/renderers.rb

@@ -0,0 +1,5 @@
+require 'scruffy/renderers/base'
+require 'scruffy/renderers/standard'
+require 'scruffy/renderers/reversed'
+require 'scruffy/renderers/cubed'
+require 'scruffy/renderers/split'

data/lib/scruffy/renderers/base.rb

@@ -0,0 +1,37 @@
+module Scruffy
+  module Renderers
+    class Base
+      include Scruffy::Helpers::Canvas
+      
+      attr_accessor :components    
+
+      def render(options = {})
+        options[:graph_id]    ||= 'scruffy_graph'
+        options[:complexity]  ||= (global_complexity || :normal)
+
+        svg = Builder::XmlMarkup.new(:indent => 2)
+        svg.instruct!
+        svg.instruct! 'DOCTYPE', 'svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"  type'
+        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]) {
+            self.components.each do |component|
+              component.render(svg, 
+                               bounds_for( options[:size], component.position, component.size ), 
+                               options)
+            end
+          }
+        }
+        svg.target!
+      end
+    
+      private
+        def global_complexity
+          if Kernel.const_defined? "SCRUFFY_COMPLEXITY"
+            SCRUFFY_COMPLEXITY
+          else
+            nil
+          end
+        end
+    end
+  end
+end

data/lib/scruffy/renderers/cubed.rb

@@ -0,0 +1,36 @@
+module Scruffy
+  module Renderers
+    # Renderer that splits the graphs up into four other little graphs.
+    class Cubed < Base
+      def initialize
+        self.components = []
+        self.components << Scruffy::Components::Background.new(:background, :position => [0,0], :size =>[100, 100])
+        self.components << Scruffy::Components::Title.new(:title, :position => [5, 2], :size => [90, 7])
+
+        # Viewports
+        self.components << Scruffy::Components::Viewport.new(:top_left, :position => [10, 25], 
+                                                             :size => [35, 30], &graph_block(:top_left))
+        self.components << Scruffy::Components::Viewport.new(:top_left, :position => [55, 25], 
+                                                             :size => [35, 30], &graph_block(:top_right))
+        self.components << Scruffy::Components::Viewport.new(:top_left, :position => [10, 65], 
+                                                             :size => [35, 30], &graph_block(:bottom_left))
+        self.components << Scruffy::Components::Viewport.new(:top_left, :position => [55, 65], 
+                                                             :size => [35, 30], &graph_block(:bottom_right))
+        
+        self.components << Scruffy::Components::Legend.new(:legend, :position => [5, 13], :size => [90, 5])
+      end
+
+      private
+        def graph_block(graph_filter)
+          block = Proc.new { |components|
+            components << Scruffy::Components::Grid.new(:grid, :position => [10, 0], :size => [90, 89])
+            components << Scruffy::Components::ValueMarkers.new(:value_markers, :position => [0, 2], :size => [8, 89])
+            components << Scruffy::Components::DataMarkers.new(:data_markers, :position => [10, 92], :size => [90, 8])
+            components << Scruffy::Components::Graphs.new(:graphs, :position => [10, 0], :size => [90, 89], :only => graph_filter)
+          }
+          
+          block
+        end
+    end
+  end
+end

data/lib/scruffy/renderers/reversed.rb

@@ -0,0 +1,18 @@
+module Scruffy
+  module Renderers
+    class Reversed < Base
+
+      def initialize
+        self.components = []
+        self.components << Scruffy::Components::Background.new(:background, :position => [0,0], :size =>[100, 100])
+        self.components << Scruffy::Components::Title.new(:title, :position => [98, 95], :size => [1, 3], :text_anchor => 'end')
+        #self.components << Scruffy::Components::Grid.new(:grid, :position => [14, 12], :size => [78.5, 70])
+        self.components << Scruffy::Components::ValueMarkers.new(:value_markers, :position => [2, 14], :size => [10, 70])
+        self.components << Scruffy::Components::DataMarkers.new(:data_markers, :position => [14, 3.5], :size => [78.5, 4])
+        self.components << Scruffy::Components::Graphs.new(:graphs, :position => [14, 12], :size => [78.5, 70])
+        self.components << Scruffy::Components::Legend.new(:legend, :position => [3, 90], :size => [55, 6])
+      end
+
+    end
+  end
+end

data/lib/scruffy/renderers/split.rb

@@ -0,0 +1,34 @@
+module Scruffy
+  module Renderers
+    # Renderer that splits the graphs up into four other little graphs.
+    class Split < Base
+      def initialize(options = {})
+        self.components = []
+        self.components << Scruffy::Components::Background.new(:background, :position => [0,0], :size =>[100, 100])
+        self.components << Scruffy::Components::Title.new(:title, :position => [5, 2], :size => [90, 7])
+        self.components << Scruffy::Components::Label.new(:label_one, :text => options[:split_label] || '', 
+                                                          :position => [30, 54.5], :size => [40, 3])
+
+        # Viewports
+        self.components << Scruffy::Components::Viewport.new(:top_left, :position => [3, 20], 
+                                                             :size => [90, 30], &graph_block(:top))
+        self.components << Scruffy::Components::Viewport.new(:top_left, :position => [3, 65], 
+                                                             :size => [90, 30], &graph_block(:bottom))
+        
+        self.components << Scruffy::Components::Legend.new(:legend, :position => [5, 11], :size => [90, 4])
+      end
+
+      private
+        def graph_block(graph_filter)
+          block = Proc.new { |components|
+            components << Scruffy::Components::Grid.new(:grid, :position => [10, 0], :size => [90, 89])
+            components << Scruffy::Components::ValueMarkers.new(:value_markers, :position => [0, 2], :size => [8, 89])
+            components << Scruffy::Components::DataMarkers.new(:data_markers, :position => [10, 92], :size => [90, 8])
+            components << Scruffy::Components::Graphs.new(:graphs, :position => [10, 0], :size => [90, 89], :only => graph_filter)
+          }
+          
+          block
+        end
+    end
+  end
+end

data/lib/scruffy/renderers/standard.rb

@@ -1,158 +1,20 @@
 module Scruffy
-  class StandardRenderer
-    GRAPH_VIEWPORT = { :x => 0.20, :y => 0.30, :width => 0.70, :height => 0.55 }
-    MARKER_ALIGNMENT = { :x => 0.17, :y => 0.31}
-    MARKERS = 5
-
-    def render(options = {})
-      title       = options[:title]
-      theme       = options[:theme]
-      layers      = options[:layers]
-      size        = options[:size]
-      graph_id    = options[:graph_id] || 'scruffy_graph'
-      
-      
-      options[:complexity] ||= (global_complexity || :normal)
-      options[:resolver] ||= Scruffy::Resolver.new(options[:size].last)
-
-      svg = Builder::XmlMarkup.new(:indent => 2)
-      svg.instruct!
-      svg.instruct! 'DOCTYPE', 'svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"  type'
-      svg.svg(:xmlns => "http://www.w3.org/2000/svg", 'xmlns:xlink' => "http://www.w3.org/1999/xlink", :width => size[0], :height => size[1]) {
-        svg.g(:id => graph_id) {
-          render_background(svg, options)
-          render_markers(svg, options)
-          render_title(svg, options)
-          render_layers(svg, options)
-          render_legend(svg, options)
-          
-        }
-      }
-      svg.target!
-    end
-    
-    protected
-      def render_background(svg, options)
-        fill = "#EEEEEE"
-        case options[:theme][:background]
-        when Symbol, String
-          fill = options[:theme][:background].to_s
-        when Array
-          fill = "url(#BackgroundGradient)"
-          svg.defs {
-            svg.linearGradient(:id=>'BackgroundGradient', :x1 => '0%', :y1 => '0%', :x2 => '0%', :y2 => '100%') {
-              svg.stop(:offset => '5%', 'stop-color' => options[:theme][:background][0])
-              svg.stop(:offset => '95%', 'stop-color' => options[:theme][:background][1])
-            }
-          }
-        when Proc
-          theme[:background].call(svg, options)
-          fill = nil
-        end
-        
-        # Render background (maybe)
-        svg.rect(:width => "100%", :height => "100%", :x => "0", :y => "0", :fill => fill) unless fill.nil?
-      end
-      
-      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 = {}
-            layer_options[:index] = idx
-            layer_options[:color] = options[:theme][:colors].values[ (idx % options[:theme][:colors].size) ]
-            layer_options[:size]  = [ GRAPH_VIEWPORT[:width] * options[:size][0], GRAPH_VIEWPORT[:height] * options[:size][1] ]
-            layer_options[:min_value] = options[:min_value]
-            layer_options[:max_value] = options[:max_value]
-            layer_options[:opacity] = (idx > 0) ? 0.6 : 1.0
-            layer_options[:resolver] = options[:resolver]
-            layer_options[:complexity] = options[:complexity]
-            layer_options[:theme] = options[:theme]
-
-            # puts options[:theme][:colors].values
-            # puts layer_options[:color]
-            # puts "#{idx} : #{options[:layers].size} == #{idx % options[:layers].size}"
-
-            svg.g {
-              layer.render(svg, layer_options)
-              (options[:legend_information][layer.title] = layer.color) unless layer.title.nil?
-            }
-          end
-        }
-      end
-      
-      def render_markers(svg, options)
-        svg.g(:id => 'markers', :transform => "translate(#{GRAPH_VIEWPORT[:x] * options[:size][0]},#{GRAPH_VIEWPORT[:y] * options[:size][1]})") {
-          (0...MARKERS).each do |idx|
-            marker = ((1 / (MARKERS - 1).to_f) * idx) * (options[:size].last * GRAPH_VIEWPORT[:height])
-            svg.line(:x1 => 0, :y1 => marker, :x2 => (GRAPH_VIEWPORT[:width] * options[:size].first), :y2 => marker, :style => "stroke: #{options[:theme][:marker].to_s}; stroke-width: #{options[:resolver].to_point(2)};")
-          end
-        }
-
-        svg.g(:id => 'marker-values', :transform => "translate(#{MARKER_ALIGNMENT[:x] * options[:size][0]},#{MARKER_ALIGNMENT[:y] * options[:size][1]})") {
-          (0...MARKERS).each do |idx|
-            marker = ((GRAPH_VIEWPORT[:height]) * options[:size].last) - ((1 / (MARKERS - 1).to_f) * idx) * (options[:size].last * GRAPH_VIEWPORT[:height])
-            marker_value = (options[:max_value] - options[:min_value]) * ((1 / (MARKERS - 1).to_f) * idx) + options[:min_value]
-            marker_value = options[:marker_transformer].route_transform(marker_value, idx, options) if options[:marker_transformer]
-            
-            svg.text(marker_value.to_s, :x => 0, :y => marker, :style => "font-size: #{options[:resolver].to_point(18)}px; fill: #{((options.delete(:marker_color_override) || options[:theme][:marker]) || 'white').to_s}; text-anchor: end;")
-          end
-        }
-
-        unless options[:point_markers].nil?
-          svg.g(:id => 'point-markers', :transform => "translate(#{GRAPH_VIEWPORT[:x] * options[:size][0]},#{(GRAPH_VIEWPORT[:y] + GRAPH_VIEWPORT[:height]) * options[:size][1]})") {
-            point_distance = (options[:size].first * GRAPH_VIEWPORT[:width]) / (options[:point_markers].size - 1).to_f
-
-            (0...options[:point_markers].size).map do |idx| 
-              x_coord = point_distance * idx
-              svg.text(options[:point_markers][idx], :x => x_coord, :y => options[:resolver].to_point(20), 
-                       'font-size' => options[:resolver].to_point(16), 
-                       :fill => (options[:theme][:marker] || 'white').to_s, 
-                       'text-anchor' => 'middle') unless options[:point_markers][idx].nil?
-            end
-          }
+  module Renderers
+    class Standard < Base
+
+      def initialize
+        self.components = []
+        self.components << Scruffy::Components::Background.new(:background, :position => [0,0], :size =>[100, 100])
+        self.components << Scruffy::Components::Title.new(:title, :position => [5, 2], :size => [90, 7])
+        self.components << Scruffy::Components::Viewport.new(:graph_viewport, :position => [2, 26], :size => [89, 66]) do |view|
+          view << Scruffy::Components::Grid.new(:grid, :position => [20, 0], :size => [80, 90])
+          view << Scruffy::Components::ValueMarkers.new(:value_markers, :position => [0, 2], :size => [17.5, 90])
+          view << Scruffy::Components::DataMarkers.new(:data_markers, :position => [20, 94], :size => [80, 6])
+          view << Scruffy::Components::Graphs.new(:graphs, :position => [20, 0], :size => [80, 90])          
         end
+        self.components << Scruffy::Components::Legend.new(:legend, :position => [5, 13], :size => [90, 6])
       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})") {
-          svg.text( options[:title], :x => options[:size][0] / 2, :y => 0, 
-                    'font-size' => options[:resolver].to_point(28), 'text-anchor' => 'middle', 
-                    :fill => 'white')
-        }
-      end
-      
-    private
-      def global_complexity
-        if Kernel.const_defined? "SCRUFFY_COMPLEXITY"
-          SCRUFFY_COMPLEXITY
-        else
-          nil
-        end
-      end
+    end
   end
 end

data/lib/scruffy/themes.rb

@@ -1,26 +1,70 @@
 module Scruffy
   module Themes
-    KEYNOTE = {
-      :background => [:black, '#4A465A'],
-      :marker => :white, 
-      :colors => {:blue => '#6886B4',
-                  :green => '#72AE6E', :red => '#D1695E', 
-                  :purple => '#8A6EAF', :orange => '#EFAA43'}
-      }
+    class Base
+      attr_accessor :background
+      attr_accessor :colors
+      attr_accessor :marker
+      attr_accessor :font_family
+
+      def initialize(descriptor)
+        self.background = descriptor[:background]
+        self.colors     = descriptor[:colors]
+        self.marker     = descriptor[:marker]
+        self.font_family = descriptor[:font_family]
+      end
       
+      def next_color
+        @previous_color = 0 if @previous_color.nil?
+        @previous_color += 1
+                
+        self.colors[(@previous_color-1) % self.colors.size]
+      end
       
-    MEPHISTO = {
-      :background => ['#101010', '#999977'],
-      :marker => :white,
-      :colors => {:orange => '#DD3300', :blue => '#66AABB', :green => '#225533',
-                  :red => '#992200'}
-    }
+      def darken(color, shift=20)
+        
+      end
+      
+      def lighten(color, shift=20)
+        
+      end
+    end
+    
+    # Keynote theme, based on Apple's Keynote presentation software.
+    #
+    # Color values used from Gruff's default theme.
+    class Keynote < Base
+      def initialize
+        super({  
+                :background => [:black, '#4A465A'],
+                :marker => :white, 
+                :colors => %w(#6886B4 #FDD84E #72AE6E #D1695E #8A6EAF #EFAA43 white)
+               })
+      end
+    end
+
+    # Roughly, roughly based on the color scheme of www.mephistoblog.com.
+    class Mephisto < Base
+      def initialize
+        super({
+                :background => ['#101010', '#999977'],
+                :marker => :white,
+                :colors => %w(#DD3300 #66AABB #225533 #992200)
+              })
+        
+      end
+    end
+    
+    # Based on the color scheme used by almost every Ruby blogger.
+    class RubyBlog < Base
+      def initialize
+        super({
+                :background => ['#670A0A', '#831515'],
+                :marker => '#DBD1C1',
+                :colors => %w(#007777 #444477 #994444 #77FFBB #D75A20)
+              })
+      end
+    end
+    
     
-    RUBY_BLOG = {
-      :background => ['#670A0A', '#831515'],
-      :marker => '#DBD1C1',
-      :colors => {:teal => '#007777', :purple => '#444477', :pink => '#994444',
-        :green => '#77FFBB', :orange => '#D75A20'}
-    }
   end
 end