request-log-analyzer 1.13.1 → 1.13.3

data/spec/unit/file_format/delayed_job21_format_spec.rb

@@ -3,34 +3,40 @@ require 'spec_helper'
 describe RequestLogAnalyzer::FileFormat::DelayedJob do
 
   subject { RequestLogAnalyzer::FileFormat.load(:delayed_job21) }
-  
+
   it { should be_well_formed }
   it { should have_line_definition(:job_lock).capturing(:timestamp, :job, :host, :pid) }
   it { should have_line_definition(:job_completed).capturing(:timestamp, :duration, :host, :pid) }
-  it { should have(4).report_trackers }
+  it { should satisfy { |ff| ff.report_trackers.length == 4 } }
 
   describe '#parse_line' do
-    
-    let(:job_lock_sample1) { "2010-05-17T17:37:34+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] acquired lock on S3FileJob" } 
-    let(:job_lock_sample2) { "2010-05-17T17:37:34+0000: [Worker(delayed_job.0 host:hostname.co.uk pid:11888)] acquired lock on S3FileJob" } 
+
+    let(:job_lock_sample1) { '2010-05-17T17:37:34+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] acquired lock on S3FileJob' }
+    let(:job_lock_sample2) { '2010-05-17T17:37:34+0000: [Worker(delayed_job.0 host:hostname.co.uk pid:11888)] acquired lock on S3FileJob' }
     let(:job_completed_sample1) { '2010-05-17T17:37:35+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] S3FileJob completed after 1.0676' }
 
-    it { should parse_line(job_lock_sample1, 'with a single worker').as(:job_lock).and_capture(
-          :timestamp => 20100517173734, :job => 'S3FileJob', :host => 'hostname.co.uk', :pid => 11888) }
+    it do
+      should parse_line(job_lock_sample1, 'with a single worker').as(:job_lock).and_capture(
+          timestamp: 20_100_517_173_734, job: 'S3FileJob', host: 'hostname.co.uk', pid: 11_888)
+    end
+
+    it do
+      should parse_line(job_lock_sample2, 'with multiple workers').as(:job_lock).and_capture(
+          timestamp: 20_100_517_173_734, job: 'S3FileJob', host: 'hostname.co.uk', pid: 11_888)
+    end
 
-    it { should parse_line(job_lock_sample2, 'with multiple workers').as(:job_lock).and_capture(
-          :timestamp => 20100517173734, :job => 'S3FileJob', :host => 'hostname.co.uk', :pid => 11888) }
+    it do
+      should parse_line(job_completed_sample1).as(:job_completed).and_capture(
+          timestamp: 20_100_517_173_735, duration: 1.0676, host: 'hostname.co.uk', pid: 11_888, job: 'S3FileJob')
+    end
 
-    it { should parse_line(job_completed_sample1).as(:job_completed).and_capture(
-          :timestamp => 20100517173735, :duration => 1.0676, :host => 'hostname.co.uk', :pid => 11888, :job => 'S3FileJob') }
-          
     it { should_not parse_line('nonsense', 'a nonsense line') }
   end
-  
+
   describe '#parse_io' do
