request-log-analyzer 1.3.4 → 1.3.6

data/request-log-analyzer.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name    = "request-log-analyzer"
-  s.version = "1.3.4"
-  s.date    = "2009-09-14"
+  s.version = "1.3.6"
+  s.date    = "2009-09-20"
   
   s.rubyforge_project = 'r-l-a'
   
@@ -31,6 +31,6 @@ Gem::Specification.new do |s|
   s.email    = ['willem@railsdoctors.com', 'bart@railsdoctors.com']
   s.homepage = 'http://railsdoctors.com'
 
-  s.files      = %w(spec/unit/filter/anonymize_filter_spec.rb lib/request_log_analyzer/line_definition.rb lib/request_log_analyzer/output/html.rb lib/request_log_analyzer/controller.rb spec/fixtures/rails_22_cached.log spec/lib/macros.rb lib/request_log_analyzer/file_format/rails_development.rb spec/fixtures/apache_combined.log spec/fixtures/apache_common.log spec/fixtures/merb_prefixed.log lib/request_log_analyzer/file_format/amazon_s3.rb tasks/request_log_analyzer.rake spec/unit/file_format/file_format_api_spec.rb spec/unit/file_format/apache_format_spec.rb spec/integration/command_line_usage_spec.rb lib/request_log_analyzer/database.rb spec/fixtures/decompression.log.bz2 lib/request_log_analyzer/log_processor.rb lib/request_log_analyzer/tracker.rb lib/request_log_analyzer/filter.rb spec/fixtures/rails_unordered.log bin/request-log-analyzer request-log-analyzer.gemspec DESIGN.rdoc spec/unit/filter/timespan_filter_spec.rb spec/unit/aggregator/database_inserter_spec.rb spec/lib/matchers.rb lib/request_log_analyzer/filter/field.rb lib/request_log_analyzer/tracker/frequency.rb spec/fixtures/decompression.log.gz spec/fixtures/decompression.log spec/lib/testing_format.rb spec/fixtures/test_order.log spec/fixtures/rails.db lib/request_log_analyzer/output/fixed_width.rb lib/request_log_analyzer/filter/anonymize.rb lib/request_log_analyzer/tracker/timespan.rb lib/request_log_analyzer/database/base.rb lib/request_log_analyzer/aggregator.rb lib/cli/progressbar.rb lib/request_log_analyzer/mailer.rb README.rdoc spec/fixtures/merb.log lib/request_log_analyzer/tracker/hourly_spread.rb .gitignore spec/unit/tracker/tracker_api_spec.rb spec/unit/tracker/duration_tracker_spec.rb spec/unit/file_format/amazon_s3_format_spec.rb lib/request_log_analyzer/aggregator/echo.rb spec/unit/controller/log_processor_spec.rb spec/spec_helper.rb lib/request_log_analyzer.rb spec/database.yml Rakefile lib/request_log_analyzer/database/connection.rb spec/unit/filter/filter_spec.rb spec/fixtures/test_language_combined.log lib/request_log_analyzer/aggregator/database_inserter.rb lib/request_log_analyzer/aggregator/summarizer.rb lib/request_log_analyzer/file_format/rails.rb spec/fixtures/decompression.tar.gz spec/unit/filter/field_filter_spec.rb spec/unit/database/base_class_spec.rb lib/request_log_analyzer/filter/timespan.rb lib/request_log_analyzer/source/log_parser.rb spec/fixtures/decompression.tgz spec/unit/tracker/timespan_tracker_spec.rb spec/unit/tracker/hourly_spread_spec.rb spec/fixtures/header_and_footer.log lib/cli/tools.rb lib/request_log_analyzer/file_format/merb.rb spec/fixtures/multiple_files_1.log spec/unit/file_format/merb_format_spec.rb spec/unit/file_format/line_definition_spec.rb lib/request_log_analyzer/source.rb lib/request_log_analyzer/request.rb lib/cli/database_console.rb spec/unit/database/connection_spec.rb spec/unit/controller/controller_spec.rb spec/lib/mocks.rb spec/lib/helpers.rb lib/cli/database_console_init.rb lib/request_log_analyzer/output.rb lib/request_log_analyzer/file_format/apache.rb spec/fixtures/rails_1x.log spec/fixtures/decompression.log.zip spec/unit/source/request_spec.rb spec/unit/source/log_parser_spec.rb spec/fixtures/test_file_format.log tasks/github-gem.rake spec/unit/database/database_spec.rb lib/request_log_analyzer/tracker/duration.rb lib/request_log_analyzer/file_format.rb spec/unit/aggregator/summarizer_spec.rb spec/fixtures/rails_22.log spec/fixtures/multiple_files_2.log spec/fixtures/syslog_1x.log LICENSE lib/request_log_analyzer/source/database_loader.rb spec/unit/tracker/frequency_tracker_spec.rb spec/unit/file_format/rails_format_spec.rb lib/cli/command_line_arguments.rb)
-  s.test_files = %w(spec/unit/filter/anonymize_filter_spec.rb spec/unit/file_format/file_format_api_spec.rb spec/unit/file_format/apache_format_spec.rb spec/integration/command_line_usage_spec.rb spec/unit/filter/timespan_filter_spec.rb spec/unit/aggregator/database_inserter_spec.rb spec/unit/tracker/tracker_api_spec.rb spec/unit/tracker/duration_tracker_spec.rb spec/unit/file_format/amazon_s3_format_spec.rb spec/unit/controller/log_processor_spec.rb spec/unit/filter/filter_spec.rb spec/unit/filter/field_filter_spec.rb spec/unit/database/base_class_spec.rb spec/unit/tracker/timespan_tracker_spec.rb spec/unit/tracker/hourly_spread_spec.rb spec/unit/file_format/merb_format_spec.rb spec/unit/file_format/line_definition_spec.rb spec/unit/database/connection_spec.rb spec/unit/controller/controller_spec.rb spec/unit/source/request_spec.rb spec/unit/source/log_parser_spec.rb spec/unit/database/database_spec.rb spec/unit/aggregator/summarizer_spec.rb spec/unit/tracker/frequency_tracker_spec.rb spec/unit/file_format/rails_format_spec.rb)
+  s.files      = %w(spec/unit/filter/anonymize_filter_spec.rb spec/fixtures/rails_22_cached.log lib/request_log_analyzer/line_definition.rb lib/request_log_analyzer/output/html.rb lib/request_log_analyzer/controller.rb spec/lib/macros.rb lib/request_log_analyzer/file_format/rails_development.rb spec/fixtures/apache_combined.log spec/fixtures/apache_common.log spec/fixtures/merb_prefixed.log lib/request_log_analyzer/file_format/amazon_s3.rb tasks/request_log_analyzer.rake spec/unit/file_format/file_format_api_spec.rb spec/unit/file_format/apache_format_spec.rb spec/integration/command_line_usage_spec.rb lib/request_log_analyzer/database.rb spec/fixtures/decompression.log.bz2 spec/fixtures/rails_unordered.log lib/request_log_analyzer/log_processor.rb lib/request_log_analyzer/tracker.rb lib/request_log_analyzer/filter.rb bin/request-log-analyzer request-log-analyzer.gemspec DESIGN.rdoc spec/unit/filter/timespan_filter_spec.rb spec/unit/aggregator/database_inserter_spec.rb spec/lib/matchers.rb lib/request_log_analyzer/filter/field.rb lib/request_log_analyzer/tracker/frequency.rb spec/fixtures/decompression.log.gz spec/fixtures/decompression.log spec/lib/testing_format.rb spec/fixtures/test_order.log spec/fixtures/rails.db lib/request_log_analyzer/output/fixed_width.rb lib/request_log_analyzer/filter/anonymize.rb lib/request_log_analyzer/tracker/timespan.rb lib/request_log_analyzer/database/base.rb lib/request_log_analyzer/aggregator.rb lib/cli/progressbar.rb lib/request_log_analyzer/mailer.rb README.rdoc lib/request_log_analyzer/database/warning.rb spec/fixtures/merb.log lib/request_log_analyzer/tracker/hourly_spread.rb .gitignore spec/unit/tracker/tracker_api_spec.rb spec/unit/tracker/duration_tracker_spec.rb spec/unit/file_format/amazon_s3_format_spec.rb lib/request_log_analyzer/aggregator/echo.rb spec/unit/controller/log_processor_spec.rb spec/spec_helper.rb lib/request_log_analyzer.rb spec/database.yml Rakefile lib/request_log_analyzer/database/connection.rb spec/unit/filter/filter_spec.rb spec/fixtures/test_language_combined.log lib/request_log_analyzer/aggregator/database_inserter.rb lib/request_log_analyzer/aggregator/summarizer.rb lib/request_log_analyzer/file_format/rack.rb lib/request_log_analyzer/database/source.rb lib/request_log_analyzer/file_format/rails.rb spec/fixtures/decompression.tar.gz spec/unit/tracker/traffic_tracker_spec.rb spec/unit/filter/field_filter_spec.rb spec/unit/database/base_class_spec.rb lib/request_log_analyzer/filter/timespan.rb lib/request_log_analyzer/source/log_parser.rb spec/fixtures/decompression.tgz spec/unit/tracker/timespan_tracker_spec.rb spec/unit/tracker/hourly_spread_spec.rb spec/fixtures/header_and_footer.log lib/cli/tools.rb lib/request_log_analyzer/file_format/merb.rb spec/fixtures/multiple_files_1.log spec/unit/file_format/merb_format_spec.rb spec/unit/file_format/line_definition_spec.rb lib/request_log_analyzer/source.rb lib/request_log_analyzer/request.rb lib/cli/database_console.rb spec/unit/database/connection_spec.rb spec/unit/controller/controller_spec.rb spec/lib/mocks.rb spec/lib/helpers.rb spec/fixtures/rails_1x.log lib/cli/database_console_init.rb lib/request_log_analyzer/output.rb lib/request_log_analyzer/file_format/apache.rb spec/fixtures/decompression.log.zip spec/unit/source/request_spec.rb spec/unit/source/log_parser_spec.rb spec/fixtures/test_file_format.log tasks/github-gem.rake spec/unit/database/database_spec.rb lib/request_log_analyzer/tracker/duration.rb lib/request_log_analyzer/tracker/traffic.rb lib/request_log_analyzer/file_format.rb spec/unit/aggregator/summarizer_spec.rb spec/fixtures/syslog_1x.log spec/fixtures/rails_22.log lib/request_log_analyzer/database/request.rb spec/fixtures/multiple_files_2.log LICENSE lib/request_log_analyzer/source/database_loader.rb spec/unit/tracker/frequency_tracker_spec.rb spec/unit/file_format/rails_format_spec.rb lib/cli/command_line_arguments.rb)
+  s.test_files = %w(spec/unit/filter/anonymize_filter_spec.rb spec/unit/file_format/file_format_api_spec.rb spec/unit/file_format/apache_format_spec.rb spec/integration/command_line_usage_spec.rb spec/unit/filter/timespan_filter_spec.rb spec/unit/aggregator/database_inserter_spec.rb spec/unit/tracker/tracker_api_spec.rb spec/unit/tracker/duration_tracker_spec.rb spec/unit/file_format/amazon_s3_format_spec.rb spec/unit/controller/log_processor_spec.rb spec/unit/filter/filter_spec.rb spec/unit/tracker/traffic_tracker_spec.rb spec/unit/filter/field_filter_spec.rb spec/unit/database/base_class_spec.rb spec/unit/tracker/timespan_tracker_spec.rb spec/unit/tracker/hourly_spread_spec.rb spec/unit/file_format/merb_format_spec.rb spec/unit/file_format/line_definition_spec.rb spec/unit/database/connection_spec.rb spec/unit/controller/controller_spec.rb spec/unit/source/request_spec.rb spec/unit/source/log_parser_spec.rb spec/unit/database/database_spec.rb spec/unit/aggregator/summarizer_spec.rb spec/unit/tracker/frequency_tracker_spec.rb spec/unit/file_format/rails_format_spec.rb)
 end

