clientperf 0.0.2 → 0.0.3

data/clientperf.gemspec

@@ -1,16 +1,16 @@
 
-# Gem::Specification for Clientperf-0.0.2
+# Gem::Specification for Clientperf-0.0.3
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{clientperf}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Falcao"]
-  s.date = %q{2008-06-18}
+  s.date = %q{2008-06-20}
   s.default_executable = %q{clientperf}
   s.description = %q{Instrumentation for the FiveRuns TuneUp product.}
   s.email = %q{efalcao@gmail.com}

data/lib/clientperf.rb

@@ -27,7 +27,7 @@ module Clientperf
     end
     
     def version
-      "0.0.2"
+      "0.0.3"
     end
     
     private

data/lib/clientperf_config.rb

@@ -1,5 +1,6 @@
 require 'yaml'
-require 'activesupport'
+require 'rubygems'
+require 'active_support'
 
 class ClientperfConfig
   

data/lib/clientperf_controller.rb

@@ -5,6 +5,7 @@ class ClientperfController < ActionController::Base
   
   def show
     @uri = ClientperfUri.find(params[:id], :include => :clientperf_results)
+    @page_title = @uri.uri
   end
   
   def reset

data/lib/clientperf_uri.rb

@@ -1,22 +1,85 @@
 class ClientperfUri < ActiveRecord::Base
-  has_many :clientperf_results, :dependent => :delete_all
-
-  def result_average
-    @result_average ||= clientperf_results.inject(0) {|sum, result| sum += result.milliseconds; next sum} / clientperf_results.size
-  end
+  
+  has_many :clientperf_results, :dependent => :delete_all do
+    def last_hour
+      end_time = (Time.now + 1.minute).change(:sec => 0)
+      start_time = end_time - 1.hour
+      results = average(:milliseconds, :conditions => ['created_at between ? and ?', start_time, end_time] ,
+        :group => 'minute(created_at)')
+      
+      max = 0  
+      padded_results = (start_time.min..start_time.min + 59).map do |i|
+        minute = i % 60
+        data = data_for(minute, results)
+        max = data if data && data > max
+        [minute, data]
+      end
+      [padded_results, max]
+    end
+    
+    def last_day
+      end_time = (Time.now + 1.hour).change(:min => 0)
+      start_time = end_time - 1.day
+      results = average(:milliseconds, :conditions => ['created_at between ? and ?', start_time, end_time], 
+        :group => 'hour(created_at)')
+      
+      max = 0  
+      padded_results = (start_time.hour..start_time.hour + 23).map do |i|
+        hour = i % 24
+        data = data_for(hour, results)
+        max = data if data && data > max
+        [hour, data]
+      end
+      [padded_results, max]  
+    end
+    
+    def last_month
+      end_time = (Time.now + 1.day).change(:hour => 0)
+      start_time = end_time - 30.days
+      results = average(:milliseconds, :conditions => ['created_at between ? and ?', start_time, end_time], 
+        :group => 'day(created_at)')
+        
+      max = 0  
+      padded_results = (start_time.day..start_time.day + 29).map do |i|
+        day = i % Time.days_in_month(start_time.month)
+        data = data_for(day, results)
+        max = data if data && data > max
+        [day, data]
+      end
+      [padded_results, max]
+    end
+    
+    def data_for(point, results)
+      data = results.detect {|p,d| point == p.to_i}
+      data ? data[1].to_i : 0
+    end
+  end 
   
   def chart_url
-    "http://chart.apis.google.com/chart?cht=ls&chs=300x200&chd=s:#{chart_data}"
+    "http://chart.apis.google.com/chart?cht=ls&chs=300x50&chm=B&chd=s:"
+  end
+  
+  def hour_chart
+    "#{chart_url}#{chart_data(clientperf_results.last_hour)}"
+  end
+  
+  def day_chart
+    "#{chart_url}#{chart_data(clientperf_results.last_day)}"
   end
   
-  private 
+  def month_chart
+    "#{chart_url}#{chart_data(clientperf_results.last_month)}"
+  end
   
-  def chart_data
+  private
+  
+  def chart_data(args)
+    data, max = args
+    max += 10
     encode = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
