request-log-analyzer 1.3.5 → 1.4.0

data/spec/unit/database/database_spec.rb

@@ -1,28 +1,28 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe RequestLogAnalyzer::Database do
-  
+
   describe '#load_database_schema!' do
-    
+
     context 'for a Rails request database' do
       before(:each) do
         @database = RequestLogAnalyzer::Database.new(log_fixture(:rails, :db))
         @database.load_database_schema!
       end
-    
+
       after(:each) { @database.remove_orm_classes! }
-    
+
       # 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
-    
+
       # Some Fileformat-specific classes
       ['CompletedLine', 'ProcessingLine'].each do |const|
         it "should create the #{const} constant" do
@@ -32,19 +32,19 @@ describe RequestLogAnalyzer::Database do
         it "should create the #{const} class inheriting from ActiveRecord::Base and RequestLogAnalyzer::Database::Base" do
           Object.const_get(const).ancestors.should include(ActiveRecord::Base, RequestLogAnalyzer::Database::Base)
         end
-      
+
         it "should create a :belongs_to relation from the #{const} class to Request and Source" do
           Object.const_get(const).send(:reflections).should include(:request, :source)
         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
   end
-  
+
   describe '#create_database_schema!' do
 
     before(:each) do
@@ -56,10 +56,11 @@ describe RequestLogAnalyzer::Database do
       @mock_class = Class.new(RequestLogAnalyzer::Database::Base)
       @mock_class.stub!(:create_table!)
     end
-    
+
     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,69 +68,63 @@ 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
 
     testing_format.line_definitions.each do |name, definition|
-      
+
       it "should create the #{(name.to_s + '_line').camelize} class for #{name.inspect} lines" do
         @database.send :create_database_schema!
         Object.const_defined?("#{name}_line".camelize).should be_true
       end
-      
+
       it "should create the #{name.to_s + '_lines'} table for the parsed #{name.inspect} lines" do
         @database.connection.should_receive(:create_table).with("#{name}_lines".to_sym)
         @database.send :create_database_schema!
       end
     end
   end
-  
+
   describe '#load_activerecord_class' do
-    
-    before(:each) do 
+
+    before(:each) do
       @database = RequestLogAnalyzer::Database.new
       @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)
-      
+
       RequestLogAnalyzer::Database::Base.stub!(:subclass_from_table).and_return(@mock_class)
       RequestLogAnalyzer::Database::Base.stub!(:subclass_from_line_definition).and_return(@mock_class)
     end
-    
+
     after(:each) { @database.remove_orm_classes! }
-    
+
     it "should call :subclass_from_table when a table name is given as string" do
       RequestLogAnalyzer::Database::Base.should_receive(:subclass_from_table).and_return(@mock_class)
       @database.load_activerecord_class('test_lines')
     end
-    
+
     it "should call :subclass_from_table when a table name is given as symbol" do
       RequestLogAnalyzer::Database::Base.should_receive(:subclass_from_table).and_return(@mock_class)
       @database.load_activerecord_class(:test_lines)
     end
-    
+
     it "should call :subclass_from_table when a LineDefinition is given" do
       RequestLogAnalyzer::Database::Base.should_receive(:subclass_from_line_definition).and_return(@mock_class)
       @database.load_activerecord_class(RequestLogAnalyzer::LineDefinition.new(:test))
-    end    
-    
+    end
+
     it "should define the class in the ORM module" do
       @database.load_activerecord_class(:test_lines)
       Object.const_defined?('TestLine').should be_true
     end
-    
+
     it "should add the class to the line_classes array of the database" do
       @database.load_activerecord_class(:test_lines)
       @database.line_classes.should include(TestLine)

data/spec/unit/file_format/amazon_s3_format_spec.rb

@@ -7,24 +7,24 @@ describe RequestLogAnalyzer::FileFormat::AmazonS3 do
     @log_parser  = RequestLogAnalyzer::Source::LogParser.new(@file_format)
     @sample = '2f88111968424e6306bf4d292c0188ccb94ff9374ea2836b50a1a79f7cd656e1 sample-bucket [06/Oct/2006:01:42:14 +0000] 207.171.172.6 65a011a29cdf8ec533ec3d1ccaae921c C980091AD89C936A REST.GET.OBJECT object.png "GET /sample-bucket/object.png HTTP/1.1" 200 - 1243 1243 988 987 "-" "aranhabot"'
   end
-  
+
   it "should be a valid file format" do
     @file_format.should be_valid
   end
-  
+
   it "should parse access lines and capture all of its fields" do
     @file_format.should have_line_definition(:access).capturing(:bucket_owner, :bucket, :timestamp, :remote_ip, :requester,
           :key, :operation, :total_time, :turnaround_time, :bytes_sent, :object_size, :referer, :user_agent)
   end
-  
+
   it "should match the sample line" do
     @file_format.parse_line(@sample).should include(:line_definition, :captures)
   end
