jagthedrummer-scruffy 0.2.9 → 0.2.10

data/Manifest.txt

@@ -24,6 +24,7 @@ lib/scruffy/graph_state.rb
 lib/scruffy/helpers.rb
 lib/scruffy/helpers/canvas.rb
 lib/scruffy/helpers/layer_container.rb
+lib/scruffy/helpers/marker_helper.rb
 lib/scruffy/helpers/meta.rb
 lib/scruffy/helpers/point_container.rb
 lib/scruffy/layers.rb
@@ -31,8 +32,11 @@ lib/scruffy/layers/all_smiles.rb
 lib/scruffy/layers/area.rb
 lib/scruffy/layers/average.rb
 lib/scruffy/layers/bar.rb
+lib/scruffy/layers/box.rb
 lib/scruffy/layers/base.rb
 lib/scruffy/layers/line.rb
+lib/scruffy/layers/multi.rb
+lib/scruffy/layers/multi_bar.rb
 lib/scruffy/layers/pie.rb
 lib/scruffy/layers/pie_slice.rb
 lib/scruffy/layers/scatter.rb
@@ -51,6 +55,7 @@ lib/scruffy/renderers/reversed.rb
 lib/scruffy/renderers/sparkline.rb
 lib/scruffy/renderers/split.rb
 lib/scruffy/renderers/standard.rb
+lib/scruffy/renderers/axis_legend.rb
 lib/scruffy/themes.rb
 lib/scruffy/version.rb
 script/console

data/lib/scruffy/components/data_markers.rb

@@ -16,15 +16,20 @@ module Scruffy
           end
         end
         unless options[:point_markers].nil?
-          point_distance = bounds[:width] / (options[:point_markers].size - 1).to_f
-    
+          # Updated to set the label in line with the point.
+          point_distance = bounds[:width] / (options[:point_markers].size).to_f
           (0...options[:point_markers].size).map do |idx| 
-            x_coord = point_distance * idx
+            x_coord = point_distance * idx  + point_distance/2
+            if options[:point_markers_ticks]
+              svg.line(:x1 => x_coord, :y1 => 0, :x2 => x_coord, :y2 => -2, :style => "stroke:#{(options[:theme].marker || 'white').to_s}, stroke-width:1")
+            end
+
             svg.text(options[:point_markers][idx],
-              :x => x_coord,
-              :y => bounds[:height], 
-              'font-size' => relative(90),
+              :x => 0,
+              :y => 0, 
+              'font-size' => options[:theme].marker_font_size || relative(90),
               'font-family' => options[:theme].font_family,
+              :transform => "translate(#{x_coord},#{bounds[:height]}) rotate(#{options[:point_markers_rotation] || 0})",
               :fill => (options[:theme].marker || 'white').to_s, 
               'text-anchor' => 'middle') unless options[:point_markers][idx].nil?
           end

data/lib/scruffy/components/graphs.rb

@@ -31,6 +31,7 @@ module Scruffy
           layer_options[:complexity]  = options[:complexity]
           layer_options[:size]        = [bounds[:width], bounds[:height]]
           layer_options[:color]       = layer.preferred_color || layer.color || options[:theme].next_color
+          layer_options[:outline]       = layer.preferred_outline || layer.outline || options[:theme].next_outline
           layer_options[:opacity]     = opacity_for(idx)
           layer_options[:theme]       = options[:theme]
 

data/lib/scruffy/components/grid.rb

@@ -13,6 +13,11 @@ module Scruffy
         each_marker(markers, options[:min_value], options[:max_value], bounds[:height], options, :value_formatter) do |label, y|
           svg.line(:x1 => 0, :y1 => y, :x2 => bounds[:width], :y2 => y, :style => "stroke: #{options[:theme].marker.to_s}; stroke-width: #{stroke_width};")
         end
+        
+        #add a 0 line
+        y = (options[:max_value] * bounds[:height])/(options[:max_value] - options[:min_value])
+        svg.line(:x1 => 0, :y1 => y, :x2 => bounds[:width], :y2 => y, :style => "stroke: #{options[:theme].marker.to_s}; stroke-width: #{stroke_width};")
+        
       end
     end
     
@@ -22,12 +27,25 @@ module Scruffy
       include Scruffy::Helpers::Marker
       
       def draw(svg, bounds, options={})