data/spec/database.yml

@@ -1,3 +1,9 @@
+# This file determines what databases are used to test the database
+# functionality of request-log-analyzer. By default, only an SQLite3
+# memory database is enabled.
+#
+# The syntax of this file is exactly the same as Rails's database.yml.
+
 sqlite3:
   adapter: "sqlite3"
   database: ":memory:"

data/spec/lib/mocks.rb

@@ -25,7 +25,7 @@ module RequestLogAnalyzer::Spec::Mocks
   def mock_io
     mio = mock('IO')
     mio.stub!(:print)
-    mio.stub!(:puts)    
+    mio.stub!(:puts)
     mio.stub!(:write)
     return mio
   end
@@ -35,12 +35,15 @@ module RequestLogAnalyzer::Spec::Mocks
     output.stub!(:header)
     output.stub!(:footer)   
     output.stub!(:puts)
-    output.stub!(:<<)    
+    output.stub!(:<<)
+    output.stub!(:colorize).and_return("Fancy text")
+    output.stub!(:link)
     output.stub!(:title)
     output.stub!(:line)
     output.stub!(:with_style)    
     output.stub!(:table).and_yield([])
     output.stub!(:io).and_return(mock_io)
+    
     return output
   end
   

data/spec/unit/aggregator/database_inserter_spec.rb

