request-log-analyzer 1.1.1 → 1.1.2

data/spec/file_formats/spec_format.rb

@@ -4,24 +4,31 @@ class SpecFormat < RequestLogAnalyzer::FileFormat::Base
     line.header = true
     line.teaser = /processing /
     line.regexp = /processing request (\d+)/
-    line.captures = [{ :name => :request_no, :type => :integer, :anonymize => :slightly }]    
+    line.captures = [{ :name => :request_no, :type => :integer }]    
   end
   
   format_definition.test do |line|
     line.teaser = /testing /
-    line.regexp = /testing is (\w+)/
-    line.captures = [{ :name => :test_capture, :type => :string, :anonymize => true}]
+    line.regexp = /testing is (\w+)(?: in (\d+\.\d+)ms)?/
+    line.captures = [{ :name => :test_capture, :type => :test_type },
+                     { :name => :duration, :type => :duration, :unit => :msec }]
   end
   
   format_definition.last do |line|
     line.footer = true
     line.teaser = /finishing /
     line.regexp = /finishing request (\d+)/
-    line.captures = [{ :name => :request_no, :type => :integer}]
+    line.captures = [{ :name => :request_no, :type => :integer }]
   end
   
   report do |analyze|
-    analyze.category :test_capture, :title => 'What is testing exactly?'
+    analyze.frequency :test_capture, :title => 'What is testing exactly?'
+  end
+  
+  class Request < RequestLogAnalyzer::Request
+    def convert_test_type(value, definition)
+      "Testing is #{value}"
+    end
   end
   
 end

data/spec/filter_spec.rb

@@ -134,11 +134,11 @@ describe RequestLogAnalyzer::Filter::Field, 'regexp in accept mode' do
   end  
 end
 
-describe RequestLogAnalyzer::Filter::Anonimize, 'anonimize request' do
+describe RequestLogAnalyzer::Filter::Anonymize, 'anonymize request' do
   include RequestLogAnalyzerSpecHelper
 
   before(:each) do
-    @filter = RequestLogAnalyzer::Filter::Anonimize.new(spec_format)
+    @filter = RequestLogAnalyzer::Filter::Anonymize.new(spec_format)
     @filter.prepare
   end
   
@@ -150,7 +150,7 @@ describe RequestLogAnalyzer::Filter::Anonimize, 'anonimize request' do
     @filter.filter(request(:url => 'https://test.mysite.com/employees'))[:url].should eql('http://example.com/employees')
   end
 
-  it "should anonimize url" do
+  it "should fuzz durations" do
     @filter.filter(request(:duration => 100))[:duration].should_not eql(100)
   end
   

data/spec/line_definition_spec.rb

@@ -22,103 +22,36 @@ describe RequestLogAnalyzer::LineDefinition, :parsing do
     (@line_definition =~ "Testing LineDefinition, tries: 123").should be_kind_of(Hash)
   end
   
-  it "should return a hash with all captures set" do
+  it "should return a hash with :captures set to an array" do
     hash = @line_definition.matches("Testing LineDefinition, tries: 123")
-    hash[:what].should == "LineDefinition"
-    hash[:tries].should == 123
+    hash[:captures][0].should == "LineDefinition"
+    hash[:captures][1].should == "123"
   end
   
-  it "should return a hash with :line_type set" do
-     @line_definition.matches("Testing LineDefinition, tries: 123")[:line_type].should == :test
-   end
-end
-
-describe RequestLogAnalyzer::LineDefinition, :anonymizing_basics do
-  before(:each) do
-    @line_definition = RequestLogAnalyzer::LineDefinition.new(:test, {
-      :teaser   => /Anonymize /,
-      :regexp   => /Anonymize (\w+)!/,
-      :captures => [{ :name => :what, :type => :string }]
-    })
-  end 
-  
-  it "should return nil if the teaser does not match" do
-    @line_definition.anonymize("Nonsense").should be_nil
-  end
-  
-  it "should return nil if no teaser exists and the regexp doesn't match" do
-    line_definition = RequestLogAnalyzer::LineDefinition.new(:test, {
-          :regexp => /Anonymize!/, :captures => []})
-
-    line_definition.anonymize('nonsense').should be_nil
-  end
-  
-  it "should return itself if only the teaser matches" do
-    @line_definition.anonymize("Anonymize 456").should == "Anonymize 456"
-  end  
-  
-  it "should return an empty string if the teaser matches and discard_teaser_lines is set" do
-    @line_definition.anonymize("Anonymize 456", :discard_teaser_lines => true).should == ""
+  it "should return a hash with :line_definition set" do
+    @line_definition.matches("Testing LineDefinition, tries: 123")[:line_definition].should == @line_definition
   end