-        markers = (options[:key_markers] || self.markers) || 5
-        
-        stroke_width = options[:stroke_width]
         
-        each_marker(markers, options[:min_key], options[:max_key], bounds[:width], options, :key_formatter) do |label, x|
-          svg.line(:x1 => x, :y1 => 0, :x2 => x, :y2 => bounds[:height], :style => "stroke: #{options[:theme].marker.to_s}; stroke-width: #{stroke_width};")
+        if options[:graph].point_markers #get vertical grid lines up with points if there are labels for them
+          point_distance = bounds[:width] / (options[:graph].point_markers.size).to_f
+          stroke_width = options[:stroke_width]
+          (0...options[:graph].point_markers.size).map do |idx| 
+            x = point_distance * idx  + point_distance/2
+            svg.line(:x1 => x, :y1 => 0, :x2 => x, :y2 => bounds[:height], :style => "stroke: #{options[:theme].marker.to_s}; stroke-width: #{stroke_width};")
+          end
+          #add the far right and far left lines
+          svg.line(:x1 => 0, :y1 => 0, :x2 => 0, :y2 => bounds[:height], :style => "stroke: #{options[:theme].marker.to_s}; stroke-width: #{stroke_width};")
+          svg.line(:x1 => bounds[:width], :y1 => 0, :x2 => bounds[:width], :y2 => bounds[:height], :style => "stroke: #{options[:theme].marker.to_s}; stroke-width: #{stroke_width};")
+        else
+            
+          markers =  (options[:key_markers] || self.markers) || 5 #options[:point_markers].size#
+          stroke_width = options[:stroke_width]
+          each_marker(markers, options[:min_key], options[:max_key], bounds[:width], options, :key_formatter) do |label, x|
+            svg.line(:x1 => x, :y1 => 0, :x2 => x, :y2 => bounds[:height], :style => "stroke: #{options[:theme].marker.to_s}; stroke-width: #{stroke_width};")
+          end
+          
         end
       end
     end

data/lib/scruffy/components/legend.rb

@@ -1,5 +1,47 @@
 module Scruffy::Components
-
+  
+  class XLegend < Base
+    def draw(svg, bounds, options={})
+      if options[:title]
+        svg.text(options[:x_legend],
+                 :class => 'title',
+        :x => (bounds[:width] / 2),
+        :y => bounds[:height], 
+            'font-size' => options[:theme].legend_font_size || relative(100),
+            'font-family' => options[:theme].font_family,
+        :fill => options[:theme].marker,
+        :stroke => 'none', 'stroke-width' => '0',
+            'text-anchor' => (@options[:text_anchor] || 'middle'))
+      end
+    end
+  end #XLegend
+  
+  
+  
+  class YLegend < Base
+    def draw(svg, bounds, options={})
+      if options[:title]
+        svg.text(options[:y_legend],
+                 :class => 'title',
+        :x => (0),
+        :y => 0, 
+            'font-size' => options[:theme].legend_font_size || relative(100),
+            'font-family' => options[:theme].font_family,
+            :transform => "translate(#{bounds[:width] / 2},#{bounds[:height]/2}) rotate(#{-90})",
+        :fill => options[:theme].marker,
+        :stroke => 'none', 'stroke-width' => '0',
+            'text-anchor' => (@options[:text_anchor] || 'middle'))
+      end
+    end
+  end #YLegend
+  
+  
+  
+  
+  
+  
+  
+  
   class Legend < Base
     FONT_SIZE = 80
     
@@ -11,18 +53,18 @@ module Scruffy::Components
         set_line_height = 0.08 * bounds[:height]
         @line_height = bounds[:height] / legend_info.length
         @line_height = set_line_height if @line_height >
-          set_line_height
+        set_line_height
       else
         set_line_height = 0.90 * bounds[:height]
         @line_height = set_line_height
       end
-
+      
       text_height = @line_height * FONT_SIZE / 100
       # #TODO how does this related to @points?
       active_width, points = layout(legend_info, vertical)
-
+      
       offset = (bounds[:width] - active_width) / 2    # Nudge over a bit for true centering
-
+      
       # Render Legend
       points.each_with_index do |point, idx|
         if vertical
