request-log-analyzer 1.2.9 → 1.3.0

data/spec/unit/aggregator/database_inserter_spec.rb

@@ -0,0 +1,93 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+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
+    end
+
+    it 'should not drop the database schema during preparation if not requested' do
+      @database.should_not_receive(:drop_database_schema!)
+      @database_inserter.prepare
+    end
+
+    it 'should drop the database schema during preparation if requested' do
+      @database_inserter.options[:reset_database] = true
+      @database.should_receive(:drop_database_schema!)
+      @database_inserter.prepare
+    end
+  end
+
+  test_databases.each do |name, connection|
+
+    context "using a #{name} database" do
+
+      before(:each) do
+        @database_inserter = RequestLogAnalyzer::Aggregator::DatabaseInserter.new(@log_parser, :database => connection, :reset_database => true)
+        @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}, 
+                              {:line_type => :test, :test_capture => "awesome"},
+                              {: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 { 
+          @database_inserter.aggregate(@incomplete_request)
+        }.should change(@database_inserter.database.request_class, :count).from(0).to(1)
+      end
+      
+      it "should insert a record in the first_lines table" do
+        lambda { 
+          @database_inserter.aggregate(@incomplete_request)
+        }.should change(@database_inserter.database.get_class(:first), :count).from(0).to(1)
+      end      
+
+      it "should insert records in all relevant line tables" do
+        @database_inserter.aggregate(@completed_request)
+        request = @database_inserter.database.request_class.first
+        request.should have(2).test_lines
+        request.should have(1).first_lines
+        request.should have(1).eval_lines
+        request.should have(1).last_lines
+      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'))
+        @database_inserter.warning(:test_warning, "Testing the warning system", 12)
+      end
+    end
+  end
+end

data/spec/unit/database/base_class_spec.rb

@@ -0,0 +1,190 @@
+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)      
+      
+      @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
+
+    it "should create a new subclass using the Base class as parent" 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)
+    end
+
+    it "should set the table name for the subclass" do
+      @orm_class.should_receive(:set_table_name).with('test_lines')
+      RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition)
+    end
+
+    it "should set the :belongs_to relationship with the Request class" do
+      @orm_class.should_receive(:belongs_to).with(:request)
+      RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition)
+    end
+
+    it "should set a :has_many relationship in the request class" do
+      @request_class.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::Base.subclass_from_line_definition(@line_definition)
+    end
+
+    it "should set the :belongs_to relationship with the Source class" do
+      @orm_class.should_receive(:belongs_to).with(:source)
+      RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition)
+    end
+
+    it "should serialize a complex field" do
+      @orm_class.should_receive(:serialize).with(:evaluated, Hash)
+      RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition)
+    end
+
+  end
+
+  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)      
+      
+      @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!(: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    
+    
+    it "should set the table name" do
+      @klass.should_receive(:set_table_name).with('completed_lines')
+      RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines')
+    end
+
+    it "should create the :belongs_to relation to the request class" 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::Base.subclass_from_table('completed_lines')
+    end
+
+    it "should create the :belongs_to relation to the source class" 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::Base.subclass_from_table('completed_lines')
+    end
+
+  end
+
+  describe '#create_table' 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
+      @database = RequestLogAnalyzer::Database.new
+      @database.stub!(:connection).and_return(mock_connection)
+      @klass = @database.load_activerecord_class(@line_definition)
+      @klass.stub!(:table_exists?).and_return(false)
+    end
+
+    after(:each) do 
+      @klass.drop_table!
+      @database.remove_orm_classes!
+    end
+
+    it "should call create_table with the correct table name" do
+      @database.connection.should_receive(:create_table).with(:test_lines)
+      @klass.create_table!
+    end
+
+    it "should not create a table based on the line type name if it already exists" do
+      @klass.stub!(:table_exists?).and_return(true)
+      @database.connection.should_not_receive(:create_table).with(:test_lines)
+      @klass.create_table!
+    end
+
+    it "should create an index on the request_id field" do
+      @database.connection.should_receive(:add_index).with(:test_lines, [:request_id])
+      @klass.create_table!
+    end
+
+    it "should create an index on the source_id field" do
+      @database.connection.should_receive(:add_index).with(:test_lines, [:source_id])
+      @klass.create_table!
+    end
+
+    it "should create a request_id field to link the requests together" do
+      @database.connection.table_creator.should_receive(:column).with(:request_id, :integer)
+      @klass.create_table!
+    end
+
+    it "should create a lineno field to save the location of the line in the original file" do
+      @database.connection.table_creator.should_receive(:column).with(:lineno, :integer)
+      @klass.create_table!
+    end
+
+    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) 
+      @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) 
+      @klass.create_table!
+    end
+  end
+end
+

data/spec/unit/database/connection_spec.rb