-  
-  it "should return a string if the line matches" do
-    @line_definition.anonymize("Anonymize anonymizing!").should be_kind_of(String)
-  end
-  
-  it "should not anonymize :what" do
-    @line_definition.anonymize("Anonymize anonymizing!").should == "Anonymize anonymizing!"
-  end  
 end
 
-describe RequestLogAnalyzer::LineDefinition, :anonymizing_specifics do
-
-  it "should anonymize completely if anonymize is true" do
-    @line_definition = RequestLogAnalyzer::LineDefinition.new(:test, {
-          :regexp => /Anonymize (.+)!/, :captures => [{ :name => :what, :type => :string, :anonymize => true }]})
+describe RequestLogAnalyzer::LineDefinition, :converting do
 
-    @line_definition.anonymize("Anonymize 1.2.3.4!").should == "Anonymize ***!"
-  end    
-    
-  it "should anonymize a URL" do
-    @line_definition = RequestLogAnalyzer::LineDefinition.new(:test, {
-          :regexp => /Anonymize (.+)!/, :captures => [{ :name => :what, :type => :string, :anonymize => :url }]})
-    
-    @line_definition.anonymize("Anonymize https://www.not-anonymous.com/path/to/file.html!").should == "Anonymize http://example.com/path/to/file.html!"
-  end
-  
-  it "should anonymize an IP address" do
-    @line_definition = RequestLogAnalyzer::LineDefinition.new(:test, {
-          :regexp => /Anonymize (.+)!/, :captures => [{ :name => :what, :type => :string, :anonymize => :ip }]})
-    
-    @line_definition.anonymize("Anonymize 1.2.3.4!").should == "Anonymize 127.0.0.1!"
-  end 
+  include RequestLogAnalyzerSpecHelper
   
-  it "should anonymize completely if the anonymizer is unknown" do
-    @line_definition = RequestLogAnalyzer::LineDefinition.new(:test, {
-          :regexp => /Anonymize (.+)!/, :captures => [{ :name => :what, :type => :string, :anonymize => :unknown }]})
-
-    @line_definition.anonymize("Anonymize 1.2.3.4!").should == "Anonymize ***!"
+  before(:each) do
+    @file_format = spec_format
+    @request = @file_format.create_request
   end
   
-  it "should anonymize an integer slightly" do
-    @line_definition = RequestLogAnalyzer::LineDefinition.new(:test, {
-          :regexp => /Anonymize (.+)!/, :captures => [{ :name => :what, :type => :integer, :anonymize => :slightly }]})
-
-    @line_definition.anonymize("Anonymize 1234!").should =~ /Anonymize \d{3,4}\!/
+  it "should convert captures to a hash of converted values" do
+    hash = @file_format.line_definitions[:first].convert_captured_values(["456"], @request)
+    hash[:request_no].should == 456
   end
-  
-  it "should anonymize an integer slightly" do
-    @line_definition = RequestLogAnalyzer::LineDefinition.new(:test, {
-          :regexp => /Anonymize (.+)!/, :captures => [{ :name => :what, :type => :integer, :anonymize => :slightly }]})
 
-    @line_definition.anonymize("Anonymize 1234!").should =~ /Anonymize \d{3,4}\!/
+  it "should convert captures to a hash" do
+    hash = @file_format.line_definitions[:test].convert_captured_values(["willem", nil], @request)
+    hash[:test_capture].should == 'Testing is willem'
+    hash[:duration].should be_nil
   end
-  
-  it "should anonymize an double slightly" do
-    @line_definition = RequestLogAnalyzer::LineDefinition.new(:test, {
-          :regexp => /Anonymize (.+)!/, :captures => [{ :name => :what, :type => :double, :anonymize => :slightly }]})
 
