autograph 0.2.0 → 0.3.0

data/lib/autograph/table.rb

@@ -0,0 +1,66 @@
+class Table
+  attr :rows
+
+  def initialize(column_names)
+    @column_names = column_names.map{|n| n.to_s.to_sym}
+    @rows = []
+  end
+
+  def column(name)
+    @rows.map{|r| r[name.to_s.to_sym]}
+  end
+
+  def max(name)
+    @rows.map{|r| r[name.to_s.to_sym].to_i}.max
+  end
+
+  def <<(row_hash)
+    # Symbolize keys on the way in
+    @rows << row_hash.inject({}){|x,y| x[y[0].to_s.to_sym] = y[1]; x}
+  end
+
+  def to_html
+    html = "<table>\n";
+    html << "  <tr>\n"
+    @column_names.each do |key|
+      html << "    <th>#{key}</th>\n"
+    end
+    html << "  </tr>\n"
+    rows.each do |r|
+      html << "  <tr>\n"
+      @column_names.each do |key|
+        html << "    <td>#{r[key]}</td>\n"
+      end
+      html << "  </tr>\n"
+    end
+    html << "</table>\n"
+    html
+  end
+
+  def to_s
+    width = 20
+    s = ""
+    html = "-"
+    html << "-"*@column_names.size*width;
+    html << "\n"
+    html << "|"
+    @column_names.each do |key|
+      html << sprintf("%#{width-2}s", key)
+      html << " |"
+    end
+    html << "\n"
+    html << "-"
+    html << "-"*@column_names.size*width;
+    html << "\n"
+    rows.each do |r|
+      html << "|"
+      @column_names.each do |key|
+        html << "#{sprintf("%#{width-2}s", r[key.to_sym])} |"
+      end
+        html << "\n"
+    end
+    html << "-"
+    html <<"-"*@column_names.size*width;
+    html
+  end
+end

data/test/test_configuration.rb

@@ -17,11 +17,6 @@ class TestHtmlReport < Test::Unit::TestCase
     assert_equal c['low_rate'], 1
   end
 
-  def test_graph_render_klazz_helper
-    c = Configuration.new()
-    assert_equal c.graph_renderer_class, GChartRenderer
-  end
-
   def test_pretty_print_returns_a_string
     c = Configuration.new().pretty_print
     assert_equal c.class, String

data/test/test_graph.rb

@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestGraphSeries < Test::Unit::TestCase
+  def setup
+  end
+
+  def test_title
+    title = "Some Title"
+    g = Graph.new(:title => title)
+    assert_equal g.title, title
+  end
+
+  def test_series_is_empty_by_default
+    g = Graph.new()
+    assert_equal g.series, []
+  end
+end

data/test/test_graph_series.rb

@@ -1,28 +1,24 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestGraphSeries < Test::Unit::TestCase
-  require 'mocha'
-  require 'autograph'
-  
   def setup
   end
-  
+
   def test_constructor
     x_values = [1,2,3]
     y_values = [4,5,6]
-    
-    gs = GraphSeries.new(:type, x_values, y_values, 'label')
-    assert_equal(gs.type, :type)
+
+    gs = GraphSeries.new(x_values, y_values, 'label')
     assert_equal(gs.x_values, x_values)
     assert_equal(gs.y_values, y_values)
     assert_equal(gs.label, 'label')
   end
-  
+
   def test_constructor_converts_to_floats
     x_values = [1,2,3]
     y_values = [4,5,6]
-    
-    gs = GraphSeries.new(:type, x_values, y_values, 'label')
+
+    gs = GraphSeries.new(x_values, y_values, 'label')
     gs.y_values.each{|y| assert_equal(y.class, Float) }
     gs.x_values.each{|x| assert_equal(x.class, Float) }
   end

data/test/test_table.rb

