request-log-analyzer 1.3.4 → 1.4.0

data/spec/integration/command_line_usage_spec.rb

@@ -15,6 +15,12 @@ describe RequestLogAnalyzer, 'running from command line' do
     output.any? { |line| /^Parsed requests\:\s*4\s/ =~ line }.should be_true
   end
 
+  it "should find 2 requests when parsing a compressed file" do
+    output = run("#{log_fixture(:decompression, :tgz)}")
+    output.any? { |line| /^Parsed requests\:\s*2\s/ =~ line }.should be_true
+  end
+
+
   it "should skip 1 requests with a --select option" do
     output = run("#{log_fixture(:rails_1x)} --select controller PeopleController")
     output.any? { |line| /^Skipped requests\:\s*1\s/ =~ line }.should be_true
@@ -70,7 +76,7 @@ describe RequestLogAnalyzer, 'running from command line' do
     File.exist?(temp_output_file(:dump)).should be_true
     YAML::load(File.read(temp_output_file(:dump))).should have_at_least(1).item
   end
-  
+
   it "should parse 4 requests from the standard input" do
     output = run("- < #{log_fixture(:rails_1x)}")
     output.any? { |line| /^Parsed requests\:\s*4\s/ =~ line }.should be_true

data/spec/lib/helpers.rb

@@ -1,10 +1,10 @@
 module RequestLogAnalyzer::Spec::Helpers
-  
+
   # Create or return a new TestingFormat
   def testing_format
     @testing_format ||= TestingFormat.create
   end
-  
+
   # Load a log file from the fixture folder
   def log_fixture(name, extention = "log")
     File.dirname(__FILE__) + "/../fixtures/#{name}.#{extention}"
@@ -15,7 +15,7 @@ module RequestLogAnalyzer::Spec::Helpers
     if fields.kind_of?(Array)
       format.request(*fields)
     else
-      format.request(fields)      
+      format.request(fields)
     end
   end
 
@@ -24,7 +24,7 @@ module RequestLogAnalyzer::Spec::Helpers
   def run(arguments)
     binary = "#{File.dirname(__FILE__)}/../../bin/request-log-analyzer"
     arguments = arguments.join(' ') if arguments.kind_of?(Array)
-    
+
     output = []
     IO.popen("#{binary} #{arguments}") do |pipe|
       output = pipe.readlines
@@ -32,16 +32,16 @@ module RequestLogAnalyzer::Spec::Helpers
     $?.exitstatus.should == 0
     output
   end
-  
+
   # Cleanup all temporary files generated by specs
   def cleanup_temp_files!
     Dir["#{File.dirname(__FILE__)}/../../tmp/spec.*tmp"].each do |file|
       File.unlink(file)
     end
   end
-  
+
   # Return a filename that can be used as temporary file in specs
   def temp_output_file(file_type)
-    "#{File.dirname(__FILE__)}/../../tmp/spec.#{file_type}.tmp"    
+    "#{File.dirname(__FILE__)}/../../tmp/spec.#{file_type}.tmp"
   end
 end

data/spec/lib/macros.rb

@@ -1,16 +1,16 @@
 module RequestLogAnalyzer::Spec::Macros
-  
+
   def test_databases
     require 'yaml'
     hash = YAML.load(File.read("#{File.dirname(__FILE__)}/../database.yml"))
     hash.inject({}) { |res, (name, h)| res[name] = h.map { |(k,v)| "#{k}=#{v}" }.join(';'); res  }
   end
-  
+
   # Create or return a new TestingFormat
   def testing_format
     @testing_format ||= TestingFormat.create
   end
-  
+
   def default_orm_class_names
     ['Warning', 'Request', 'Source']
   end

data/spec/lib/matchers.rb

@@ -1,17 +1,17 @@
 module RequestLogAnalyzer::Spec::Matchers
-  
+
   class HasLineDefinition
-    
+
     def initialize(line_type)
       @line_type = line_type.to_sym
       @captures  = []
     end