-    let(:log_parser) { RequestLogAnalyzer::Source::LogParser.new(subject) } 
-    
-    it "should parse a batch of completed jobs without warnings" do
+    let(:log_parser) { RequestLogAnalyzer::Source::LogParser.new(subject) }
+
+    it 'should parse a batch of completed jobs without warnings' do
       fragment = log_snippet(<<-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

data/spec/unit/file_format/delayed_job2_format_spec.rb

@@ -6,35 +6,41 @@ describe RequestLogAnalyzer::FileFormat::DelayedJob2 do
 
   it { should be_well_formed }
   it { should have_line_definition(:job_lock).capturing(:timestamp, :job, :host, :pid) }
-  it { should have_line_definition(:job_completed).capturing(:timestamp, :duration, :host, :pid) }  
-  it { should have(4).report_trackers }
-  
+  it { should have_line_definition(:job_completed).capturing(:timestamp, :duration, :host, :pid) }
+  it { should satisfy { |ff| ff.report_trackers.length == 4 } }
+
   describe '#parse_line' do
-    
-    let(:job_lock_sample1)     { "2010-05-17T17:37:34+0000: * [Worker(delayed_job host:hostname.co.uk pid:11888)] acquired lock on S3FileJob" }
-    let(:job_lock_sample2)     { "2010-05-17T17:37:34+0000: * [Worker(delayed_job.0 host:hostname.co.uk pid:11888)] acquired lock on S3FileJob" }
+
+    let(:job_lock_sample1)     { '2010-05-17T17:37:34+0000: * [Worker(delayed_job host:hostname.co.uk pid:11888)] acquired lock on S3FileJob' }
+    let(:job_lock_sample2)     { '2010-05-17T17:37:34+0000: * [Worker(delayed_job.0 host:hostname.co.uk pid:11888)] acquired lock on S3FileJob' }
     let(:job_completed_sample) { '2010-05-17T17:37:35+0000: * [JOB] delayed_job host:hostname.co.uk pid:11888 completed after 1.0676' }
-    let(:starting_sample)      { '2010-05-17T17:36:44+0000: *** Starting job worker delayed_job host:hostname.co.uk pid:11888' } 
+    let(:starting_sample)      { '2010-05-17T17:36:44+0000: *** Starting job worker delayed_job host:hostname.co.uk pid:11888' }
     let(:summary_sample)       { '3 jobs processed at 0.3163 j/s, 0 failed ...' }
-    
-    it { should parse_line(job_lock_sample1, 'with a single worker').as(:job_lock).and_capture(
-                    :timestamp => 20100517173734, :job => 'S3FileJob', :host => 'hostname.co.uk', :pid => 11888) }
 
-    it { should parse_line(job_lock_sample2, 'with multiple workers').as(:job_lock).and_capture(
-                    :timestamp => 20100517173734, :job => 'S3FileJob', :host => 'hostname.co.uk', :pid => 11888) }
+    it do
+      should parse_line(job_lock_sample1, 'with a single worker').as(:job_lock).and_capture(
+                    timestamp: 20_100_517_173_734, job: 'S3FileJob', host: 'hostname.co.uk', pid: 11_888)
+    end
 
-    it { should parse_line(job_completed_sample).as(:job_completed).and_capture(:timestamp => 20100517173735,
-                    :duration => 1.0676, :host => 'hostname.co.uk', :pid => 11888) }
+    it do
+      should parse_line(job_lock_sample2, 'with multiple workers').as(:job_lock).and_capture(
+                    timestamp: 20_100_517_173_734, job: 'S3FileJob', host: 'hostname.co.uk', pid: 11_888)
+    end
+
+    it do
+      should parse_line(job_completed_sample).as(:job_completed).and_capture(timestamp: 20_100_517_173_735,
+                    duration: 1.0676, host: 'hostname.co.uk', pid: 11_888)
+    end
 
     it { should_not parse_line(starting_sample, 'a starting line') }
     it { should_not parse_line(summary_sample, 'a summary line') }
     it { should_not parse_line('nonsense', 'a nonsense line') }
   end
-  
+
   describe '#parse_io' do
     let(:log_parser) { RequestLogAnalyzer::Source::LogParser.new(subject) }
 
-    it "should parse a batch of completed jobs without warnings" do
+    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

data/spec/unit/file_format/delayed_job3_format_spec.rb

@@ -8,8 +8,7 @@ describe RequestLogAnalyzer::FileFormat::DelayedJob do
   it { should have_line_definition(:job_completed).capturing(:timestamp, :duration, :host, :pid, :job) }
   it { should have_line_definition(:job_failed).capturing(:timestamp, :host, :pid, :job, :attempts) }
   it { should have_line_definition(:job_deleted).capturing(:timestamp, :host, :pid, :job, :failures) }
-  it { should have(6).report_trackers }
-
+  it { should satisfy { |ff| ff.report_trackers.length == 6 } }
 
   describe '#parse_line' do
 
@@ -17,23 +16,28 @@ describe RequestLogAnalyzer::FileFormat::DelayedJob do
     let(:job_failed_sample) { '2010-05-17T17:37:35+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] S3FileJob.create failed with SocketError: getaddrinfo: Name or service not known - 0 failed attempts' }
     let(:job_deleted_sample) { '2010-05-17T17:37:35+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] PERMANENTLY removing S3FileJob.create because of 25 consecutive failures.' }
 
-    it { should parse_line(job_completed_sample).as(:job_completed).and_capture(
-          :timestamp => 20100517173735, :duration => 1.0676, :host => 'hostname.co.uk', :pid => 11888, :job => 'S3FileJob.create') }
+    it do
+      should parse_line(job_completed_sample).as(:job_completed).and_capture(
+          timestamp: 20_100_517_173_735, duration: 1.0676, host: 'hostname.co.uk', pid: 11_888, job: 'S3FileJob.create')
+    end
 
-    it { should parse_line(job_failed_sample).as(:job_failed).and_capture(
-          :timestamp => 20100517173735, :host => 'hostname.co.uk', :pid => 11888, :job => 'S3FileJob.create failed with SocketError: getaddrinfo: Name or service not known', :attempts => 0) }
+    it do
+      should parse_line(job_failed_sample).as(:job_failed).and_capture(
+          timestamp: 20_100_517_173_735, host: 'hostname.co.uk', pid: 11_888, job: 'S3FileJob.create failed with SocketError: getaddrinfo: Name or service not known', attempts: 0)
+    end
 
-    it { should parse_line(job_deleted_sample).as(:job_deleted).and_capture(
-          :timestamp => 20100517173735, :host => 'hostname.co.uk', :pid => 11888, :job => 'S3FileJob.create', :failures => 25) }
+    it do
+      should parse_line(job_deleted_sample).as(:job_deleted).and_capture(
+          timestamp: 20_100_517_173_735, host: 'hostname.co.uk', pid: 11_888, job: 'S3FileJob.create', failures: 25)
+    end
 
     it { should_not parse_line('nonsense', 'a nonsense line') }
   end
 
-
   describe '#parse_io' do
     let(:log_parser) { RequestLogAnalyzer::Source::LogParser.new(subject) }
 
-    it "should parse a batch of completed jobs without warnings" do
+    it 'should parse a batch of completed jobs without warnings' do
       fragment = log_snippet(<<-EOLOG)
         2010-05-17T17:36:44+0000: *** Starting job worker delayed_job host:hostname.co.uk pid:11888
         2010-05-17T17:37:35+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] S3FileJob completed after 1.0676