-    @line_definition.anonymize("Anonymize 1.3!").should =~ /Anonymize 1\.\d+\!/
-  end
-   
+  
 end

data/spec/log_parser_spec.rb

@@ -28,10 +28,9 @@ describe RequestLogAnalyzer::Source::LogParser, :requests do
   
   it "should parse all request values when spanned over multiple files" do
     @log_parser.parse_files([log_fixture(:multiple_files_1), log_fixture(:multiple_files_2)]) do |request|
-      request.lines.should have(4).items
-      
+      request.lines.should have(4).items      
       request[:request_no].should == 1
-      request[:test_capture].should == "amazing"      
+      request[:test_capture].should == "Testing is amazing" # Note the custom converter     
     end
   end  
   

data/spec/log_processor_spec.rb

@@ -1,44 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper'
 require 'request_log_analyzer/log_processor'
 
-describe RequestLogAnalyzer::LogProcessor, 'anonymization' do
-
-  include RequestLogAnalyzerSpecHelper
-  
-  before(:each) do
-    @log_anonymizer = RequestLogAnalyzer::LogProcessor.new(spec_format, :anonymize, {})
-    @alternate_log_anonymizer = RequestLogAnalyzer::LogProcessor.new(spec_format, :anonymize, {:keep_junk_lines => true, :discard_teaser_lines => true})
-  end
-  
-  it "should keep a junk line if :keep_junk_lines is true" do
-    @alternate_log_anonymizer.anonymize_line("junk line\n").should == "junk line\n"
-  end
-  
-  it "should remove a junk line" do
-    @log_anonymizer.anonymize_line("junk line\n").should be_empty
-  end
-
-  it "should keep a teaser line intact" do
-    @log_anonymizer.anonymize_line("processing 1234\n").should == "processing 1234\n"
-  end
-  
-  it "should discard a teaser line if discard_teaser_line is true" do
-    @alternate_log_anonymizer.anonymize_line("processing 1234\n").should be_empty
-  end
-  
-  it "should keep a matching line intact if no anonymizing is declared" do
-    @alternate_log_anonymizer.anonymize_line("finishing request 130\n").should == "finishing request 130\n"
-  end  
-
-  it "should anonymize values completely if requested" do
-    @alternate_log_anonymizer.anonymize_line("testing is great\n").should == "testing is ***\n"
-  end  
-  
-  it "should anonymize values slightly if requested" do
-    @alternate_log_anonymizer.anonymize_line("finishing request 130\n").should =~ /^finishing request 1\d\d\n$/
-  end
-end
-
 describe RequestLogAnalyzer::LogProcessor, 'stripping log files' do
 
   include RequestLogAnalyzerSpecHelper

data/spec/merb_format_spec.rb

@@ -29,7 +29,7 @@ describe RequestLogAnalyzer::Source::LogParser, :merb do
     @log_parser.parse_file(log_fixture(:merb)) { |found_request| request ||= found_request }
     
     request.should be_completed
-    #request[:timestamp].should == DateTime.parse('Fri Aug 29 11:10:23 +0200 2008') # FIX ME
+    request[:timestamp].should == 20080829111023 # 'Fri Aug 29 11:10:23 +0200 2008'
     request[:dispatch_time].should == 0.243424
     request[:after_filters_time].should == 6.9e-05
     request[:before_filters_time].should == 0.213213

data/spec/rails_format_spec.rb

@@ -80,6 +80,7 @@ describe "RequestLogAnalyzer::FileFormat::RailsDevelopment - Rails with developm
   
   before(:each) do
     @file_format = RequestLogAnalyzer::FileFormat.load(:rails_development)
+    @request = @file_format.create_request
   end
   
   it "should have a valid language definitions" do
@@ -87,33 +88,33 @@ describe "RequestLogAnalyzer::FileFormat::RailsDevelopment - Rails with developm
   end
   
   it "should parse a rendered line" do
-    info = @file_format.line_definitions[:rendered].matches("Rendered layouts/_footer (2.9ms)")
+    info = @file_format.line_definitions[:rendered].match_for("Rendered layouts/_footer (2.9ms)", @request)
     info[:render_file].should == 'layouts/_footer'
     info[:render_duration].should == 0.0029
   end
   
   it "should parse a query executed line with colors" do
