request-log-analyzer 1.7.0 → 1.10.0

data/spec/integration/command_line_usage_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require 'spec_helper'
 
 describe RequestLogAnalyzer, 'running from command line' do
 
@@ -38,7 +38,7 @@ describe RequestLogAnalyzer, 'running from command line' do
 
   it "should not write output with the --silent option" do
     output = run("#{log_fixture(:rails_1x)} --silent --file #{temp_output_file(:report)}")
-    output.to_s.should eql("")
+    output.should be_empty
     File.exist?(temp_output_file(:report)).should be_true
   end
 
@@ -83,9 +83,9 @@ describe RequestLogAnalyzer, 'running from command line' do
   end
 
   it "should dump the results to a YAML file" do
-    run("#{log_fixture(:rails_1x)} --dump #{temp_output_file(:yaml)}")
+    run("#{log_fixture(:rails_1x)} --yaml #{temp_output_file(:yaml)}")
     File.exist?(temp_output_file(:yaml)).should be_true
-    YAML::load(File.read(temp_output_file(:yaml))).should have_at_least(1).item
+    YAML.load(File.read(temp_output_file(:yaml))).should have_at_least(1).item
   end
 
   it "should parse 4 requests from the standard input" do

data/spec/integration/mailer_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require 'spec_helper'
 require 'socket'
 
 describe RequestLogAnalyzer, 'running mailer integration' do
@@ -30,8 +30,24 @@ describe RequestLogAnalyzer, 'running mailer integration' do
     find_string_in_file("From: <contact@railsdoctors.com>", @log_file).should_not be_nil
     find_string_in_file("To: <root@localhost>", @log_file).should_not be_nil
     find_string_in_file("From: Request-log-analyzer reporter <contact@railsdoctors.com>", @log_file).should_not be_nil
+    find_string_in_file("Subject: Request log analyzer report - generated on", @log_file).should_not be_nil
     find_string_in_file("Request summary", @log_file).should_not be_nil
-    find_string_in_file("PeopleController#show.html [ |    1 |  0.29s |  0.29s |  0.00s |  0.29s |  0.29s", @log_file).should_not be_nil
+    find_string_in_file("PeopleControll |    1 |  0.04s |  0.04s |  0.00s |  0.04s |  0.04s | 0.04s-0.04s", @log_file).should_not be_nil
+  end
+  
+  it "should allow a custom mail subject" do
+    RequestLogAnalyzer::Controller.build(
+      :mail         => 'root@localhost',
+      :mailhost     => 'localhost:2525',
+      :mailsubject  => 'TESTSUBJECT',
+      :source_files => log_fixture(:rails_1x),
+      :format       => RequestLogAnalyzer::FileFormat::Rails,
+      :no_progress  => true
+    ).run!
+    
+    Process.wait # Wait for mailer to complete
+
+    find_string_in_file("Subject: TESTSUBJECT", @log_file).should_not be_nil  
   end
 
   it "should send html mail" do    
@@ -50,7 +66,7 @@ describe RequestLogAnalyzer, 'running mailer integration' do
     find_string_in_file("To: <root@localhost>", @log_file).should_not be_nil
     find_string_in_file("From: Request-log-analyzer reporter <contact@railsdoctors.com>", @log_file).should_not be_nil
     find_string_in_file('<h1>Request-log-analyzer summary report</h1>', @log_file).should_not be_nil
-    find_string_in_file('<td class="alt">0.29s</td></tr><tr><td>DashboardController#index.html [GET]</td>', @log_file).should_not be_nil
+    find_string_in_file('<td class="alt">0.29s-0.30s</td></tr><tr><td>DashboardController#index.html [GET]</td>', @log_file).should_not be_nil
   end
 end
 
@@ -78,7 +94,7 @@ class Mailtrap
     @port = port
     @once = once
     @msgfile = msgfile
-
+    
     File.open( @msgfile, "a" ) do |file|
       file.puts "\n* Mailtrap started at #{@host}:#{port}\n"
     end

data/spec/integration/munin_plugins_rails_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require 'spec_helper'
 
 describe RequestLogAnalyzer, 'when harvesting like munin-plugins-rails the YAML output' do
   

data/spec/integration/scout_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require 'spec_helper'
 
 def capture_stdout_and_stderr_with_warnings_on
   $stdout, $stderr, warnings, $VERBOSE =

data/spec/lib/helpers.rb

@@ -1,4 +1,4 @@
-module RequestLogAnalyzer::Spec::Helpers
+module RequestLogAnalyzer::RSpec::Helpers
 
   # Create or return a new TestingFormat
   def testing_format
