request-log-analyzer 1.5.2 → 1.5.3

data/request-log-analyzer.gemspec

@@ -2,8 +2,8 @@ Gem::Specification.new do |s|
   s.name    = "request-log-analyzer"
   
   # Do not set the version and date field manually, this is done by the release script
-  s.version = "1.5.2"
-  s.date    = "2009-12-02"
+  s.version = "1.5.3"
+  s.date    = "2009-12-14"
 
   s.rubyforge_project = 'r-l-a'
 
@@ -36,6 +36,6 @@ Gem::Specification.new do |s|
 
   # The files and test_files directives are set automatically by the release script.
   # Do not change them by hand, but make sure to add the files to the git repository.
-  s.files      = %w(spec/unit/tracker/hourly_spread_spec.rb lib/request_log_analyzer/output/html.rb DESIGN.rdoc spec/fixtures/rails_unordered.log spec/fixtures/multiple_files_1.log lib/request_log_analyzer/database/source.rb README.rdoc spec/unit/file_format/amazon_s3_format_spec.rb lib/request_log_analyzer/file_format/rails_development.rb spec/fixtures/rails_22.log spec/fixtures/test_order.log spec/unit/database/base_class_spec.rb lib/request_log_analyzer/database/connection.rb lib/request_log_analyzer/aggregator.rb spec/fixtures/decompression.log lib/request_log_analyzer/file_format/apache.rb spec/unit/file_format/rack_format_spec.rb spec/fixtures/decompression.log.gz lib/request_log_analyzer/tracker/frequency.rb lib/request_log_analyzer/tracker/duration.rb tasks/github-gem.rake .gitignore spec/unit/filter/filter_spec.rb spec/lib/macros.rb spec/spec_helper.rb spec/unit/tracker/count_tracker_spec.rb spec/fixtures/decompression.log.bz2 spec/unit/database/connection_spec.rb lib/request_log_analyzer/filter.rb spec/integration/scout_spec.rb spec/fixtures/test_file_format.log lib/request_log_analyzer/tracker/traffic.rb spec/unit/file_format/merb_format_spec.rb spec/unit/file_format/format_autodetection_spec.rb spec/unit/filter/timespan_filter_spec.rb spec/unit/file_format/file_format_api_spec.rb lib/request_log_analyzer/filter/field.rb lib/request_log_analyzer/file_format/merb.rb lib/request_log_analyzer/filter/anonymize.rb lib/request_log_analyzer/file_format/amazon_s3.rb lib/cli/database_console.rb spec/integration/mailer_spec.rb lib/request_log_analyzer/line_definition.rb spec/unit/tracker/frequency_tracker_spec.rb spec/fixtures/multiple_files_2.log spec/lib/mocks.rb spec/unit/file_format/apache_format_spec.rb spec/fixtures/syslog_1x.log spec/integration/munin_plugins_rails_spec.rb spec/lib/helpers.rb spec/fixtures/rails.db spec/unit/source/log_parser_spec.rb lib/request_log_analyzer/aggregator/database_inserter.rb spec/fixtures/header_and_footer.log spec/lib/testing_format.rb lib/request_log_analyzer/database.rb spec/unit/file_format/rails_format_spec.rb lib/request_log_analyzer/request.rb lib/request_log_analyzer/output/fixed_width.rb spec/integration/command_line_usage_spec.rb lib/request_log_analyzer/file_format/rack.rb spec/fixtures/test_language_combined.log lib/cli/command_line_arguments.rb lib/request_log_analyzer.rb spec/database.yml spec/unit/request_spec.rb lib/request_log_analyzer/database/base.rb spec/unit/aggregator/database_inserter_spec.rb lib/request_log_analyzer/database/request.rb lib/cli/database_console_init.rb lib/cli/progressbar.rb lib/request_log_analyzer/database/warning.rb spec/unit/filter/anonymize_filter_spec.rb spec/fixtures/apache_combined.log spec/fixtures/rails_22_cached.log lib/request_log_analyzer/aggregator/summarizer.rb spec/unit/tracker/duration_tracker_spec.rb spec/fixtures/rails_1x.log lib/request_log_analyzer/tracker/count.rb lib/request_log_analyzer/output.rb spec/unit/file_format/line_definition_spec.rb lib/request_log_analyzer/file_format/mysql.rb spec/unit/file_format/mysql_format_spec.rb request-log-analyzer.gemspec spec/fixtures/apache_common.log lib/request_log_analyzer/file_format/rails.rb Rakefile spec/unit/mailer_spec.rb lib/request_log_analyzer/tracker/hourly_spread.rb spec/unit/aggregator/summarizer_spec.rb spec/unit/tracker/traffic_tracker_spec.rb lib/request_log_analyzer/tracker/timespan.rb spec/unit/controller/log_processor_spec.rb spec/fixtures/sinatra.log spec/unit/filter/field_filter_spec.rb spec/fixtures/merb_prefixed.log lib/request_log_analyzer/log_processor.rb lib/request_log_analyzer/filter/timespan.rb spec/unit/controller/controller_spec.rb lib/request_log_analyzer/mailer.rb lib/cli/tools.rb spec/fixtures/decompression.tar.gz spec/unit/tracker/timespan_tracker_spec.rb spec/lib/matchers.rb lib/request_log_analyzer/controller.rb spec/unit/tracker/tracker_api_spec.rb lib/request_log_analyzer/source/database_loader.rb spec/fixtures/merb.log LICENSE lib/request_log_analyzer/file_format.rb tasks/request_log_analyzer.rake spec/unit/database/database_spec.rb spec/fixtures/decompression.log.zip spec/fixtures/decompression.tgz bin/request-log-analyzer lib/request_log_analyzer/tracker.rb lib/request_log_analyzer/source.rb spec/fixtures/mysql_slow_query.log lib/request_log_analyzer/source/log_parser.rb lib/request_log_analyzer/aggregator/echo.rb)
-  s.test_files = %w(spec/unit/tracker/hourly_spread_spec.rb spec/unit/file_format/amazon_s3_format_spec.rb spec/unit/database/base_class_spec.rb spec/unit/file_format/rack_format_spec.rb spec/unit/filter/filter_spec.rb spec/unit/tracker/count_tracker_spec.rb spec/unit/database/connection_spec.rb spec/integration/scout_spec.rb spec/unit/file_format/merb_format_spec.rb spec/unit/file_format/format_autodetection_spec.rb spec/unit/filter/timespan_filter_spec.rb spec/unit/file_format/file_format_api_spec.rb spec/integration/mailer_spec.rb spec/unit/tracker/frequency_tracker_spec.rb spec/unit/file_format/apache_format_spec.rb spec/integration/munin_plugins_rails_spec.rb spec/unit/source/log_parser_spec.rb spec/unit/file_format/rails_format_spec.rb spec/integration/command_line_usage_spec.rb spec/unit/request_spec.rb spec/unit/aggregator/database_inserter_spec.rb spec/unit/filter/anonymize_filter_spec.rb spec/unit/tracker/duration_tracker_spec.rb spec/unit/file_format/line_definition_spec.rb spec/unit/file_format/mysql_format_spec.rb spec/unit/mailer_spec.rb spec/unit/aggregator/summarizer_spec.rb spec/unit/tracker/traffic_tracker_spec.rb spec/unit/controller/log_processor_spec.rb spec/unit/filter/field_filter_spec.rb spec/unit/controller/controller_spec.rb spec/unit/tracker/timespan_tracker_spec.rb spec/unit/tracker/tracker_api_spec.rb spec/unit/database/database_spec.rb)
+  s.files      = %w(spec/unit/tracker/hourly_spread_spec.rb lib/request_log_analyzer/output/html.rb DESIGN.rdoc spec/fixtures/rails_unordered.log spec/fixtures/multiple_files_1.log lib/request_log_analyzer/database/source.rb README.rdoc spec/unit/file_format/amazon_s3_format_spec.rb lib/request_log_analyzer/file_format/rails_development.rb spec/fixtures/rails_22.log spec/fixtures/test_order.log spec/unit/database/base_class_spec.rb lib/request_log_analyzer/database/connection.rb lib/request_log_analyzer/aggregator.rb spec/fixtures/decompression.log lib/request_log_analyzer/file_format/apache.rb spec/unit/file_format/rack_format_spec.rb spec/fixtures/decompression.log.gz lib/request_log_analyzer/tracker/frequency.rb lib/request_log_analyzer/tracker/duration.rb tasks/github-gem.rake .gitignore spec/unit/filter/filter_spec.rb spec/lib/macros.rb spec/spec_helper.rb spec/fixtures/decompression.log.bz2 spec/unit/database/connection_spec.rb lib/request_log_analyzer/filter.rb spec/integration/scout_spec.rb spec/fixtures/test_file_format.log lib/request_log_analyzer/tracker/traffic.rb spec/unit/file_format/merb_format_spec.rb spec/unit/file_format/format_autodetection_spec.rb spec/unit/filter/timespan_filter_spec.rb spec/unit/file_format/file_format_api_spec.rb lib/request_log_analyzer/filter/field.rb lib/request_log_analyzer/file_format/merb.rb lib/request_log_analyzer/filter/anonymize.rb lib/request_log_analyzer/file_format/amazon_s3.rb lib/cli/database_console.rb spec/integration/mailer_spec.rb lib/request_log_analyzer/line_definition.rb spec/unit/tracker/frequency_tracker_spec.rb spec/fixtures/multiple_files_2.log spec/lib/mocks.rb spec/unit/file_format/apache_format_spec.rb spec/fixtures/syslog_1x.log spec/integration/munin_plugins_rails_spec.rb spec/lib/helpers.rb spec/fixtures/rails.db spec/unit/source/log_parser_spec.rb lib/request_log_analyzer/aggregator/database_inserter.rb spec/fixtures/header_and_footer.log spec/lib/testing_format.rb lib/request_log_analyzer/database.rb spec/unit/file_format/rails_format_spec.rb lib/request_log_analyzer/request.rb lib/request_log_analyzer/output/fixed_width.rb spec/integration/command_line_usage_spec.rb lib/request_log_analyzer/file_format/rack.rb lib/request_log_analyzer/tracker/numeric_value.rb spec/fixtures/test_language_combined.log lib/cli/command_line_arguments.rb lib/request_log_analyzer.rb spec/database.yml spec/unit/request_spec.rb lib/request_log_analyzer/database/base.rb spec/unit/aggregator/database_inserter_spec.rb lib/request_log_analyzer/database/request.rb lib/request_log_analyzer/output/fancy_html.rb lib/cli/database_console_init.rb lib/cli/progressbar.rb lib/request_log_analyzer/database/warning.rb spec/unit/filter/anonymize_filter_spec.rb spec/fixtures/apache_combined.log spec/fixtures/rails_22_cached.log lib/request_log_analyzer/aggregator/summarizer.rb spec/unit/tracker/duration_tracker_spec.rb spec/unit/file_format/common_regular_expressions_spec.rb spec/fixtures/rails_1x.log lib/request_log_analyzer/output.rb spec/unit/file_format/line_definition_spec.rb lib/request_log_analyzer/file_format/mysql.rb spec/unit/file_format/mysql_format_spec.rb request-log-analyzer.gemspec spec/fixtures/apache_common.log lib/request_log_analyzer/file_format/rails.rb Rakefile spec/unit/mailer_spec.rb lib/request_log_analyzer/tracker/hourly_spread.rb spec/unit/aggregator/summarizer_spec.rb spec/unit/tracker/traffic_tracker_spec.rb spec/unit/tracker/numeric_value_tracker_spec.rb lib/request_log_analyzer/tracker/timespan.rb spec/unit/controller/log_processor_spec.rb spec/fixtures/sinatra.log spec/unit/filter/field_filter_spec.rb spec/fixtures/merb_prefixed.log lib/request_log_analyzer/log_processor.rb lib/request_log_analyzer/filter/timespan.rb spec/unit/controller/controller_spec.rb lib/request_log_analyzer/mailer.rb lib/cli/tools.rb spec/fixtures/decompression.tar.gz spec/unit/tracker/timespan_tracker_spec.rb spec/lib/matchers.rb lib/request_log_analyzer/controller.rb spec/unit/tracker/tracker_api_spec.rb lib/request_log_analyzer/source/database_loader.rb spec/fixtures/merb.log LICENSE lib/request_log_analyzer/file_format.rb tasks/request_log_analyzer.rake spec/unit/database/database_spec.rb spec/fixtures/decompression.log.zip spec/fixtures/decompression.tgz bin/request-log-analyzer lib/request_log_analyzer/tracker.rb lib/request_log_analyzer/source.rb spec/fixtures/mysql_slow_query.log lib/request_log_analyzer/source/log_parser.rb lib/request_log_analyzer/aggregator/echo.rb)
+  s.test_files = %w(spec/unit/tracker/hourly_spread_spec.rb spec/unit/file_format/amazon_s3_format_spec.rb spec/unit/database/base_class_spec.rb spec/unit/file_format/rack_format_spec.rb spec/unit/filter/filter_spec.rb spec/unit/database/connection_spec.rb spec/integration/scout_spec.rb spec/unit/file_format/merb_format_spec.rb spec/unit/file_format/format_autodetection_spec.rb spec/unit/filter/timespan_filter_spec.rb spec/unit/file_format/file_format_api_spec.rb spec/integration/mailer_spec.rb spec/unit/tracker/frequency_tracker_spec.rb spec/unit/file_format/apache_format_spec.rb spec/integration/munin_plugins_rails_spec.rb spec/unit/source/log_parser_spec.rb spec/unit/file_format/rails_format_spec.rb spec/integration/command_line_usage_spec.rb spec/unit/request_spec.rb spec/unit/aggregator/database_inserter_spec.rb spec/unit/filter/anonymize_filter_spec.rb spec/unit/tracker/duration_tracker_spec.rb spec/unit/file_format/common_regular_expressions_spec.rb spec/unit/file_format/line_definition_spec.rb spec/unit/file_format/mysql_format_spec.rb spec/unit/mailer_spec.rb spec/unit/aggregator/summarizer_spec.rb spec/unit/tracker/traffic_tracker_spec.rb spec/unit/tracker/numeric_value_tracker_spec.rb spec/unit/controller/log_processor_spec.rb spec/unit/filter/field_filter_spec.rb spec/unit/controller/controller_spec.rb spec/unit/tracker/timespan_tracker_spec.rb spec/unit/tracker/tracker_api_spec.rb spec/unit/database/database_spec.rb)
 end