@@ -38,18 +80,18 @@ module Scruffy::Components
         # "#{x} #{y} #{@line_height} #{size}"
         
         svg.rect(:x => x, 
-          :y => y, 
-          :width => size, 
-          :height => size,
-          :fill => legend_info[idx][:color])
-
+                 :y => y, 
+                 :width => size, 
+                 :height => size,
+                 :fill => legend_info[idx][:color])
+        
         svg.text(legend_info[idx][:title], 
-          :x => x + @line_height, 
-          :y => y + text_height * 0.75,
+                 :x => x + @line_height, 
+                 :y => y + text_height * 0.75,
           'font-size' => text_height, 
           'font-family' => options[:theme].font_family,
-          :style => "color: #{options[:theme].marker || 'white'}",
-          :fill => (options[:theme].marker || 'white'))
+        :style => "color: #{options[:theme].marker || 'white'}",
+        :fill => (options[:theme].marker || 'white'))
       end
     end   # draw
     
@@ -60,9 +102,9 @@ module Scruffy::Components
     def relevant_legend_info(layers, categories=(@options[:category] ? [@options[:category]] : @options[:categories]))
       legend_info = layers.inject([]) do |arr, layer|
         if categories.nil? ||
-            (categories.include?(layer.options[:category]) ||
-              (layer.options[:categories] && (categories & layer.options[:categories]).size > 0) )
-
+         (categories.include?(layer.options[:category]) ||
+         (layer.options[:categories] && (categories & layer.options[:categories]).size > 0) )
+          
           data = layer.legend_data
           arr << data if data.is_a?(Hash)
           arr = arr + data if data.is_a?(Array)
@@ -70,7 +112,7 @@ module Scruffy::Components
         arr
       end
     end   # relevant_legend_info
-      
+    
     # Returns an array consisting of the total width needed by the legend
     # information, as well as an array of @x-coords for each element. If
     # vertical, then these are @y-coords, and @x is 0
@@ -84,7 +126,7 @@ module Scruffy::Components
           longest = longest < cur_length ? cur_length : longest
         }
         y_positions = []