@@ -53,7 +53,7 @@ module RequestLogAnalyzer::Spec::Helpers
   # Check if a given string can be found in the given file
   # Returns the line number if found, nil otherwise
   def find_string_in_file(string, file, options = {})
-    return nil unless File::exists?(file)
+    return nil unless File.exists?(file)
     
     line_counter = 0
 

data/spec/lib/macros.rb

@@ -1,4 +1,4 @@
-module RequestLogAnalyzer::Spec::Macros
+module RequestLogAnalyzer::RSpec::Macros
 
   def test_databases
     require 'yaml'

data/spec/lib/matchers.rb

@@ -1,4 +1,4 @@
-module RequestLogAnalyzer::Spec::Matchers
+module RequestLogAnalyzer::RSpec::Matchers
 
   class HasLineDefinition
 

data/spec/lib/mocks.rb

@@ -1,4 +1,4 @@
-module RequestLogAnalyzer::Spec::Mocks
+module RequestLogAnalyzer::RSpec::Mocks
 
   def mock_source
     source = mock('RequestLogAnalyzer::Source::Base')

data/spec/spec_helper.rb

@@ -1,11 +1,11 @@
-$:.reject! { |e| e.include? 'TextMate' }
-$: << File.join(File.dirname(__FILE__), '..', 'lib')
-
 require 'rubygems'
-require 'spec/autorun'
+require 'bundler/setup'
+
+require 'rspec'
 require 'request_log_analyzer'
+require 'stringio'
 
-module RequestLogAnalyzer::Spec
+module RequestLogAnalyzer::RSpec
 end
 
 # Include all files in the spec_helper directory
@@ -15,10 +15,10 @@ 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::Mocks
-  config.include RequestLogAnalyzer::Spec::Helpers
+RSpec.configure do |config|
+  config.include RequestLogAnalyzer::RSpec::Matchers
+  config.include RequestLogAnalyzer::RSpec::Mocks
+  config.include RequestLogAnalyzer::RSpec::Helpers
 
-  config.extend RequestLogAnalyzer::Spec::Macros
+  config.extend RequestLogAnalyzer::RSpec::Macros
 end

data/spec/unit/aggregator/database_inserter_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::Aggregator::DatabaseInserter do
 

data/spec/unit/aggregator/summarizer_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::Aggregator::Summarizer do
 

data/spec/unit/controller/controller_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::Controller do
 

data/spec/unit/controller/log_processor_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 require 'request_log_analyzer/log_processor'
 

data/spec/unit/database/base_class_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::Database::Base do
 

data/spec/unit/database/connection_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::Database::Connection do
   describe '.from_string' do

data/spec/unit/database/database_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::Database do
 

data/spec/unit/file_format/amazon_s3_format_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::FileFormat::AmazonS3 do
 

data/spec/unit/file_format/apache_format_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::FileFormat::Apache do
 
@@ -28,6 +28,23 @@ describe RequestLogAnalyzer::FileFormat::Apache do
       @line_definition.captures?(:duration).should be_true
     end
   end
+  
+  describe '.access_line_definition' do
+    it "should parse values in microseconds when no argument is given to %D" do
+      format = RequestLogAnalyzer::FileFormat::Apache.create('%D')
+      format.should parse_line('12345').and_capture(:duration => 0.012345)
+    end
+    
+    it "should parse values in microseconds when micro is given as argument to %D" do
+      format = RequestLogAnalyzer::FileFormat::Apache.create('%{micro}D')
+      format.should parse_line('12345').and_capture(:duration => 0.012345)
+    end
+    
+    it "should parse values in microseconds when micro is given as argument to %D" do
+      format = RequestLogAnalyzer::FileFormat::Apache.create('%{milli}D')
+      format.should parse_line('12345').and_capture(:duration => 12.345)
+    end
+  end
 
   describe '.create' do
 

data/spec/unit/file_format/common_regular_expressions_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::FileFormat::CommonRegularExpressions do
   