-  
+
   it "should not match a nonsense line" do
     @file_format.parse_line('dsadasdas dsaadsads dsaadsads').should be_nil
   end
-  
+
   it "should parse and convert the sample fields correctly" do
     @log_parser.parse_io(StringIO.new(@sample)) do |request|
       request[:bucket_owner].should    == '2f88111968424e6306bf4d292c0188ccb94ff9374ea2836b50a1a79f7cd656e1'

data/spec/unit/file_format/apache_format_spec.rb

@@ -23,7 +23,7 @@ describe RequestLogAnalyzer::FileFormat::Apache do
     it "should make it a footer line" do
       @line_definition.should be_footer
     end
-    
+
     it "should capture :duration" do
       @line_definition.captures?(:duration).should be_true
     end
@@ -43,7 +43,7 @@ describe RequestLogAnalyzer::FileFormat::Apache do
     it "should be a valid file format" do
       @format.should be_valid
     end
-    
+
     it "should setup report trackers" do
       @format.report_trackers.should_not be_empty
     end
@@ -60,7 +60,7 @@ describe RequestLogAnalyzer::FileFormat::Apache do
     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
@@ -68,7 +68,7 @@ describe RequestLogAnalyzer::FileFormat::Apache do
     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 HTTP/1.0 access log line" do
       @log_parser.parse_io(StringIO.new(@sample_1)) do |request|
         request[:remote_host].should  == '1.129.119.13'
@@ -80,7 +80,7 @@ describe RequestLogAnalyzer::FileFormat::Apache do
         request[:user].should         == nil
       end
     end
-    
+
     it "should read the correct values from a valid 200 access log line" do
       @log_parser.parse_io(StringIO.new(@sample_2)) do |request|
         request[:remote_host].should  == '1.82.235.29'
@@ -91,7 +91,7 @@ describe RequestLogAnalyzer::FileFormat::Apache do
         request[:bytes_sent].should   == 23414
         request[:user].should         == nil
       end
-    end    
+    end
 
     it "should parse 10 request from fixture access log" do
       counter = mock('counter')
@@ -99,18 +99,18 @@ 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
@@ -136,7 +136,7 @@ describe RequestLogAnalyzer::FileFormat::Apache do
       end
     end
   end
- 
+
   context '"Combined" access log parsing' do
 
     before(:all) do
@@ -171,7 +171,7 @@ describe RequestLogAnalyzer::FileFormat::Apache do
         request[:user_agent].should   == 'Mozilla/4.0 (compatible; MSIE 6.0; Windows 98)'
       end
     end
-    
+
     it "should read the correct values from a valid 200 access log line" do
       @log_parser.parse_io(StringIO.new(@sample_2)) do |request|
         request[:remote_host].should  == '10.0.1.1'
@@ -184,8 +184,8 @@ describe RequestLogAnalyzer::FileFormat::Apache do
         request[:user].should         == nil
         request[:user_agent].should   == '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
-    end    
-  
+    end
+
     it "should parse 5 request from fixture access log" do
       counter = mock('counter')
       counter.should_receive(:hit!).exactly(5).times

data/spec/unit/file_format/file_format_api_spec.rb

@@ -3,43 +3,43 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 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 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 for the format definition" do
       @first_file_format.format_definition do |format|
         format.block_test :regexp => /test (\w+)/, :captures => [{:name => :tester, :type => :string}]
-      end 
-          
+      end
+
       @first_file_format.should have_line_definition(:block_test).capturing(:tester)
     end
-    
+
     it "should specify a line with a block" do
       @first_file_format.format_definition.hash_test do |line|
         line.regexp   = /test/
         line.captures = []
       end
-    
+
       @first_file_format.should have_line_definition(:hash_test)
     end
-  
+
     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_not have_line_definition(:first)
       @second_file_format.should     have_line_definition(:second)
-    end  
+    end
   end
 
   describe ".load" do
@@ -58,12 +58,12 @@ describe RequestLogAnalyzer::FileFormat 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
-  
+    
   end
 end

data/spec/unit/file_format/line_definition_spec.rb

@@ -9,20 +9,27 @@ describe RequestLogAnalyzer::LineDefinition do
       :captures => [{ :name => :what, :type => :string }, { :name => :tries, :type => :integer }]
     })
   end
-  
+
   describe '#matches' do
-  
+
     it "should return false on an unmatching line" do
-      @line_definition.should_not parse("nonmatching")
+      @line_definition.matches("nonmatching").should be_false
     end
-  
+
     it "should return false when only the teaser matches" do
-      @line_definition.should_not parse("Testing LineDefinition")    
+      @line_definition.matches("Testing LineDefinition").should be_false
     end
-  
+
     it "should parse a line and capture the expected values" do
-      @line_definition.should parse("Testing LineDefinition, tries: 123").capturing('LineDefinition', '123')
+      @line_definition.matches("Testing LineDefinition, tries: 123").should == {:line_definition => @line_definition, :captures => ['LineDefinition', '123'] }
+    end
+
+    it "should know which names it can capture" do
+      @line_definition.captures?(:what).should be_true
+      @line_definition.captures?(:tries).should be_true
+      @line_definition.captures?(:bogus).should be_false
     end
