request-log-analyzer 1.7.0 → 1.10.0

data/spec/unit/file_format/oink_format_spec.rb

@@ -0,0 +1,105 @@
+require 'spec_helper'
+
+describe RequestLogAnalyzer::FileFormat::Oink do
+  describe '.create' do
+
+    context 'without providing a lines argument' do
+      before(:each) { @oink = RequestLogAnalyzer::FileFormat.load(:oink) }
+
+      it "should create a valid file format" do
+        @oink.should be_valid
+      end
+      
+      it "should parse :memory_usage line" do
+        @oink.line_definitions.should include(:memory_usage)
+      end
+
+    end
+  
+  end
+  
+  describe '#parse_line' do
+    before(:each) { @oink = RequestLogAnalyzer::FileFormat.load(:oink, :all) }
+    
+    it "should parse a :memory_usage line correctly" do
+      line = 'Jun 18 11:27:36 derek rails[67783]: Memory usage: 714052 | PID: 67783'
+      @oink.should parse_line(line).as(:memory_usage).and_capture(:pid => 67783, :memory => 714052)
+    end
+    
+    it "should parse the PID from a :processing line correctly" do
+      line = 'Aug 14 21:16:30 derek rails[67783]: Processing PeopleController#index (for 1.1.1.1 at 2008-08-14 21:16:30) [GET]'
+      @oink.should parse_line(line).as(:processing).and_capture(:pid => 67783, :controller => 'PeopleController', :action => 'index', :timestamp => 20080814211630, :method => 'GET', :ip => '1.1.1.1')
+    end
+
+    it "should parse a :instance_type_counter correctly" do
+
+      line = "Dec 13 12:00:44 storenvy rails[26364]: Instantiation Breakdown: Total: 732 | User: 376 | Post: 323 | Comment: 32 | Blog: 1"
+
+      @oink.should parse_line(line).as(:instance_type_counter).and_capture(:pid => 26364, :instance_counts =>  {'Total' => 732, 'User' => 376, 'Post' => 323, 'Comment' => 32, 'Blog' => 1})
+    end
+  end
+  
+  describe '#parse_io' do
+    context "Rails 2.2 style log" do
+      before(:each) do
+        @log_parser = RequestLogAnalyzer::Source::LogParser.new(
+              RequestLogAnalyzer::FileFormat.load(:oink), :parse_strategy => 'cautious')
+      end
+
+      it "should parse requests" do
+        request_counter.should_receive(:hit!).exactly(4).times
+        
+        @log_parser.parse_file(log_fixture(:oink_22)) do |request|
+          request_counter.hit! if request.kind_of?(RequestLogAnalyzer::FileFormat::Rails::Request) && request.completed?
+        end
+      end
+      
+      it "should not record :memory_diff on first request" do
+        @log_parser.parse_file(log_fixture(:oink_22)) do |request|
+          if @log_parser.parsed_requests == 1
+            request[:memory_diff].should == nil
+          end
+        end
+      end
+      
+      it "should record :memory_diff of 2nd tracked PID" do
+        @log_parser.parse_file(log_fixture(:oink_22)) do |request|
+          if @log_parser.parsed_requests == 3
+            request[:memory_diff].should == 50000*1024
+          end
+        end
+      end
+      
+      it "should record :memory_diff of 1st tracked PID" do
+        @log_parser.parse_file(log_fixture(:oink_22)) do |request|
+          if @log_parser.parsed_requests == 4
+            request[:memory_diff].should == 30000*1024
+          end
+        end
+      end
+    end
+    
+    context 'Rails 2.2 style log w/failure' do
+      before(:each) do
+        @log_parser = RequestLogAnalyzer::Source::LogParser.new(
+              RequestLogAnalyzer::FileFormat.load(:oink), :parse_strategy => 'cautious')
+      end
+      
+      it "should parse requests" do
+        request_counter.should_receive(:hit!).exactly(4).times
+        
+        @log_parser.parse_file(log_fixture(:oink_22_failure)) do |request|
+          request_counter.hit! if request.kind_of?(RequestLogAnalyzer::FileFormat::Rails::Request) && request.completed?
+        end
+      end
+      
+      it "should ignore memory changes when a failure occurs" do
+        @log_parser.parse_file(log_fixture(:oink_22_failure)) do |request|
+          if @log_parser.parsed_requests == 4
+            request[:memory_diff].should == nil
+          end
+        end
+      end
+    end
+  end
+end