-      
+
     def capturing(*captures)
       @captures += captures
       return self
     end
-    
+
     def matches?(file_format)
       file_format = file_format.create if file_format.kind_of?(Class)
       if ld = file_format.line_definitions[@line_type]
@@ -21,43 +21,57 @@ module RequestLogAnalyzer::Spec::Matchers
       end
     end
   end
-  
-  class Parse
+
+  class ParseLine
+    
     def initialize(line)
-      @line     = line
-      @captures = nil
+      @line      = line
+      @captures  = {}
+      @line_type = nil
     end
-    
+
     def failure_message
-      message = "expected to parse the provided line"
-      if @found_captures
-        message << "with captures #{@captures.inspect}, but captured #{@found_captures.inspect}"
-      end
-      return message
+      @failure_message
+    end
+
+    def as(line_type)
+      @line_type = line_type
+      return self
     end
     
-    def capturing(*captures)
+    def and_capture(captures)
       @captures = captures
       return self
     end
-    
-    def matches?(line_definition)
-      hash = line_definition.matches(@line)
-      if hash
-        @found_captures = hash[:captures].to_a
-        @captures.nil? ? true : @found_captures.eql?(@captures)
+
+    def fail(message)
+      @failure_message = message
+      return false
+    end
+
+    def matches?(file_format)
+      if @line_hash = file_format.parse_line(@line)
+        if @line_type.nil? || @line_hash[:line_definition].name == @line_type
+          @request   = file_format.request(@line_hash)
+          @captures.each do |key, value|
+            return fail("Expected line #{@line.inspect}\n    to capture #{key.inspect} as #{value.inspect} but was #{@request[key].inspect}.") if @request[key] != value
+          end
+          return true
+        else
+          return fail("The line should match the #{@line_type.inspect} line definition, but matched #{@line_hash[:line_definition].name.inspect} instead.")
+        end
       else
-        return false
+        return fail("The line did not match any line definition.")
       end
     end
   end
-  
+
   def have_line_definition(line_type)
     return HasLineDefinition.new(line_type)
   end
-  
-  def parse(line)
-    Parse.new(line)
+
+  def parse_line(line)
+    ParseLine.new(line)
   end
-  
+
 end

data/spec/lib/mocks.rb

@@ -1,49 +1,53 @@
 module RequestLogAnalyzer::Spec::Mocks
-  
+
   def mock_source
     source = mock('RequestLogAnalyzer::Source::Base')
     source.stub!(:file_format).and_return(testing_format)
     source.stub!(:parsed_requests).and_return(2)
-    source.stub!(:skipped_requests).and_return(1)    
+    source.stub!(:skipped_requests).and_return(1)
     source.stub!(:parse_lines).and_return(10)
-    
+
     source.stub!(:warning=)
     source.stub!(:progress=)
     source.stub!(:source_changes=)
 
     source.stub!(:prepare)
     source.stub!(:finalize)
-        
+
     source.stub!(:each_request).and_return do |block|
       block.call(testing_format.request(:field => 'value1'))
       block.call(testing_format.request(:field => 'value2'))
     end
-    
+
     return source
   end
 
   def mock_io
     mio = mock('IO')
     mio.stub!(:print)
-    mio.stub!(:puts)    
+    mio.stub!(:puts)
     mio.stub!(:write)
     return mio
   end
-  
+
   def mock_output
     output = mock('RequestLogAnalyzer::Output::Base')
     output.stub!(:header)
-    output.stub!(:footer)   
+    output.stub!(:footer)
     output.stub!(:puts)
-    output.stub!(:<<)    
+    output.stub!(:<<)
+    output.stub!(:colorize).and_return("Fancy text")
+    output.stub!(:link)
     output.stub!(:title)
     output.stub!(:line)
-    output.stub!(:with_style)    
+    output.stub!(:with_style)
     output.stub!(:table).and_yield([])
     output.stub!(:io).and_return(mock_io)
+    output.stub!(:options).and_return({})
+    output.stub!(:slice_results).and_return { |a| a } 
     return output
   end