data/spec/unit/file_format/delayed_job4_format_spec.rb

@@ -8,8 +8,7 @@ describe RequestLogAnalyzer::FileFormat::DelayedJob do
   it { should have_line_definition(:job_completed).capturing(:timestamp, :duration, :host, :pid, :job) }
   it { should have_line_definition(:job_failed).capturing(:timestamp, :host, :pid, :job, :attempts, :error) }
   it { should have_line_definition(:job_deleted).capturing(:timestamp, :host, :pid, :job, :failures) }
-  it { should have(6).report_trackers }
-
+  it { should satisfy { |ff| ff.report_trackers.length == 6 } }
 
   describe '#parse_line' do
 
@@ -17,23 +16,28 @@ describe RequestLogAnalyzer::FileFormat::DelayedJob do
     let(:job_failed_sample) { '2010-05-17T17:37:35+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] Job S3FileJob.create (id=534785) FAILED (0 prior attempts) with SocketError: getaddrinfo: Name or service not known' }
     let(:job_deleted_sample) { '2010-05-17T17:37:35+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] Job S3FileJob.create (id=534785) REMOVED permanently because of 25 consecutive failures' }
 
-    it { should parse_line(job_completed_sample).as(:job_completed).and_capture(
-          :timestamp => 20100517173735, :duration => 1.0676, :host => 'hostname.co.uk', :pid => 11888, :job => 'S3FileJob.create') }
+    it do
+      should parse_line(job_completed_sample).as(:job_completed).and_capture(
+          timestamp: 20_100_517_173_735, duration: 1.0676, host: 'hostname.co.uk', pid: 11_888, job: 'S3FileJob.create')
+    end
 
