request-log-analyzer 1.2.1 → 1.2.3

data/spec/unit/aggregator/summarizer_spec.rb

@@ -1,8 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe RequestLogAnalyzer::Aggregator::Summarizer do
-  
-  include RequestLogAnalyzer::Spec::Helper
 
   before(:each) do
     @summarizer = RequestLogAnalyzer::Aggregator::Summarizer.new(mock_source, :output => mock_output)

data/spec/unit/controller/controller_spec.rb

@@ -2,8 +2,6 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe RequestLogAnalyzer::Controller do
 
-  include RequestLogAnalyzer::Spec::Helper
-
   it "should use a custom output generator correctly" do
     
     mock_output = mock('RequestLogAnalyzer::Output::Base')

data/spec/unit/controller/log_processor_spec.rb

@@ -4,8 +4,6 @@ require 'request_log_analyzer/log_processor'
 
 describe RequestLogAnalyzer::LogProcessor, 'stripping log files' do
 
-  include RequestLogAnalyzer::Spec::Helper
-  
   before(:each) do
     @log_stripper = RequestLogAnalyzer::LogProcessor.new(testing_format, :strip, {})
   end

data/spec/unit/file_format/file_format_api_spec.rb

@@ -1,90 +1,69 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
-describe RequestLogAnalyzer::FileFormat, :format_definition do
+describe RequestLogAnalyzer::FileFormat do
+
+  describe ".format_definition" do
   
-  before(:each) do
-    @first_file_format = Class.new(RequestLogAnalyzer::FileFormat::Base)
-    @second_file_format = Class.new(RequestLogAnalyzer::FileFormat::Base)
-  end
-    
-  it "should specify lines with a hash" do
-    
-    @first_file_format.new.should have(0).line_definitions
-        
-    @first_file_format.format_definition do |line|
-      line.hash_test :regexp => /test/, :captures => []
+    before(:each) do
+      @first_file_format  = Class.new(RequestLogAnalyzer::FileFormat::Base)
+      @second_file_format = Class.new(RequestLogAnalyzer::FileFormat::Base)
     end
     
-    @format_instance = @first_file_format.new
-    @format_instance.should have(1).line_definitions
-    @format_instance.line_definitions[:hash_test].should_not be_nil
-  end
-  
-  it "should specift lines directly" do
-    @first_file_format.new.should have(0).line_definitions    
-    
-    @first_file_format.format_definition.direct_test do |line|
-      line.regexp   = /test/
-    end 
-    
-    @first_file_format.new.line_definitions[:direct_test].should_not be_nil
-  end
+    it "should specify line definitions directly within the file_format" do
+      @first_file_format.format_definition.direct_test :regexp => /test/
+      @first_file_format.should have_line_definition(:direct_test)
+    end
  
-  it "specify lines with a block" do
-    
-    @first_file_format.new.should have(0).line_definitions    
+    it "specify lines with a block for the format definition" do
+      @first_file_format.format_definition do |format|
+        format.block_test :regexp => /test (\w+)/, :captures => [:tester]
+      end 
+          
+      @first_file_format.should have_line_definition(:block_test).capturing(:tester)
+    end
     
-    @first_file_format.format_definition do |format|
-      format.block_test do |line|
+    it "should specify a line with a block" do
+      @first_file_format.format_definition.hash_test do |line|
         line.regexp   = /test/
         line.captures = []
       end
-    end 
-    
-    @first_file_format.new.line_definitions[:block_test].should_not be_nil
-  end
-  
-  it "should define lines only for itself" do
     
-    @first_file_format.format_definition do |line|
-      line.first_test :regexp => /test/, :captures => []
+      @first_file_format.should have_line_definition(:hash_test)
     end