+    
   end
 
   describe '#convert_captured_values' do
@@ -31,38 +38,38 @@ describe RequestLogAnalyzer::LineDefinition 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\: (\{.+\})/, 
+        @ld = RequestLogAnalyzer::LineDefinition.new(:test, :regexp   => /Hash\: (\{.+\})/,
             :captures => [{ :name => :hash, :type => :hash, :provides => {:bar => :string}}])
-            
+
         @request = mock('request')
 
         @request.stub!(:convert_value).with("{:bar=>'baz'}", anything).and_return(:bar => 'baz')
         @request.stub!(:convert_value).with('baz', anything).and_return('foo')
-      end   
-      
+      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
-    
+
   end
 end

data/spec/unit/file_format/merb_format_spec.rb

@@ -1,56 +1,52 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe RequestLogAnalyzer::FileFormat::Merb do
-  
-  before(:each) do
-    @log_parser = RequestLogAnalyzer::Source::LogParser.new(RequestLogAnalyzer::FileFormat.load(:merb))
-  end
-  
-  it "should have a valid language definitions" do
-    @log_parser.file_format.should be_valid
-  end
-  
-  it "should parse a stream and find valid requests" do
-    File.open(log_fixture(:merb), 'r') do |io|
-      @log_parser.parse_io(io) do |request| 
-        request.should be_kind_of(RequestLogAnalyzer::Request)
-      end
-    end
-  end
 
-  it "should find 11 completed requests" do
-    @log_parser.should_receive(:handle_request).exactly(11).times
-    @log_parser.parse_file(log_fixture(:merb))
+  it "should be a valid file format" do
+    RequestLogAnalyzer::FileFormat.load(:merb).should be_valid
   end
-  
-  it "should parse all details from the first request correctly" do
-    request = nil
-    @log_parser.parse_file(log_fixture(:merb)) { |found_request| request ||= found_request }
+
+  describe '#parse_line' do
+    before(:each) do
+      @file_format = RequestLogAnalyzer::FileFormat.load(:merb)
+    end
     
-    request.should be_completed
-    request[:controller].should == 'session'
-    request[:action].should == 'destroy'    
-    request[:method].should == 'delete'
-    request[:params].should be_kind_of(Hash)      
-    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
-    request[:action_time].should == 0.241652
+    it "should parse a :started line correctly" do
+      line = '~ Started request handling: Fri Aug 29 11:10:23 +0200 2008'
+      @file_format.should parse_line(line).as(:started).and_capture(:timestamp => 20080829111023)
+    end
 
+    it "should parse a prefixed :started line correctly" do
+      line = '~ Aug 31 18:35:24 typekit-web001 merb:  ~ Started request handling: Mon Aug 31 18:35:25 +0000 2009'
+      @file_format.should parse_line(line).as(:started).and_capture(:timestamp => 20090831183525)
+    end
+
+    it "should parse a :params line correctly" do
+      line = '~ Params: {"_method"=>"delete", "authenticity_token"=>"[FILTERED]", "action"=>"delete", "controller"=>"session"}'
+      @file_format.should parse_line(line).as(:params).and_capture(:controller => 'session', :action => 'delete', :namespace => nil)
+    end
+
+    it "should parse a :completed line correctly" do
+      line = '~ {:dispatch_time=>0.006117, :after_filters_time=>6.1e-05, :before_filters_time=>0.000712, :action_time=>0.005833}'
+      @file_format.should parse_line(line).as(:completed).and_capture(:dispatch_time => 0.006117, 
+        :before_filters_time => 0.000712, :action_time => 0.005833, :after_filters_time => 6.1e-05)
+    end
   end
+
+  describe '#parse_io' do
+    before(:each) do
+      @log_parser = RequestLogAnalyzer::Source::LogParser.new(RequestLogAnalyzer::FileFormat.load(:merb))
+    end
+
+    it "should parse a stream and find valid Merb requests" do
+      @log_parser.parse_file(log_fixture(:merb)) do |request|
+        request.should be_kind_of(RequestLogAnalyzer::FileFormat::Merb::Request)
+      end
+    end
   
-  it "should parse a prefixed Merb file correctly" do
-    request = nil
-    @log_parser.parse_file(log_fixture(:merb_prefixed)) { |found_request| request ||= found_request }
-    
-    request.should be_completed
-    request[:timestamp].should == 20090831183525
-    request[:controller].should == 'home'
-    request[:action].should == 'index'
-    request[:dispatch_time].should == 0.012001
-    request[:after_filters_time].should == 0.0
-    request[:before_filters_time].should == 0.0
-    request[:action_time].should == 0.012001
+    it "should find 11 completed requests" do
+      @log_parser.should_receive(:handle_request).exactly(11).times
+      @log_parser.parse_file(log_fixture(:merb))
+    end
   end
 end