-    info = @file_format.line_definitions[:query_executed].matches(" User Load (0.4ms)   SELECT * FROM `users` WHERE (`users`.`id` = 18205844) ")
+    info = @file_format.line_definitions[:query_executed].match_for(" User Load (0.4ms)   SELECT * FROM `users` WHERE (`users`.`id` = 18205844) ", @request)
     info[:query_class].should == 'User'
     info[:query_duration].should == 0.0004
     info[:query_sql].should == 'SELECT * FROM `users` WHERE (`users`.`id` = 18205844)'
   end  
   
   it "should parse a query executed line without colors" do
-    info = @file_format.line_definitions[:query_executed].matches(" User Load (0.4ms)   SELECT * FROM `users` WHERE (`users`.`id` = 18205844) ")
+    info = @file_format.line_definitions[:query_executed].match_for(" User Load (0.4ms)   SELECT * FROM `users` WHERE (`users`.`id` = 18205844) ", @request)
     info[:query_class].should == 'User'
     info[:query_duration].should == 0.0004
     info[:query_sql].should == 'SELECT * FROM `users` WHERE (`users`.`id` = 18205844)'    
   end  
   
   it "should parse a cached query line with colors" do
-    info = @file_format.line_definitions[:query_cached].matches(' CACHE (0.0ms)   SELECT * FROM `users` WHERE (`users`.`id` = 0) ')
+    info = @file_format.line_definitions[:query_cached].match_for(' CACHE (0.0ms)   SELECT * FROM `users` WHERE (`users`.`id` = 0) ', @request)
     info[:cached_duration].should == 0.0
     info[:cached_sql].should == 'SELECT * FROM `users` WHERE (`users`.`id` = 0)'   
   end
   
   it "should parse a cached query line without colors" do
-    info = @file_format.line_definitions[:query_cached].matches(' CACHE (0.0ms)   SELECT * FROM `users` WHERE (`users`.`id` = 0) ')
+    info = @file_format.line_definitions[:query_cached].match_for(' CACHE (0.0ms)   SELECT * FROM `users` WHERE (`users`.`id` = 0) ', @request)
     info[:cached_duration].should == 0.0
     info[:cached_sql].should == 'SELECT * FROM `users` WHERE (`users`.`id` = 0)'   
   end  

data/spec/spec_helper.rb

@@ -28,6 +28,22 @@ module RequestLogAnalyzerSpecHelper
       format.create_request(fields)      
     end
   end
+
+  def mock_io
+    mio = mock('IO')
+    mio.stub!(:print)
+    mio.stub!(:puts)    
+    mio.stub!(:write)
+    return mio
+  end
+  
+  def mock_output
+    output = mock('RequestLogAnalyzer::Output')
+    output.stub!(:header)
+    output.stub!(:footer)    
+    output.stub!(:io).and_return(mock_io)
+    return output
+  end
   
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: request-log-analyzer
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-21 00:00:00 +01:00
+date: 2009-01-24 00:00:00 +01:00
 default_executable: request-log-analyzer
 dependencies: []
 
@@ -49,7 +49,7 @@ files:
 - lib/request_log_analyzer/file_format/rails_development.rb
 - lib/request_log_analyzer/filter
 - lib/request_log_analyzer/filter.rb
-- lib/request_log_analyzer/filter/anonimize.rb
+- lib/request_log_analyzer/filter/anonymize.rb
 - lib/request_log_analyzer/filter/field.rb
 - lib/request_log_analyzer/filter/timespan.rb
 - lib/request_log_analyzer/line_definition.rb
@@ -64,8 +64,8 @@ files:
 - lib/request_log_analyzer/source/log_parser.rb
 - lib/request_log_analyzer/tracker
 - lib/request_log_analyzer/tracker.rb
-- lib/request_log_analyzer/tracker/category.rb
 - lib/request_log_analyzer/tracker/duration.rb
+- lib/request_log_analyzer/tracker/frequency.rb
 - lib/request_log_analyzer/tracker/hourly_spread.rb
 - lib/request_log_analyzer/tracker/timespan.rb
 - spec