@@ -66,7 +66,7 @@ describe RequestLogAnalyzer::Aggregator::DatabaseInserter do
       it "should insert a record in the request table" do
         lambda { 
           @database_inserter.aggregate(@incomplete_request)
-        }.should change(@database_inserter.database.request_class, :count).from(0).to(1)
+        }.should change(RequestLogAnalyzer::Database::Request, :count).from(0).to(1)
       end
       
       it "should insert a record in the first_lines table" do
@@ -77,7 +77,7 @@ describe RequestLogAnalyzer::Aggregator::DatabaseInserter do
 
       it "should insert records in all relevant line tables" do
         @database_inserter.aggregate(@completed_request)
-        request = @database_inserter.database.request_class.first
+        request = RequestLogAnalyzer::Database::Request.first
         request.should have(2).test_lines
         request.should have(1).first_lines
         request.should have(1).eval_lines
@@ -85,7 +85,7 @@ describe RequestLogAnalyzer::Aggregator::DatabaseInserter do
       end
 
       it "should log a warning in the warnings table" do
-        @database_inserter.database.warning_class.should_receive(:create!).with(hash_including(:warning_type => 'test_warning'))
+        RequestLogAnalyzer::Database::Warning.should_receive(:create!).with(hash_including(:warning_type => 'test_warning'))
         @database_inserter.warning(:test_warning, "Testing the warning system", 12)
       end
     end