@@ -0,0 +1,34 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe RequestLogAnalyzer::Database::Connection do
+  describe '.from_string' do
+
+    it "should parse a name-value based string" do
+      string = 'adapter=sqlite3;database=filename.db'
+      RequestLogAnalyzer::Database::Connection.from_string(string).should == {:adapter => 'sqlite3', :database => 'filename.db'}
+    end
+
+    it "should parse an URI-based string for SQLite3" do
+      string = 'sqlite3://filename.db'
+      RequestLogAnalyzer::Database::Connection.from_string(string).should == {:adapter => 'sqlite3', :database => 'filename.db'}
+    end
+
+    it "should parse an URI-based string for MySQL" do
+      string = 'mysql://localhost.local/database'
+      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 == 
+              { :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 == 
+              { :adapter => 'mysql', :database => 'database', :host => 'localhost.local', :username => 'username', :password => 'password' }
+    end
+  end
+end

data/spec/unit/database/database_spec.rb

@@ -0,0 +1,138 @@
+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
+        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)
+        end
+      end
+    
+      # Some Fileformat-specific classes
+      ['CompletedLine', 'ProcessingLine'].each do |const|
+        it "should create the #{const} constant" do
+          Object.const_defined?(const).should be_true
+        end
+
+        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)
+        end
+      end
+    end
+  end
+  
+  describe '#create_database_schema!' do
+
+    before(:each) do
+      @database = RequestLogAnalyzer::Database.new
+      @database.file_format = testing_format
+      @database.stub!(:connection).and_return(mock_connection)
+
+      # Stub the expected method calls for the preparation, these will be tested separately
+      @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!
+      end
+
+      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)
+      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 
+      @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_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    
+    
+    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)
+    end
+  end
+end

data/spec/unit/source/log_parser_spec.rb

@@ -14,6 +14,18 @@ describe RequestLogAnalyzer::Source::LogParser, :requests do
     @log_parser.file_format.should be_valid
   end
   
+  it "should set the :source for every parsed line" do
+    @log_parser.parse_file(log_fixture(:rails_22)) do |request|
+      request.lines.all? { |line| line[:source] == log_fixture(:rails_22) }.should be_true
+    end
+  end
+  
+  it "should set the :lineno for every parsed line" do
+    @log_parser.parse_file(log_fixture(:rails_22)) do |request|
+      request.lines.all? { |line| line.has_key?(:lineno) }.should be_true
+    end
+  end
+  
   it "should parse more lines than requests" do
     @log_parser.should_receive(:handle_request).with(an_instance_of(TestingFormat::Request)).twice
     @log_parser.parse_file(log_fixture(:test_language_combined))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: request-log-analyzer
 version: !ruby/object:Gem::Version 
-  version: 1.2.9
+  version: 1.3.0
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-08 00:00:00 +02:00
+date: 2009-09-12 00:00:00 +02:00
 default_executable: request-log-analyzer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.0
     version: 
-description: "    Request log analyzer's purpose is to find ot how your web application is being used and to focus your optimization efforts.\n    This tool will parse all requests in the application's log file and aggregate the information. Once it is finished parsing \n    the log file(s), it will show the requests that take op most server time using various metrics. It can also insert all \n    parsed request information into a database so you can roll your own analysis. It supports Rails- and Merb-based applications \n    out of the box, but file formats of other applications can easily be supported by supplying an easy to write log file format \n    definition.\n"
+description: "    Request log analyzer's purpose is to find ot how your web application is being used and to focus your optimization efforts.\n    This tool will parse all requests in the application's log file and aggregate the information. Once it is finished parsing \n    the log file(s), it will show the requests that take op most server time using various metrics. It can also insert all \n    parsed request information into a database so you can roll your own analysis. It supports Rails- and Merb-based applications \n    and Apache access log files out of the box, but file formats of other applications can easily be supported by supplying an \n    easy to write log file format definition.\n"
 email: 
 - willem@railsdoctors.com
 - bart@railsdoctors.com
@@ -49,8 +49,8 @@ files:
 - lib/request_log_analyzer/output/html.rb
 - lib/request_log_analyzer/controller.rb
 - spec/fixtures/rails_22_cached.log
-- lib/request_log_analyzer/file_format/rails_development.rb
 - spec/lib/macros.rb
+- lib/request_log_analyzer/file_format/rails_development.rb
 - spec/fixtures/apache_combined.log
 - spec/fixtures/apache_common.log
 - spec/fixtures/merb_prefixed.log
@@ -58,6 +58,7 @@ files:
 - spec/unit/file_format/file_format_api_spec.rb
 - spec/unit/file_format/apache_format_spec.rb
 - spec/integration/command_line_usage_spec.rb
+- lib/request_log_analyzer/database.rb
 - spec/fixtures/decompression.log.bz2
 - lib/request_log_analyzer/log_processor.rb
 - lib/request_log_analyzer/tracker.rb
@@ -67,18 +68,22 @@ files:
 - request-log-analyzer.gemspec
 - DESIGN.rdoc
 - spec/unit/filter/timespan_filter_spec.rb
+- spec/unit/aggregator/database_inserter_spec.rb
+- spec/lib/matchers.rb
 - lib/request_log_analyzer/filter/field.rb
 - lib/request_log_analyzer/tracker/frequency.rb
 - spec/fixtures/decompression.log.gz
 - spec/fixtures/decompression.log