-  
+
   def mock_database(*stubs)
     database = mock('RequestLogAnalyzer::Database')
     database.stub!(:connect)
@@ -52,11 +56,11 @@ module RequestLogAnalyzer::Spec::Mocks
     stubs.each { |s| database.stub!(s)}
     return database
   end
-  
+
   def mock_connection
     table_creator = mock('ActiveRecord table creator')
     table_creator.stub!(:column)
-    
+
     connection = mock('ActiveRecord::Base.connection')
     connection.stub!(:add_index)
     connection.stub!(:remove_index)
@@ -65,6 +69,6 @@ module RequestLogAnalyzer::Spec::Mocks
     connection.stub!(:table_creator).and_return(table_creator)
     return connection
   end
-  
-  
+
+
 end

data/spec/lib/testing_format.rb

@@ -5,42 +5,42 @@ class TestingFormat < RequestLogAnalyzer::FileFormat::Base
     line.header = true
     line.teaser = /processing /
     line.regexp = /processing request (\d+)/
-    line.captures = [{ :name => :request_no, :type => :integer }]    
+    line.captures = [{ :name => :request_no, :type => :integer }]
   end
-  
+
   format_definition.test do |line|
     line.teaser = /testing /
     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.eval do |line|
     line.regexp = /evaluation (\{.*\})/
     line.captures = [{ :name => :evaluated, :type => :eval, :provides => { :greating => :string, :what => :string } }]
-  end 
-  
+  end
+
   format_definition.last do |line|
     line.footer = true
     line.teaser = /finishing /
     line.regexp = /finishing request (\d+)/
     line.captures = [{ :name => :request_no, :type => :integer }]
   end
-  
+
   format_definition.combined do |line|
     line.header = true
     line.footer = true
     line.regexp = /this is a header and footer line/
   end
-  
+
   report do |analyze|
     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/spec_helper.rb

@@ -9,16 +9,16 @@ module RequestLogAnalyzer::Spec
 end
 
 # Include all files in the spec_helper directory
-Dir[File.dirname(__FILE__) + "/lib/**/*.rb"].each do |file| 
-  require file 
+Dir[File.dirname(__FILE__) + "/lib/**/*.rb"].each do |file|
+  require file
 end
 
 Dir.mkdir("#{File.dirname(__FILE__)}/../tmp") unless File.exist?("#{File.dirname(__FILE__)}/../tmp")
 
 Spec::Runner.configure do |config|
-  config.include RequestLogAnalyzer::Spec::Matchers  
+  config.include RequestLogAnalyzer::Spec::Matchers
   config.include RequestLogAnalyzer::Spec::Mocks
-  config.include RequestLogAnalyzer::Spec::Helpers  
-  
-  config.extend RequestLogAnalyzer::Spec::Macros  
+  config.include RequestLogAnalyzer::Spec::Helpers
+
+  config.extend RequestLogAnalyzer::Spec::Macros
 end

data/spec/unit/aggregator/database_inserter_spec.rb

@@ -5,27 +5,27 @@ describe RequestLogAnalyzer::Aggregator::DatabaseInserter do
   before(:all) do
     @log_parser = RequestLogAnalyzer::Source::LogParser.new(testing_format)
   end
-  
+
   # The prepare method is called before the parsing starts. It should establish a connection
   # to a database that is suitable for inserting requests later on.
   describe '#prepare' do
-  
+
     before(:each) do
       @database = mock_database(:create_database_schema!, :drop_database_schema!, :file_format=)
       @database_inserter = RequestLogAnalyzer::Aggregator::DatabaseInserter.new(@log_parser)
       RequestLogAnalyzer::Database.stub!(:new).and_return(@database)
     end
-  
+
     it 'should establish the database connection' do
       RequestLogAnalyzer::Database.should_receive(:new).and_return(@database)
       @database_inserter.prepare
     end
-    
+
     it "should set the file_format" do
       @database.should_receive(:file_format=).with(testing_format)
       @database_inserter.prepare
     end