-    it { should parse_line(job_failed_sample).as(:job_failed).and_capture(
-          :timestamp => 20100517173735, :host => 'hostname.co.uk', :pid => 11888, :job => 'S3FileJob.create (id=534785)', :attempts => 0, :error => "SocketError: getaddrinfo: Name or service not known") }
+    it do
+      should parse_line(job_failed_sample).as(:job_failed).and_capture(
+          timestamp: 20_100_517_173_735, host: 'hostname.co.uk', pid: 11_888, job: 'S3FileJob.create (id=534785)', attempts: 0, error: 'SocketError: getaddrinfo: Name or service not known')
+    end
 
-    it { should parse_line(job_deleted_sample).as(:job_deleted).and_capture(
-          :timestamp => 20100517173735, :host => 'hostname.co.uk', :pid => 11888, :job => 'S3FileJob.create (id=534785)', :failures => 25) }
+    it do
+      should parse_line(job_deleted_sample).as(:job_deleted).and_capture(
+          timestamp: 20_100_517_173_735, host: 'hostname.co.uk', pid: 11_888, job: 'S3FileJob.create (id=534785)', failures: 25)
+    end
 
     it { should_not parse_line('nonsense', 'a nonsense line') }
   end
 
-
   describe '#parse_io' do
     let(:log_parser) { RequestLogAnalyzer::Source::LogParser.new(subject) }
 
-    it "should parse a batch of completed jobs without warnings" do
+    it 'should parse a batch of completed jobs without warnings' do
       fragment = log_snippet(<<-EOLOG)
         2010-05-17T17:36:44+0000: *** Starting job worker delayed_job host:hostname.co.uk pid:11888
         2010-05-17T17:37:35+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] Job S3FileJob (id=534785) COMPLETED after 1.0676

data/spec/unit/file_format/delayed_job_format_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe RequestLogAnalyzer::FileFormat::DelayedJob do
-  
+
   subject { RequestLogAnalyzer::FileFormat.load(:delayed_job) }
 
   it { should be_well_formed }
@@ -9,28 +9,28 @@ describe RequestLogAnalyzer::FileFormat::DelayedJob do
   it { should have_line_definition(:job_completed).capturing(:completed_job, :duration) }
   it { should have_line_definition(:job_lock_failed).capturing(:locked_job) }
   it { should have_line_definition(:job_failed).capturing(:failed_job, :attempts, :exception) }
-  it { should have(3).report_trackers }
+  it { should satisfy { |ff| ff.report_trackers.length == 3 } }
 
   describe '#parse_line' do
     let(:job_lock_sample)        { '* [JOB] acquiring lock on BackgroundJob::ThumbnailSaver' }
     let(:job_completed_sample)   { '* [JOB] BackgroundJob::ThumbnailSaver completed after 0.7932' }
     let(:job_lock_failed_sample) { '* [JOB] failed to acquire exclusive lock for BackgroundJob::ThumbnailSaver' }
-    let(:job_failed_sample)      { "* [JOB] BackgroundJob::ThumbnailSaver failed with ActiveRecord::RecordNotFound: Couldn't find Design with ID=20413443 - 1 failed attempts" }  
+    let(:job_failed_sample)      { "* [JOB] BackgroundJob::ThumbnailSaver failed with ActiveRecord::RecordNotFound: Couldn't find Design with ID=20413443 - 1 failed attempts" }
     let(:summary_sample)         { '1 jobs processed at 1.0834 j/s, 0 failed ...' }
 
-    it { should parse_line(job_lock_sample).as(:job_lock).and_capture(:job => 'BackgroundJob::ThumbnailSaver') }
-    it { should parse_line(job_completed_sample).as(:job_completed).and_capture(:duration => 0.7932, :completed_job => 'BackgroundJob::ThumbnailSaver') }
-    it { should parse_line(job_lock_failed_sample).as(:job_lock_failed).and_capture(:locked_job => 'BackgroundJob::ThumbnailSaver') }
-    it { should parse_line(job_failed_sample).as(:job_failed).and_capture(:attempts => 1, :failed_job => 'BackgroundJob::ThumbnailSaver', :exception => 'ActiveRecord::RecordNotFound') }
+    it { should parse_line(job_lock_sample).as(:job_lock).and_capture(job: 'BackgroundJob::ThumbnailSaver') }
+    it { should parse_line(job_completed_sample).as(:job_completed).and_capture(duration: 0.7932, completed_job: 'BackgroundJob::ThumbnailSaver') }
+    it { should parse_line(job_lock_failed_sample).as(:job_lock_failed).and_capture(locked_job: 'BackgroundJob::ThumbnailSaver') }
+    it { should parse_line(job_failed_sample).as(:job_failed).and_capture(attempts: 1, failed_job: 'BackgroundJob::ThumbnailSaver', exception: 'ActiveRecord::RecordNotFound') }
 
     it { should_not parse_line(summary_sample, 'a summary line') }
     it { should_not parse_line('nonsense', 'a nonsense line') }
   end
 
   describe '#parse_io' do