data/spec/unit/database/base_class_spec.rb

@@ -15,16 +15,13 @@ describe RequestLogAnalyzer::Database::Base do
       @orm_class.stub!(:belongs_to)
       @orm_class.stub!(:serialize)
       @orm_class.stub!(:line_definition=)
+      
       Class.stub!(:new).with(RequestLogAnalyzer::Database::Base).and_return(@orm_class)
       
-      @request_class = mock('Request ActiveRecord::Base class')
-      @request_class.stub!(:has_many)
-      @source_class = mock('Source ActiveRecord::Base class')
-      @source_class.stub!(:has_many)      
+      RequestLogAnalyzer::Database::Request.stub!(:has_many)
+      RequestLogAnalyzer::Database::Source.stub!(:has_many)
       
       @database = mock_database
-      @database.stub!(:request_class).and_return(@request_class)
-      @database.stub!(:source_class).and_return(@source_class)
       RequestLogAnalyzer::Database::Base.stub!(:database).and_return(@database)
     end
 
@@ -49,12 +46,12 @@ describe RequestLogAnalyzer::Database::Base do
     end
 
     it "should set a :has_many relationship in the request class" do
-      @request_class.should_receive(:has_many).with(:test_lines)
+      RequestLogAnalyzer::Database::Request.should_receive(:has_many).with(:test_lines)
       RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition)
     end
 
     it "should set a :has_many relationship in the source class" do
-      @source_class.should_receive(:has_many).with(:test_lines)
+      RequestLogAnalyzer::Database::Source.should_receive(:has_many).with(:test_lines)
       RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition)
     end
 
@@ -73,14 +70,10 @@ describe RequestLogAnalyzer::Database::Base do
   describe '.subclass_from_table' do
     before(:each) do
       
-      @request_class = mock('Request ActiveRecord::Base class')
-      @request_class.stub!(:has_many)
-      @source_class = mock('Source ActiveRecord::Base class')
-      @source_class.stub!(:has_many)      
+      RequestLogAnalyzer::Database::Request.stub!(:has_many)
+      RequestLogAnalyzer::Database::Source.stub!(:has_many)      
       
       @database = mock_database
-      @database.stub!(:request_class).and_return(@request_class)
-      @database.stub!(:source_class).and_return(@source_class)
       @database.connection.stub!(:table_exists?).and_return(true)
       RequestLogAnalyzer::Database::Base.stub!(:database).and_return(@database)
       
@@ -107,7 +100,7 @@ describe RequestLogAnalyzer::Database::Base do
     end
     
     it "should create the :has_many relation in the request class" do
-      @request_class.should_receive(:has_many).with(:completed_lines)
+      RequestLogAnalyzer::Database::Request.should_receive(:has_many).with(:completed_lines)
       RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines')
     end
 
@@ -117,7 +110,7 @@ describe RequestLogAnalyzer::Database::Base do
     end
     
     it "should create the :has_many relation in the request class" do
-      @source_class.should_receive(:has_many).with(:completed_lines)
+      RequestLogAnalyzer::Database::Source.should_receive(:has_many).with(:completed_lines)
       RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines')
     end
 

data/spec/unit/database/database_spec.rb

@@ -15,11 +15,11 @@ describe RequestLogAnalyzer::Database do
       # FileFormat-agnostic classes
       default_orm_class_names.each do |const|
         it "should create the default #{const} constant" do
-          Object.const_defined?(const).should be_true
+          RequestLogAnalyzer::Database.const_defined?(const).should be_true
         end
 
         it "should create the default #{const} class inheriting from ActiveRecord::Base and RequestLogAnalyzer::Database::Base" do
-          Object.const_get(const).ancestors.should include(ActiveRecord::Base, RequestLogAnalyzer::Database::Base)
+          RequestLogAnalyzer::Database.const_get(const).ancestors.should include(ActiveRecord::Base, RequestLogAnalyzer::Database::Base)
         end
       end
     
@@ -38,8 +38,8 @@ describe RequestLogAnalyzer::Database do
         end
         
         it "should create a :has_many relation from the Request and Source class to the #{const} class" do