-        (0..legend_info_array.length - 1).each {|y|
+         (0..legend_info_array.length - 1).each {|y|
           y_positions << y * @line_height
         }
         [longest, y_positions]
@@ -94,12 +136,12 @@ module Scruffy::Components
           enum[1] << enum.first                                 # Add location to points
           enum[0] += relative(50)                               # Add room for color box
           enum[0] += (relative(50) * elem[:title].length)       # Add room for text
-
+          
           [enum.first, enum.last]
         end        
       end
     end
-
+    
   end   # class Legend
   
 end   # Scruffy::Components

data/lib/scruffy/components/title.rb

@@ -7,7 +7,7 @@ module Scruffy
             :class => 'title',
             :x => (bounds[:width] / 2),
             :y => bounds[:height], 
-            'font-size' => relative(100),
+            'font-size' => options[:theme].title_font_size || relative(100),
             'font-family' => options[:theme].font_family,
             :fill => options[:theme].marker,
             :stroke => 'none', 'stroke-width' => '0',

data/lib/scruffy/components/value_markers.rb

@@ -10,10 +10,11 @@ module Scruffy
         markers = (options[:markers] || self.markers) || 5
         
         each_marker(markers, options[:min_value], options[:max_value], bounds[:height], options, :value_formatter) do |label, y|
+
           svg.text( label, 
             :x => bounds[:width], 
             :y => (bounds[:height] - y), 
-            'font-size' => relative(8),
+            'font-size' => options[:theme].marker_font_size || relative(8),
             'font-family' => options[:theme].font_family,
             :fill => ((options.delete(:marker_color_override) || options[:theme].marker) || 'white').to_s,
             'text-anchor' => 'end')

data/lib/scruffy/graph.rb

@@ -79,12 +79,12 @@ module Scruffy
     include Scruffy::Helpers::LayerContainer
 
     # Delegating these getters to the internal state object.
-    def_delegators  :internal_state, :title, :theme, :default_type, 
-                    :point_markers, :value_formatter, :rasterizer,
+    def_delegators  :internal_state, :title,:x_legend,:y_legend, :theme, :default_type, 
+                    :point_markers,:point_markers_rotation,:point_markers_ticks, :value_formatter, :rasterizer,
                     :key_formatter
                   
-    def_delegators  :internal_state, :title=, :theme=, :default_type=,
-                    :point_markers=, :value_formatter=, :rasterizer=,
+    def_delegators  :internal_state, :title=, :theme=,:x_legend=,:y_legend=, :default_type=,
+                    :point_markers=,:point_markers_rotation=,:point_markers_ticks=, :value_formatter=, :rasterizer=,
                     :key_formatter=
     
     attr_reader :renderer     # Writer defined below
@@ -98,11 +98,15 @@ module Scruffy
     # Options:
     #
     # title::  Graph's title
+    # x_legend :: Title for X Axis
+    # y_legend :: Title for Y Axis
     # theme::  A theme object to use when rendering graph
     # layers::  An array of Layers for this graph to use
     # default_type::  A symbol indicating the default type of Layer for this graph
     # value_formatter::   Sets a formatter used to modify marker values prior to rendering
     # point_markers::  Sets the x-axis marker values
+    # point_markers_rotation::  Sets the angle of rotation for x-axis marker values
+    # point_markers_ticks::  Sets a small tick mark above each marker value.  Helful when used with rotation.    
     # rasterizer::  Sets the rasterizer to use when rendering to an image format.  Defaults to RMagick.
     def initialize(*args)
       self.default_type   = args.shift if args.first.is_a?(Symbol)
@@ -110,13 +114,15 @@ module Scruffy
       raise ArgumentError, "The arguments provided are not supported." if args.size > 0
 
       options ||= {}
+      
+      
       self.theme = Scruffy::Themes::Standard.new
       self.renderer = Scruffy::Renderers::Standard.new
       self.rasterizer = Scruffy::Rasterizers::RMagickRasterizer.new
       self.value_formatter = Scruffy::Formatters::Number.new
       self.key_formatter = Scruffy::Formatters::Number.new
 
-      %w(title theme layers default_type value_formatter point_markers rasterizer key_formatter).each do |arg|
+      %w(title x_legend y_legend theme layers default_type value_formatter point_markers point_markers_rotation point_markers_ticks rasterizer key_formatter).each do |arg|
         self.send("#{arg}=".to_sym, options.delete(arg.to_sym)) unless options[arg.to_sym].nil?
       end
       
@@ -141,11 +147,15 @@ module Scruffy
       options[:value_formatter]     ||= value_formatter
       options[:key_formatter]       ||= key_formatter
       options[:point_markers]       ||= point_markers
+      options[:point_markers_rotation]       ||= point_markers_rotation
+      options[:point_markers_ticks]       ||= point_markers_ticks
       options[:size]                ||= (options[:width] ? [options[:width], (options.delete(:width) * 0.6).to_i] : [600, 360])
       options[:title]               ||= title
+      options[:x_legend]               ||= x_legend
+      options[:y_legend]               ||= y_legend
       options[:layers]              ||= layers
-      options[:min_value]           ||= bottom_value #(:padded)
-      options[:max_value]           ||= top_value
+      options[:min_value]           ||= bottom_value(options[:padding] ? options[:padding] : nil)
+      options[:max_value]           ||= top_value(options[:padding] ? options[:padding] : nil)
       options[:min_key]             ||= bottom_key
       options[:max_key]             ||= top_key
       options[:graph]               ||= self

data/lib/scruffy/graph_state.rb

@@ -11,9 +11,13 @@ module Scruffy
   class GraphState
 
     attr_accessor :title
+    attr_accessor :x_legend
+    attr_accessor :y_legend
     attr_accessor :theme
     attr_accessor :default_type
     attr_accessor :point_markers
+    attr_accessor :point_markers_rotation
+    attr_accessor :point_markers_ticks
     attr_accessor :value_formatter
     attr_accessor :key_formatter
     attr_accessor :rasterizer

data/lib/scruffy/helpers/layer_container.rb

@@ -67,7 +67,9 @@ module Scruffy::Helpers
     # If padding is set to :padded, a 15% padding is added to the highest value.
     def top_value(padding=nil) # :nodoc:
       topval = layers.inject(0) { |max, layer| (max = ((max < layer.top_value) ? layer.top_value : max)) unless layer.top_value.nil?; max }
-      padding == :padded ? (topval - ((topval - bottom_value) * 0.15)) : topval
+      below_zero = (topval <= 0)
+      topval = padding == :padded ? (topval + ((topval - bottom_value) * 0.15)) : topval
+      (below_zero && topval > 0) ? 0 : topval
     end
   
     # Returns the lowest value in any of this container's layers.
@@ -80,7 +82,7 @@ module Scruffy::Helpers
         (min = ((min > layer.bottom_value) ? layer.bottom_value : min)) unless layer.bottom_value.nil?
         min 
       end
-      above_zero = (botval > 0)
+      above_zero = (botval >= 0)
       botval = (botval - ((top_value - botval) * 0.15)) if padding == :padded
     
       # Don't introduce negative values solely due to padding.

data/lib/scruffy/helpers/marker_helper.rb

@@ -11,7 +11,9 @@ module Scruffy::Helpers
       end
 
       all_values.size.times do |idx|
-        location = idx.to_f * width/(markers-1)
+        dx = width/(markers - 1)
+        
+        location = idx.to_f * dx #+ dx/2
         marker_value = all_values[idx]
         marker_value = options[format_key].route_format(marker_value, idx, options.merge({:all_values => all_values})) if options[format_key]
 

data/lib/scruffy/layers/bar.rb

@@ -8,10 +8,22 @@ module Scruffy::Layers
   class Bar < Base
   
     # Draw bar graph.
+    # Now handles positive and negative values gracefully.
     def draw(svg, coords, options = {})
-      coords.each do |coord|
-        x, y, bar_height = (coord.first-(@bar_width * 0.5)), coord.last, (height - coord.last)
-
+      coords.each_with_index do |coord,idx|
+        x, y, bar_height = (coord.first), coord.last, 1#(height - coord.last)
+        
+          valh = max_value + min_value * -1 #value_height
+          maxh = max_value * height / valh #positive area height
+          minh = min_value * height / valh #negative area height
+          #puts "height = #{height} and max_value = #{max_value} and min_value = #{min_value} and y = #{y} and point = #{points[idx]}"
+          if points[idx] > 0
+            bar_height = points[idx]*maxh/max_value
+          else
+            bar_height = points[idx]*minh/min_value
+          end
+        
+        #puts " y = #{y} and point = #{points[idx]}"  
         svg.g(:transform => "translate(-#{relative(0.5)}, -#{relative(0.5)})") {
           svg.rect( :x => x, :y => y, :width => @bar_width + relative(1), :height => bar_height + relative(1), 
                     :style => "fill: black; fill-opacity: 0.15; stroke: none;" )
@@ -34,13 +46,17 @@ module Scruffy::Layers
       # 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 = {})
         @bar_width = (width / points.size) * 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 = (options[:point_distance] * idx) + (width / points.size * 0.5)
+          x_coord = (options[:point_distance] * idx) + (width / points.size * 0.5) - (@bar_width * 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))

data/lib/scruffy/layers/base.rb

@@ -26,6 +26,7 @@ module Scruffy::Layers
     attr_accessor :points
     attr_accessor :relevant_data
     attr_accessor :preferred_color
+    attr_accessor :preferred_outline
     attr_accessor :options          # On-the-fly values for easy customization / acts as attributes.
     
     # The following attributes are set during the layer's render process,
@@ -34,6 +35,7 @@ module Scruffy::Layers
     attr_reader :height, :width
     attr_reader :min_value, :max_value
     attr_reader :color
+    attr_reader :outline
     attr_reader :opacity
     attr_reader :complexity
 
@@ -47,6 +49,7 @@ module Scruffy::Layers
     # title:: Name/title of data group
     # points:: Array of data points
     # preferred_color:: Color used to render this graph, overrides theme color.
+    # preferred_outline:: Color used to render this graph outline, overrides theme outline.
     # relevant_data:: Rarely used - indicates the data on this graph should not 
     #                 included in any graph data aggregations, such as averaging data points.
     # style:: SVG polyline style. (default: 'fill-opacity: 0; stroke-opacity: 0.35')
@@ -57,6 +60,7 @@ module Scruffy::Layers
     def initialize(options = {})
       @title              = options.delete(:title) || ''
       @preferred_color    = options.delete(:color)
+      @preferred_outline    = options.delete(:outline)
       @relevant_data      = options.delete(:relevant_data) || true
       @points             = options.delete(:points) || []
       @points.extend Scruffy::Helpers::PointContainer unless @points.kind_of? Scruffy::Helpers::PointContainer
@@ -145,6 +149,7 @@ module Scruffy::Layers
       # itself.
       def setup_variables(options = {})
         @color = (preferred_color || options.delete(:color))
+        @outline = (preferred_outline || options.delete(:outline))
         @width, @height = options.delete(:size)
         @min_value, @max_value = options[:min_value], options[:max_value]
         @opacity = options[:opacity] || 1.0
@@ -154,15 +159,19 @@ module Scruffy::Layers
       # Optimistic generation of coordinates for layer to use.  These coordinates are
       # just a best guess, and can be overridden or thrown away (for example, this is overridden
       # in pie charting and bar charts).
+      
+      # Updated : Assuming n number of points, the graph is divided into n rectangles
+      # and the points are plotted in the middle of each rectangle.  This allows bars to 
+      # play nice with lines.
       def generate_coordinates(options = {})
         
-        dy = height.to_f / (options[:max_value] - options[:min_value])
-        dx = width.to_f / (options[:max_key] - options[:min_key])
+        dy = height.to_f / (options[:max_value] - options[:min_value]) 
+        dx = width.to_f / (options[:max_key] - options[:min_key] + 1)
 
         ret = []
         points.each_point do |x, y|
           if y
-            x_coord = dx * (x - options[:min_key])
+            x_coord = dx * (x - options[:min_key]) + dx/2
             y_coord = dy * (y - options[:min_value])
 
             ret << [x_coord, height - y_coord]

data/lib/scruffy/layers.rb

@@ -17,9 +17,12 @@ require 'scruffy/layers/base'
 require 'scruffy/layers/area'
 require 'scruffy/layers/all_smiles'
 require 'scruffy/layers/bar'
+require 'scruffy/layers/box'
 require 'scruffy/layers/line'
 require 'scruffy/layers/average'
 require 'scruffy/layers/stacked'
+require 'scruffy/layers/multi'
+require 'scruffy/layers/multi_bar'
 require 'scruffy/layers/pie'
 require 'scruffy/layers/pie_slice'
 require 'scruffy/layers/scatter'

data/lib/scruffy/renderers/standard.rb

@@ -4,12 +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], :stroke_width => 1)
-          graph << Scruffy::Components::VGrid.new(:vgrid, :position => [20, 0], :size => [80, 89], :stroke_width => 1)
-          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

