request-log-analyzer 1.2.1 → 1.2.6

data/spec/unit/source/log_parser_spec.rb

@@ -1,7 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe RequestLogAnalyzer::Source::LogParser, :requests do
-  include RequestLogAnalyzer::Spec::Helper
   
   before(:each) do
     @log_parser = RequestLogAnalyzer::Source::LogParser.new(testing_format)
@@ -42,12 +41,15 @@ describe RequestLogAnalyzer::Source::LogParser, :requests do
       request[:test_capture].should_not be_nil      
     end
     io.close
-  end  
+  end
   
+  it "should parse a request that only consists of one line" do
+    @log_parser.parse_file(log_fixture(:header_and_footer))
+    @log_parser.parsed_requests.should == 2
+  end
 end
 
 describe RequestLogAnalyzer::Source::LogParser, :warnings do
-  include RequestLogAnalyzer::Spec::Helper
   
   before(:each) do
     @log_parser = RequestLogAnalyzer::Source::LogParser.new(testing_format, :parse_strategy => 'cautious')
@@ -67,7 +69,6 @@ describe RequestLogAnalyzer::Source::LogParser, :warnings do
 end
 
 describe RequestLogAnalyzer::Source::LogParser, :decompression do
-  include RequestLogAnalyzer::Spec::Helper
   
   before(:each) do
     @log_parser = RequestLogAnalyzer::Source::LogParser.new(RequestLogAnalyzer::FileFormat::Rails.new)

data/spec/unit/source/request_spec.rb

@@ -1,72 +1,111 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
-describe RequestLogAnalyzer::Request, :incomplete_request do
-  
-  include RequestLogAnalyzer::Spec::Helper
+describe RequestLogAnalyzer::Request do
   
   before(:each) do
-    @incomplete_request = testing_format.request
-    @incomplete_request << { :line_type => :test, :lineno => 1, :test_capture => 'awesome!' }
-  end
-  
-  it "should be single if only one line has been added" do
-    @incomplete_request.should_not be_empty
-  end
-  
-  it "should not be a completed request" do
-    @incomplete_request.should_not be_completed
+    @request = testing_format.request
   end  
   
-  it "should take the line type of the first line as global line_type" do
-    @incomplete_request.lines[0][:line_type].should == :test
-    @incomplete_request.should =~ :test
+  it "should be empty without any captured lines in it" do
+    @request.should be_empty
   end
   
-  it "should return the first field value" do
-    @incomplete_request[:test_capture].should == 'awesome!'
-  end
+  context :incomplete do
   
-  it "should return nil if no such field is present" do
-    @incomplete_request[:nonexisting].should be_nil
-  end
-end  
-
-
-describe RequestLogAnalyzer::Request, :completed_request do
+    before(:each) do
+      @request << { :line_type => :test, :lineno => 1, :test_capture => 'awesome!' }
+    end
   
-  include RequestLogAnalyzer::Spec::Helper
+    it "should be single if only one line has been added" do
+      @request.should_not be_empty
+    end
   
-  before(:each) do
-    @completed_request = testing_format.request
-    @completed_request << { :line_type => :first, :lineno =>  1, :name => 'first line!' }    
-    @completed_request << { :line_type => :test,  :lineno =>  4, :test_capture => 'testing' }        
-    @completed_request << { :line_type => :test,  :lineno =>  7, :test_capture => 'testing some more' }            
-    @completed_request << { :line_type => :last,  :lineno => 10, :time => 0.03 }
-  end
+    it "should not be a completed request" do
+      @request.should_not be_completed
+    end  
   
-  it "should not be empty when multiple liness are added" do
-    @completed_request.should_not be_empty
-  end
+    it "should take the line type of the first line as global line_type" do
+      @request.lines[0][:line_type].should == :test
+      @request.should =~ :test
+    end
   
-  it "should be a completed request" do
-    @completed_request.should be_completed
-  end
+    it "should return the first field value" do
+      @request[:test_capture].should == 'awesome!'
+    end
   
-  it "should recognize all line types" do
-    [:first, :test, :last].each { |type| @completed_request.should =~ type }
+    it "should return nil if no such field is present" do
+      @request[:nonexisting].should be_nil
+    end
   end
   
-  it "should detect the correct field value" do
-    @completed_request[:name].should == 'first line!'
-    @completed_request[:time].should == 0.03
+  context :completed do
+    
+    before(:each) do
+      @request << { :line_type => :first, :lineno =>  1, :name => 'first line!' }    
+      @request << { :line_type => :test,  :lineno =>  4, :test_capture => 'testing' }        
+      @request << { :line_type => :test,  :lineno =>  7, :test_capture => 'testing some more' }            
+      @request << { :line_type => :last,  :lineno => 10, :time => 0.03 }
+    end
+
+    it "should not be empty when multiple liness are added" do
+      @request.should_not be_empty
+    end
+
+    it "should be a completed request" do
+      @request.should be_completed
+    end
+
+    it "should recognize all line types" do
+      [:first, :test, :last].each { |type| @request.should =~ type }
+    end
+
+    it "should detect the correct field value" do
+      @request[:name].should == 'first line!'
+      @request[:time].should == 0.03
+    end
+
+    it "should detect the first matching field value" do  
+      @request.first(:test_capture).should == 'testing'
+    end
+
+    it "should detect the every matching field value" do  
+      @request.every(:test_capture).should == ['testing', "testing some more"]
+    end
+
+    it "should set the first_lineno for a request to the lowest lineno encountered" do
+      @request.first_lineno.should eql(1)
+    end
+    
+    it "should set the first_lineno for a request if a line with a lower lineno is added" do
+      @request << { :line_type => :test, :lineno =>  0 }          
+      @request.first_lineno.should eql(0)
+    end    
+
+    it "should set the last_lineno for a request to the highest encountered lineno" do
+      @request.last_lineno.should eql(10)
+    end
+    
+    it "should not set the last_lineno for a request if a line with a lower lineno is added" do
+      @request << { :line_type => :test, :lineno =>  7 }          
+      @request.last_lineno.should eql(10)
+    end
+
+    it "should not have a timestamp if no such field is captured" do
+      @request.timestamp.should be_nil
+    end
+
+    it "should set return a timestamp field if such a field is captured" do
+      @request << { :line_type => :first, :lineno =>  1, :name => 'first line!', :timestamp => Time.now}    
+      @request.timestamp.should_not be_nil
+    end    
   end
   