data/spec/lib/mocks.rb

@@ -32,6 +32,7 @@ module RequestLogAnalyzer::Spec::Mocks
 
   def mock_output
     output = mock('RequestLogAnalyzer::Output::Base')
+    output.stub!(:report_tracker)
     output.stub!(:header)
     output.stub!(:footer)
     output.stub!(:puts)

data/spec/unit/file_format/common_regular_expressions_spec.rb

@@ -0,0 +1,53 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe RequestLogAnalyzer::FileFormat::CommonRegularExpressions do
+  
+  include RequestLogAnalyzer::FileFormat::CommonRegularExpressions
+  
+  describe '.timestamp' do
+    
+    it "should parse timestamps with a given format" do
+      timestamp('%Y-%m-%dT%H:%M:%S%z').should =~ '2009-12-03T00:12:37+0100'
+      timestamp('%Y-%m-%dT%H:%M:%S%z').should_not =~ '2009-12-03 00:12:37+0100'
+      timestamp('%Y-%m-%dT%H:%M:%S%z').should_not =~ '2009-12-03T00:12:37'
+    end
+  end
+  
+  describe '.ip_address' do
+    
+    it "should parse IPv4 addresses" do
+      ip_address.should =~ '127.0.0.1'
+      ip_address.should =~ '255.255.255.255'
+      
+      ip_address.should_not =~ '2552.2552.2552.2552'
+      ip_address.should_not =~ '127001'
+      ip_address.should_not =~ ''
+      ip_address.should_not =~ '-'
+      ip_address.should_not =~ 'sub-host.domain.tld'
+    end
+    
+    it "should pase IPv6 addresses" do
+      ip_address.should =~ '::1'
+      ip_address.should =~ '3ffe:1900:4545:3:200:f8ff:fe21:67cf'
+      ip_address.should =~ '3ffe:1900:4545:3:200:f8ff:127.0.0.1'
+      ip_address.should =~ '::3:200:f8ff:127.0.0.1'
+      
+      ip_address.should_not =~ 'qqqq:wwww:eeee:3q:200:wf8ff:fe21:67cf'
+      ip_address.should_not =~ '3ffe44:1900f:454545:3:200:f8ff:ffff:5432'
+    end
+    
+    it "should allow blank if true is given as parameter" do
+      /^#{ip_address(true)}$/.should =~ ''
+      /^#{ip_address(true)}$/.should_not =~ ' '
+    end
+    
+    it "should allow a nil substitute if a string is given as parameter" do
+      /^#{ip_address('-')}$/.should =~ '-'
+      /^#{ip_address('-')}$/.should_not =~ ' -'
+      /^#{ip_address('-')}$/.should_not =~ '--'
+      /^#{ip_address('-')}$/.should_not =~ ''
+    end
+    
+  end
+end
+