data/lib/scruffy/renderers.rb

@@ -15,6 +15,7 @@ module Scruffy::Renderers; end
 require 'scruffy/renderers/base'
 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/themes.rb

@@ -19,8 +19,12 @@ 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 :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,8 +38,12 @@ module Scruffy::Themes
     def initialize(descriptor)
       self.background = descriptor[:background]
       self.colors     = descriptor[:colors]
+      self.outlines     = descriptor[:outlines]
       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.
@@ -45,6 +53,17 @@ module Scruffy::Themes
               
       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

data/test/graph_creation_test.rb

@@ -49,6 +49,43 @@ class GraphCreationTest < Test::Unit::TestCase
     graph.render :to => "#{WEBSITE_DIR}/line_test.svg"
     graph.render  :width => 400, :to => "#{WEBSITE_DIR}/line_test.png", :as => 'png' if $make_png
   end
+  
+  
+  def test_create_line_with_negatives
+    graph = Scruffy::Graph.new
+    graph.title = "Sample Line Graph"
+    graph.renderer = Scruffy::Renderers::Standard.new
+
+    graph.add :line, 'Example', [-20, 100, -70, -30, 106]
+    theme = Scruffy::Themes::Base.new :background=>"#ffffff", :marker=>"#444444",
+                          :colors=>["#4f83bf","#be514e","#a1ba5e","#82649a"],
+                          :title_font_size => 30, :marker_font_size=>10
+    graph.render :to => "#{WEBSITE_DIR}/line_test_with_negatives.svg",:theme=>theme
+    graph.render  :width => 400, :to => "#{WEBSITE_DIR}/line_test_with_negatives.png",:theme=>theme, :as => 'png' if $make_png
+  end
+  
+  
+  def test_create_negative_line
+    graph = Scruffy::Graph.new
+    graph.title = "Sample Line Graph"
+    graph.renderer = Scruffy::Renderers::Standard.new
+
+    graph.add :line, 'Example', [-20, -100, -70, -30, -106]
+    theme = Scruffy::Themes::Apples.new 
+    graph.render :to => "#{WEBSITE_DIR}/negative_line_test.svg",:theme=>theme
+    graph.render  :width => 600,:theme=>theme, :to => "#{WEBSITE_DIR}/negative_line_test.png", :as => 'png' if $make_png
+  end
+  
+  def test_create_small_value_line
+    graph = Scruffy::Graph.new
+    graph.title = "Sample Line Graph"
+    graph.renderer = Scruffy::Renderers::Standard.new
+    graph.value_formatter = Scruffy::Formatters::Number.new(:precision => 1)
+    graph.add :line, 'Example', [0.2,0.5,0.1,0.9,0.8,1.2,0.05,1]
+
+    graph.render :to => "#{WEBSITE_DIR}/small_value_line_test.svg"
+    graph.render  :width => 400, :to => "#{WEBSITE_DIR}/small_value_line_test.png", :as => 'png' if $make_png
+  end
 
   
   def test_create_bar