-    
-
-    @second_file_format.format_definition do |line|
-      line.second_test :regexp => /test/, :captures => []
-    end
-
-    @first_file_format.line_definer.should_not eql(@second_file_format.line_definer)
-    @first_file_format.new.should have(1).line_definitions    
-    @second_file_format.new.line_definitions[:second_test].should_not be_nil
-  end  
-end
-
-describe RequestLogAnalyzer::FileFormat, :load do
-
-  include RequestLogAnalyzer::Spec::Helper
-
-  it "should return an instance of a FileFormat class" do
-    @file_format = RequestLogAnalyzer::FileFormat.load(TestingFormat)
-    @file_format.should be_kind_of(TestingFormat)
+  
+    it "should define lines only for its own language" do
+      @first_file_format.format_definition.first   :regexp => /test 123/
+      @second_file_format.format_definition.second :regexp => /test 456/
+ 
+      @first_file_format.should      have_line_definition(:first)
+      @first_file_format.should_not  have_line_definition(:second)
+      @second_file_format.should_not have_line_definition(:first)      
+      @second_file_format.should     have_line_definition(:second)
+    end  
   end
 
+  describe ".load" do
 
-  it "should return itself if it already is a FileFormat::Base instance" do
-    @file_format = RequestLogAnalyzer::FileFormat.load(testing_format)
-    @file_format.should be_kind_of(TestingFormat)
-  end
+    it "should return an instance of a FileFormat class" do
+      @file_format = RequestLogAnalyzer::FileFormat.load(TestingFormat)
+      @file_format.should be_kind_of(TestingFormat)
+    end
 
-  it "should load a predefined file format from the /file_format dir" do
-    @file_format = RequestLogAnalyzer::FileFormat.load(:rails)
-    @file_format.should be_kind_of(RequestLogAnalyzer::FileFormat::Rails)
-  end
+    it "should return itself if it already is a FileFormat::Base instance" do
+      @file_format = RequestLogAnalyzer::FileFormat.load(testing_format)
+      @file_format.should be_kind_of(TestingFormat)
+    end
+
+    it "should load a predefined file format from the /file_format dir" do
+      @file_format = RequestLogAnalyzer::FileFormat.load(:rails)
+      @file_format.should be_kind_of(RequestLogAnalyzer::FileFormat::Rails)
+    end
   
-  it "should load a provided format file" do
-    format_filename = File.dirname(__FILE__) + '/../../lib/testing_format.rb'
-    @file_format = RequestLogAnalyzer::FileFormat.load(format_filename)
-    @file_format.should be_kind_of(TestingFormat)
-  end
+    it "should load a provided format file" do
+      format_filename = File.dirname(__FILE__) + '/../../lib/testing_format.rb'
+      @file_format = RequestLogAnalyzer::FileFormat.load(format_filename)
+      @file_format.should be_kind_of(TestingFormat)
+    end
   
+  end
 end

data/spec/unit/file_format/line_definition_spec.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
-describe RequestLogAnalyzer::LineDefinition, :parsing do
-  
+describe RequestLogAnalyzer::LineDefinition do
+
   before(:each) do
     @line_definition = RequestLogAnalyzer::LineDefinition.new(:test, {
       :teaser   => /Testing /,
@@ -10,55 +10,59 @@ describe RequestLogAnalyzer::LineDefinition, :parsing do
     })
   end
   
-  it "should return false on an unmatching line" do
-    (@line_definition =~ "nonmatching").should be_false
-  end
-  
-  it "should return false when only the teaser matches" do
-    (@line_definition =~ "Testing LineDefinition").should be_false  
-  end
+  describe '#matches' do
   
-  it "should return a hash if the line matches" do
-    (@line_definition =~ "Testing LineDefinition, tries: 123").should be_kind_of(Hash)
-  end
+    it "should return false on an unmatching line" do
+      @line_definition.should_not parse("nonmatching")
+    end
   
-  it "should return a hash with :captures set to an array" do
-    hash = @line_definition.matches("Testing LineDefinition, tries: 123")
-    hash[:captures][0].should == "LineDefinition"
-    hash[:captures][1].should == "123"
-  end
+    it "should return false when only the teaser matches" do
+      @line_definition.should_not parse("Testing LineDefinition")    
+    end
   
-  it "should return a hash with :line_definition set" do
-    @line_definition.matches("Testing LineDefinition, tries: 123")[:line_definition].should == @line_definition
+    it "should parse a line and capture the expected values" do
+      @line_definition.should parse("Testing LineDefinition, tries: 123").capturing('LineDefinition', '123')
+    end
   end
-end
 