-    let(:log_parser) { RequestLogAnalyzer::Source::LogParser.new(subject) } 
-    
-    it "should parse a batch of completed jobs without warnings" do
+    let(:log_parser) { RequestLogAnalyzer::Source::LogParser.new(subject) }
+
+    it 'should parse a batch of completed jobs without warnings' do
       fragment = log_snippet(<<-EOLOG)
           * [JOB] acquiring lock on BackgroundJob::ThumbnailSaver
           * [JOB] BackgroundJob::ThumbnailSaver completed after 0.9114
@@ -43,8 +43,8 @@ describe RequestLogAnalyzer::FileFormat::DelayedJob do
       log_parser.should_not_receive(:warn)
       log_parser.parse_io(fragment)
     end
-    
-    it "should parse a batch with a failed job without warnings" do
+
+    it 'should parse a batch with a failed job without warnings' do
       fragment = log_snippet(<<-EOLOG)
           * [JOB] acquiring lock on BackgroundJob::ThumbnailSaver
           * [JOB] BackgroundJob::ThumbnailSaver completed after 1.0627

data/spec/unit/file_format/file_format_api_spec.rb

@@ -2,27 +2,27 @@ require 'spec_helper'
 
 describe RequestLogAnalyzer::FileFormat do
 
-  describe ".format_definition" 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/
+    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
+    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}]
+        format.block_test regexp: /test (\w+)/, captures: [{ name: :tester, type: :string }]
       end
 
       @first_file_format.should have_line_definition(:block_test).capturing(:tester)
     end
 
-    it "should specify a line with a block" do
+    it 'should specify a line with a block' do
       @first_file_format.format_definition.hash_test do |line|
         line.regexp   = /test/
         line.captures = []
@@ -31,39 +31,39 @@ describe RequestLogAnalyzer::FileFormat do
       @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/
+    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)
+      @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     have_line_definition(:second)
+      @second_file_format.should have_line_definition(:second)
     end
   end
 
-  describe ".load" do
+  describe '.load' do
 
-    it "should return an instance of a FileFormat class" do
+    it 'should return an instance of a FileFormat class' do
       @file_format = RequestLogAnalyzer::FileFormat.load(TestingFormat)
       @file_format.should be_kind_of(TestingFormat)
     end
 
-    it "should return itself if it already is a FileFormat::Base instance" do
+    it 'should return itself if it already is a FileFormat::Base instance' do
       @file_format = RequestLogAnalyzer::FileFormat.load(testing_format)
       @file_format.should be_kind_of(TestingFormat)
     end
 
-    it "should load a predefined file format from the /file_format dir" do
+    it 'should load a predefined file format from the /file_format dir' 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
+    it 'should load a provided format file' do
       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
-    
+
   end
-end
+end

data/spec/unit/file_format/format_autodetection_spec.rb

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

data/spec/unit/file_format/haproxy_format_spec.rb

@@ -11,7 +11,7 @@ describe RequestLogAnalyzer::FileFormat::Haproxy do
   it { should have_line_definition(:haproxy12).capturing(:client_ip, :timestamp, :frontend_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, :srv_conn, :listener_conn, :process_conn, :srv_queue, :backend_queue, :captured_request_headers, :captured_response_headers, :http_request) }
   it { should have_line_definition(:haproxy11).capturing(:client_ip, :timestamp, :frontend_name, :server_name, :tq, :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, :listener_conn, :process_conn, :captured_request_headers, :captured_response_headers, :http_request) }
 