-  
+
     it 'should create the database schema during preparation' do
       @database.should_receive(:create_database_schema!)
       @database_inserter.prepare
@@ -52,32 +52,32 @@ describe RequestLogAnalyzer::Aggregator::DatabaseInserter do
         @database_inserter.prepare
 
         @incomplete_request = testing_format.request( {:line_type => :first, :request_no => 564})
-        @completed_request  = testing_format.request( {:line_type => :first, :request_no => 564}, 
+        @completed_request  = testing_format.request( {:line_type => :first, :request_no => 564},
                               {:line_type => :test, :test_capture => "awesome"},
-                              {:line_type => :test, :test_capture => "indeed"}, 
-                              {:line_type => :eval, :evaluated => { :greating => 'howdy'}, :greating => 'howdy' }, 
+                              {:line_type => :test, :test_capture => "indeed"},
+                              {:line_type => :eval, :evaluated => { :greating => 'howdy'}, :greating => 'howdy' },
                               {:line_type => :last, :request_no   => 564})
       end
-      
+
       after(:each) do
         @database_inserter.database.send :remove_orm_classes!
       end
 
       it "should insert a record in the request table" do
-        lambda { 
+        lambda {
           @database_inserter.aggregate(@incomplete_request)
-        }.should change(@database_inserter.database.request_class, :count).from(0).to(1)
+        }.should change(RequestLogAnalyzer::Database::Request, :count).from(0).to(1)
       end
-      
+
       it "should insert a record in the first_lines table" do
-        lambda { 
+        lambda {
           @database_inserter.aggregate(@incomplete_request)
         }.should change(@database_inserter.database.get_class(:first), :count).from(0).to(1)
-      end      
+      end
 
       it "should insert records in all relevant line tables" do
         @database_inserter.aggregate(@completed_request)
-        request = @database_inserter.database.request_class.first
+        request = RequestLogAnalyzer::Database::Request.first
         request.should have(2).test_lines
         request.should have(1).first_lines
         request.should have(1).eval_lines
@@ -85,7 +85,7 @@ describe RequestLogAnalyzer::Aggregator::DatabaseInserter do
       end
 
       it "should log a warning in the warnings table" do
-        @database_inserter.database.warning_class.should_receive(:create!).with(hash_including(:warning_type => 'test_warning'))
+        RequestLogAnalyzer::Database::Warning.should_receive(:create!).with(hash_including(:warning_type => 'test_warning'))
         @database_inserter.warning(:test_warning, "Testing the warning system", 12)
       end
     end

data/spec/unit/aggregator/summarizer_spec.rb

@@ -6,11 +6,11 @@ describe RequestLogAnalyzer::Aggregator::Summarizer do
     @summarizer = RequestLogAnalyzer::Aggregator::Summarizer.new(mock_source, :output => mock_output)
     @summarizer.prepare
   end
-  
+
   it "not raise exception when creating a report after aggregating multiple requests" do
     @summarizer.aggregate(request(:data => 'bluh1'))
-    @summarizer.aggregate(request(:data => 'bluh2'))    
-    
+    @summarizer.aggregate(request(:data => 'bluh2'))
+
     lambda { @summarizer.report(mock_output) }.should_not raise_error
   end
 
@@ -22,5 +22,5 @@ describe RequestLogAnalyzer::Aggregator::Summarizer do
   it "not raise exception when creating a report after aggregating no requests" do
     lambda { @summarizer.report(mock_output) }.should_not raise_error
   end
-  
+
 end

data/spec/unit/controller/controller_spec.rb

@@ -17,7 +17,7 @@ describe RequestLogAnalyzer::Controller do
   it "should call aggregators correctly when run" do
     controller  = RequestLogAnalyzer::Controller.new(mock_source, :output => mock_output)
     
-    mock_aggregator = mock('RequestLogAnalyzer::Aggregator::Base')
+    mock_aggregator = mock('RequestLogAnalyzer::Aggregator::Base') 
     mock_aggregator.should_receive(:prepare).once.ordered
     mock_aggregator.should_receive(:aggregate).with(an_instance_of(testing_format.request_class)).twice.ordered
     mock_aggregator.should_receive(:finalize).once.ordered
@@ -38,4 +38,4 @@ describe RequestLogAnalyzer::Controller do
     controller.run!
   end
   
-end
+end

data/spec/unit/controller/log_processor_spec.rb

@@ -7,7 +7,7 @@ describe RequestLogAnalyzer::LogProcessor, 'stripping log files' do
   before(:each) do
     @log_stripper = RequestLogAnalyzer::LogProcessor.new(testing_format, :strip, {})
   end
-  
+
   it "should remove a junk line" do
     @log_stripper.strip_line("junk line\n").should be_empty
   end

data/spec/unit/database/base_class_spec.rb

@@ -1,30 +1,27 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe RequestLogAnalyzer::Database::Base do
-  
+
   describe '.subclass_from_line_definition' do
     before(:all) do
       @line_definition = RequestLogAnalyzer::LineDefinition.new(:test, { :regexp   => /Testing (\w+), tries\: (\d+)/,
                           :captures => [{ :name => :what, :type => :string }, { :name => :tries, :type => :integer },
                             { :name => :evaluated, :type => :hash, :provides => {:evaluated_field => :duration} }]})
     end
-    
+
     before(:each) do
       @orm_class = mock('Line ActiveRecord::Base class')
       @orm_class.stub!(:set_table_name)
       @orm_class.stub!(:belongs_to)
       @orm_class.stub!(:serialize)
       @orm_class.stub!(:line_definition=)
+
       Class.stub!(:new).with(RequestLogAnalyzer::Database::Base).and_return(@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)      
-      
+
+      RequestLogAnalyzer::Database::Request.stub!(:has_many)
+      RequestLogAnalyzer::Database::Source.stub!(:has_many)
+
       @database = mock_database
-      @database.stub!(:request_class).and_return(@request_class)
-      @database.stub!(:source_class).and_return(@source_class)
       RequestLogAnalyzer::Database::Base.stub!(:database).and_return(@database)
     end
 
@@ -32,7 +29,7 @@ describe RequestLogAnalyzer::Database::Base do
       Class.should_receive(:new).with(RequestLogAnalyzer::Database::Base).and_return(@orm_class)
       RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition)
     end
-    
+
     it "should store the LineDefinition" do
       @orm_class.should_receive(:line_definition=).with(@line_definition)
       RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition)