data/spec/unit/file_format/mysql_format_spec.rb

@@ -12,8 +12,7 @@ describe RequestLogAnalyzer::FileFormat::Mysql do
     end
 
     it "should parse a :time line correctly" do
-      line = '# Time: 091112 8:13:56'
-      line = '# Time: 091112 8:13:56'      
+      line = '# Time: 091112  8:13:56'
       @file_format.should parse_line(line).as(:time).and_capture(:timestamp => 20091112081356)
     end
 

data/spec/unit/file_format/rails_format_spec.rb

@@ -23,7 +23,7 @@ describe RequestLogAnalyzer::FileFormat::Rails do
       it "should return a valid language" do
         @rails.should be_valid
       end
-      
+
       it "should at least parse :processing and :completed lines" do
         @rails.line_definitions.should include(:processing, :completed, :failure)
       end
@@ -52,12 +52,17 @@ describe RequestLogAnalyzer::FileFormat::Rails do
       context context do
         it "should parse a :processing line correctly" do
           line = prefix + 'Processing PeopleController#index (for 1.1.1.1 at 2008-08-14 21:16:30) [GET]'
-          @rails.should parse_line(line).as(:processing).and_capture(:controller => 'PeopleController', :action => 'index', :timestamp => 20080814211630, :method => 'GET')
+          @rails.should parse_line(line).as(:processing).and_capture(:controller => 'PeopleController', :action => 'index', :timestamp => 20080814211630, :method => 'GET', :ip => '1.1.1.1')
         end
         