data/spec/unit/file_format/postgresql_format_spec.rb

@@ -1,65 +1,43 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::FileFormat::Postgresql do
 
-  it "should be a valid file format" do
-    RequestLogAnalyzer::FileFormat.load(:Postgresql).should be_valid
-  end
+  subject { RequestLogAnalyzer::FileFormat.load(:Postgresql) }
+  let(:log_parser)  { RequestLogAnalyzer::Source::LogParser.new(subject) }
+  
+  it { should be_valid }
 
   describe '#parse_line' do
-    before(:each) do
-      @file_format = RequestLogAnalyzer::FileFormat.load(:Postgresql)
-    end
-
     it "should parse a :query line correctly" do
-      line = '2004-05-07 11:58:36 LOG:  query: SELECT plugin_id, plugin_name FROM plugins'
-      @file_format.should parse_line(line).as(:query).and_capture(:timestamp => 20040507115836, :query_fragment => 'SELECT plugin_id, plugin_name FROM plugins')
+      line = '2010-10-10 13:52:07 GMT [38747]: [33-1] LOG:  00000: duration: 0.710 ms  statement: SELECT * FROM "delayed_jobs"'
+      subject.should parse_line(line).as(:query).and_capture(:timestamp => 20101010135207, :query_fragment => 'SELECT * FROM "delayed_jobs"')
     end
     
     it "should parse a :query_fragment line correctly" do
-      line = '    groups.type_id,users.user_name,users.realname,'
-      @file_format.should parse_line(line).as(:query_fragment).and_capture(:query_fragment => "groups.type_id,users.user_name,users.realname,")
+      line = '    ("failed_at", "locked_by", "created_at", "handler", "updated_at", "priority", "run_at", "attempts", "locked_at",'
+      subject.should parse_line(line).as(:query_fragment).and_capture(:query_fragment => '("failed_at", "locked_by", "created_at", "handler", "updated_at", "priority", "run_at", "attempts", "locked_at",')
     end
 
-    it "should parse a :duration line correctly" do
-      line = '2004-05-07 11:58:36 LOG:  duration: 0.002612 sec'
-      @file_format.should parse_line(line).as(:duration).and_capture(:query_time => 0.002612)
-    end    
+    it "should parse a :query line correctly" do
+      line = '2010-10-10 13:52:07 GMT [38747]: [33-1] LOG:  00000: duration: 0.710 ms  statement: SELECT * FROM "delayed_jobs"'
+      subject.should parse_line(line).as(:query).and_capture(:query_time => 0.710)
+    end
   end
 
   describe '#parse_io' do
-    before(:each) do
-      @log_parser = RequestLogAnalyzer::Source::LogParser.new(RequestLogAnalyzer::FileFormat.load(:postgresql))
-    end
-
     it "should parse a multiline query entry correctly" do