-          @database.request_class.send(:reflections).should include(const.underscore.pluralize.to_sym)
-          @database.source_class.send(:reflections).should include(const.underscore.pluralize.to_sym)
+          RequestLogAnalyzer::Database::Request.send(:reflections).should include(const.underscore.pluralize.to_sym)
+          RequestLogAnalyzer::Database::Source.send(:reflections).should include(const.underscore.pluralize.to_sym)
         end
       end
     end
@@ -60,6 +60,7 @@ describe RequestLogAnalyzer::Database do
     after(:each) { @database.remove_orm_classes! }
 
     default_orm_class_names.each do |klass|
+      
       it "should create a table for the default #{klass} class" do
         @database.connection.should_receive(:create_table).with(klass.underscore.pluralize.to_sym)
         @database.send :create_database_schema!
@@ -67,7 +68,7 @@ describe RequestLogAnalyzer::Database do
 
       it "should create a #{klass} class inheriting from ActiveRecord and the base class of the ORM module" do
         @database.send :create_database_schema!
-        @database.send("#{klass.underscore}_class".to_sym).ancestors.should include(ActiveRecord::Base, RequestLogAnalyzer::Database::Base)
+        RequestLogAnalyzer::Database.const_get(klass).ancestors.should include(ActiveRecord::Base, RequestLogAnalyzer::Database::Base)
       end
     end
 
@@ -92,15 +93,9 @@ describe RequestLogAnalyzer::Database do
       @connection = mock_connection
       @database.stub!(:connection).and_return(@connection)
       
-      # Mock the request ORM class
-      @request_class = mock('Request ActiveRecord::Base class')
-      @request_class.stub!(:has_many)
-    
-      @source_class = mock('Source ActiveRecord::Base class')
-      @source_class.stub!(:has_many)
-    
-      @database.stub!(:request_class).and_return(@request_class)
-      @database.stub!(:source_class).and_return(@source_class)
+      # Mock the has_many method of the defaukt ORM classes
+      RequestLogAnalyzer::Database::Request.stub!(:has_many)
+      RequestLogAnalyzer::Database::Source.stub!(:has_many)
       
       @mock_class = Class.new(RequestLogAnalyzer::Database::Base)
       

data/spec/unit/file_format/apache_format_spec.rb

@@ -99,12 +99,49 @@ describe RequestLogAnalyzer::FileFormat::Apache do
       @log_parser.parse_file(log_fixture(:apache_common)) { counter.hit! }
     end
   end
+  
+  context '"Rack" access log parser' do
+    before(:each) do
+      @file_format = RequestLogAnalyzer::FileFormat.load(:rack)
+      @log_parser  = RequestLogAnalyzer::Source::LogParser.new(@file_format)
+      @sample_1 = '127.0.0.1 - - [16/Sep/2009 06:40:08] "GET /favicon.ico HTTP/1.1" 500 63183 0.0453'
+    end
+    
+    it "should create a kind of an Apache file format" do
+      @file_format.should be_kind_of(RequestLogAnalyzer::FileFormat::Apache)
+    end
+    
+    it "should have a valid language definitions" do
+      @file_format.should be_valid
+    end
+
+    it "should parse a valid access log line" do
+      @file_format.line_definitions[:access].matches(@sample_1).should be_kind_of(Hash)
+    end
+
+    it "should not parse a valid access log line" do
+      @file_format.line_definitions[:access].matches('addasdsasadadssadasd').should be_false
+    end
+
+    it "should read the correct values from a valid 404 access log line" do
+      @log_parser.parse_io(StringIO.new(@sample_1)) do |request|
+        request[:remote_host].should  == '127.0.0.1'
+        request[:timestamp].should    == 20090916064008
+        request[:http_status].should  == 500
+        request[:http_method].should  == 'GET'
+        request[:http_version].should == '1.1'
+        request[:bytes_sent].should   == 63183
+        request[:user].should         == nil
+        request[:duration].should     == 0.0453
+      end
+    end
+  end
  
   context '"Combined" access log parsing' do
 
     before(:all) do
       @file_format = RequestLogAnalyzer::FileFormat.load(:apache, :combined)
-      @log_parser = RequestLogAnalyzer::Source::LogParser.new(@file_format)
+      @log_parser  = RequestLogAnalyzer::Source::LogParser.new(@file_format)
       @sample_1 = '69.41.0.45 - - [02/Sep/2009:12:02:40 +0200] "GET //phpMyAdmin/ HTTP/1.1" 404 209 "-" "Mozilla/4.0 (compatible; MSIE 6.0; Windows 98)"'
       @sample_2 = '10.0.1.1 - - [02/Sep/2009:05:08:33 +0200] "GET / HTTP/1.1" 200 30 "-" "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_8; en-us) AppleWebKit/531.9 (KHTML, like Gecko) Version/4.0.3 Safari/531.9"'
     end

data/spec/unit/tracker/tracker_api_spec.rb

@@ -1,49 +1,124 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
-describe RequestLogAnalyzer::Tracker::Base, "API test" do
+describe RequestLogAnalyzer::Tracker::Base do
 