-        it "should parse a :processing line correctly when it contains ipv6 address" do
+        it "should parse a :processing line correctly when it contains ipv6 localhost address" do
            line = prefix + 'Processing PeopleController#index (for ::1 at 2008-08-14 21:16:30) [GET]'
-           @rails.should parse_line(line).as(:processing).and_capture(:controller => 'PeopleController', :action => 'index', :timestamp => 20080814211630, :method => 'GET')
+           @rails.should parse_line(line).as(:processing).and_capture(:controller => 'PeopleController', :action => 'index', :timestamp => 20080814211630, :method => 'GET', :ip => '::1')
+        end
+
+        it "should parse a :processing line correctly when it contains ipv6 address" do
+           line = prefix + 'Processing PeopleController#index (for 3ffe:1900:4545:3:200:f8ff:fe21:67cf at 2008-08-14 21:16:30) [GET]'
+           @rails.should parse_line(line).as(:processing).and_capture(:controller => 'PeopleController', :action => 'index', :timestamp => 20080814211630, :method => 'GET', :ip => '3ffe:1900:4545:3:200:f8ff:fe21:67cf')
         end
 
         it "should parse a Rails 2.1 style :completed line correctly" do

data/spec/unit/tracker/duration_tracker_spec.rb

@@ -2,90 +2,10 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe RequestLogAnalyzer::Tracker::Duration do
 