-      fixture = <<EOS
-2004-05-07 11:58:22 LOG:  query: SELECT groups.group_name,groups.unix_group_name,
-		groups.type_id,users.user_name,users.realname,
-		news_bytes.forum_id,news_bytes.summary,news_bytes.post_date,news_bytes.details 
-		FROM users,news_bytes,groups 
-		WHERE news_bytes.group_id='98' AND news_bytes.is_approved <> '4' 
-		AND users.user_id=news_bytes.submitted_by 
-		AND news_bytes.group_id=groups.group_id 
-		ORDER BY post_date DESC LIMIT 10 OFFSET 0
-2004-05-07 11:58:22 LOG:  duration: 0.002680 sec
-EOS
-      @log_parser.parse_io(StringIO.new(fixture)) do |request|
-        request.should be_kind_of(RequestLogAnalyzer::FileFormat::Postgresql::Request)
-        request[:query].should == "SELECT groups.group_name,groups.unix_group_name, groups.type_id,users.user_name,users.realname, news_bytes.forum_id,news_bytes.summary,news_bytes.post_date,news_bytes.details FROM users,news_bytes,groups WHERE news_bytes.group_id=:string AND news_bytes.is_approved <> :string AND users.user_id=news_bytes.submitted_by AND news_bytes.group_id=groups.group_id ORDER BY post_date DESC LIMIT :int OFFSET :int"
-      end
-    end
-
-    it "should parse a dualline query entry correctly" do
-      fixture = <<EOS
-      2004-05-07 11:58:36 LOG:  query: SELECT type, count FROM project_sums_agg WHERE group_id=59
-      2004-05-07 11:58:36 LOG:  duration: 0.001197 sec
-EOS
-      @log_parser.parse_io(StringIO.new(fixture)) do |request|
-        request.should be_kind_of(RequestLogAnalyzer::FileFormat::Postgresql::Request)
-        request[:query].should == "SELECT type, count FROM project_sums_agg WHERE group_id=:int"
+      fixture = <<-EOS
+        2010-10-10 15:00:02 GMT [38747]: [1669-1] LOG:  00000: duration: 0.195 ms  statement: INSERT INTO "delayed_jobs" ("failed_at", "locked_by", "created_at", "handler", "updated_at", "priority", "run_at", "attempts", "locked_at", "last_error") VALUES(NULL, NULL, '2010-10-10 15:00:02.159884', E'--- !ruby/object:RuntheChooChootrain {}
+        	', '2010-10-10 15:00:02.159884', 0, '2010-10-10 16:00:00.000000', 0, NULL, NULL) RETURNING "id"
+        2010-10-10 15:00:02 GMT [38747]: [1670-1] LOCATION:  exec_simple_query, postgres.c:1081
+      EOS
+
+      request_counter.should_receive(:hit!).exactly(1).times
+      log_parser.should_not_receive(:warn)
+      log_parser.parse_io(StringIO.new(fixture)) do |request|
+        request_counter.hit! if request.kind_of?(RequestLogAnalyzer::FileFormat::Postgresql::Request) && request.completed?
+        request[:query].should == 'INSERT INTO delayed_jobs (failed_at, locked_by, created_at, handler, updated_at, priority, run_at, attempts, locked_at, last_error) VALUES(NULL, NULL, :string, E:string, :string, :int, :string, :int, NULL, NULL) RETURNING id'
       end
     end
   end
 end
-

data/spec/unit/file_format/rack_format_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::FileFormat::Rack do
 

data/spec/unit/file_format/rails3_format_spec.rb

@@ -10,30 +10,57 @@ describe RequestLogAnalyzer::FileFormat::Rails do
     before(:each) { @file_format = RequestLogAnalyzer::FileFormat.load(:rails3) }
 
     it "should parse :started lines correctly" do
-      line = 'Started GET "/queries" for 127.0.0.1 at 2010-02-25 16:15:18'
+      line = 'Started GET "/queries" for 127.0.0.1 at Thu Feb 25 16:15:18 -0800 2010'
       @file_format.should parse_line(line).as(:started).and_capture(:method => 'GET', 
             :path => '/queries', :ip => '127.0.0.1', :timestamp => 20100225161518)
     end
     
+    it "should parse :started lines in Oct, Nov and Dec correctly" do
+      line = 'Started GET "/queries" for 127.0.0.1 at Thu Oct 25 16:15:18 -0800 2010'
+      @file_format.should parse_line(line).as(:started).and_capture(:method => 'GET',
+            :path => '/queries', :ip => '127.0.0.1', :timestamp => 20101025161518)
+    end
+    
+    it "should parse :started lines in Ruby 1.9.2 format correctly" do
+      line = 'Started GET "/queries" for 127.0.0.1 at 2010-10-26 02:27:15 +0000'
+      @file_format.should parse_line(line).as(:started).and_capture(:method => 'GET',
+            :path => '/queries', :ip => '127.0.0.1', :timestamp => 20101026022715)
+    end
+
     it "should parse :processing lines correctly" do
       line = ' Processing by QueriesController#index as HTML'
       @file_format.should parse_line(line).as(:processing).and_capture(
         :controller => 'QueriesController', :action => 'index', :format => 'HTML')
     end
-    
-    
-    # it "should parse beta :completed lines correctly" do
-    #   line = 'Completed in 9ms (Views: 4.9ms | ActiveRecord: 0.5ms) with 200'
-    #   @file_format.should parse_line(line).as(:completed).and_capture(
-    #       :duration => 0.009, :status => 200)
-    # end
+    it "should parse nested :processing lines correctly" do
+      line = ' Processing by Projects::QueriesController#index as HTML'
+      @file_format.should parse_line(line).as(:processing).and_capture(
+        :controller => 'Projects::QueriesController', :action => 'index', :format => 'HTML')
+    end
+    it "should parse :processing lines correctly with format */*" do
+      line = '  Processing by ProjectsController#avatar as */*'
+      @file_format.should parse_line(line).as(:processing).and_capture(
+        :controller => 'ProjectsController', :action => 'avatar', :format => '*/*')
+    end
     
     it "should parse :completed lines correctly" do
-      line = 'Completed 200 OK in 170ms (Views: 78.4ms | ActiveRecord: 48.2ms)'
+      line = 'Completed 200 OK in 170ms (Views: 78.0ms | ActiveRecord: 48.2ms)'
       @file_format.should parse_line(line).as(:completed).and_capture(
-          :duration => 0.170, :status => 200)
+          :duration => 0.170, :view => 0.078, :db => 0.0482, :status => 200)
+    end
+    
+    it "should parse :completed lines correctly when ActiveRecord is not mentioned" do
+      line = 'Completed 200 OK in 364ms (Views: 31.4ms)'
+      @file_format.should parse_line(line).as(:completed).and_capture(:duration => 0.364, :status => 200)
     end
     
