@@ -1,4 +1,5 @@
= History
+* v0.1.6. Good with SafeERB now. Added indexes to the clientperf tables.
* v0.1.3. Another timezone fix...
* v0.1.2. Use ActiveRecord::Base.default_timezone when trying to format dateparts, thanks Mike Perham
* v0.1.1. Fixed error when there is no data at all, thanks Mike Perham
History.rdoc
@@ -27,7 +27,7 @@ module Clientperf
end
def version
- "0.1.5"
+ "0.1.6"
end
private
lib/clientperf.rb
@@ -1,12 +1,17 @@
module ClientperfHelper
- def chart(data)
- "http://chart.apis.google.com/chart?cht=ls&chs=300x100&chm=B,e6f2fa,0,0,0|R,000000,0,0.998,1.0&chco=0f7fcf&chxt=r&chd=s:#{chart_data(data)}"
+ def chart_for(data)
+ if encoded = chart_data(data)
+ image_tag("http://chart.apis.google.com/chart?cht=ls&chs=300x100&chm=B,e6f2fa,0,0,0|R,000000,0,0.998,1.0&chco=0f7fcf&chxt=r&chd=s:#{encoded}")
+ else
+ content_tag('p', "no data for this chart")
+ end
end
private
def chart_data(args)
data, max = args
+ return nil if max == 0 || data.size == 0
max += max * 0.1
encode = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
lib/clientperf_helper.rb
@@ -1,5 +1,5 @@
class ClientperfMigrations
- MIGRATION_NAMES = %w(add_clientperf_tables)
+ MIGRATION_NAMES = %w(add_clientperf_tables add_clientperf_indexes)
MIGRATION_CONTENTS = {
:add_clientperf_tables => %(
class AddClientperfTables < ActiveRecord::Migration
@@ -20,6 +20,18 @@ class AddClientperfTables < ActiveRecord::Migration
drop_table :clientperf_uris
drop_table :clientperf_results
end
+end),
+ :add_clientperf_indexes => %(
+class AddClientperfIndexes < ActiveRecord::Migration
+ def self.up
+ add_index :clientperf_uris, :uri
+ add_index :clientperf_results, :clientperf_uri_id
+ end
+
+ def self.down
+ remove_index :clientperf_uris, :uri
+ remove_index :clientperf_results, :clientperf_uri_id
+ end
end)
}
lib/clientperf_migrations.rb
@@ -5,7 +5,7 @@
<% @uris.each do |uri| %>
<tr>
<td class="vital-stats">[ <%= number_with_precision(uri.clientperf_results.average(:milliseconds) / 1000.to_f, 2) %>s | <%= uri.clientperf_results.count %> ]</td>
- <td><%= link_to uri.uri, "/clientperf/#{uri.id}" %></td>
+ <td><%= link_to h(uri.uri), "/clientperf/#{uri.id}" %></td>
</tr>
<% end %>
</table>
@@ -17,11 +17,11 @@
<% if @uris.size > 0 %>
<div class="chart">
<h4>24 hour</h4>
- <img src="<%= chart(ClientperfResult.last_24_hours) %>" />
+ <%= chart_for(ClientperfResult.last_24_hours) %>
</div>
<div class="chart">
<h4>30 day</h4>
- <img src="<%= chart(ClientperfResult.last_30_days)%>" />
+ <%= chart_for(ClientperfResult.last_30_days) %>
</div>
<% else %>
<p>no data yet.</p>
views/clientperf/index.html.erb
@@ -3,11 +3,11 @@
<h2>trends</h2>
<div class="chart">
<h4>24 hour</h4>
- <img src="<%= chart(@uri.last_24_hours) %>" />
+ <%= chart_for(@uri.last_24_hours) %>
</div>
<div class="chart">
<h4>30 day</h4>
- <img src="<%= chart(@uri.last_30_days)%>" />
+ <%= chart_for(@uri.last_30_days)%>
</div>
</div>
</div>
views/clientperf/show.html.erb
@@ -1,6 +1,6 @@
<html>
<head>
- <title>clientperf <%= ": #{@page_title}" if @page_title %></title>
+ <title>clientperf <%= ": #{h(@page_title)}" if @page_title %></title>
<style type="text/css">
body {
margin:0;
@@ -95,7 +95,7 @@
<body>
<div id="header">
<h1><%= link_to "clientperf", :controller => 'clientperf', :action => 'index' %></h1>
- <%= "<h3><span>»</span>#{@uri.uri}</h3>" if @uri %>
+ <%= "<h3><span>»</span>#{h(@uri.uri)}</h3>" if @uri %>
<div style="clear:both"></div>
</div>
<div id="content">
views/layouts/clientperf.html.erb
154292e9644cb7a7ecab29fa9d6d973eebc2c2d0
Eric Falcao
efalcao@gmail.com
http://github.com/efalcao/clientperf/commit/c538352522e44a39803ef229823b20ec800de16e
c538352522e44a39803ef229823b20ec800de16e
2008-06-29T15:53:23-07:00
2008-06-29T15:53:23-07:00
h()'d stuff to comply with SafeERB. Added migrations to tables
246ad01c1c697a4dd062bc367ac6595688099034
Eric Falcao
efalcao@gmail.com