-  context 'using a static category' do
-
-    before(:each) do
-      @tracker = RequestLogAnalyzer::Tracker::Duration.new(:duration => :duration, :category => :category)
-      @tracker.prepare
-    end
-
-    it "should create a category for every request using the category field" do
-      @tracker.update(request(:category => 'a', :duration => 0.2))
-      @tracker.categories.keys.should include('a')
-    end
-
-    it "should register a request as hit in the right category" do
-      @tracker.update(request(:category => 'a', :duration => 0.2))
-      @tracker.update(request(:category => 'b', :duration => 0.3))
-      @tracker.update(request(:category => 'b', :duration => 0.4))
-
-      @tracker.hits('a').should == 1
-      @tracker.hits('b').should == 2
-    end
-  end
-
-  context 'using a dynamic category' do
-    before(:each) do
-      @categorizer = Proc.new { |request| request[:duration] > 0.2 ? 'slow' : 'fast' }
-      @tracker = RequestLogAnalyzer::Tracker::Duration.new(:duration => :duration, :category => @categorizer)
-      @tracker.prepare
-    end
-
-    it "should use the categorizer to determine the right category" do
-      @tracker.update(request(:category => 'a', :duration => 0.2))
-      @tracker.update(request(:category => 'b', :duration => 0.3))
-      @tracker.update(request(:category => 'b', :duration => 0.4))
-
-      @tracker.hits('fast').should == 1
-      @tracker.hits('slow').should == 2
-    end
-  end
-
-  describe '#update' do
-
-    before(:each) do
-      @tracker = RequestLogAnalyzer::Tracker::Duration.new(:duration => :duration, :category => :category)
-      @tracker.prepare
-
-      @tracker.update(request(:category => 'a', :duration => 0.4))
-      @tracker.update(request(:category => 'a', :duration => 0.2))
-      @tracker.update(request(:category => 'a', :duration => 0.3))
-    end
-
-    it "should sum of the durations for a category correctly" do
-      @tracker.sum('a').should be_close(0.9, 0.000001)
-    end
-
-    it "should overall sum of the durations correctly" do
-      @tracker.sum_overall.should be_close(0.9, 0.000001)
-    end
-
-    it "should keep track of the minimum and maximum duration" do
-      @tracker.min('a').should == 0.2
-      @tracker.max('a').should == 0.4
-    end
-
-    it "should calculate the mean duration correctly" do
-      @tracker.mean('a').should be_close(0.3, 0.000001)
-    end
-
-    it "should calculate the overall mean duration correctly" do
-      @tracker.mean_overall.should be_close(0.3, 0.000001)
-    end
-
-    it "should calculate the duration variance correctly" do
-      @tracker.variance('a').should be_close(0.01, 0.000001)
-    end
-
-    it "should calculate the duration standard deviation correctly" do
-      @tracker.stddev('a').should be_close(0.1,  0.000001)
-    end
-  end
-
   describe '#report' do
 
     before(:each) do