@@ -49,12 +46,12 @@ describe RequestLogAnalyzer::Database::Base do
     end
 
     it "should set a :has_many relationship in the request class" do
-      @request_class.should_receive(:has_many).with(:test_lines)
+      RequestLogAnalyzer::Database::Request.should_receive(:has_many).with(:test_lines)
       RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition)
     end
 
     it "should set a :has_many relationship in the source class" do
-      @source_class.should_receive(:has_many).with(:test_lines)
+      RequestLogAnalyzer::Database::Source.should_receive(:has_many).with(:test_lines)
       RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition)
     end
 
@@ -72,30 +69,26 @@ describe RequestLogAnalyzer::Database::Base do
 
   describe '.subclass_from_table' do
     before(:each) do
-      
-      @request_class = mock('Request ActiveRecord::Base class')
-      @request_class.stub!(:has_many)
-      @source_class = mock('Source ActiveRecord::Base class')
-      @source_class.stub!(:has_many)      
-      
+
+      RequestLogAnalyzer::Database::Request.stub!(:has_many)
+      RequestLogAnalyzer::Database::Source.stub!(:has_many)
+
       @database = mock_database
-      @database.stub!(:request_class).and_return(@request_class)
-      @database.stub!(:source_class).and_return(@source_class)
       @database.connection.stub!(:table_exists?).and_return(true)
       RequestLogAnalyzer::Database::Base.stub!(:database).and_return(@database)
-      
+
       @klass = mock('ActiveRecord ORM class')