-  before(:each) do
-    @tracker    = Class.new(RequestLogAnalyzer::Tracker::Base).new
+  describe 'API' do
     
-    @summarizer = RequestLogAnalyzer::Aggregator::Summarizer.new(mock_source)
-    @summarizer.trackers << @tracker
-  end
-    
-  it "should receive :prepare when the summarizer is preparing" do
-    @tracker.should_receive(:prepare).once    
-    @summarizer.prepare
-  end
-  
-  it "should receieve :finalize when the summarizer is finalizing" do
-    @tracker.should_receive(:finalize).once    
-    @summarizer.finalize    
+    before(:each) do
+      @tracker    = Class.new(RequestLogAnalyzer::Tracker::Base).new
+
+      @summarizer = RequestLogAnalyzer::Aggregator::Summarizer.new(mock_source)
+      @summarizer.trackers << @tracker
+    end
+        
+    it "should receive :prepare when the summarizer is preparing" do
+      @tracker.should_receive(:prepare).once
+      @summarizer.prepare
+    end
+
+    it "should receive :update for every request for which should_update? returns true" do
+      @tracker.should_receive(:should_update?).twice.and_return(true)
+      @tracker.should_receive(:update).twice
+
+      @summarizer.aggregate(testing_format.request(:field => 'value1'))
+      @summarizer.aggregate(testing_format.request(:field => 'value2'))
+    end
+
+    it "should not :update for every request for which should_update? returns false" do
+      @tracker.should_receive(:should_update?).twice.and_return(false)
+      @tracker.should_not_receive(:update)
+
+      @summarizer.aggregate(testing_format.request(:field => 'value1'))
+      @summarizer.aggregate(testing_format.request(:field => 'value2'))
+    end
+
+    it "should receive :report when the summary report is being built" do
+      @tracker.should_receive(:report).with(anything).once   
+      @summarizer.report(mock_output) 
+    end
+
+    it "should receieve :finalize when the summarizer is finalizing" do
+      @tracker.should_receive(:finalize).once
+      @summarizer.finalize
+    end
   end
   
-  it "should receive :update for every request for which should_update? returns true" do
-    @tracker.should_receive(:should_update?).twice.and_return(true)
-    @tracker.should_receive(:update).twice
+  describe '#should_update?' do
+    before(:each) do
+      @tracker_class = Class.new(RequestLogAnalyzer::Tracker::Base)
+    end
     
-    @summarizer.aggregate(testing_format.request(:field => 'value1'))
-    @summarizer.aggregate(testing_format.request(:field => 'value2'))    
-  end
-  
-  it "should not :update for every request for which should_update? returns false" do
-    @tracker.should_receive(:should_update?).twice.and_return(false)
-    @tracker.should_not_receive(:update)
+    it "should return true by default, when no checks are installed" do
+      tracker = @tracker_class.new
+      tracker.should_update?(testing_format.request).should be_true
+    end
     
-    @summarizer.aggregate(testing_format.request(:field => 'value1'))
-    @summarizer.aggregate(testing_format.request(:field => 'value2'))    
-  end
+    it "should return false if the line type is not in the request" do
+      tracker = @tracker_class.new(:line_type => :not_there)
+      tracker.should_update?(request(:line_type => :different)).should be_false
+    end
+    
+    it "should return true if the line type is in the request" do
+      tracker = @tracker_class.new(:line_type => :there)
+      tracker.should_update?(request(:line_type => :there)).should be_true
+    end
+    
+    it "should return true if a field name is given to :if and it is in the request" do
+      tracker = @tracker_class.new(:if => :field)
+      tracker.should_update?(request(:field => 'anything')).should be_true
+    end
+
+    it "should return false if a field name is given to :if and it is not the request" do
+      tracker = @tracker_class.new(:if => :field)
+      tracker.should_update?(request(:other_field => 'anything')).should be_false
+    end
+
+    it "should return false if a field name is given to :unless and it is in the request" do
+      tracker = @tracker_class.new(:unless => :field)
+      tracker.should_update?(request(:field => 'anything')).should be_false
+    end
+
+    it "should return true if a field name is given to :unless and it is not the request" do
+      tracker = @tracker_class.new(:unless => :field)
+      tracker.should_update?(request(:other_field => 'anything')).should be_true
+    end
+
+    it "should return the value of the block if one is given to the :if option" do
+      tracker = @tracker_class.new(:if => lambda { false } )
+      tracker.should_update?(request(:field => 'anything')).should be_false
+    end
+
+    it "should return the inverse value of the block if one is given to the :if option" do
+      tracker = @tracker_class.new(:unless => lambda { false } )
+      tracker.should_update?(request(:field => 'anything')).should be_true
+    end
+
+    it "should return false if any of the checks fail" do
+      tracker = @tracker_class.new(:if => :field, :unless => lambda { false }, :line_type => :not_present )
+      tracker.should_update?(request(:line_type => :present, :field => 'anything')).should be_false
+    end
+
+    it "should return true if all of the checks succeed" do
+      tracker = @tracker_class.new(:if => :field, :unless => lambda { false }, :line_type => :present )
+      tracker.should_update?(request(:line_type => :present, :field => 'anything')).should be_true
+    end
+
   