+    it "should parse :completed lines correctly when other durations are specified" do
+      line = 'Completed 200 OK in 384ms (Views: 222.0ms | ActiveRecord: 121.0ms | Sphinx: 0.0ms)'
+      @file_format.should parse_line(line).as(:completed).and_capture(:duration => 0.384, :view => 0.222, 
+          :db => 0.121, :status => 200)
+    end
+    
+
     it "should pase :failure lines correctly" do
       line = "ActionView::Template::Error (undefined local variable or method `field' for #<Class>) on line #3 of /Users/willem/Code/warehouse/app/views/queries/execute.csv.erb:"
       @file_format.should parse_line(line).as(:failure).and_capture(:line => 3, 
@@ -50,7 +77,7 @@ describe RequestLogAnalyzer::FileFormat::Rails do
     
     it "should parse a successful request correctly" do
       log = <<-EOLOG
-        Started GET "/" for 127.0.0.1 at 2010-03-19 06:40:41
+        Started GET "/" for 127.0.0.1 at Fri Mar 19 06:40:41 -0700 2010
           Processing by QueriesController#index as HTML
           SQL (16.3ms)  SHOW TABLES
           Query Load (32.0ms)  SELECT `queries`.* FROM `queries`
@@ -68,7 +95,7 @@ describe RequestLogAnalyzer::FileFormat::Rails do
     
     it "should parse an unroutable request correctly" do
       log = <<-EOLOG
-        Started GET "/404" for 127.0.0.1 at 2010-03-19 06:40:57
+        Started GET "/404" for 127.0.0.1 at Fri Mar 19 06:40:57 -0700 2010
 
         ActionController::RoutingError (No route matches "/404"):
 
@@ -87,7 +114,7 @@ describe RequestLogAnalyzer::FileFormat::Rails do
     
     it "should parse a failing request correctly" do
       log = <<-EOLOG
-        Started POST "/queries/397638749/execute.csv" for 127.0.0.1 at 2010-03-01 18:44:33
+        Started POST "/queries/397638749/execute.csv" for 127.0.0.1 at Mon Mar 01 18:44:33 -0800 2010
           Processing by QueriesController#execute as CSV
           Parameters: {"commit"=>"Run query", "authenticity_token"=>"pz9WcxkcrlG/43eg6BgSAnJL7yIsaffuHbYxPHUsUzQ=", "id"=>"397638749"}
 
@@ -117,4 +144,4 @@ describe RequestLogAnalyzer::FileFormat::Rails do
       end
     end
   end
-end
+end

data/spec/unit/file_format/rails_format_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::FileFormat::Rails do
 
@@ -75,6 +75,16 @@ describe RequestLogAnalyzer::FileFormat::Rails do
           @rails.should parse_line(line).as(:completed).and_capture(:duration => 0.614, :db => 0.031, :view => 0.120, :status => 200, :url => 'http://floorplanner.local/demo')
         end
 
+        it "should parse a Rails 2.2 style :completed line correctly when AR is disabled" do
+          line = prefix + 'Completed in 597ms (View: 298 | 200 OK [http://shapado.com]'
+          @rails.should parse_line(line).as(:completed).and_capture(:duration => 0.597, :db => nil, :view => 0.298, :status => 200, :url => 'http://shapado.com')
+        end
+        
+        it "should parse a Rails 2.2 style :completed line without view" do
+          line = prefix + "Completed in 148ms (DB: 0) | 302 Found [http://iwp-sod.hargray.org/login]"
+          @rails.should parse_line(line).as(:completed).and_capture(:duration => 0.148, :db => 0.0, :view => nil, :status => 302, :url => 'http://iwp-sod.hargray.org/login')
+        end
+
         it "should parse a :failure line with exception correctly" do
           line = prefix + "NoMethodError (undefined method `update_domain_account' for nil:NilClass):"
           @rails.should parse_line(line).as(:failure).and_capture(:error => 'NoMethodError', :message => "undefined method `update_domain_account' for nil:NilClass")

data/spec/unit/file_format/w3c_format_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe RequestLogAnalyzer::FileFormat::W3c do
+
+  before(:each) do
+    @file_format = RequestLogAnalyzer::FileFormat.load(:w3c)
+    @log_parser  = RequestLogAnalyzer::Source::LogParser.new(@file_format)  
+    #          date       time     c-ip cs-username s-ip     s-port  cs-method cs-uri-stem cs-uri-query sc-status sc-bytes cs-bytes time-taken cs(User-Agent) cs(Referrer) 
+    @sample = '2002-05-24 20:18:01 172.224.24.114 - 206.73.118.24 80 GET /Default.htm - 200 7930 248 31 Mozilla/4.0+(compatible;+MSIE+5.01;+Windows+2000+Server) http://64.224.24.114/'
+  end
+
+  it "should be a valid file format" do
+    @file_format.should be_valid
+  end
+
+  it "should parse access lines and capture all of its fields" do
+    @file_format.should have_line_definition(:access).capturing(:timestamp, :remote_ip, :username, :local_ip, :port, :method, :path, :http_status, :bytes_sent, :bytes_received, :duration, :user_agent, :referer)
+  end
+
+  it "should match the sample line" do
+    @file_format.parse_line(@sample).should include(:line_definition, :captures)
+  end
+
+  it "should not match a nonsense line" do
+    @file_format.parse_line('#Software: Microsoft Internet Information Services 6.0').should be_nil
+  end
+
+  it "should parse and convert the sample fields correctly" do
+    @log_parser.parse_io(StringIO.new(@sample)) do |request|
+      request[:timestamp].should      == 20020524201801
+      request[:remote_ip].should      == "172.224.24.114"
+      request[:username].should       == nil
+      request[:local_ip].should       == "206.73.118.24"
+      request[:port].should           == 80
+      request[:method].should         == 'GET'
+      request[:path].should           == '/Default.htm'
+      request[:http_status].should    == 200
+      request[:bytes_sent].should     == 7930
+      request[:bytes_received].should == 248
+      request[:duration].should       == 0.031
+      request[:user_agent].should     == 'Mozilla/4.0+(compatible;+MSIE+5.01;+Windows+2000+Server)'
+      request[:referer].should        == 'http://64.224.24.114/'
+    end
+  end
+
+end

data/spec/unit/filter/anonymize_filter_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::Filter::Anonymize, 'anonymize request' do
 

data/spec/unit/filter/field_filter_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::Filter::Field, 'string in accept mode' do
 

data/spec/unit/filter/filter_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::Filter::Base, 'base filter' do
 

data/spec/unit/filter/timespan_filter_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::Filter::Timespan, 'both before and after'  do
 

data/spec/unit/mailer_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::Mailer, 'mailer' do
 

data/spec/unit/request_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::Request do
 

data/spec/unit/source/log_parser_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::Source::LogParser, :requests do
 

data/spec/unit/tracker/duration_tracker_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::Tracker::Duration do
 
@@ -27,7 +27,9 @@ describe RequestLogAnalyzer::Tracker::Duration do
     it "should generate a YAML output" do
       @tracker.update(request(:category => 'a', :duration => 0.2))
       @tracker.update(request(:category => 'b', :duration => 0.2))
-      @tracker.to_yaml_object.should == {"a"=>{:hits=>1, :min=>0.2, :mean=>0.2, :max=>0.2, :sum_of_squares=>0.0, :sum=>0.2}, "b"=>{:hits=>1, :min=>0.2, :mean=>0.2, :max=>0.2, :sum_of_squares=>0.0, :sum=>0.2}}
+      @tracker.to_yaml_object.keys.should =~ ['a', 'b']
+      @tracker.to_yaml_object['a'].should include(:min => 0.2, :hits => 1, :max => 0.2, :mean => 0.2, :sum => 0.2, :sum_of_squares => 0.0)
+      @tracker.to_yaml_object['b'].should include(:min => 0.2, :hits => 1, :max => 0.2, :mean => 0.2, :sum => 0.2, :sum_of_squares => 0.0)
     end
   end
   

data/spec/unit/tracker/frequency_tracker_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::Tracker::Frequency do
 

data/spec/unit/tracker/hourly_spread_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::Tracker::HourlySpread do
 

data/spec/unit/tracker/numeric_value_tracker_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::Tracker::NumericValue do
 
@@ -22,7 +22,7 @@ describe RequestLogAnalyzer::Tracker::NumericValue do
       @tracker.categories['b'][:sum].should == 4
     end
   end
-  
+
 
   context 'dynamic category' do
     before(:each) do
@@ -40,11 +40,12 @@ describe RequestLogAnalyzer::Tracker::NumericValue do
       @tracker.categories['slow'][:sum].should == 4
     end
   end
-  
-  describe '#update' do
 
+  describe '#update' do
     before(:each) do
-      @tracker = RequestLogAnalyzer::Tracker::NumericValue.new(:value => :duration, :category => :category)
+      @tracker = RequestLogAnalyzer::Tracker::NumericValue.new(:value => :duration, :category => :category,
+                                                    :min_bucket_value => 0.0001, :max_bucket_value => 1000)
+
       @tracker.prepare
 
       @tracker.update(request(:category => 'a', :duration => 0.4))
@@ -53,11 +54,11 @@ describe RequestLogAnalyzer::Tracker::NumericValue do
     end
 
     it "should sum of the durations for a category correctly" do
-      @tracker.sum('a').should be_close(0.9, 0.000001)
+      @tracker.sum('a').should be_within(0.000001).of(0.9)
     end
 
     it "should overall sum of the durations correctly" do
-      @tracker.sum_overall.should be_close(0.9, 0.000001)
+      @tracker.sum_overall.should be_within(0.000001).of(0.9)
     end
 
     it "should keep track of the minimum and maximum duration" do
@@ -66,21 +67,39 @@ describe RequestLogAnalyzer::Tracker::NumericValue do
     end
 
     it "should calculate the mean duration correctly" do
-      @tracker.mean('a').should be_close(0.3, 0.000001)
+      @tracker.mean('a').should be_within(0.000001).of(0.3)
     end
 
     it "should calculate the overall mean duration correctly" do
-      @tracker.mean_overall.should be_close(0.3, 0.000001)
+      @tracker.mean_overall.should be_within(0.000001).of(0.3)
     end
 
     it "should calculate the duration variance correctly" do
-      @tracker.variance('a').should be_close(0.01, 0.000001)
+      @tracker.variance('a').should be_within(0.000001).of(0.01)
     end
 
     it "should calculate the duration standard deviation correctly" do
-      @tracker.stddev('a').should be_close(0.1,  0.000001)
+      @tracker.stddev('a').should be_within(0.000001).of(0.1)
+    end
+
+    it "should calculate the bucket spread correctly" do
+      @tracker.update(request(:category => 'a', :duration => 0.3))
+      @tracker.update(request(:category => 'a', :duration => 0.3))
+      @tracker.update(request(:category => 'a', :duration => 0.3))
+      @tracker.update(request(:category => 'a', :duration => 0.3))
+      @tracker.update(request(:category => 'a', :duration => 0.3))
+      @tracker.update(request(:category => 'a', :duration => 0.3))
+      @tracker.update(request(:category => 'a', :duration => 0.3))
+      # 0.2, 0.3 and 0.4 are already there, so, 10 values in total
+      
+      @tracker.median('a').should be_within(0.01).of(0.3)
+      
+      @tracker.percentile_interval('a', 80).begin.should be_within(0.01).of(0.3)
+      @tracker.percentile_interval('a', 80).end.should be_within(0.01).of(0.3)
+      @tracker.percentile_interval('a', 90).begin.should be_within(0.01).of(0.2)
+      @tracker.percentile_interval('a', 90).end.should be_within(0.01).of(0.4)
     end
-  end  
+  end
 
   describe '#report' do
     before(:each) do
@@ -113,9 +132,13 @@ describe RequestLogAnalyzer::Tracker::NumericValue do
     it "should generate a YAML output" do
       @tracker.update(request(:category => 'a', :blah => 2))
       @tracker.update(request(:category => 'b', :blah => 3))
-      @tracker.to_yaml_object.should == {
-            "a" => { :min => 2, :hits => 1, :max => 2, :mean => 2.0, :sum => 2, :sum_of_squares => 0.0 },
-            "b" => { :min => 3, :hits => 1, :max => 3, :mean => 3.0, :sum => 3, :sum_of_squares => 0.0 }}
+      @tracker.to_yaml_object.keys.should =~ ['a', 'b']
+      
+      @tracker.to_yaml_object['a'].should include(:min => 2, :hits => 1, :max => 2, :mean => 2.0, :sum => 2, :sum_of_squares => 0.0)
+      @tracker.to_yaml_object['a'][:interval_95_percent].should be_member(2)
+      
+      @tracker.to_yaml_object['b'].should include(:min => 3, :hits => 1, :max => 3, :mean => 3.0, :sum => 3, :sum_of_squares => 0.0)
+      @tracker.to_yaml_object['b'][:interval_95_percent].should be_member(3)
     end
   end
 
@@ -161,6 +184,4 @@ describe RequestLogAnalyzer::Tracker::NumericValue do
       @tracker.display_value(9000_000_001_001_000).should eql('9000T')
     end
   end
-  
-  
 end

data/spec/unit/tracker/timespan_tracker_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::Tracker::Timespan do
 

data/spec/unit/tracker/tracker_api_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::Tracker::Base do
 

data/spec/unit/tracker/traffic_tracker_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::Tracker::Traffic do