@@ -0,0 +1,131 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestGraphSeries < Test::Unit::TestCase
+  COLUMN_NAMES = [:column_a, :column_b]
+
+  def setup
+  end
+
+  def test_column_returns_array
+    assert_equal Table.new(COLUMN_NAMES).column(:some_key).class, Array
+  end
+
+  def test_column_returns_empty_array_by_default
+    assert_equal Table.new(COLUMN_NAMES).column(:some_key).size, 0
+  end
+
+  def test_column_with_multiple_rows
+    one   = {:column_a => 1, :column_b => 222}
+    two   = {:column_a => 11, :column_b => 22}
+    three = {:column_a => 111, :column_b => 2}
+    t = Table.new(COLUMN_NAMES)
+    t << one
+    t << two
+    t << three
+    assert_equal t.column(:column_a), [1,11,111]
+  end
+
+  def test_column_with_string_keys
+    one   = {:column_b => 2}
+    two   = {'column_b' => 222}
+    t = Table.new(COLUMN_NAMES)
+    t << one
+    t << two
+    assert_equal t.column(:column_b), [2,222]
+  end
+
+  def test_column_with_string_key
+    one   = {:column_b => 2}
+    two   = {'column_b' => 222}
+    t = Table.new(COLUMN_NAMES)
+    t << one
+    t << two
+    assert_equal t.column("column_b"), [2,222]
+  end
+
+  def test_max
+    zero  = {:column_b => 1}
+    one   = {:column_b => 2}
+    two   = {'column_b' => 222}
+    t = Table.new(COLUMN_NAMES)
+    t << one
+    t << two
+    assert_equal t.max("column_b"), 222
+  end
+
+  def test_to_html_returns_string
+    assert_equal Table.new(COLUMN_NAMES).to_html.class, String
+  end
+
+  def test_to_html_header
+    html = Table.new(COLUMN_NAMES).to_html
+    assert html.match(Regexp.new(COLUMN_NAMES.join(".*"), Regexp::MULTILINE))
+  end
+
+
+  def test_to_html_contains_correct_tds
+    t = Table.new(COLUMN_NAMES)
+    t << {:column_a => 1, :column_b => 222}
+    t << {:column_a => 111, :column_b => 2}
+    assert t.to_html.match(/<td>1<\/td>/)
+    assert t.to_html.match(/<td>111<\/td>/)
+    assert t.to_html.match(/<td>2<\/td>/)
+    assert t.to_html.match(/<td>222<\/td>/)
+  end
+
+  def test_adding_rows
+    t = Table.new(COLUMN_NAMES)
+    t << {:column_a => 1, :column_b => 2}
+    assert_equal t.column(:column_a).size, 1
+  end
+
+  def test_adding_rows_with_missing_key_adds_nil_value
+    t = Table.new(COLUMN_NAMES)
+    t << {:column_a => 1, :column_b => 2}
+    assert_equal t.column(:c).size, 1
+    assert_equal t.column(:c).first, nil
+  end
+
+  def test_multiple_rows_are_ordered
+    one   = {:column_a => 1, :column_b => 222}
+    two   = {:column_a => 11, :column_b => 22}
+    three = {:column_a => 111, :column_b => 2}
+    t = Table.new(COLUMN_NAMES)
+    t << one
+    t << two
+    t << three
+    assert_equal t.rows[0], one
+    assert_equal t.rows[1], two
+    assert_equal t.rows[2], three
+  end
+
+  def test_to_s
+    tables = []
+    one   = {:column_a => 1, :column_b => 222}
+    two   = {:column_a => 11, :column_b => 22}
+    three = {:column_a => 111, :column_b => 2}
+    t = Table.new(COLUMN_NAMES)
+    t << one
+    t << two
+    t << three
+    tables << t
+    one   = {:column_a => 1, :column_b => 222, :col_c => 1222}
+    two   = {:column_a => 11, :column_b => 22}
+    three = {:column_a => 111, :column_b => 2}
+    t = Table.new([COLUMN_NAMES, [:col_c]].flatten)
+    t << one
+    t << two
+    t << three
+    tables << t
+    tables.each do |table|
+      # puts
+      # puts table.to_s
+      length = nil
+      assert table.to_s.split("\n").size > 3
+      table.to_s.split("\n").each do |l|
+        assert_equal length, l.length if length
+        length = l.length
+      end
+    end
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Nick Stielau
@@ -14,65 +14,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-25 00:00:00 -07:00
+date: 2010-05-29 00:00:00 -07:00
 default_executable: autograph
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: builder
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 2
-        version: 2.1.2
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ruport
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 3
-        version: 1.6.3
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: scruffy
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 5
-        version: 0.2.5
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: gchart
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :runtime
-  version_requirements: *id004
+dependencies: []
+
 description: Autograph wraps httperf, running multiple tests while varying the parameters, graphing the output.
 email: nick.stielau@gmail.com
 executables: 
@@ -93,23 +38,22 @@ files:
 - lib/autograph.rb
 - lib/autograph/autoperf.rb
 - lib/autograph/configuration.rb