-  it { should have(14).report_trackers }
+  it { should satisfy { |ff| ff.report_trackers.length == 14 } }
 
   let(:sample_haproxy13) { '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"' }
   let(:sample_haproxy12) { 'Mar 15 06:36:49 localhost haproxy[9367]: 127.0.0.1:38990 [15/Mar/2011:06:36:45.103] as-proxy mc-search-2 0/0/0/730/731 200 29404 - - --NN 2/54/54 0/0 {66.249.68.216} {} "GET /neighbor/26014153 HTTP/1.0" ' }
@@ -19,61 +19,65 @@ describe RequestLogAnalyzer::FileFormat::Haproxy do
   let(:sample_errors)    { '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 ""' }
 
   describe '#parse_line' do
-    it { should parse_line(sample_haproxy13, 'an haproxy 1.3 access line').and_capture(
-            :client_ip => '10.0.1.2',     :tq => 0.010,   :captured_request_cookie => nil,
-            :timestamp => 20090206121414, :tw => 0.000,   :captured_response_cookie => nil,
-            :frontend_name => 'http-in',  :tc => 0.030,   :clientside_persistence_cookie => nil,
-            :backend_name => 'static',    :tr => 0.069,   :serverside_persistence_cookie => nil,
-            :server_name => 'srv1',       :tt => 0.109,   :termination_event_code => nil,
-            :status_code => 200,          :actconn => 1,  :terminated_session_state => nil,
-            :bytes_read => 2750,          :feconn => 1,   :captured_request_headers => '{1wt.eu}',
-            :backend_queue => 0,          :beconn => 1,   :captured_response_headers => nil,
-            :retries => 0,                :srv_conn => 1, :srv_queue => 0,
-            :http_request => 'GET /index.html HTTP/1.1')
-    }
+    it do
+      should parse_line(sample_haproxy13, 'an haproxy 1.3 access line').and_capture(
+            client_ip: '10.0.1.2',     tq: 0.010,   captured_request_cookie: nil,
+            timestamp: 20_090_206_121_414, tw: 0.000,   captured_response_cookie: nil,
+            frontend_name: 'http-in',  tc: 0.030,   clientside_persistence_cookie: nil,
+            backend_name: 'static',    tr: 0.069,   serverside_persistence_cookie: nil,
+            server_name: 'srv1',       tt: 0.109,   termination_event_code: nil,
+            status_code: 200,          actconn: 1,  terminated_session_state: nil,
+            bytes_read: 2750,          feconn: 1,   captured_request_headers: '{1wt.eu}',
+            backend_queue: 0,          beconn: 1,   captured_response_headers: nil,
+            retries: 0,                srv_conn: 1, srv_queue: 0,
+            http_request: 'GET /index.html HTTP/1.1')
+    end
+
+    it do
+      should parse_line(sample_haproxy12, 'an haproxy 1.2 access line').and_capture(
+            client_ip: '127.0.0.1',    tq: 0.000,         captured_request_cookie: nil,
+            timestamp: 20_110_315_063_645, tw: 0.000,         captured_response_cookie: nil,
+            frontend_name: 'as-proxy', tc: 0.000,         clientside_persistence_cookie: 'N',
+            server_name: 'mc-search-2', tr: 0.730,         serverside_persistence_cookie: 'N',
+            status_code: 200,          tt: 0.731,         termination_event_code: nil,
+            bytes_read: 29_404,         listener_conn: 54, terminated_session_state: nil,
+            backend_queue: 0,          process_conn: 54,  captured_request_headers: '{66.249.68.216}',
+            srv_queue: 0,              srv_conn: 2,       captured_response_headers: nil,
+            http_request: 'GET /neighbor/26014153 HTTP/1.0')
+    end
+
+    it do
+      should parse_line(sample_haproxy11, 'an haproxy 1.1 access line').and_capture(
+            client_ip: '127.0.0.1',      tq: 0.009,       captured_request_cookie: nil,
+            timestamp: 20_031_015_083_217,   tc: 0.007,       captured_response_cookie: nil,
+            frontend_name: 'relais-http', tr: 0.014,       clientside_persistence_cookie: nil,
+            server_name: 'Srv1',         tt: 0.030,       serverside_persistence_cookie: nil,
+            status_code: 502,            listener_conn: 2, termination_event_code: 'P',
+            bytes_read: 243,             process_conn: 3, terminated_session_state: 'H',
+            captured_request_headers: nil,                   captured_response_headers: nil,
+            http_request: nil)
+    end
 