-      @tracker = RequestLogAnalyzer::Tracker::Duration.new(:category => :category, :duration => :duration)
+      @tracker = RequestLogAnalyzer::Tracker::Duration.new(:category => :category, :value => :duration)
       @tracker.prepare
     end
 
@@ -112,7 +32,7 @@ describe RequestLogAnalyzer::Tracker::Duration do
   end
   
   describe '#display_value' do
-    before(:each) { @tracker = RequestLogAnalyzer::Tracker::Duration.new(:category => :category, :duration => :duration) }
+    before(:each) { @tracker = RequestLogAnalyzer::Tracker::Duration.new(:category => :category, :value => :duration) }
     
     it "should only display seconds when time < 60" do
       @tracker.display_value(33.12).should == '33.12s'
@@ -125,6 +45,5 @@ describe RequestLogAnalyzer::Tracker::Duration do
     it "should display minutes and wholeseconds when time > 60" do
       @tracker.display_value(3601.12).should == '1h00m01s'
     end
-
   end
 end

data/spec/unit/tracker/{count_tracker_spec.rb → numeric_value_tracker_spec.rb}

@@ -1,10 +1,10 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
-describe RequestLogAnalyzer::Tracker::Count do
+describe RequestLogAnalyzer::Tracker::NumericValue do
 
   context 'static category' do
     before(:each) do
-      @tracker = RequestLogAnalyzer::Tracker::Count.new(:category => :category, :field => :blah)
+      @tracker = RequestLogAnalyzer::Tracker::NumericValue.new(:category => :category, :value => :blah)
       @tracker.prepare
     end
 
@@ -27,7 +27,7 @@ describe RequestLogAnalyzer::Tracker::Count do
   context 'dynamic category' do
     before(:each) do
       @categorizer = Proc.new { |request| request[:duration] > 0.2 ? 'slow' : 'fast' }
-      @tracker = RequestLogAnalyzer::Tracker::Count.new(:category => @categorizer, :field => :blah)
+      @tracker = RequestLogAnalyzer::Tracker::NumericValue.new(:category => @categorizer, :value => :blah)
       @tracker.prepare
     end
 
@@ -40,10 +40,51 @@ describe RequestLogAnalyzer::Tracker::Count do
       @tracker.categories['slow'][:sum].should == 4
     end
   end
+  
+  describe '#update' do
+
+    before(:each) do
+      @tracker = RequestLogAnalyzer::Tracker::NumericValue.new(:value => :duration, :category => :category)
+      @tracker.prepare
+
+      @tracker.update(request(:category => 'a', :duration => 0.4))
+      @tracker.update(request(:category => 'a', :duration => 0.2))
+      @tracker.update(request(:category => 'a', :duration => 0.3))
+    end
+
+    it "should sum of the durations for a category correctly" do
+      @tracker.sum('a').should be_close(0.9, 0.000001)
+    end
+
+    it "should overall sum of the durations correctly" do
+      @tracker.sum_overall.should be_close(0.9, 0.000001)
+    end
+
+    it "should keep track of the minimum and maximum duration" do
+      @tracker.min('a').should == 0.2
+      @tracker.max('a').should == 0.4
+    end
+
+    it "should calculate the mean duration correctly" do
+      @tracker.mean('a').should be_close(0.3, 0.000001)
+    end
+
+    it "should calculate the overall mean duration correctly" do
+      @tracker.mean_overall.should be_close(0.3, 0.000001)
+    end
+
+    it "should calculate the duration variance correctly" do
+      @tracker.variance('a').should be_close(0.01, 0.000001)
+    end
+
+    it "should calculate the duration standard deviation correctly" do
+      @tracker.stddev('a').should be_close(0.1,  0.000001)
+    end
+  end  
 
   describe '#report' do
     before(:each) do