@@ -60,6 +97,34 @@ class GraphCreationTest < Test::Unit::TestCase
     graph.render  :width => 400, :to => "#{WEBSITE_DIR}/bar_test.png", :as => 'png' if $make_png
   end
   
+  
+  
+  
+  def test_create_bar_with_negatives
+    graph = Scruffy::Graph.new
+    graph.title = "Sample Bar Graph"
+    graph.renderer = Scruffy::Renderers::Standard.new
+    graph.add :bar, 'Example', [20, 100,-10, 70, 30, -40, 106]
+    graph.render :to => "#{WEBSITE_DIR}/negative_bar_test.svg"
+    graph.render  :width => 400, :to => "#{WEBSITE_DIR}/negative_bar_test.png", :as => 'png' if $make_png
+  end
+  
+  
+  def test_create_bar_with_all_negatives
+    graph = Scruffy::Graph.new
+    graph.title = "Sample Bar Graph"
+    graph.renderer = Scruffy::Renderers::Standard.new
+    graph.add :bar, 'Example', [-20, -100,-10, -70, -30, -40, -106]
+    
+    theme = Scruffy::Themes::Base.new :background=>"#ffffff", :marker=>"#444444",
+                          :colors=>["#ff0000","#00ff00","#0000ff","#cccccc"],
+                          :title_font_size => 30, :marker_font_size=>10
+    
+    graph.render :to => "#{WEBSITE_DIR}/all_negative_bar_test.svg",:theme=>theme
+    graph.render  :width => 400,:theme=>theme, :to => "#{WEBSITE_DIR}/all_negative_bar_test.png", :as => 'png' if $make_png
+  end
+  
+  
   def test_split
     graph = Scruffy::Graph.new
     graph.title = "Long-term Comparisons"