-    max_value = clientperf_results.max {|a, b| a.milliseconds <=> b.milliseconds}.milliseconds + 10
-    
-    clientperf_results.map do |result|
-      char = 62 * result.milliseconds / max_value.to_f
+
+    data.map do |result|
+      char = 62 * result[1] / max.to_f
       encode[char.round,1]
     end.join
   end

data/views/clientperf/index.html.erb

@@ -1,7 +1,7 @@
-<%= button_to "Reset all data", {:action => 'reset'},  :confirm => "are you sure?" %>
+<h2>all urls</h2>
 <table>
 	<tr>
-		<td>URI</td>
+		<td>URL</td>
 		<td># of times measured</td>
 		<td>avg. client time (ms)</td>
 		<td>first measured</td>
@@ -10,10 +10,11 @@
 	<% @uris.each do |uri| %>
 	<tr>
 		<td><%= link_to uri.uri, "/clientperf/#{uri.id}" %></td>
-		<td><%= uri.clientperf_results.size %></td>
-		<td><%= uri.result_average %></td>
+		<td><%= uri.clientperf_results.count %></td>
+		<td><%= uri.clientperf_results.average(:milliseconds).to_i %></td>
 		<td><%= uri.created_at.strftime("%M/%d/%y") %></td>
 		<td><%= uri.updated_at.strftime("%M/%d/%y") %></td>
 	</tr>
 	<% end %>
-</table>
+</table>
+<p><%= button_to "Reset all data", {:action => 'reset'},  :confirm => "are you sure?" %></p>

data/views/clientperf/show.html.erb

@@ -1,5 +1,18 @@
-<%= button_to "Reset this URI", {:action => 'reset', :id => @uri.id},  :confirm => "are you sure?" %>
-<h1><%= @uri.uri %></h1>
-<h3>times measured: <%= @uri.clientperf_results.size %></h3>
-<h3>average time: <%= @uri.result_average %>ms</h3>
-<img src="<%= @uri.chart_url %>" />
+<h2>summary</h2>
+<p>recorded <%= @uri.clientperf_results.count %> times with average time of <%= @uri.clientperf_results.average(:milliseconds).to_i %>ms. last recorded <%= @uri.updated_at.strftime("%Y-%m-%d") %>.</p>
+
+<h2>trends</h2>
+<div class="chart">
+	<h4>last hour</h4>
+	<img src="<%= @uri.hour_chart %>" />
+</div>
+<div class="chart">
+	<h4>last day</h4>
+	<img src="<%= @uri.day_chart %>" />
+</div>
+<div class="chart">
+	<h4>last month</h4>
+	<img src="<%= @uri.month_chart %>" />
+</div>
+
+<p><%= button_to "Reset this URI", {:action => 'reset', :id => @uri.id},  :confirm => "are you sure?" %></p>

data/views/layouts/clientperf.html.erb

@@ -1,12 +1,52 @@
 <html>
 	<head>
-		<title></title>
+		<title>clientperf <%= ": #{@page_title}" if @page_title %></title>
 		<style type="text/css">
+			body {margin:0; font-family: helvetica, arial, sans-serif; font-size: 14px;}
+			
+			#header {
+				background-color: #dedede;
+				border-bottom: 2px solid #bbb;
+				padding: 5px 20px;
+			}
+			
+			#header h1, #header h3 {
+				color: #222;
+				margin: 0;
+				padding: 0;
+			}
+			
+			#header h1 a {
+				color: inherit;
+				text-decoration: none;
+			}
+			
+			#header h3 {
+				margin-top: 0px;
+				font-size: 14px;
+			}
+			
+			#header h3 span {
+			}
+			
+			#content {
+				padding: 0 20px;
+			}
+			
+			#content h2 {
+				margin-top: 20px;
+				border-bottom: 1px solid #d3d3d3;
+			}
 		</style>
 	</head>
 	<body>
-		<h1>clientperf</h1>
-		<h3>a measurement tool for client-side performance</h3>
-		<%= yield %>
+		<div id="header">
+			<h1><%= link_to "clientperf", :controller => 'clientperf', :action => 'index' %></h1>
+			<%= "<h3><span>&raquo;</span>#{@uri.uri}</h3>" if @uri %>
+			<div style="clear:both"></div>
+		</div>
+		<div id="content">
+			<%= yield %>
+		</div>
 	</body>
 </html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: clientperf
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Eric Falcao
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-18 00:00:00 -05:00
+date: 2008-06-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency