request-log-analyzer 1.4.0 → 1.5.0

data/spec/unit/file_format/rails_format_spec.rb

@@ -120,35 +120,32 @@ describe RequestLogAnalyzer::FileFormat::Rails do
     end
 
     it "should parse a Rails 2.1 style log and find valid Rails requests without warnings" do
+      request_counter.should_receive(:hit!).exactly(4).times
       @log_parser.should_not_receive(:warn)
+      
       @log_parser.parse_file(log_fixture(:rails_1x)) do |request|
-        request.should be_kind_of(RequestLogAnalyzer::FileFormat::Rails::Request)
-        request.should be_completed
+        request_counter.hit! if request.kind_of?(RequestLogAnalyzer::FileFormat::Rails::Request) && request.completed?
       end
     end
 
     it "should parse a Rails 2.2 style log and find valid Rails requests without warnings" do
+      request_counter.should_receive(:hit!).once
       @log_parser.should_not_receive(:warn)
+      
       @log_parser.parse_file(log_fixture(:rails_22)) do |request|
-        request.should be_kind_of(RequestLogAnalyzer::FileFormat::Rails::Request)
-        request.should be_completed
+        request_counter.hit! if request.kind_of?(RequestLogAnalyzer::FileFormat::Rails::Request) && request.completed?
       end
     end
 
     it "should parse a Rails SyslogLogger file with prefix and find valid requests without warnings" do
+      request_counter.should_receive(:hit!).once
       @log_parser.should_not_receive(:warn)
+      
       @log_parser.parse_file(log_fixture(:syslog_1x)) do |request|
-        request.should be_kind_of(RequestLogAnalyzer::FileFormat::Rails::Request)
-        request.should be_completed
+        request_counter.hit! if request.kind_of?(RequestLogAnalyzer::FileFormat::Rails::Request) && request.completed?
       end
     end
 
-    it "should find 4 completed requests" do
-      @log_parser.should_not_receive(:warn)
-      @log_parser.should_receive(:handle_request).exactly(4).times
-      @log_parser.parse_file(log_fixture(:rails_1x))
-    end
-
     it "should parse cached requests" do
       @log_parser.should_not_receive(:warn)
       @log_parser.parse_file(log_fixture(:rails_22_cached)) do |request|

data/spec/unit/mailer_spec.rb

@@ -2,6 +2,18 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe RequestLogAnalyzer::Mailer, 'mailer' do
 
+  it "should initialize correctly" do
+    @mailer = RequestLogAnalyzer::Mailer.new('alfa@beta.com', 'localhost', :debug => true) 
+    @mailer.host.should eql("localhost")
+    @mailer.port.should eql(25)
+  end
+  
+  it "should allow alternate port settings" do
+    @mailer = RequestLogAnalyzer::Mailer.new('alfa@beta.com', 'localhost:2525', :debug => true) 
+    @mailer.host.should eql("localhost")
+    @mailer.port.should eql("2525")
+  end
+
   it "should store printed data" do
     @mailer = RequestLogAnalyzer::Mailer.new('alfa@beta.com', 'localhost', :debug => true)
 

data/spec/unit/tracker/count_tracker_spec.rb

@@ -0,0 +1,123 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe RequestLogAnalyzer::Tracker::Count do
+
+  context 'static category' do
+    before(:each) do
+      @tracker = RequestLogAnalyzer::Tracker::Count.new(:category => :category, :field => :blah)
+      @tracker.prepare
+    end
+
+    it "should register a request in the right category" do
+      @tracker.update(request(:category => 'a', :blah => 2))
+      @tracker.categories.should include('a')
+    end
+
+    it "should register requests in the right category" do
+      @tracker.update(request(:category => 'a', :blah => 2))
+      @tracker.update(request(:category => 'b', :blah => 2))
+      @tracker.update(request(:category => 'b', :blah => 2))
+
+      @tracker.categories['a'][:sum].should == 2
+      @tracker.categories['b'][:sum].should == 4
+    end
+  end
+  
+
+  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.prepare
+    end
+
+    it "should use the categorizer to determine the right category" do
+      @tracker.update(request(:category => 'a', :duration => 0.2, :blah => 2))
+      @tracker.update(request(:category => 'b', :duration => 0.3, :blah => 2))
+      @tracker.update(request(:category => 'b', :duration => 0.4, :blah => 2))
+
+      @tracker.categories['fast'][:sum].should == 2
+      @tracker.categories['slow'][:sum].should == 4
+    end
+  end
+
+  describe '#report' do
+    before(:each) do
+      @tracker = RequestLogAnalyzer::Tracker::Count.new(:category => :category, :field => :blah)
+      @tracker.prepare
+    end
+
+    it "should generate a report without errors when one category is present" do
+      @tracker.update(request(:category => 'a', :blah => 2))
+      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', :blah => 2))
+      @tracker.update(request(:category => 'b', :blah => 2))
+      lambda { @tracker.report(mock_output) }.should_not raise_error
+    end
+  end
+
+  describe '#to_yaml_object' do
+    before(:each) do
+      @tracker = RequestLogAnalyzer::Tracker::Count.new(:category => :category, :field => :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}}
+    end
+  end
+
+  describe '#display_value' do
+    before(:each) do
+      @tracker = RequestLogAnalyzer::Tracker::Count.new(:category => :category, :field => :blah)
+      @tracker.prepare
+    end
+
+    it "should not crash on nil" do
+      lambda { @tracker.display_value(nil) }.should_not raise_error
+      @tracker.display_value(nil).should_not be_nil
+      @tracker.display_value(nil).should_not eql("")
+    end
+
+    it "should not touch thousands" do
+      @tracker.display_value(1000).should eql('1000 ')
+      @tracker.display_value(5000).should eql('5000 ')
+      @tracker.display_value(9001).should eql('9001 ')
+    end
+
+    it "should reduce milions to thousands (k)" do
+      @tracker.display_value(1000_000).should eql('1000k')
+      @tracker.display_value(5000_000).should eql('5000k')
+      @tracker.display_value(9000_001).should eql('9000k')
+    end
+
+    it "should reduce giga to millons (M)" do
+      @tracker.display_value(1000_000_000).should eql('1000M')
+      @tracker.display_value(5000_000_000).should eql('5000M')
+      @tracker.display_value(9000_000_001).should eql('9000M')
+    end
+
+    it "should reduce teras to gigas (G)" do
+      @tracker.display_value(1000_000_000_000).should eql('1000G')
+      @tracker.display_value(5000_000_000_000).should eql('5000G')
+      @tracker.display_value(9000_000_001_001).should eql('9000G')
+    end
+
+    it "should reduce petas to teras (T)" do
+      @tracker.display_value(1000_000_000_000_000).should eql('1000T')
+      @tracker.display_value(5000_000_000_000_000).should eql('5000T')
+      @tracker.display_value(9000_000_001_001_000).should eql('9000T')
+    end
+  end
+  
+  
+end

data/spec/unit/tracker/tracker_api_spec.rb

@@ -116,7 +116,7 @@ describe RequestLogAnalyzer::Tracker::Base do
     end
 
     it "should receive :to_yaml object when finalizing" do
-      @summarizer.options[:dump] = temp_output_file(:dump)
+      @summarizer.options[:yaml] = temp_output_file(:yaml)
       @tracker.should_receive(:to_yaml_object).once
       @summarizer.to_yaml
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: request-log-analyzer
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-30 00:00:00 +02:00
+date: 2009-11-18 00:00:00 +01:00
 default_executable: request-log-analyzer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,115 +44,124 @@ extensions: []
 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/lib/macros.rb
+- spec/unit/tracker/hourly_spread_spec.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/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/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/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/fixtures/rails_unordered.log
-- lib/request_log_analyzer/log_processor.rb
-- lib/request_log_analyzer/tracker.rb
+- spec/unit/database/connection_spec.rb
 - lib/request_log_analyzer/filter.rb
-- bin/request-log-analyzer
-- request-log-analyzer.gemspec
-- DESIGN.rdoc
+- 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/aggregator/database_inserter_spec.rb
-- spec/lib/matchers.rb
+- spec/unit/file_format/file_format_api_spec.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
+- 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
-- 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
+- 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/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/mailer_spec.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
+- 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
-- lib/request_log_analyzer/file_format/rack.rb
-- lib/request_log_analyzer/database/source.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
-- spec/fixtures/decompression.tar.gz
+- 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/unit/filter/field_filter_spec.rb
-- spec/unit/database/base_class_spec.rb
+- spec/fixtures/merb_prefixed.log
+- lib/request_log_analyzer/log_processor.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/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/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/unit/tracker/frequency_tracker_spec.rb
-- spec/unit/file_format/rails_format_spec.rb
-- lib/cli/command_line_arguments.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
 has_rdoc: true
 homepage: http://railsdoctors.com
 licenses: []
@@ -187,30 +196,36 @@ signing_key:
 specification_version: 3
 summary: A command line tool to analyze request logs for Apache, Rails, Merb and other web application servers
 test_files: 
-- spec/unit/filter/anonymize_filter_spec.rb
+- 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/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/filter/timespan_filter_spec.rb
-- spec/unit/aggregator/database_inserter_spec.rb
 - spec/unit/request_spec.rb
-- spec/unit/tracker/tracker_api_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/amazon_s3_format_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/controller/log_processor_spec.rb
-- spec/unit/filter/filter_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/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/log_parser_spec.rb
+- spec/unit/tracker/timespan_tracker_spec.rb
+- spec/unit/tracker/tracker_api_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