-      @tracker = RequestLogAnalyzer::Tracker::Count.new(:category => :category, :field => :blah)
+      @tracker = RequestLogAnalyzer::Tracker::NumericValue.new(:category => :category, :value => :blah)
       @tracker.prepare
     end
 
@@ -65,20 +106,22 @@ describe RequestLogAnalyzer::Tracker::Count do
 
   describe '#to_yaml_object' do
     before(:each) do
-      @tracker = RequestLogAnalyzer::Tracker::Count.new(:category => :category, :field => :blah)
+      @tracker = RequestLogAnalyzer::Tracker::NumericValue.new(:category => :category, :value => :blah)
       @tracker.prepare
     end
 
     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.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 }}
     end
   end
 
   describe '#display_value' do
     before(:each) do
-      @tracker = RequestLogAnalyzer::Tracker::Count.new(:category => :category, :field => :blah)
+      @tracker = RequestLogAnalyzer::Tracker::NumericValue.new(:category => :category, :value => :blah)
       @tracker.prepare
     end
 

data/spec/unit/tracker/tracker_api_spec.rb

@@ -33,8 +33,9 @@ describe RequestLogAnalyzer::Tracker::Base do
     end
 
     it "should receive :report when the summary report is being built" do
-      @tracker.should_receive(:report).with(anything).once
-      @summarizer.report(mock_output)
+      m = mock_output
+      m.should_receive(:report_tracker).with(@tracker)
+      @summarizer.report(m)
     end
 
     it "should receieve :finalize when the summarizer is finalizing" do

data/spec/unit/tracker/traffic_tracker_spec.rb

@@ -2,85 +2,6 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe RequestLogAnalyzer::Tracker::Traffic do
 
-  context 'using a field-based category' do
-    before(:each) do
-      @tracker = RequestLogAnalyzer::Tracker::Traffic.new(:traffic => :traffic, :category => :category)
-      @tracker.prepare
-
-      @tracker.update(request(:category => 'a', :traffic => 1))
-      @tracker.update(request(:category => 'b', :traffic => 2))
-      @tracker.update(request(:category => 'b', :traffic => 3))
-    end
-
-    it "should register a request in the right category using the category field" do
-      @tracker.categories.should include('a', 'b')
-    end
-
-    it "should register requests under the correct category" do
-      @tracker.hits('a').should == 1
-      @tracker.hits('b').should == 2
-    end
-  end
-
-  context 'using a dynamic category' do
-
-    before(:each) do
-      @categorizer = lambda { |request| request[:traffic] < 2 ? 'few' : 'lots' }
-      @tracker = RequestLogAnalyzer::Tracker::Traffic.new(:traffic => :traffic, :category => @categorizer)
-      @tracker.prepare
-
-      @tracker.update(request(:category => 'a', :traffic => 1))
-      @tracker.update(request(:category => 'b', :traffic => 2))
-      @tracker.update(request(:category => 'b', :traffic => 3))
-    end
-
-    it "should use the categorizer to determine the category" do
-      @tracker.categories.should include('few', 'lots')
-    end
-
-    it "should register requests under the correct category using the categorizer" do
-      @tracker.hits('few').should  == 1
-      @tracker.hits('lots').should == 2
-    end
-  end
-
-  describe '#update' do
-
-    before(:each) do
-      @tracker = RequestLogAnalyzer::Tracker::Traffic.new(:traffic => :traffic, :category => :category)
-      @tracker.prepare
-
-      @tracker.update(request(:category => 'a', :traffic => 2))
-      @tracker.update(request(:category => 'a', :traffic => 1))
-      @tracker.update(request(:category => 'a', :traffic => 3))
-    end
-
-    it "should calculate the total traffic correctly" do
-      @tracker.sum('a').should == 6
-    end
-
-    it "should calculate the traffic variance correctly" do
-      @tracker.variance('a').should == 1.0
-    end
-
-    it "should calculate the traffic standard deviation correctly" do
-      @tracker.stddev('a').should == 1.0
-    end
-
-    it "should calculate the average traffic correctly" do
-      @tracker.mean('a').should == 2.0
-    end
-
-    it "should calculate the overall mean traffic correctly" do
-      @tracker.mean_overall.should == 2.0
-    end
-
-    it "should set min and max traffic correctly" do
-      @tracker.min('a').should == 1
-      @tracker.max('a').should == 3
-    end
-  end
-
   describe '#report' do
     before(:each) do
       @tracker = RequestLogAnalyzer::Tracker::Traffic.new(:category => :category, :traffic => :traffic)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: request-log-analyzer
 version: !ruby/object:Gem::Version 
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-02 00:00:00 +01:00
+date: 2009-12-14 00:00:00 +01:00
 default_executable: request-log-analyzer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,7 +69,6 @@ files:
 - spec/unit/filter/filter_spec.rb
 - spec/lib/macros.rb
 - spec/spec_helper.rb