-  it "should detect the first matching field value" do  
-    @completed_request.first(:test_capture).should == 'testing'
-  end
+  context 'single line' do
+    # combined is both a header and a footer line
+    before(:each) { @request << { :line_type => :combined, :lineno => 1 } }
   
-  it "should detect the every matching field value" do  
-    @completed_request.every(:test_capture).should == ['testing', "testing some more"]
+    it "should be a completed request if the line is both header and footer" do
+      @request.should be_completed
+    end   
   end
-  
-end
+end  

data/spec/unit/tracker/duration_tracker_spec.rb

@@ -2,8 +2,6 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe RequestLogAnalyzer::Tracker::Duration, 'static category' do
   
-  include RequestLogAnalyzer::Spec::Helper
-
   before(:each) do
     @tracker = RequestLogAnalyzer::Tracker::Duration.new(:duration => :duration, :category => :category)
     @tracker.prepare
@@ -54,8 +52,6 @@ end
 
 describe RequestLogAnalyzer::Tracker::Duration, 'dynamic category' do
   
-  include RequestLogAnalyzer::Spec::Helper
-  
   before(:each) do
     @categorizer = Proc.new { |request| request[:duration] > 0.2 ? 'slow' : 'fast' }
     @tracker = RequestLogAnalyzer::Tracker::Duration.new(:duration => :duration, :category => @categorizer)
@@ -75,8 +71,6 @@ end
 
 describe RequestLogAnalyzer::Tracker::Duration, 'reporting' do
  
-  include RequestLogAnalyzer::Spec::Helper
- 
   before(:each) do
     @tracker = RequestLogAnalyzer::Tracker::Duration.new(:category => :category, :duration => :duration)
     @tracker.prepare

data/spec/unit/tracker/frequency_tracker_spec.rb

@@ -2,8 +2,6 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe RequestLogAnalyzer::Tracker::Frequency, 'static category' do
   
-  include RequestLogAnalyzer::Spec::Helper
-
   before(:each) do
     @tracker = RequestLogAnalyzer::Tracker::Frequency.new(:category => :category)
     @tracker.prepare
@@ -36,8 +34,6 @@ end
 
 describe RequestLogAnalyzer::Tracker::Frequency, 'dynamic category' do
   
-  include RequestLogAnalyzer::Spec::Helper
-  
   before(:each) do
     @categorizer = Proc.new { |request| request[:duration] > 0.2 ? 'slow' : 'fast' }
     @tracker = RequestLogAnalyzer::Tracker::Frequency.new(:category => @categorizer)
@@ -59,8 +55,6 @@ end
 
 describe RequestLogAnalyzer::Tracker::Frequency, 'reporting' do
  
-  include RequestLogAnalyzer::Spec::Helper
- 
   before(:each) do
     @tracker = RequestLogAnalyzer::Tracker::Frequency.new(:category => :category)
     @tracker.prepare

data/spec/unit/tracker/hourly_spread_spec.rb

@@ -2,8 +2,6 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe RequestLogAnalyzer::Tracker::HourlySpread do
 
-  include RequestLogAnalyzer::Spec::Helper
-
   before(:each) do
     @tracker = RequestLogAnalyzer::Tracker::HourlySpread.new
     @tracker.prepare
@@ -54,8 +52,6 @@ end
 
 describe RequestLogAnalyzer::Tracker::HourlySpread, 'reporting' do
  
-  include RequestLogAnalyzer::Spec::Helper
- 
   before(:each) do
     @tracker = RequestLogAnalyzer::Tracker::HourlySpread.new
     @tracker.prepare

data/spec/unit/tracker/timespan_tracker_spec.rb

@@ -2,8 +2,6 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe RequestLogAnalyzer::Tracker::Timespan do
 
-  include RequestLogAnalyzer::Spec::Helper
-
   before(:each) do
     @tracker = RequestLogAnalyzer::Tracker::Timespan.new
     @tracker.prepare
@@ -45,8 +43,6 @@ end
 
 describe RequestLogAnalyzer::Tracker::Timespan, 'reporting' do
  
-  include RequestLogAnalyzer::Spec::Helper
- 
   before(:each) do
     @tracker = RequestLogAnalyzer::Tracker::Timespan.new
     @tracker.prepare

data/spec/unit/tracker/tracker_api_spec.rb

@@ -2,8 +2,6 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe RequestLogAnalyzer::Tracker::Base, "API test" do
 
-  include RequestLogAnalyzer::Spec::Helper
-  
   before(:each) do
     @tracker    = Class.new(RequestLogAnalyzer::Tracker::Base).new