data/spec/unit/file_format/delayed_job21_format_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe RequestLogAnalyzer::FileFormat::DelayedJob do
+
+  it "should be a valid file format" do
+    RequestLogAnalyzer::FileFormat.load(:delayed_job).should be_valid
+  end
+
+  describe '#parse_line' do
+    
+    before(:each) do
+      @file_format = RequestLogAnalyzer::FileFormat.load(:delayed_job21)
+    end
+
+    it "should parse a :job_lock line correctly" do
+      line = "2010-05-17T17:37:34+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] acquired lock on S3FileJob"
+      @file_format.should parse_line(line).as(:job_lock).and_capture(:timestamp => 20100517173734,
+                                    :job => 'S3FileJob', :host => 'hostname.co.uk', :pid => 11888)
+    end
+
+    it "should parse a :job_lock line correctly when the worker is one of many" do
+      line = "2010-05-17T17:37:34+0000: [Worker(delayed_job.0 host:hostname.co.uk pid:11888)] acquired lock on S3FileJob"
+      @file_format.should parse_line(line).as(:job_lock).and_capture(:timestamp => 20100517173734,
+                                    :job => 'S3FileJob', :host => 'hostname.co.uk', :pid => 11888)
+    end
+
+    it "should parse a :job_completed line correctly" do
+      line = '2010-05-17T17:37:35+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] S3FileJob completed after 1.0676'
+      @file_format.should parse_line(line).as(:job_completed).and_capture(:timestamp => 20100517173735,
+                                    :duration => 1.0676, :host => 'hostname.co.uk', :pid => 11888, :job => 'S3FileJob')
+    end
+  end
+  
+  describe '#parse_io' do
+    before(:each) do
+      @log_parser = RequestLogAnalyzer::Source::LogParser.new(RequestLogAnalyzer::FileFormat.load(:delayed_job21))
+    end
+    
+    it "should parse a batch of completed jobs without warnings" do
+      fragment = <<-EOLOG
+        2010-05-17T17:36:44+0000: *** Starting job worker delayed_job host:hostname.co.uk pid:11888
+        2010-05-17T17:37:34+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] acquired lock on S3FileJob
+        2010-05-17T17:37:35+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] S3FileJob completed after 1.0676
+        2010-05-17T17:37:35+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] acquired lock on S3FileJob
+        2010-05-17T17:37:37+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] S3FileJob completed after 1.4407
+        2010-05-17T17:37:37+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] acquired lock on S3FileJob
+        2010-05-17T17:37:44+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] S3FileJob completed after 6.9374
+        2010-05-17T17:37:44+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] 3 jobs processed at 0.3163 j/s, 0 failed ...
+        2010-05-19T11:47:26+0000: Exiting...
+      EOLOG
+
+      request_counter.should_receive(:hit!).exactly(3).times
+      @log_parser.should_not_receive(:warn)
+
+      @log_parser.parse_io(StringIO.new(fragment)) do |request|
+        request_counter.hit! if request.kind_of?(RequestLogAnalyzer::FileFormat::DelayedJob21::Request)
+      end
+    end
+  end
+end

data/spec/unit/file_format/delayed_job2_format_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe RequestLogAnalyzer::FileFormat::DelayedJob do
+
+  it "should be a valid file format" do
+    RequestLogAnalyzer::FileFormat.load(:delayed_job).should be_valid
+  end
+
+  describe '#parse_line' do
+    
+    before(:each) do
+      @file_format = RequestLogAnalyzer::FileFormat.load(:delayed_job2)
+    end
+
+    it "should parse a :job_lock line correctly" do
+      line = "2010-05-17T17:37:34+0000: * [Worker(delayed_job host:hostname.co.uk pid:11888)] acquired lock on S3FileJob"
+      @file_format.should parse_line(line).as(:job_lock).and_capture(:timestamp => 20100517173734,
+                                    :job => 'S3FileJob', :host => 'hostname.co.uk', :pid => 11888)
+    end
+
+    it "should parse a :job_lock line correctly when the worker is one of many" do
+      line = "2010-05-17T17:37:34+0000: * [Worker(delayed_job.0 host:hostname.co.uk pid:11888)] acquired lock on S3FileJob"
+      @file_format.should parse_line(line).as(:job_lock).and_capture(:timestamp => 20100517173734,
+                                    :job => 'S3FileJob', :host => 'hostname.co.uk', :pid => 11888)
+    end
+
+    it "should parse a :job_completed line correctly" do
+      line = '2010-05-17T17:37:35+0000: * [JOB] delayed_job host:hostname.co.uk pid:11888 completed after 1.0676'
+      @file_format.should parse_line(line).as(:job_completed).and_capture(:timestamp => 20100517173735,
+                                    :duration => 1.0676, :host => 'hostname.co.uk', :pid => 11888)
+    end
+  end
+  
+  describe '#parse_io' do
+    before(:each) do
+      @log_parser = RequestLogAnalyzer::Source::LogParser.new(RequestLogAnalyzer::FileFormat.load(:delayed_job2))
+    end
+    
+    it "should parse a batch of completed jobs without warnings" do
+      fragment = <<-EOLOG
+        2010-05-17T17:36:44+0000: *** Starting job worker delayed_job host:hostname.co.uk pid:11888
+        2010-05-17T17:37:34+0000: * [Worker(delayed_job host:hostname.co.uk pid:11888)] acquired lock on S3FileJob
+        2010-05-17T17:37:35+0000: * [JOB] delayed_job host:hostname.co.uk pid:11888 completed after 1.0676
+        2010-05-17T17:37:35+0000: * [Worker(delayed_job host:hostname.co.uk pid:11888)] acquired lock on S3FileJob
+        2010-05-17T17:37:37+0000: * [JOB] delayed_job host:hostname.co.uk pid:11888 completed after 1.4407
+        2010-05-17T17:37:37+0000: * [Worker(delayed_job host:hostname.co.uk pid:11888)] acquired lock on S3FileJob
+        2010-05-17T17:37:44+0000: * [JOB] delayed_job host:hostname.co.uk pid:11888 completed after 6.9374
+        2010-05-17T17:37:44+0000: 3 jobs processed at 0.3163 j/s, 0 failed ...
+        2010-05-19T11:47:26+0000: Exiting...
+      EOLOG
+
+      request_counter.should_receive(:hit!).exactly(3).times
+      @log_parser.should_not_receive(:warn)
+
+      @log_parser.parse_io(StringIO.new(fragment)) do |request|
+        request_counter.hit! if request.kind_of?(RequestLogAnalyzer::FileFormat::DelayedJob2::Request)
+      end
+    end
+  end
+end