-- spec/unit/tracker/count_tracker_spec.rb
 - spec/fixtures/decompression.log.bz2
 - spec/unit/database/connection_spec.rb
 - lib/request_log_analyzer/filter.rb
@@ -105,6 +104,7 @@ files:
 - lib/request_log_analyzer/output/fixed_width.rb
 - spec/integration/command_line_usage_spec.rb
 - lib/request_log_analyzer/file_format/rack.rb
+- lib/request_log_analyzer/tracker/numeric_value.rb
 - spec/fixtures/test_language_combined.log
 - lib/cli/command_line_arguments.rb
 - lib/request_log_analyzer.rb
@@ -113,6 +113,7 @@ files:
 - lib/request_log_analyzer/database/base.rb
 - spec/unit/aggregator/database_inserter_spec.rb
 - lib/request_log_analyzer/database/request.rb
+- lib/request_log_analyzer/output/fancy_html.rb
 - lib/cli/database_console_init.rb
 - lib/cli/progressbar.rb
 - lib/request_log_analyzer/database/warning.rb
@@ -121,8 +122,8 @@ files:
 - spec/fixtures/rails_22_cached.log
 - lib/request_log_analyzer/aggregator/summarizer.rb
 - spec/unit/tracker/duration_tracker_spec.rb
+- spec/unit/file_format/common_regular_expressions_spec.rb
 - spec/fixtures/rails_1x.log
-- lib/request_log_analyzer/tracker/count.rb
 - lib/request_log_analyzer/output.rb
 - spec/unit/file_format/line_definition_spec.rb
 - lib/request_log_analyzer/file_format/mysql.rb
@@ -135,6 +136,7 @@ files:
 - lib/request_log_analyzer/tracker/hourly_spread.rb
 - spec/unit/aggregator/summarizer_spec.rb
 - spec/unit/tracker/traffic_tracker_spec.rb
+- spec/unit/tracker/numeric_value_tracker_spec.rb
 - lib/request_log_analyzer/tracker/timespan.rb
 - spec/unit/controller/log_processor_spec.rb
 - spec/fixtures/sinatra.log
@@ -203,7 +205,6 @@ test_files:
 - spec/unit/database/base_class_spec.rb
 - spec/unit/file_format/rack_format_spec.rb
 - spec/unit/filter/filter_spec.rb
-- spec/unit/tracker/count_tracker_spec.rb
 - spec/unit/database/connection_spec.rb
 - spec/integration/scout_spec.rb
 - spec/unit/file_format/merb_format_spec.rb
@@ -221,11 +222,13 @@ test_files:
 - spec/unit/aggregator/database_inserter_spec.rb
 - spec/unit/filter/anonymize_filter_spec.rb
 - spec/unit/tracker/duration_tracker_spec.rb
+- spec/unit/file_format/common_regular_expressions_spec.rb
 - spec/unit/file_format/line_definition_spec.rb
 - spec/unit/file_format/mysql_format_spec.rb
 - spec/unit/mailer_spec.rb
 - spec/unit/aggregator/summarizer_spec.rb
 - spec/unit/tracker/traffic_tracker_spec.rb
+- spec/unit/tracker/numeric_value_tracker_spec.rb
 - spec/unit/controller/log_processor_spec.rb
 - spec/unit/filter/field_filter_spec.rb
 - spec/unit/controller/controller_spec.rb