-- lib/autograph/graph_renderers/base_renderer.rb
-- lib/autograph/graph_renderers/flot_renderer.rb
-- lib/autograph/graph_renderers/gchart_renderer.rb
-- lib/autograph/graph_renderers/rasterized_scruffy_renderer.rb
-- lib/autograph/graph_renderers/scruffy_renderer.rb
+- lib/autograph/graph.rb
 - lib/autograph/graph_series.rb
 - lib/autograph/html_report.rb
 - lib/autograph/report.html.erb
+- lib/autograph/table.rb
 - load_test_report_example.html
 - script/console
 - script/destroy
 - script/generate
 - test/test_autograph.rb
 - test/test_configuration.rb
+- test/test_graph.rb
 - test/test_graph_series.rb
 - test/test_helper.rb
 - test/test_html_report.rb
+- test/test_table.rb
 has_rdoc: true
 homepage: http://github.com/nstielau/autograph
 licenses: []
@@ -143,6 +87,8 @@ summary: Simple httperf runner with nice html reports with graphs.
 test_files: 
 - test/test_autograph.rb
 - test/test_configuration.rb
+- test/test_graph.rb
 - test/test_graph_series.rb
 - test/test_helper.rb
 - test/test_html_report.rb
+- test/test_table.rb

data/lib/autograph/graph_renderers/base_renderer.rb

@@ -1,82 +0,0 @@
-class BaseRenderer
-  attr :title, true
-  attr :width, true
-  attr :height, true
-  attr :path, true
-  attr :series
-
-  AVAILABLE_GRAPH_RENDERERS = %W(ScruffyRenderer GChartRenderer)
-
-  def initialize
-    @series = []
-  end
-
-  def add_series(new_series)
-    series.push(new_series)
-  end
-
-  def to_html
-    return "DATA"
-  end
-
-  def find_max_y_value
-    series.map{|s| s.y_values.max}.max
-  end
-
-  def self.header_html
-  end
-
-  def self.generate_graphs(reports, configuration)
-    graphs = {}
-    reports.each do |uri, report|
-      graphs[uri] = []
-
-      puts "For '#{uri}' the values are #{report.column('reply time').join(', ')}" if configuration['verbose']
-      request_rate_graph = configuration.graph_renderer_class.new
-      request_rate_graph.title = "Demanded vs. Achieved Request Rate (r/s)"
-      request_rate_graph.path = uri
-      request_rate_graph.width  = 600
-      request_rate_graph.height = 300
-
-      if reports['Avg']
-        avg_request_rate = GraphSeries.new(:area, report.column('rate'), reports['Avg'].column('conn/s').map{|x| x.to_f}, "Avg")
-        request_rate_graph.add_series(avg_request_rate)
-      end
-
-      request_rate = GraphSeries.new(:line, report.column('rate'), report.column('conn/s').map{|x| x.to_f}, "Requests for '#{uri}'")
-      request_rate_graph.add_series(request_rate)
-
-      graphs[uri] << request_rate_graph
-
-      response_time_graph = configuration.graph_renderer_class.new
-      response_time_graph.path = uri
-      response_time_graph.title = "Demanded Request Rate (r/s) vs. Response Time"
-      response_time_graph.width  = 600
-      response_time_graph.height = 300
-
-      if reports['Avg']
-        avg_response_time = GraphSeries.new(:area, report.column('rate'), reports['Avg'].column('reply time').map{|x| x.to_f}, "Avg")
-        response_time_graph.add_series(avg_response_time)
-      end
-
-      response_time = GraphSeries.new(:line, report.column('rate'), report.column('reply time'), "Requests for '#{uri}'")
-      response_time_graph.add_series(response_time)
-
-      graphs[uri] << response_time_graph
-    end
-
-    max_rate_graph = configuration.graph_renderer_class.new
-    max_rate_graph.title = "Max Achieved Connection Rate"
-    max_rate_graph.width  = 600
-    max_rate_graph.height = 300
-
-    reports.keys.each do |key|
-      max = reports[key].column('conn/s').map{|x| x.to_i}.max.to_i
-      max_request_rate = GraphSeries.new(:bar, [key], [max], "Max Request Rate for '#{key}'")
-      max_rate_graph.add_series(max_request_rate)
-    end
-
-    graphs['summary_graph'] = max_rate_graph
-    graphs
-  end
-end