@@ -91,6 +156,93 @@ class GraphCreationTest < Test::Unit::TestCase
     graph.render  :width => 500, :to => "#{WEBSITE_DIR}/stacking_test.png", :as => 'png' if $make_png
   end
   
+  
+  def test_reg_multi_bar
+    graph = Scruffy::Graph.new
+    graph.title = "Comparative Agent Performance"
+    graph.value_formatter = Scruffy::Formatters::Percentage.new(:precision => 0)
+    #graph.add :multi do |multi|
+      graph.add :bar, 'Jack', [30, 60, 49, 29, 100, 120]
+      graph.add :bar, 'Jill', [120, 240, 0, 100, 140, 20]
+      graph.add :bar, 'Hill', [10, 10, 90, 20, 40, 10]
+    #end
+    graph.point_markers = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun']
+    graph.render :to => "#{WEBSITE_DIR}/reg_multi_bar_test.svg"
+    graph.render  :width => 500, :to => "#{WEBSITE_DIR}/reg_multi_bar_test.png", :as => 'png' if $make_png
+  end
+  
+  def test_multi_bar
+    graph = Scruffy::Graph.new
+    graph.title = "Comparative Agent Performance"
+    graph.value_formatter = Scruffy::Formatters::Percentage.new(:precision => 0)
+    graph.add :multi do |multi|
+      multi.add :multi_bar, 'Jack', [30, 60, 49, 29, 100, 120]
+      multi.add :multi_bar, 'Jill', [120, 240, 0, 100, 140, 20]
+      multi.add :multi_bar, 'Hill', [10, 10, 90, 20, 40, 10]
+      multi.add :multi_bar, 'Bob', [-10, -20, -30, -40, -50, -60]
+    end
+    graph.point_markers = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun']
+    graph.point_markers_ticks = true
+    theme = Scruffy::Themes::Base.new :background=>"#ffffff", :marker=>"#444444",
+                          :colors=>["#cccccc","#ff0000","#00ff00","#0000ff"],
+                          :title_font_size => 30, :marker_font_size=>10
+    
+    graph.render :to => "#{WEBSITE_DIR}/multi_bar_test.svg",:theme=>theme
+    
+    graph.render  :width => 900,:theme=>theme, :to => "#{WEBSITE_DIR}/multi_bar_test.png", :as => 'png' if $make_png
+  end
+  
+  
+  def test_box_plot
+    graph = Scruffy::Graph.new()
+    graph.title = "Box Plot Test"
+    graph.x_legend = "Time in Seconds"
+    graph.y_legend = "Inces of Rain"
+    graph.value_formatter = Scruffy::Formatters::Percentage.new(:precision => 0)
+    graph.add :box, "Test Data", [
+                                [10,8,6.2,4,2],
+                                [12,9,8.2,4.2,3.5],
+                                [10,8,5.3,4,2],
+                                [12,9,8.2,4.2,3.5],
+                                [10,8,6.6,4,2],
+                                [12,9,8.2,4.2,3.5]
+                                ]
+                                
+    graph.point_markers = ['Jan', 'Feb','Jan', 'Feb','Jan', 'Feb']
+    graph.point_markers_ticks = true
+    graph.renderer = Scruffy::Renderers::AxisLegend.new
+    
+    theme = Scruffy::Themes::Base.new :background=>"#ffffff", :marker=>"#aaaaaa",
+                          :colors=>["#4f83bf","#be514e","#a1ba5e","#82649a"],
+                          :legend_font_size=>30,
+                          :title_font_size=>40,
+                          :marker_font_size=>20,
+                          :outlines=>["#be514e","#a1ba5e","#82649a","#4f83bf"]
+    graph.render :to => "#{WEBSITE_DIR}/box_plot_test.svg",:padding=>:padded,:theme=>theme,:key_markers=>8
+    graph.render  :size => [600,540],:theme=>theme,:key_markers=>7, :to => "#{WEBSITE_DIR}/box_plot_test.png", :as => 'png',:padding=>:padded if $make_png
+  end
+  
+ 
+  
+  def test_rotated_point_markers
+    graph = Scruffy::Graph.new({:point_markers_rotation=>30}) #
+    graph.title = "Comparative Agent Performance"
+    graph.value_formatter = Scruffy::Formatters::Percentage.new(:precision => 0)
+    graph.add :stacked do |stacked|
+      stacked.add :bar, 'Jack', [30, 60, 49, 29, 100, 120]
+      stacked.add :bar, 'Jill', [120, 240, 0, 100, 140, 20]
+      stacked.add :bar, 'Hill', [10, 10, 90, 20, 40, 10]
+    end
+    graph.point_markers = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun']
+    graph.point_markers_ticks = true
+    #Rotation was set when the graph was created
+    #You can also do something like this
+    #graph.point_markers_rotation = 90
+    graph.render :to => "#{WEBSITE_DIR}/rotated_point_markers_test.svg"
+    graph.render  :width => 500, :to => "#{WEBSITE_DIR}/rotated_point_markers_test.png", :as => 'png' if $make_png
+  end
+  
+  
   def test_multi_layered
     graph = Scruffy::Graph.new
     graph.title = "Some Kind of Information"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jagthedrummer-scruffy
 version: !ruby/object:Gem::Version 
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors: 
 - Brasten Sager