-  it "should receive :report when the summary report is being built" do
-    @tracker.should_receive(:report).with(anything).once   
-    @summarizer.report(mock_output) 
   end
   
-  it "should receive :to_yaml object when finalizing" do
-    @summarizer.options[:dump] = temp_output_file(:dump)
-    @tracker.should_receive(:to_yaml_object).once
-    @summarizer.to_yaml
+  describe '#to_yaml_object' do
+    
+    before(:each) do
+      @tracker    = Class.new(RequestLogAnalyzer::Tracker::Base).new
+
+      @summarizer = RequestLogAnalyzer::Aggregator::Summarizer.new(mock_source)
+      @summarizer.trackers << @tracker
+    end
+        
+    it "should receive :to_yaml object when finalizing" do
+      @summarizer.options[:dump] = temp_output_file(:dump)
+      @tracker.should_receive(:to_yaml_object).once
+      @summarizer.to_yaml
+    end
   end
-  
 end

data/spec/unit/tracker/traffic_tracker_spec.rb

@@ -0,0 +1,105 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe RequestLogAnalyzer::Tracker::Traffic do
+  
+  describe '#update' do
+    
+    context 'using a field-based category' do
+      before(:each) do
+        @tracker = RequestLogAnalyzer::Tracker::Traffic.new(:traffic => :traffic, :category => :category)
+        @tracker.prepare
+      end
+    
+      it "should register a request in the right category" do
+        @tracker.update(request(:category => 'a', :traffic => 200))
+        @tracker.categories.should include('a')
+      end
+    
+      it "should register a hit in the right category" do
+        @tracker.update(request(:category => 'a', :traffic => 1))
+        @tracker.update(request(:category => 'b', :traffic => 2))
+        @tracker.update(request(:category => 'b', :traffic => 3))
+      
+        @tracker.hits('a').should == 1
+        @tracker.hits('b').should == 2
+      end
+    
+      it "should sum the traffics of the same category as cumulative traffic" do
+        @tracker.update(request(:category => 'a', :traffic => 1))
+        @tracker.update(request(:category => 'b', :traffic => 2))
+        @tracker.update(request(:category => 'b', :traffic => 3))
+      
+        @tracker.cumulative_traffic('a').should == 1
+        @tracker.cumulative_traffic('b').should == 5
+      end
+    
+      it "should calculate the average traffic correctly" do
+        @tracker.update(request(:category => 'a', :traffic => 1))
+        @tracker.update(request(:category => 'b', :traffic => 2))
+        @tracker.update(request(:category => 'b', :traffic => 3))
+      
+        @tracker.average_traffic('a').should == 1.0
+        @tracker.average_traffic('b').should == 2.5
+      end
+    
+      it "should set min and max traffic correctly" do
+        @tracker.update(request(:category => 'a', :traffic => 1))
+        @tracker.update(request(:category => 'b', :traffic => 2))
+        @tracker.update(request(:category => 'b', :traffic => 3))
+      
+        @tracker.min_traffic('b').should == 2
+        @tracker.max_traffic('b').should == 3
+      end  
+    
+    end
+  
+    context 'using a dynamic category' do
+      before(:each) do
+        @categorizer = Proc.new { |request| request[:traffic] < 2 ? 'few' : 'lots' }
+        @tracker = RequestLogAnalyzer::Tracker::Traffic.new(:traffic => :traffic, :category => @categorizer)
+        @tracker.prepare
+      end
+    
+      it "should use the categorizer to determine the right category" do
+        @tracker.update(request(:category => 'a', :traffic => 1))
+        @tracker.update(request(:category => 'b', :traffic => 2))
+        @tracker.update(request(:category => 'b', :traffic => 3))
+      
+        @tracker.categories.should include('few', 'lots')
+      end
+    
+      it "should use the categorizer to aggregate the values correctly" do
+        @tracker.update(request(:category => 'a', :traffic => 1))
+        @tracker.update(request(:category => 'b', :traffic => 2))
+        @tracker.update(request(:category => 'b', :traffic => 3))
+      
+        @tracker.max_traffic('few').should == 1
+        @tracker.min_traffic('lots').should == 2
+      end
+    end
+  end
+  
+  describe '#report' do
+    before(:each) do
+      @tracker = RequestLogAnalyzer::Tracker::Traffic.new(:category => :category, :traffic => :traffic)
+      @tracker.prepare
+    end
+    
+    it "should generate a report without errors when one category is present" do
+      @tracker.update(request(:category => 'a', :traffic => 2))
+      @tracker.report(mock_output)
+      lambda { @tracker.report(mock_output) }.should_not raise_error
+    end
+  
+    it "should generate a report without errors when no category is present" do
+      lambda { @tracker.report(mock_output) }.should_not raise_error
+    end
+  
+    it "should generate a report without errors when multiple categories are present" do
+      @tracker.update(request(:category => 'a', :traffic => 2))
+      @tracker.update(request(:category => 'b', :traffic => 2))
+      lambda { @tracker.report(mock_output) }.should_not raise_error
+    end
+    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: request-log-analyzer
 version: !ruby/object:Gem::Version 