-describe RequestLogAnalyzer::LineDefinition, :converting do
+  describe '#convert_captured_values' do
 
-  include RequestLogAnalyzer::Spec::Helper
-  
-  before(:each) do
-    @file_format = testing_format
-    @request = @file_format.request
-  end
-  
-  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
+    before(:each) do
+      @request = mock('request')
+      @request.stub!(:convert_value).and_return('foo')
+    end
+    
+    it "should call convert_value for every captured value" do
+      @request.should_receive(:convert_value).twice
+      @line_definition.convert_captured_values(['test', '123'], @request)
+    end
+    
+    it "should set the converted values" do
+      @line_definition.convert_captured_values(['test', '123'], @request).should == {:what => 'foo', :tries => 'foo'}
+    end
+    
+    context 'when using :provides option' do
+      before(:each) do
+        @ld = RequestLogAnalyzer::LineDefinition.new(:test, :regexp   => /Hash\: (\{.+\})/, 
+            :captures => [{ :name => :hash, :type => :hash, :provides => {:bar => :string}}])
+            
+        @request = mock('request')
 
-  it "should convert captures to a hash" do
-    hash = @file_format.line_definitions[:test].convert_captured_values(["great", nil], @request)
-    hash[:test_capture].should == 'Testing is great'
-    hash[:duration].should be_nil
+        @request.stub!(:convert_value).with("{:bar=>'baz'}", anything).and_return(:bar => 'baz')
+        @request.stub!(:convert_value).with('baz', anything).and_return('foo')
+      end   
+      
+      it "should call Request#convert_value for the initial hash and the value in the hash" do
+        @request.should_receive(:convert_value).with("{:bar=>'baz'}", anything).and_return(:bar => 'baz')
+        @request.should_receive(:convert_value).with("baz", anything)
+        @ld.convert_captured_values(["{:bar=>'baz'}"], @request)
+      end
+      
+      it "should set the provides fields" do
+        # The captures field must be set and converted as well
+        @ld.convert_captured_values(["{:bar=>'baz'}"], @request)[:bar].should eql('foo')
+      end      
+    end
+    
   end
-  
-  it "should merge a hash capture into the line hash" do
-    hash = @file_format.line_definitions[:eval].convert_captured_values(["{ 'greating' => 'hello', 'what' => 'world'}"], @request)
-    hash[:evaluated].should == { :greating => "hello", :what => "world"}
-    hash[:greating].should == 'hello'
-    hash[:what].should == 'world'    
-  end  
-
-  
 end

data/spec/unit/file_format/merb_format_spec.rb

@@ -1,7 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe RequestLogAnalyzer::Source::LogParser, :merb do
-  include RequestLogAnalyzer::Spec::Helper
   
   before(:each) do
     @log_parser = RequestLogAnalyzer::Source::LogParser.new(RequestLogAnalyzer::FileFormat.load(:merb))

data/spec/unit/file_format/rails_format_spec.rb