data/spec/unit/file_format/delayed_job_format_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::FileFormat::DelayedJob do
 
@@ -28,7 +28,7 @@ describe RequestLogAnalyzer::FileFormat::DelayedJob do
         :failed_job => 'BackgroundJob::ThumbnailSaver', :exception => 'ActiveRecord::RecordNotFound')
     end
     
-    it "" do
+    it "should parse a failed job lock line correctly" do
       line = "* [JOB] failed to acquire exclusive lock for BackgroundJob::ThumbnailSaver"
       @file_format.should parse_line(line).as(:job_lock_failed).and_capture(:locked_job => 'BackgroundJob::ThumbnailSaver')
     end

data/spec/unit/file_format/file_format_api_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::FileFormat do
 
@@ -60,7 +60,7 @@ describe RequestLogAnalyzer::FileFormat do
     end
 
     it "should load a provided format file" do
-      format_filename = File.dirname(__FILE__) + '/../../lib/testing_format.rb'
+      format_filename = File.expand_path('../../lib/testing_format.rb', File.dirname(__FILE__))
       @file_format = RequestLogAnalyzer::FileFormat.load(format_filename)
       @file_format.should be_kind_of(TestingFormat)
     end

data/spec/unit/file_format/format_autodetection_spec.rb

@@ -1,36 +1,36 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::FileFormat do
 
   describe '.autodetect' do
     it "should autodetect a Merb log" do
       file_format = RequestLogAnalyzer::FileFormat.autodetect(log_fixture(:merb))
-      file_format.should be_kind_of(RequestLogAnalyzer::FileFormat::Merb)
+      file_format.should be_instance_of(RequestLogAnalyzer::FileFormat::Merb)
     end
 
     it "should autodetect a MySQL slow query log" do
       file_format = RequestLogAnalyzer::FileFormat.autodetect(log_fixture(:mysql_slow_query))
-      file_format.should be_kind_of(RequestLogAnalyzer::FileFormat::Mysql)
+      file_format.should be_instance_of(RequestLogAnalyzer::FileFormat::Mysql)
     end
 
     it "should autodetect a Rails 1.x log" do
       file_format = RequestLogAnalyzer::FileFormat.autodetect(log_fixture(:rails_1x))
-      file_format.should be_kind_of(RequestLogAnalyzer::FileFormat::Rails)
+      file_format.should be_instance_of(RequestLogAnalyzer::FileFormat::Rails)
     end
 
     it "should autodetect a Rails 2.x log" do
       file_format = RequestLogAnalyzer::FileFormat.autodetect(log_fixture(:rails_22))
-      file_format.should be_kind_of(RequestLogAnalyzer::FileFormat::Rails)
+      file_format.should be_instance_of(RequestLogAnalyzer::FileFormat::RailsDevelopment)
     end
 
     it "should autodetect an Apache access log" do
       file_format = RequestLogAnalyzer::FileFormat.autodetect(log_fixture(:apache_common))
-      file_format.should be_kind_of(RequestLogAnalyzer::FileFormat::Apache)
+      file_format.should be_instance_of(RequestLogAnalyzer::FileFormat::Apache)
     end
 
     it "should autodetect a Rack access log" do
       file_format = RequestLogAnalyzer::FileFormat.autodetect(log_fixture(:sinatra))