-  version: 1.3.4
+  version: 1.3.6
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-14 00:00:00 +02:00
+date: 2009-09-20 00:00:00 +02:00
 default_executable: request-log-analyzer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,10 +45,10 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - spec/unit/filter/anonymize_filter_spec.rb
+- spec/fixtures/rails_22_cached.log
 - lib/request_log_analyzer/line_definition.rb
 - lib/request_log_analyzer/output/html.rb
 - lib/request_log_analyzer/controller.rb
-- spec/fixtures/rails_22_cached.log
 - spec/lib/macros.rb
 - lib/request_log_analyzer/file_format/rails_development.rb
 - spec/fixtures/apache_combined.log
@@ -61,10 +61,10 @@ files:
 - spec/integration/command_line_usage_spec.rb
 - lib/request_log_analyzer/database.rb
 - spec/fixtures/decompression.log.bz2
+- spec/fixtures/rails_unordered.log
 - lib/request_log_analyzer/log_processor.rb
 - lib/request_log_analyzer/tracker.rb
 - lib/request_log_analyzer/filter.rb
-- spec/fixtures/rails_unordered.log
 - bin/request-log-analyzer
 - request-log-analyzer.gemspec
 - DESIGN.rdoc
@@ -86,6 +86,7 @@ files:
 - lib/cli/progressbar.rb
 - lib/request_log_analyzer/mailer.rb
 - README.rdoc
+- lib/request_log_analyzer/database/warning.rb
 - spec/fixtures/merb.log
 - lib/request_log_analyzer/tracker/hourly_spread.rb
 - .gitignore
@@ -103,8 +104,11 @@ files:
 - spec/fixtures/test_language_combined.log
 - lib/request_log_analyzer/aggregator/database_inserter.rb
 - lib/request_log_analyzer/aggregator/summarizer.rb
+- lib/request_log_analyzer/file_format/rack.rb
+- lib/request_log_analyzer/database/source.rb
 - lib/request_log_analyzer/file_format/rails.rb
 - spec/fixtures/decompression.tar.gz
+- spec/unit/tracker/traffic_tracker_spec.rb
 - spec/unit/filter/field_filter_spec.rb
 - spec/unit/database/base_class_spec.rb
 - lib/request_log_analyzer/filter/timespan.rb
@@ -125,10 +129,10 @@ files:
 - spec/unit/controller/controller_spec.rb
 - spec/lib/mocks.rb
 - spec/lib/helpers.rb
+- spec/fixtures/rails_1x.log
 - lib/cli/database_console_init.rb
 - lib/request_log_analyzer/output.rb
 - lib/request_log_analyzer/file_format/apache.rb
-- spec/fixtures/rails_1x.log
 - spec/fixtures/decompression.log.zip
 - spec/unit/source/request_spec.rb
 - spec/unit/source/log_parser_spec.rb
@@ -136,11 +140,13 @@ files:
 - tasks/github-gem.rake
 - spec/unit/database/database_spec.rb
 - lib/request_log_analyzer/tracker/duration.rb
+- lib/request_log_analyzer/tracker/traffic.rb
 - lib/request_log_analyzer/file_format.rb
 - spec/unit/aggregator/summarizer_spec.rb
+- spec/fixtures/syslog_1x.log
 - spec/fixtures/rails_22.log
+- lib/request_log_analyzer/database/request.rb
 - spec/fixtures/multiple_files_2.log
-- spec/fixtures/syslog_1x.log
 - LICENSE
 - lib/request_log_analyzer/source/database_loader.rb
 - spec/unit/tracker/frequency_tracker_spec.rb
@@ -191,6 +197,7 @@ test_files:
 - spec/unit/file_format/amazon_s3_format_spec.rb
 - spec/unit/controller/log_processor_spec.rb
 - spec/unit/filter/filter_spec.rb
+- spec/unit/tracker/traffic_tracker_spec.rb
 - spec/unit/filter/field_filter_spec.rb
 - spec/unit/database/base_class_spec.rb
 - spec/unit/tracker/timespan_tracker_spec.rb