-- spec/lib/matchers.rb
+- spec/lib/testing_format.rb
 - spec/fixtures/test_order.log
+- spec/fixtures/rails.db
 - lib/request_log_analyzer/output/fixed_width.rb
 - lib/request_log_analyzer/filter/anonymize.rb
-- spec/lib/testing_format.rb
 - lib/request_log_analyzer/tracker/timespan.rb
+- lib/request_log_analyzer/database/base.rb
 - lib/request_log_analyzer/aggregator.rb
 - lib/cli/progressbar.rb
+- lib/request_log_analyzer/mailer.rb
 - README.rdoc
 - spec/fixtures/merb.log
 - lib/request_log_analyzer/tracker/hourly_spread.rb
@@ -89,15 +94,17 @@ files:
 - spec/unit/controller/log_processor_spec.rb
 - spec/spec_helper.rb
 - lib/request_log_analyzer.rb
+- spec/database.yml
 - Rakefile
+- lib/request_log_analyzer/database/connection.rb
 - spec/unit/filter/filter_spec.rb
+- spec/fixtures/test_language_combined.log
+- lib/request_log_analyzer/aggregator/database_inserter.rb
 - lib/request_log_analyzer/aggregator/summarizer.rb
 - lib/request_log_analyzer/file_format/rails.rb
-- spec/fixtures/test_language_combined.log
 - spec/fixtures/decompression.tar.gz
 - spec/unit/filter/field_filter_spec.rb
-- spec/spec.opts
-- lib/request_log_analyzer/aggregator/database.rb
+- spec/unit/database/base_class_spec.rb
 - lib/request_log_analyzer/filter/timespan.rb
 - lib/request_log_analyzer/source/log_parser.rb
 - spec/fixtures/decompression.tgz
@@ -111,19 +118,21 @@ files:
 - spec/unit/file_format/line_definition_spec.rb
 - lib/request_log_analyzer/source.rb
 - lib/request_log_analyzer/request.rb
+- lib/cli/database_console.rb
+- spec/unit/database/connection_spec.rb
 - spec/unit/controller/controller_spec.rb
+- spec/lib/mocks.rb
+- spec/lib/helpers.rb
+- lib/cli/database_console_init.rb
 - lib/request_log_analyzer/output.rb
 - lib/request_log_analyzer/file_format/apache.rb
-- spec/lib/helpers.rb
 - spec/fixtures/rails_1x.log
-- spec/lib/mocks.rb
 - spec/fixtures/decompression.log.zip
 - spec/unit/source/request_spec.rb
 - spec/unit/source/log_parser_spec.rb
-- spec/unit/aggregator/database_spec.rb
 - spec/fixtures/test_file_format.log
-- lib/request_log_analyzer/source/database.rb
 - tasks/github-gem.rake
+- spec/unit/database/database_spec.rb
 - lib/request_log_analyzer/tracker/duration.rb
 - lib/request_log_analyzer/file_format.rb
 - spec/unit/aggregator/summarizer_spec.rb
@@ -131,6 +140,7 @@ files:
 - spec/fixtures/multiple_files_2.log
 - spec/fixtures/syslog_1x.log
 - LICENSE
+- lib/request_log_analyzer/source/database_loader.rb
 - spec/unit/tracker/frequency_tracker_spec.rb
 - spec/unit/file_format/rails_format_spec.rb
 - lib/cli/command_line_arguments.rb
@@ -163,29 +173,32 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - To use the database inserter, ActiveRecord and an appropriate database adapter are required.
 rubyforge_project: r-l-a
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: A command line tool to analyze request logs for Rails, Merb and other application servers
+summary: A command line tool to analyze request logs for Apache, Rails, Merb and other application servers
 test_files: 
 - spec/unit/filter/anonymize_filter_spec.rb
 - spec/unit/file_format/file_format_api_spec.rb
 - spec/unit/file_format/apache_format_spec.rb
 - spec/integration/command_line_usage_spec.rb
 - spec/unit/filter/timespan_filter_spec.rb
+- spec/unit/aggregator/database_inserter_spec.rb
 - spec/unit/tracker/tracker_api_spec.rb
 - spec/unit/tracker/duration_tracker_spec.rb
 - spec/unit/controller/log_processor_spec.rb
 - spec/unit/filter/filter_spec.rb
 - spec/unit/filter/field_filter_spec.rb
+- spec/unit/database/base_class_spec.rb
 - spec/unit/tracker/timespan_tracker_spec.rb
 - spec/unit/tracker/hourly_spread_spec.rb
 - spec/unit/file_format/merb_format_spec.rb
 - spec/unit/file_format/line_definition_spec.rb
+- spec/unit/database/connection_spec.rb
 - spec/unit/controller/controller_spec.rb
 - spec/unit/source/request_spec.rb
 - spec/unit/source/log_parser_spec.rb
-- spec/unit/aggregator/database_spec.rb
+- spec/unit/database/database_spec.rb
 - spec/unit/aggregator/summarizer_spec.rb
 - spec/unit/tracker/frequency_tracker_spec.rb
 - spec/unit/file_format/rails_format_spec.rb