-      file_format.should be_kind_of(RequestLogAnalyzer::FileFormat::Rack)
+      file_format.should be_instance_of(RequestLogAnalyzer::FileFormat::Rack)
     end
 
     it "should not find any file format with a bogus file" do

data/spec/unit/file_format/haproxy_format_spec.rb

@@ -0,0 +1,84 @@
+require 'spec_helper'
+
+describe RequestLogAnalyzer::FileFormat::Haproxy do
+
+  before(:each) do
+    @file_format = RequestLogAnalyzer::FileFormat.load(:haproxy)
+    @log_parser  = RequestLogAnalyzer::Source::LogParser.new(@file_format)
+    @sample1 = 'Feb  6 12:14:14 localhost haproxy[14389]: 10.0.1.2:33317 [06/Feb/2009:12:14:14.655] http-in static/srv1 10/0/30/69/109 200 2750 - - ---- 1/1/1/1/0 0/0 {1wt.eu} {} "GET /index.html HTTP/1.1"'
+    @sample2 = 'haproxy[18113]: 127.0.0.1:34549 [15/Oct/2003:15:19:06.103] px-http px-http/<NOSRV> -1/-1/-1/-1/+50001 408 +2750 - - cR-- 2/2/2/0/+2 0/0 ""'
+  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(:haproxy).capturing(:client_ip, :accept_date, :frontend_name, :backend_name, :server_name, :tq, :tw, :tc, :tr, :tt, :status_code, :bytes_read, :captured_request_cookie, :captured_response_cookie, :termination_event_code, :terminated_session_state, :clientside_persistence_cookie, :serverside_persistence_cookie, :actconn, :feconn, :beconn, :srv_conn, :retries, :srv_queue, :backend_queue, :captured_request_headers, :captured_response_headers, :http_request)
+  end
+
+  it "should match the sample line" do
+    @file_format.parse_line(@sample1).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(@sample1)) do |request|
+      request[:client_ip].should                      == '10.0.1.2'
+      request[:accept_date].should                    == 20090206121414
+      request[:frontend_name].should                  == 'http-in'
+      request[:backend_name].should                   == 'static'
+      request[:server_name].should                    == 'srv1'
+      request[:tq].should                             == 0.010
+      request[:tw].should                             == 0.000
+      request[:tc].should                             == 0.030
+      request[:tr].should                             == 0.069
+      request[:tt].should                             == 0.109
+      request[:status_code].should                    == 200
+      request[:bytes_read].should                     == 2750
+      request[:captured_request_cookie].should        == nil
+      request[:captured_response_cookie].should       == nil
+      request[:termination_event_code].should         == nil
+      request[:terminated_session_state].should       == nil
+      request[:clientside_persistence_cookie].should  == nil
+      request[:serverside_persistence_cookie].should  == nil
+      request[:actconn].should                        == 1
+      request[:feconn].should                         == 1
+      request[:beconn].should                         == 1
+      request[:srv_conn].should                       == 1
+      request[:retries].should                        == 0
+      request[:srv_queue].should                      == 0
+      request[:backend_queue].should                  == 0
+      request[:captured_request_headers].should       == '{1wt.eu}'
+      request[:captured_response_headers].should      == nil
+      request[:http_request].should                   == 'GET /index.html HTTP/1.1'
+    end
+  end
+
+  it "should parse and convert edge case sample fields correctly" do
+    @log_parser.parse_io(StringIO.new(@sample2)) do |request|
+      request[:accept_date].should                    == 20031015151906
+      request[:server_name].should                    == '<NOSRV>'
+      request[:tq].should                             == nil
+      request[:tw].should                             == nil
+      request[:tc].should                             == nil
+      request[:tr].should                             == nil
+      request[:tt].should                             == 50.001
+      request[:bytes_read].should                     == 2750
+      request[:captured_request_cookie].should        == nil
+      request[:captured_response_cookie].should       == nil
+      request[:termination_event_code].should         == 'c'
+      request[:terminated_session_state].should       == 'R'
+      request[:clientside_persistence_cookie].should  == nil
+      request[:serverside_persistence_cookie].should  == nil
+      request[:retries].should                        == 2
+      request[:captured_request_headers].should       == nil
+      request[:captured_response_headers].should      == nil
+      request[:http_request].should                   == nil
+    end
+  end
+
+end

data/spec/unit/file_format/line_definition_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::LineDefinition do
 

data/spec/unit/file_format/merb_format_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::FileFormat::Merb do
 

data/spec/unit/file_format/mysql_format_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe RequestLogAnalyzer::FileFormat::Mysql do