@@ -1,7 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe RequestLogAnalyzer::Source::LogParser, "Rails" do
-  include RequestLogAnalyzer::Spec::Helper
   
   before(:each) do
     @log_parser = RequestLogAnalyzer::Source::LogParser.new(
@@ -79,7 +78,6 @@ describe RequestLogAnalyzer::Source::LogParser, "Rails" do
 end
 
 describe RequestLogAnalyzer::FileFormat::RailsDevelopment, "Rails with development details" do
-  include RequestLogAnalyzer::Spec::Helper
   
   before(:each) do
     @file_format = RequestLogAnalyzer::FileFormat.load(:rails_development)

data/spec/unit/filter/anonymize_filter_spec.rb

@@ -1,7 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe RequestLogAnalyzer::Filter::Anonymize, 'anonymize request' do
-  include RequestLogAnalyzer::Spec::Helper
 
   before(:each) do
     @filter = RequestLogAnalyzer::Filter::Anonymize.new(testing_format)

data/spec/unit/filter/field_filter_spec.rb

@@ -1,7 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe RequestLogAnalyzer::Filter::Field, 'string in accept mode' do
-  include RequestLogAnalyzer::Spec::Helper
 
   before(:each) do
     @filter = RequestLogAnalyzer::Filter::Field.new(testing_format, :field => :test, :value => 'test', :mode => :select)
@@ -25,7 +24,6 @@ describe RequestLogAnalyzer::Filter::Field, 'string in accept mode' do
 end
 
 describe RequestLogAnalyzer::Filter::Field, 'string in reject mode' do
-  include RequestLogAnalyzer::Spec::Helper
 
   before(:each) do
     @filter = RequestLogAnalyzer::Filter::Field.new(testing_format, :field => :test, :value => 'test', :mode => :reject)
@@ -49,7 +47,6 @@ describe RequestLogAnalyzer::Filter::Field, 'string in reject mode' do
 end
 
 describe RequestLogAnalyzer::Filter::Field, 'regexp in accept mode' do
-  include RequestLogAnalyzer::Spec::Helper
 
   before(:each) do
     @filter = RequestLogAnalyzer::Filter::Field.new(testing_format, :field => :test, :value => '/test/', :mode => :select)

data/spec/unit/filter/filter_spec.rb

@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe RequestLogAnalyzer::Filter::Base, 'base filter' do
+
+  before(:each) do
+    @filter = RequestLogAnalyzer::Filter::Base.new(testing_format)
+  end
+  
+  it "should return everything" do
+    @filter.filter(request(:ip => '123.123.123.123'))[:ip].should eql('123.123.123.123')
+  end
+
+  it "should return nil on nil request" do
+    @filter.filter(nil).should be_nil
+  end
+
+end

data/spec/unit/filter/timespan_filter_spec.rb

@@ -1,7 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe RequestLogAnalyzer::Filter::Timespan, 'both before and after'  do
-  include RequestLogAnalyzer::Spec::Helper
 
   before(:each) do
     @filter = RequestLogAnalyzer::Filter::Timespan.new(testing_format, :after => DateTime.parse('2009-01-01'), :before => DateTime.parse('2009-02-02'))
@@ -21,7 +20,6 @@ describe RequestLogAnalyzer::Filter::Timespan, 'both before and after'  do
 end
 
 describe RequestLogAnalyzer::Filter::Timespan, 'only before'  do
-  include RequestLogAnalyzer::Spec::Helper
   
   before(:each) do
     @filter = RequestLogAnalyzer::Filter::Timespan.new(testing_format, :before => DateTime.parse('2009-02-02'))    
@@ -41,7 +39,6 @@ describe RequestLogAnalyzer::Filter::Timespan, 'only before'  do
 end
 
 describe RequestLogAnalyzer::Filter::Timespan, 'only after'  do  
-  include RequestLogAnalyzer::Spec::Helper 
   
   before(:each) do
     @filter = RequestLogAnalyzer::Filter::Timespan.new(testing_format, :after => DateTime.parse('2009-01-01'))

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

@@ -2,8 +2,6 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe RequestLogAnalyzer::Request, :incomplete_request do
   
-  include RequestLogAnalyzer::Spec::Helper
-  
   before(:each) do
     @incomplete_request = testing_format.request
     @incomplete_request << { :line_type => :test, :lineno => 1, :test_capture => 'awesome!' }
@@ -34,8 +32,6 @@ end
 
 describe RequestLogAnalyzer::Request, :completed_request do
   
-  include RequestLogAnalyzer::Spec::Helper
-  
   before(:each) do
     @completed_request = testing_format.request
     @completed_request << { :line_type => :first, :lineno =>  1, :name => 'first line!' }    
@@ -69,4 +65,21 @@ describe RequestLogAnalyzer::Request, :completed_request do
     @completed_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
+    @completed_request.first_lineno.should eql(1)
+  end
+
+  it "should set the last_lineno for a request to the highest encountered lineno" do
+    @completed_request.last_lineno.should eql(10)
+  end
+
+  it "should not have a timestamp if no such field is captured" do
+    @completed_request.timestamp.should be_nil
+  end
+
+  it "should set return a timestamp field if such a field is captured" do
+    @completed_request << { :line_type => :first, :lineno =>  1, :name => 'first line!', :timestamp => Time.now}    
+    @completed_request.timestamp.should_not be_nil
+  end
+  
 end