-    it { should parse_line(sample_haproxy12, 'an haproxy 1.2 access line').and_capture(
-            :client_ip => '127.0.0.1',    :tq => 0.000,         :captured_request_cookie => nil,
-            :timestamp => 20110315063645, :tw => 0.000,         :captured_response_cookie => nil,
-            :frontend_name => 'as-proxy', :tc => 0.000,         :clientside_persistence_cookie => 'N',
-            :server_name => 'mc-search-2',:tr => 0.730,         :serverside_persistence_cookie => 'N',
-            :status_code => 200,          :tt => 0.731,         :termination_event_code => nil,
-            :bytes_read => 29404,         :listener_conn => 54, :terminated_session_state => nil,
-            :backend_queue => 0,          :process_conn => 54,  :captured_request_headers => '{66.249.68.216}',
-            :srv_queue => 0,              :srv_conn => 2,       :captured_response_headers => nil,
-            :http_request => 'GET /neighbor/26014153 HTTP/1.0')
-    }
+    it do
+      should parse_line(sample_errors, 'a failed access line').and_capture(
+            timestamp: 20_031_015_151_906, tq: nil,    captured_request_cookie: nil,
+            server_name: '<NOSRV>',    tw: nil,    captured_response_cookie: nil,
+            bytes_read: 2750,          tc: nil,    clientside_persistence_cookie: nil,
+            retries: 2,                tr: nil,    serverside_persistence_cookie: nil,
+            http_request: nil,         tt: 50.001, termination_event_code: 'c',
+                                                         terminated_session_state: 'R',
+                                                         captured_request_headers: nil,
+                                                         captured_response_headers: nil)
+    end
 
-    it { should parse_line(sample_haproxy11, 'an haproxy 1.1 access line').and_capture(
-            :client_ip => '127.0.0.1',      :tq => 0.009,       :captured_request_cookie => nil,
-            :timestamp => 20031015083217,   :tc => 0.007,       :captured_response_cookie => nil,
-            :frontend_name => 'relais-http',:tr => 0.014,       :clientside_persistence_cookie => nil,
-            :server_name => 'Srv1',         :tt => 0.030,       :serverside_persistence_cookie => nil,
-            :status_code => 502,            :listener_conn => 2,:termination_event_code => 'P',
-            :bytes_read => 243,             :process_conn => 3, :terminated_session_state => 'H',
-            :captured_request_headers => nil,                   :captured_response_headers => nil,
-            :http_request => nil)
-    }
-    
-    it { should parse_line(sample_errors, 'a failed access line').and_capture(
-            :timestamp => 20031015151906, :tq => nil,    :captured_request_cookie => nil,
-            :server_name => '<NOSRV>',    :tw => nil,    :captured_response_cookie => nil,
-            :bytes_read => 2750,          :tc => nil,    :clientside_persistence_cookie => nil,
-            :retries => 2,                :tr => nil,    :serverside_persistence_cookie => nil,
-            :http_request => nil,         :tt => 50.001, :termination_event_code => 'c',
-                                                         :terminated_session_state => 'R',
-                                                         :captured_request_headers => nil,
-                                                         :captured_response_headers => nil)
-    }
-    
     it { should_not parse_line('nonsense') }
   end
-  
+
   describe '#parse_io' do
     let(:log_parser) { RequestLogAnalyzer::Source::LogParser.new(subject) }
     let(:snippet)    { log_snippet(sample_haproxy13, sample_haproxy12, sample_haproxy11, sample_errors, 'nonsense') }
-    
-    it "should parse a log snippet without warnings" do
+
+    it 'should parse a log snippet without warnings' do
       log_parser.should_receive(:handle_request).exactly(4).times
       log_parser.should_not_receive(:warn)
       log_parser.parse_io(snippet)