request-log-analyzer 1.2.1 → 1.2.3

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
     

data/tasks/rspec.rake

@@ -9,4 +9,11 @@ namespace :spec do
     t.rcov = true
     t.rcov_opts = ['--exclude', '"spec/*,gems/*"', '--rails']
   end
-end
+
+  desc "Run all specs in spec directory (excluding plugin specs)"
+  Spec::Rake::SpecTask.new(:fancy) do |t|
+    t.spec_opts = ['--options', "\"spec/spec.opts\""]
+    t.spec_files = FileList['spec/**/*_spec.rb']
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: request-log-analyzer
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.3
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-15 00:00:00 +02:00
+date: 2009-08-19 00:00:00 +02:00
 default_executable: request-log-analyzer
 dependencies: []
 
@@ -66,6 +66,7 @@ files:
 - spec/fixtures/decompression.log.zip
 - spec/fixtures/decompression.tar.gz
 - spec/fixtures/decompression.tgz
+- spec/fixtures/header_and_footer.log
 - spec/fixtures/merb.log
 - spec/fixtures/multiple_files_1.log
 - spec/fixtures/multiple_files_2.log
@@ -78,11 +79,14 @@ files:
 - spec/fixtures/test_language_combined.log
 - spec/fixtures/test_order.log
 - spec/integration/command_line_usage_spec.rb
-- spec/lib/helper.rb
+- spec/lib/helpers.rb
+- spec/lib/macros.rb
+- spec/lib/matchers.rb
 - spec/lib/mocks.rb
 - spec/lib/testing_format.rb
+- spec/spec.opts
 - spec/spec_helper.rb
-- spec/unit/aggregator/database_inserter_spec.rb
+- spec/unit/aggregator/database_spec.rb
 - spec/unit/aggregator/summarizer_spec.rb
 - spec/unit/controller/controller_spec.rb
 - spec/unit/controller/log_processor_spec.rb
@@ -92,6 +96,7 @@ files:
 - spec/unit/file_format/rails_format_spec.rb
 - spec/unit/filter/anonymize_filter_spec.rb
 - spec/unit/filter/field_filter_spec.rb
+- spec/unit/filter/filter_spec.rb
 - spec/unit/filter/timespan_filter_spec.rb
 - spec/unit/source/log_parser_spec.rb
 - spec/unit/source/request_spec.rb
@@ -132,13 +137,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: r-l-a
-rubygems_version: 1.3.2
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: A command line tool to analyze Rails logs
 test_files: 
 - spec/integration/command_line_usage_spec.rb
-- spec/unit/aggregator/database_inserter_spec.rb
+- spec/unit/aggregator/database_spec.rb
 - spec/unit/aggregator/summarizer_spec.rb
 - spec/unit/controller/controller_spec.rb
 - spec/unit/controller/log_processor_spec.rb
@@ -148,6 +153,7 @@ test_files:
 - spec/unit/file_format/rails_format_spec.rb
 - spec/unit/filter/anonymize_filter_spec.rb
 - spec/unit/filter/field_filter_spec.rb
+- spec/unit/filter/filter_spec.rb
 - spec/unit/filter/timespan_filter_spec.rb
 - spec/unit/source/log_parser_spec.rb
 - spec/unit/source/request_spec.rb

data/spec/unit/aggregator/database_inserter_spec.rb

@@ -1,106 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-describe RequestLogAnalyzer::Aggregator::Database, "schema creation" do
-
-  include RequestLogAnalyzer::Spec::Helper
-
-  before(:each) do
-    log_parser = RequestLogAnalyzer::Source::LogParser.new(testing_format)
-    @database_inserter = RequestLogAnalyzer::Aggregator::Database.new(log_parser, :database => ':memory:')
-  end
-
-  
-  it "should create the correct tables" do
-    ActiveRecord::Migration.should_receive(:create_table).with("warnings")    
-    ActiveRecord::Migration.should_receive(:create_table).with("requests")        
-    ActiveRecord::Migration.should_receive(:create_table).with("first_lines")
-    ActiveRecord::Migration.should_receive(:create_table).with("test_lines")        
-    ActiveRecord::Migration.should_receive(:create_table).with("eval_lines")    
-    ActiveRecord::Migration.should_receive(:create_table).with("last_lines")
-
-    ActiveRecord::Migration.should_receive(:add_index).with("eval_lines",  [:request_id])
-    ActiveRecord::Migration.should_receive(:add_index).with("first_lines", [:request_id])    
-    ActiveRecord::Migration.should_receive(:add_index).with("test_lines",  [:request_id])
-    ActiveRecord::Migration.should_receive(:add_index).with("last_lines",  [:request_id])
-
-    @database_inserter.prepare
-  end
-  
-  it "should create a default Request class" do
-    @database_inserter.prepare
-    TestingFormat::Database::Request.ancestors.should include(ActiveRecord::Base)
-    TestingFormat::Database::Request.column_names.should include('first_lineno')
-    TestingFormat::Database::Request.column_names.should include('last_lineno')    
-  end
-  
-  it "should create associations for the default Request class" do
-    @database_inserter.prepare
-    @request = TestingFormat::Database::Request.new
-    @request.should respond_to(:test_lines)
-    @request.test_lines.should
-  end
-  
-  it "should create the default table names" do
-    @database_inserter.prepare
-    @database_inserter.file_format.line_definitions.each do |name, definition|
-      klass = TestingFormat::Database.const_get("#{name}_line".camelize)
-      klass.column_names.should include('id')
-      klass.column_names.should include('lineno')      
-      klass.column_names.should include('request_id')      
-    end
-  end
-  
-  it "should create the correct fields in the table" do
-    @database_inserter.prepare
-    
-    TestingFormat::Database::FirstLine.column_names.should include('request_no')
-    TestingFormat::Database::LastLine.column_names.should include('request_no')
-    TestingFormat::Database::TestLine.column_names.should include('test_capture')    
-  end
-  
-  it "should create fields for provides" do
-    @database_inserter.prepare
-    TestingFormat::Database::EvalLine.column_names.should include('evaluated')    
-    TestingFormat::Database::EvalLine.column_names.should include('greating')
-    TestingFormat::Database::EvalLine.column_names.should include('what')    
-  end
-  
-end
-
-describe RequestLogAnalyzer::Aggregator::Database, "record insertion" do
-  include RequestLogAnalyzer::Spec::Helper  
-  
-  before(:each) do
-    log_parser = RequestLogAnalyzer::Source::LogParser.new(testing_format)    
-    @database_inserter = RequestLogAnalyzer::Aggregator::Database.new(log_parser, :database => ':memory:')
-    @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
-  
-  it "should insert a record in the request table" do
-    TestingFormat::Database::Request.count.should == 0
-    @database_inserter.aggregate(@incomplete_request)
-    TestingFormat::Database::Request.count.should == 1
-  end
-  
-  it "should insert records in all relevant line tables" do
-    @database_inserter.aggregate(@completed_request)
-    request = TestingFormat::Database::Request.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
-    TestingFormat::Database::Warning.should_receive(:create!).with(hash_including(:warning_type => 'test_warning'))
-    @database_inserter.warning(:test_warning, "Testing the warning system", 12)
-  end
-  
-end