-      @klass.stub!(:column_names).and_return(['id', 'request_id', 'source_id', 'lineno', 'duration']) 
+      @klass.stub!(:column_names).and_return(['id', 'request_id', 'source_id', 'lineno', 'duration'])
       @klass.stub!(:set_table_name)
       @klass.stub!(:belongs_to)
       Class.stub!(:new).with(RequestLogAnalyzer::Database::Base).and_return(@klass)
     end
-    
+
     it "should create a new subclass using the Base class as parent" do
       Class.should_receive(:new).with(RequestLogAnalyzer::Database::Base).and_return(@klass)
       RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines')
-    end    
-    
+    end
+
     it "should set the table name" do
       @klass.should_receive(:set_table_name).with('completed_lines')
       RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines')
@@ -105,9 +98,9 @@ describe RequestLogAnalyzer::Database::Base do
       @klass.should_receive(:belongs_to).with(:request)
       RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines')
     end
-    
+
     it "should create the :has_many relation in the request class" do
-      @request_class.should_receive(:has_many).with(:completed_lines)
+      RequestLogAnalyzer::Database::Request.should_receive(:has_many).with(:completed_lines)
       RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines')
     end
 
@@ -115,9 +108,9 @@ describe RequestLogAnalyzer::Database::Base do
       @klass.should_receive(:belongs_to).with(:source)
       RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines')
     end
-    
+
     it "should create the :has_many relation in the request class" do
-      @source_class.should_receive(:has_many).with(:completed_lines)
+      RequestLogAnalyzer::Database::Source.should_receive(:has_many).with(:completed_lines)
       RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines')
     end
 
@@ -138,7 +131,7 @@ describe RequestLogAnalyzer::Database::Base do
       @klass.stub!(:table_exists?).and_return(false)
     end
 
-    after(:each) do 
+    after(:each) do
       @klass.drop_table!
       @database.remove_orm_classes!
     end
@@ -177,12 +170,12 @@ describe RequestLogAnalyzer::Database::Base do
     it "should create a field of the correct type for every defined capture field" do
       @database.connection.table_creator.should_receive(:column).with(:what, :string)
       @database.connection.table_creator.should_receive(:column).with(:tries, :integer)
-      @database.connection.table_creator.should_receive(:column).with(:evaluated, :text) 
+      @database.connection.table_creator.should_receive(:column).with(:evaluated, :text)
       @klass.create_table!
     end
 
     it "should create a field of the correct type for every provided field" do
-      @database.connection.table_creator.should_receive(:column).with(:evaluated_field, :double) 
+      @database.connection.table_creator.should_receive(:column).with(:evaluated_field, :double)
       @klass.create_table!
     end
   end

data/spec/unit/database/connection_spec.rb

@@ -15,19 +15,19 @@ describe RequestLogAnalyzer::Database::Connection do
 
     it "should parse an URI-based string for MySQL" do
       string = 'mysql://localhost.local/database'
-      RequestLogAnalyzer::Database::Connection.from_string(string).should == 
+      RequestLogAnalyzer::Database::Connection.from_string(string).should ==
               { :adapter => 'mysql', :database => 'database', :host => 'localhost.local' }
     end
 
     it "should parse an URI-based string for MySQL with only username" do
       string = 'mysql://username@localhost.local/database'
-      RequestLogAnalyzer::Database::Connection.from_string(string).should == 
+      RequestLogAnalyzer::Database::Connection.from_string(string).should ==
               { :adapter => 'mysql', :database => 'database', :host => 'localhost.local', :username => 'username' }
     end
 
     it "should parse an URI-based string for MySQL with username and password" do
       string = 'mysql://username:password@localhost.local/database'
-      RequestLogAnalyzer::Database::Connection.from_string(string).should == 
+      RequestLogAnalyzer::Database::Connection.from_string(string).should ==
               { :adapter => 'mysql', :database => 'database', :host => 'localhost.local', :username => 'username', :password => 'password' }
     end
   end